diff --git a/.jshintignore b/.eslintignore similarity index 92% rename from .jshintignore rename to .eslintignore index ac11baa97e..5b61bf6c51 100644 --- a/.jshintignore +++ b/.eslintignore @@ -7,6 +7,7 @@ app/assets/javascripts/vendor.js app/assets/javascripts/locales/i18n.js app/assets/javascripts/defer/html-sanitizer-bundle.js app/assets/javascripts/discourse/lib/Markdown.Editor.js +app/assets/javascripts/ember-addons/ jsapp/lib/Markdown.Editor.js lib/javascripts/locale/ lib/javascripts/messageformat.js @@ -20,5 +21,5 @@ vendor/ test/javascripts/helpers/ test/javascripts/test_helper.js test/javascripts/test_helper.js +test/javascripts/fixtures app/assets/javascripts/ember-addons/ - diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000000..d2a13ae262 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,102 @@ +{ + "env": { + "jasmine": true, + "node": true, + "mocha": true, + "browser": true, + "builtin": true + }, + ecmaVersion: 7, + "globals": + {"Ember":true, + "jQuery":true, + "$":true, + "RSVP":true, + "Discourse":true, + "Em":true, + "PreloadStore":true, + "Handlebars":true, + "I18n":true, + "bootbox":true, + "module":true, + "moduleFor":true, + "moduleForComponent":true, + "Pretender":true, + "sandbox":true, + "controllerFor":true, + "test":true, + "ok":true, + "not":true, + "expect":true, + "equal":true, + "visit":true, + "andThen":true, + "click":true, + "currentPath":true, + "currentRouteName":true, + "currentURL":true, + "fillIn":true, + "keyEvent":true, + "triggerEvent":true, + "count":true, + "exists":true, + "visible":true, + "invisible":true, + "asyncRender":true, + "selectDropdown":true, + "asyncTestDiscourse":true, + "fixture":true, + "find":true, + "sinon":true, + "moment":true, + "start":true, + "_":true, + "alert":true, + "containsInstance":true, + "deepEqual":true, + "notEqual":true, + "define":true, + "require":true, + "requirejs":true, + "hasModule":true, + "Blob":true, + "File":true}, + "rules": { + "block-scoped-var": 2, + "dot-notation": 0, + "eqeqeq": [ + 2, + "allow-null" + ], + "guard-for-in": 2, + "no-bitwise": 2, + "no-caller": 2, + "no-cond-assign": 0, + "no-debugger": 2, + "no-empty": 0, + "no-eval": 2, + "no-extend-native": 2, + "no-extra-parens": 0, + "no-irregular-whitespace": 2, + "no-iterator": 2, + "no-loop-func": 2, + "no-multi-str": 2, + "no-new": 2, + "no-plusplus": 0, + "no-proto": 2, + "no-script-url": 2, + "no-sequences": 2, + "no-shadow": 2, + "no-undef": 2, + "no-unused-vars": 2, + "no-with": 2, + "semi": 2, + "strict": 0, + "valid-typeof": 2, + "wrap-iife": [ + 2, + "inside" + ] + }, + "parser": "babel-eslint" +} diff --git a/.image_optim.yml b/.image_optim.yml index c7196cbb29..4a9ad0555c 100644 --- a/.image_optim.yml +++ b/.image_optim.yml @@ -1,11 +1,11 @@ skip_missing_workers: true -allow_lossy: true +allow_lossy: false # PNG advpng: false -optipng: false +optipng: + level: 2 pngcrush: false pngout: false -pngquant: - quality: !ruby/range 10..90 +pngquant: false # JPG jpegrecompress: false diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 55cc59d193..0000000000 --- a/.jshintrc +++ /dev/null @@ -1,86 +0,0 @@ -{ - "predef":["Ember", - "jQuery", - "$", - "RSVP", - "Discourse", - "Em", - "PreloadStore", - "Handlebars", - "I18n", - "bootbox", - "module", - "moduleFor", - "moduleForComponent", - "Pretender", - "sandbox", - "controllerFor", - "test", - "ok", - "not", - "expect", - "equal", - "blank", - "present", - "visit", - "andThen", - "click", - "currentPath", - "currentRouteName", - "currentURL", - "fillIn", - "keyEvent", - "triggerEvent", - "count", - "exists", - "visible", - "invisible", - "asyncRender", - "selectDropdown", - "asyncTestDiscourse", - "fixture", - "find", - "sinon", - "moment", - "start", - "_", - "alert", - "containsInstance", - "parseHTML", - "deepEqual", - "notEqual", - "define", - "require", - "requirejs", - "hasModule", - "Blob", - "File"], - "node" : false, - "browser" : true, - "boss" : true, - "curly": false, - "debug": false, - "devel": false, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "unused": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "quotmark": false, - "lastsemic": true, - "esnext": true -} diff --git a/.travis.yml b/.travis.yml index 9c2e282d89..62961abc4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,18 @@ env: - DISCOURSE_HOSTNAME=www.example.com - RUBY_GC_MALLOC_LIMIT=50000000 matrix: + - "RAILS_MASTER=0" - "RAILS42=1" - "RAILS_MASTER=1" - - "RAILS_MASTER=0" addons: postgresql: 9.3 + apt: + packages: + - gifsicle + - jpegoptim + - optipng + - jhead matrix: allow_failures: @@ -23,18 +29,23 @@ rvm: - 2.0.0 - 2.1 - 2.2 - - rbx-2 services: - redis-server sudo: false -cache: bundler +cache: + directories: + - vendor/bundle before_install: - - npm i -g jshint - - jshint . + - gem install bundler + - npm i -g eslint babel-eslint + - eslint app/assets/javascripts + - eslint --ext .es6 app/assets/javascripts + - eslint --ext .es6 test/javascripts + - eslint test/javascripts before_script: - bundle exec rake db:create db:migrate diff --git a/Brewfile b/Brewfile index 2f0e8f764e..ee7378b71c 100644 --- a/Brewfile +++ b/Brewfile @@ -1,22 +1,19 @@ # Install development dependencies on Mac OS X using Homebrew (http://mxcl.github.com/homebrew) -# ensure that Homebrew's sources are up to date -update - # add this repo to Homebrew's sources -tap homebrew/dupes +tap 'homebrew/dupes' # install the gcc compiler required for ruby -install apple-gcc42 +brew 'apple-gcc42' # you probably already have git installed; ensure that it is the latest version -install git +brew 'git' # install the PostgreSQL database -install postgresql +brew 'postgresql' # install the Redis datastore -install redis +brew 'redis' # install headless Javascript testing library -install phantomjs +brew 'phantomjs' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f00d5d078e..98aa05e4ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,129 +1,27 @@ # Contributing to Discourse -## Before You Start +## Important note for Developers -Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/discourse/discourse)** project **MUST read & sign the [Electronic Discourse Forums Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. +Anyone wishing to contribute to the [github.com/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contributor License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. -## Reporting Bugs +For more information on -1. Always update to the most recent master release; the bug may already be resolved. +- how to set up your development environment +- first-time project suggestions +- code conventions +- step-by-step guide for GitHub commits -2. Search for similar issues on the [Discourse meta forum][m]; it may already be an identified problem. +**please read our [Discourse Development Contribution Guidelines](https://meta.discourse.org/t/discourse-development-contribution-guidelines/3823)** -3. Make sure you can reproduce your problem on our sandbox at [try.discourse.org](http://try.discourse.org) +## Everything Else -4. If this is a bug or problem that **requires any kind of extended discussion -- open [a topic on meta][m] about it**. +There are many other ways to contribute to Discourse besides code. We've outlined the most common ones below. -5. If possible, submit a Pull Request with a failing test. If you'd rather take matters into your own hands, fix the bug yourself (jump down to the "Contributing (Step-by-step)" section). +- [Reporting Bugs](https://meta.discourse.org/t/how-to-make-bug-reports-for-discourse/33070) +- [Requesting Features](https://meta.discourse.org/t/how-to-request-new-features-for-discourse/32986) +- [Translation](https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882) +- Documentation (TBA) -6. When the bug is fixed, we will do our best to update the Discourse topic. +For anything else, just start a new topic on [Meta](https://meta.discourse.org/) and let us know what you're interested in working on. -## Requesting New Features - -1. Do not submit a feature request on GitHub; all feature requests on GitHub will be closed. Instead, visit the **[Discourse meta forum, features category](http://meta.discourse.org/category/feature)**, and search this list for similar feature requests. It's possible somebody has already asked for this feature or provided a pull request that we're still discussing. - -2. Provide a clear and detailed explanation of the feature you want and why it's important to add. The feature must apply to a wide array of users of Discourse; for smaller, more targeted "one-off" features, you might consider writing a plugin for Discourse. You may also want to provide us with some advance documentation on the feature, which will help the community to better understand where it will fit. - -3. If you're a Rock Star programmer, build the feature yourself (refer to the "Contributing (Step-by-step)" section below). - -## Contributing (Step-by-step) - -1. Clone the Repo: - - git clone git://github.com/discourse/discourse.git - -2. Create a new Branch: - - cd discourse - git checkout -b new_discourse_branch - - > Please keep your code clean: one feature or bug-fix per branch. If you find another bug, you want to fix while being in a new branch, please fix it in a separated branch instead. - -3. Code - * Adhere to common conventions you see in the existing code - * Include tests, and ensure they pass - * Search to see if your new functionality has been discussed on [the Discourse meta forum](http://meta.discourse.org), and include updates as appropriate - -4. Follow the Coding Conventions - * two spaces, no tabs - * no trailing whitespaces, blank lines should have no spaces - * use spaces around operators, after commas, colons, semicolons, around `{` and before `}` - * no space after `(`, `[` or before `]`, `)` - * use Ruby 1.9 hash syntax: prefer `{ a: 1 }` over `{ :a => 1 }` - * prefer `class << self; def method; end` over `def self.method` for class methods - * prefer `{ ... }` over `do ... end` for single-line blocks, avoid using `{ ... }` for multi-line blocks - * avoid `return` when not required - - > However, please note that **pull requests consisting entirely of style changes are not welcome on this project**. Style changes in the context of pull requests that also refactor code, fix bugs, improve functionality *are* welcome. - -5. Commit - - For every commit please write a short (max 72 characters) summary in the first line followed with a blank line and then more detailed descriptions of the change. Use markdown syntax for simple styling. - - **NEVER leave the commit message blank!** Provide a detailed, clear, and complete description of your commit! - - -6. Update your branch - - ``` - git fetch origin - git rebase origin/master - ``` - -7. Fork - - ``` - git remote add mine git@github.com:/discourse.git - ``` - -8. Push to your remote - - ``` - git push mine new_discourse_branch - ``` - -9. Issue a Pull Request - - Before submitting a pull-request, clean up the history, go over your commits and squash together minor changes and fixes into the corresponding commits. You can squash commits with the interactive rebase command: - - ``` - git fetch origin - git checkout new_discourse_branch - git rebase origin/master - git rebase -i - - < the editor opens and allows you to change the commit history > - < follow the instructions on the bottom of the editor > - - git push -f mine new_discourse_branch - ``` - - - In order to make a pull request, - * Navigate to the Discourse repository you just pushed to (e.g. https://github.com/your-user-name/discourse) - * Click "Pull Request". - * Write your branch name in the branch field (this is filled with "master" by default) - * Click "Update Commit Range". - * Ensure the changesets you introduced are included in the "Commits" tab. - * Ensure that the "Files Changed" incorporate all of your changes. - * Fill in some details about your potential patch including a meaningful title. - * Click "Send pull request". - - Thanks for that -- we'll get to your pull request ASAP, we love pull requests! - -10. Responding to Feedback - - The Discourse team may recommend adjustments to your code. Part of interacting with a healthy open-source community requires you to be open to learning new techniques and strategies; *don't get discouraged!* Remember: if the Discourse team suggest changes to your code, **they care enough about your work that they want to include it**, and hope that you can assist by implementing those revisions on your own. - - > Though we ask you to clean your history and squash commit before submitting a pull-request, please do not change any commits you've submitted already (as other work might be build on top). - -## Translations - -Translators can do their work in our [Transifex project](https://www.transifex.com/projects/p/discourse-org/). For more information, please see these how-to topics: - -* [Contributing a translation to Discourse](https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882) -* [How to add a new language](https://meta.discourse.org/t/how-to-add-a-new-language/14970) - - - -[m]: http://meta.discourse.org +*Thanks for contributing!* diff --git a/Gemfile b/Gemfile index 03750100f4..2332689189 100644 --- a/Gemfile +++ b/Gemfile @@ -25,8 +25,6 @@ else gem 'seed-fu', '~> 2.3.3' end -gem 'actionpack-action_caching' - # Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`. # However, mail gem 2.6.x currently does not work with discourse because of the # reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse @@ -42,7 +40,7 @@ gem 'active_model_serializers', '~> 0.8.3' gem 'onebox' gem 'ember-rails' -gem 'ember-source', '1.11.3.1' +gem 'ember-source', '1.12.1' gem 'handlebars-source', '2.0.0' gem 'barber' gem 'babel-transpiler' @@ -65,7 +63,8 @@ gem 'email_reply_parser' # note: for image_optim to correctly work you need to follow # https://github.com/toy/image_optim -gem 'image_optim' +# pinned due to https://github.com/toy/image_optim/pull/75, docker image must be upgraded to upgrade +gem 'image_optim', '0.20.2' gem 'multi_json' gem 'mustache' gem 'nokogiri' @@ -92,6 +91,7 @@ gem 'rinku' gem 'sanitize' gem 'sass' gem 'sidekiq' +gem 'sidekiq-statistic' # for sidekiq web gem 'sinatra', require: false @@ -133,6 +133,7 @@ group :test, :development do gem 'rspec-given' gem 'pry-nav' gem 'spork-rails' + gem 'byebug' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 562f3a9197..46f0d552f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,8 +15,6 @@ GEM activesupport (= 4.1.10) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-action_caching (1.1.1) - actionpack (>= 4.0.0, < 5.0) actionview (4.1.10) activesupport (= 4.1.10) builder (~> 3.1) @@ -48,9 +46,9 @@ GEM multi_json (~> 1.0) aws-sdk-resources (2.0.45) aws-sdk-core (= 2.0.45) - babel-source (4.6.6) - babel-transpiler (0.6.0) - babel-source (>= 4.0, < 5) + babel-source (5.8.19) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) execjs (~> 2.0) barber (0.9.0) ember-source (>= 1.0, < 2) @@ -62,11 +60,14 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) + byebug (5.0.0) + columnize (= 0.9.0) celluloid (0.16.0) timers (~> 4.0.0) certified (1.0.0) coderay (1.1.0) - connection_pool (2.1.2) + columnize (0.9.0) + connection_pool (2.2.0) crass (1.0.1) daemons (1.2.2) debug_inspector (0.0.2) @@ -88,7 +89,7 @@ GEM ember-source (>= 1.1.0) jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (1.11.3.1) + ember-source (1.12.1) erubis (2.7.0) eventmachine (1.0.7) excon (0.45.3) @@ -139,7 +140,7 @@ GEM jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.3) jwt (1.3.0) kgio (2.9.3) librarian (0.1.2) @@ -147,13 +148,13 @@ GEM thor (~> 0.15) libv8 (3.16.14.7) listen (0.7.3) - logster (0.8.1) + logster (1.0.0.3.pre) lru_redux (1.1.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) memory_profiler (0.9.3) - message_bus (1.0.12) + message_bus (1.0.16) rack (>= 1.1.3) redis metaclass (0.0.4) @@ -166,10 +167,10 @@ GEM mock_redis (0.14.0) moneta (0.8.0) msgpack (0.5.11) - multi_json (1.11.0) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - mustache (0.99.8) + mustache (1.0.2) netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) @@ -208,11 +209,11 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - onebox (1.5.19) - moneta (~> 0.7) - multi_json (~> 1.7) - mustache (~> 0.99) - nokogiri (~> 1.6.1) + onebox (1.5.26) + moneta (~> 0.8) + multi_json (~> 1.11) + mustache + nokogiri (~> 1.6.6) openid-redis-store (0.0.2) redis ruby-openid @@ -230,8 +231,8 @@ GEM puma (2.11.1) rack (>= 1.1, < 2.0) r2 (0.2.5) - rack (1.5.3) - rack-mini-profiler (0.9.3) + rack (1.5.5) + rack-mini-profiler (0.9.6) rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) @@ -270,7 +271,7 @@ GEM trollop (>= 1.16.2) redcarpet (3.2.2) redis (3.2.1) - redis-namespace (1.5.1) + redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) ref (1.0.5) rest-client (1.7.2) @@ -326,12 +327,14 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.7.0) activesupport (>= 3.0.0) - sidekiq (3.3.2) - celluloid (>= 0.16.0) - connection_pool (>= 2.1.1) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) + sidekiq (3.4.2) + celluloid (~> 0.16.0) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) + sidekiq-statistic (1.1.0) + sidekiq (~> 3.3, >= 3.3.4) simple-rss (1.3.1) simplecov (0.9.1) docile (~> 1.1.0) @@ -392,7 +395,6 @@ PLATFORMS ruby DEPENDENCIES - actionpack-action_caching active_model_serializers (~> 0.8.3) annotate aws-sdk @@ -400,11 +402,12 @@ DEPENDENCIES barber better_errors binding_of_caller + byebug certified discourse-qunit-rails email_reply_parser ember-rails - ember-source (= 1.11.3.1) + ember-source (= 1.12.1) excon fabrication (= 2.9.8) fakeweb (~> 1.3.0) @@ -419,7 +422,7 @@ DEPENDENCIES highline hiredis htmlentities - image_optim + image_optim (= 0.20.2) librarian (>= 0.0.25) listen (= 0.7.3) logster @@ -473,6 +476,7 @@ DEPENDENCIES seed-fu (~> 2.3.3) shoulda sidekiq + sidekiq-statistic simple-rss simplecov sinatra @@ -486,4 +490,4 @@ DEPENDENCIES unicorn BUNDLED WITH - 1.10.3 + 1.10.6 diff --git a/README.md b/README.md index 3b1bf88d06..5659382d31 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Discourse is built for the *next* 10 years of the Internet, so our requirements | Browsers | Tablets | Smartphones | | -------- | ------- | ----------- | -| Safari 5.1+| iPad 2+ | iOS 6+ | +| Safari 5.1+| iPad 2+ | iOS 7+ | | Google Chrome 23+ | Android 4.1+ | Android 4.1+ | | Internet Explorer 10+ | Windows 8 | Windows Phone 8 | | Firefox 16+ | | diff --git a/app/assets/fonts/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf index f7936cc1e7..681bdd4d4c 100644 Binary files a/app/assets/fonts/FontAwesome.otf and b/app/assets/fonts/FontAwesome.otf differ diff --git a/app/assets/fonts/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot index 33b2bb8005..a30335d748 100644 Binary files a/app/assets/fonts/fontawesome-webfont.eot and b/app/assets/fonts/fontawesome-webfont.eot differ diff --git a/app/assets/fonts/fontawesome-webfont.svg b/app/assets/fonts/fontawesome-webfont.svg index 1ee89d4368..6fd19abcb9 100644 --- a/app/assets/fonts/fontawesome-webfont.svg +++ b/app/assets/fonts/fontawesome-webfont.svg @@ -399,7 +399,7 @@ - + @@ -411,8 +411,8 @@ - - + + @@ -459,7 +459,7 @@ - + @@ -483,13 +483,13 @@ - + - + @@ -523,7 +523,7 @@ - + @@ -531,18 +531,18 @@ - + - + - + - + @@ -556,10 +556,85 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf index ed9372f8ea..d7994e1308 100644 Binary files a/app/assets/fonts/fontawesome-webfont.ttf and b/app/assets/fonts/fontawesome-webfont.ttf differ diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff index 8b280b98fa..6fd4ede0f3 100644 Binary files a/app/assets/fonts/fontawesome-webfont.woff and b/app/assets/fonts/fontawesome-webfont.woff differ diff --git a/app/assets/fonts/fontawesome-webfont.woff2 b/app/assets/fonts/fontawesome-webfont.woff2 index 3311d58514..5560193ccc 100644 Binary files a/app/assets/fonts/fontawesome-webfont.woff2 and b/app/assets/fonts/fontawesome-webfont.woff2 differ diff --git a/app/assets/fonts/zocial-regular-webfont.eot b/app/assets/fonts/zocial-regular-webfont.eot deleted file mode 100644 index 5db5d21666..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.svg b/app/assets/fonts/zocial-regular-webfont.svg deleted file mode 100644 index 130d83ca10..0000000000 --- a/app/assets/fonts/zocial-regular-webfont.svg +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/fonts/zocial-regular-webfont.ttf b/app/assets/fonts/zocial-regular-webfont.ttf deleted file mode 100644 index a043566360..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.woff b/app/assets/fonts/zocial-regular-webfont.woff deleted file mode 100644 index 5a91cf3056..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.woff and /dev/null differ diff --git a/app/assets/javascripts/admin.js.erb b/app/assets/javascripts/admin.js.erb index ce47046a21..41f0315deb 100644 --- a/app/assets/javascripts/admin.js.erb +++ b/app/assets/javascripts/admin.js.erb @@ -2,4 +2,12 @@ require_asset("main_include_admin.js") DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) } + +DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f, ext| + if File.directory?(f) + depend_on(f) + elsif f.to_s.end_with?(".#{ext}") + require_asset(f) + end +end %> diff --git a/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 b/app/assets/javascripts/admin/adapters/build-plugin.js.es6 similarity index 79% rename from app/assets/javascripts/discourse/adapters/build-plugin.js.es6 rename to app/assets/javascripts/admin/adapters/build-plugin.js.es6 index 218a8d8d8c..b73bf7ecb1 100644 --- a/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 +++ b/app/assets/javascripts/admin/adapters/build-plugin.js.es6 @@ -2,8 +2,8 @@ import RestAdapter from 'discourse/adapters/rest'; export default function buildPluginAdapter(pluginName) { return RestAdapter.extend({ - pathFor(store, type) { - return "/admin/plugins/" + pluginName + this._super(store, type); + pathFor(store, type, findArgs) { + return "/admin/plugins/" + pluginName + this._super(store, type, findArgs); } }); } diff --git a/app/assets/javascripts/admin/adapters/customization-base.js.es6 b/app/assets/javascripts/admin/adapters/customization-base.js.es6 new file mode 100644 index 0000000000..f57240a116 --- /dev/null +++ b/app/assets/javascripts/admin/adapters/customization-base.js.es6 @@ -0,0 +1,7 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + basePath() { + return "/admin/customize/"; + } +}); diff --git a/app/assets/javascripts/admin/adapters/embedding.js.es6 b/app/assets/javascripts/admin/adapters/embedding.js.es6 new file mode 100644 index 0000000000..c8985cfdca --- /dev/null +++ b/app/assets/javascripts/admin/adapters/embedding.js.es6 @@ -0,0 +1,7 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + pathFor() { + return "/admin/customize/embedding"; + } +}); diff --git a/app/assets/javascripts/admin/adapters/site-text-type.js.es6 b/app/assets/javascripts/admin/adapters/site-text-type.js.es6 new file mode 100644 index 0000000000..b547b06f3c --- /dev/null +++ b/app/assets/javascripts/admin/adapters/site-text-type.js.es6 @@ -0,0 +1,2 @@ +import CustomizationBase from 'admin/adapters/customization-base'; +export default CustomizationBase; diff --git a/app/assets/javascripts/admin/adapters/site-text.js.es6 b/app/assets/javascripts/admin/adapters/site-text.js.es6 new file mode 100644 index 0000000000..b547b06f3c --- /dev/null +++ b/app/assets/javascripts/admin/adapters/site-text.js.es6 @@ -0,0 +1,2 @@ +import CustomizationBase from 'admin/adapters/customization-base'; +export default CustomizationBase; diff --git a/app/assets/javascripts/admin/adapters/user-field.js.es6 b/app/assets/javascripts/admin/adapters/user-field.js.es6 new file mode 100644 index 0000000000..b547b06f3c --- /dev/null +++ b/app/assets/javascripts/admin/adapters/user-field.js.es6 @@ -0,0 +1,2 @@ +import CustomizationBase from 'admin/adapters/customization-base'; +export default CustomizationBase; diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6 index d1813bcf35..b660d48859 100644 --- a/app/assets/javascripts/admin/components/ace-editor.js.es6 +++ b/app/assets/javascripts/admin/components/ace-editor.js.es6 @@ -26,8 +26,18 @@ export default Ember.Component.extend({ this._editor.destroy(); this._editor = null; } + if (this.appEvents) { + // xxx: don't run during qunit tests + this.appEvents.off('ace:resize', this, this.resize); + } }.on('willDestroyElement'), + resize() { + if (this._editor) { + this._editor.resize(); + } + }, + _initEditor: function() { const self = this; @@ -43,9 +53,14 @@ export default Ember.Component.extend({ self.set('content', editor.getSession().getValue()); self._skipContentChangeEvent = false; }); + editor.$blockScrolling = Infinity; self.$().data('editor', editor); self._editor = editor; + if (self.appEvents) { + // xxx: don't run during qunit tests + self.appEvents.on('ace:resize', self, self.resize); + } }); }); diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js.es6 new file mode 100644 index 0000000000..e7cef2edb0 --- /dev/null +++ b/app/assets/javascripts/admin/components/admin-form-row.js.es6 @@ -0,0 +1,3 @@ +export default Ember.Component.extend({ + classNames: ['row'] +}); diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6 index 25bf94db21..46ab32f609 100644 --- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6 @@ -1,3 +1,5 @@ export default Ember.Component.extend({ - tagName: 'tr' + tagName: 'tr', + reverseColors: Ember.computed.match('report.type', /^(time_to_first_response|topics_with_no_response)$/), + classNameBindings: ['reverseColors'] }); diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 new file mode 100644 index 0000000000..d10280daf7 --- /dev/null +++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 @@ -0,0 +1,94 @@ +import UserField from 'admin/models/user-field'; +import { bufferedProperty } from 'discourse/mixins/buffered-content'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; +import { propertyEqual } from 'discourse/lib/computed'; + +export default Ember.Component.extend(bufferedProperty('userField'), { + editing: Ember.computed.empty('userField.id'), + classNameBindings: [':user-field'], + + cantMoveUp: propertyEqual('userField', 'firstField'), + cantMoveDown: propertyEqual('userField', 'lastField'), + + userFieldsDescription: function() { + return I18n.t('admin.user_fields.description'); + }.property(), + + bufferedFieldType: function() { + return UserField.fieldTypeById(this.get('buffered.field_type')); + }.property('buffered.field_type'), + + _focusOnEdit: function() { + if (this.get('editing')) { + Ember.run.scheduleOnce('afterRender', this, '_focusName'); + } + }.observes('editing').on('didInsertElement'), + + _focusName: function() { + $('.user-field-name').select(); + }, + + fieldName: function() { + return UserField.fieldTypeById(this.get('userField.field_type')).get('name'); + }.property('userField.field_type'), + + flags: function() { + const ret = []; + if (this.get('userField.editable')) { + ret.push(I18n.t('admin.user_fields.editable.enabled')); + } + if (this.get('userField.required')) { + ret.push(I18n.t('admin.user_fields.required.enabled')); + } + if (this.get('userField.show_on_profile')) { + ret.push(I18n.t('admin.user_fields.show_on_profile.enabled')); + } + + return ret.join(', '); + }.property('userField.editable', 'userField.required', 'userField.show_on_profile'), + + actions: { + save() { + const self = this; + const buffered = this.get('buffered'); + const attrs = buffered.getProperties('name', + 'description', + 'field_type', + 'editable', + 'required', + 'show_on_profile', + 'options'); + + this.get('userField').save(attrs).then(function() { + self.set('editing', false); + self.commitBuffer(); + }).catch(popupAjaxError); + }, + + moveUp() { + this.sendAction('moveUpAction', this.get('userField')); + }, + + moveDown() { + this.sendAction('moveDownAction', this.get('userField')); + }, + + edit() { + this.set('editing', true); + }, + + destroy() { + this.sendAction('destroyAction', this.get('userField')); + }, + + cancel() { + const id = this.get('userField.id'); + if (Ember.isEmpty(id)) { + this.sendAction('destroyAction', this.get('userField')); + } else { + this.rollbackBuffer(); + this.set('editing', false); + } + } + } +}); diff --git a/app/assets/javascripts/admin/components/customize-link.js.es6 b/app/assets/javascripts/admin/components/customize-link.js.es6 new file mode 100644 index 0000000000..79d8cc26f4 --- /dev/null +++ b/app/assets/javascripts/admin/components/customize-link.js.es6 @@ -0,0 +1,10 @@ +export default Ember.Component.extend({ + router: function() { + return this.container.lookup('router:main'); + }.property(), + + active: function() { + const id = this.get('customization.id'); + return this.get('router.url').indexOf(`/customize/css_html/${id}/css`) !== -1; + }.property('router.url', 'customization.id') +}); diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6 new file mode 100644 index 0000000000..f33c750965 --- /dev/null +++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6 @@ -0,0 +1,63 @@ +import { bufferedProperty } from 'discourse/mixins/buffered-content'; +import computed from 'ember-addons/ember-computed-decorators'; +import { on, observes } from 'ember-addons/ember-computed-decorators'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +export default Ember.Component.extend(bufferedProperty('host'), { + editToggled: false, + tagName: 'tr', + categoryId: null, + + editing: Ember.computed.or('host.isNew', 'editToggled'), + + @on('didInsertElement') + @observes('editing') + _focusOnInput() { + Ember.run.schedule('afterRender', () => { this.$('.host-name').focus(); }); + }, + + @computed('buffered.host', 'host.isSaving') + cantSave(host, isSaving) { + return isSaving || Ember.isEmpty(host); + }, + + actions: { + edit() { + this.set('categoryId', this.get('host.category.id')); + this.set('editToggled', true); + }, + + save() { + if (this.get('cantSave')) { return; } + + const props = this.get('buffered').getProperties('host'); + props.category_id = this.get('categoryId'); + + const host = this.get('host'); + host.save(props).then(() => { + host.set('category', Discourse.Category.findById(this.get('categoryId'))); + this.set('editToggled', false); + }).catch(popupAjaxError); + }, + + delete() { + bootbox.confirm(I18n.t('admin.embedding.confirm_delete'), (result) => { + if (result) { + this.get('host').destroyRecord().then(() => { + this.sendAction('deleteHost', this.get('host')); + }); + } + }); + }, + + cancel() { + const host = this.get('host'); + if (host.get('isNew')) { + this.sendAction('deleteHost', host); + } else { + this.rollbackBuffer(); + this.set('editToggled', false); + } + } + } +}); diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js.es6 new file mode 100644 index 0000000000..904afacfee --- /dev/null +++ b/app/assets/javascripts/admin/components/embedding-setting.js.es6 @@ -0,0 +1,23 @@ +import computed from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + classNames: ['embed-setting'], + + @computed('field') + inputId(field) { return field.dasherize(); }, + + @computed('field') + translationKey(field) { return `admin.embedding.${field}`; }, + + @computed('type') + isCheckbox(type) { return type === "checkbox"; }, + + @computed('value') + checked: { + get(value) { return !!value; }, + set(value) { + this.set('value', value); + return value; + } + } +}); diff --git a/app/assets/javascripts/admin/components/group-member.js.es6 b/app/assets/javascripts/admin/components/group-member.js.es6 new file mode 100644 index 0000000000..abf0f2984a --- /dev/null +++ b/app/assets/javascripts/admin/components/group-member.js.es6 @@ -0,0 +1,9 @@ +export default Ember.Component.extend({ + classNames: ["item"], + + actions: { + remove() { + this.sendAction('removeAction', this.get('member')); + } + } +}); diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js.es6 new file mode 100644 index 0000000000..4fc413fd89 --- /dev/null +++ b/app/assets/javascripts/admin/components/highlighted-code.js.es6 @@ -0,0 +1,12 @@ +import { on, observes } from 'ember-addons/ember-computed-decorators'; +import highlightSyntax from 'discourse/lib/highlight-syntax'; + +export default Ember.Component.extend({ + + @on('didInsertElement') + @observes('code') + _refresh: function() { + highlightSyntax(this.$()); + } + +}); diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6 index bf46c9a2da..f1fe7a391c 100644 --- a/app/assets/javascripts/admin/components/ip-lookup.js.es6 +++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6 @@ -22,7 +22,7 @@ export default Ember.Component.extend({ this.set("show", true); if (!this.get("location")) { - Discourse.ajax("/admin/users/ip-info.json", { + Discourse.ajax("/admin/users/ip-info", { data: { ip: this.get("ip") } }).then(function (location) { self.set("location", Em.Object.create(location)); @@ -38,7 +38,7 @@ export default Ember.Component.extend({ "order": "trust_level DESC" }; - Discourse.ajax("/admin/users/total-others-with-same-ip.json", { data: data }).then(function (result) { + Discourse.ajax("/admin/users/total-others-with-same-ip", { data }).then(function (result) { self.set("totalOthersWithSameIP", result.total); }); diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6 new file mode 100644 index 0000000000..1bb29e52eb --- /dev/null +++ b/app/assets/javascripts/admin/components/permalink-form.js.es6 @@ -0,0 +1,56 @@ +export default Ember.Component.extend({ + classNames: ['permalink-form'], + formSubmitted: false, + permalinkType: 'topic_id', + + permalinkTypes: function() { + return [ + {id: 'topic_id', name: I18n.t('admin.permalink.topic_id')}, + {id: 'post_id', name: I18n.t('admin.permalink.post_id')}, + {id: 'category_id', name: I18n.t('admin.permalink.category_id')}, + {id: 'external_url', name: I18n.t('admin.permalink.external_url')} + ]; + }.property(), + + permalinkTypePlaceholder: function() { + return 'admin.permalink.' + this.get('permalinkType'); + }.property('permalinkType'), + + actions: { + submit: function() { + if (!this.get('formSubmitted')) { + const self = this; + self.set('formSubmitted', true); + const permalink = Discourse.Permalink.create({url: self.get('url'), permalink_type: self.get('permalinkType'), permalink_type_value: self.get('permalink_type_value')}); + permalink.save().then(function(result) { + self.set('url', ''); + self.set('permalink_type_value', ''); + self.set('formSubmitted', false); + self.sendAction('action', Discourse.Permalink.create(result.permalink)); + Em.run.schedule('afterRender', function() { self.$('.permalink-url').focus(); }); + }, function(e) { + self.set('formSubmitted', false); + let error; + if (e.responseJSON && e.responseJSON.errors) { + error = I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}); + } else { + error = I18n.t("generic_error"); + } + bootbox.alert(error, function() { self.$('.permalink-url').focus(); }); + }); + } + } + }, + + didInsertElement: function() { + var self = this; + self._super(); + Em.run.schedule('afterRender', function() { + self.$('.external-url').keydown(function(e) { + if (e.keyCode === 13) { // enter key + self.send('submit'); + } + }); + }); + } +}); diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6 index f8e3cc6b2c..8b6601b4d3 100644 --- a/app/assets/javascripts/admin/components/site-setting.js.es6 +++ b/app/assets/javascripts/admin/components/site-setting.js.es6 @@ -1,50 +1,43 @@ import BufferedContent from 'discourse/mixins/buffered-content'; import ScrollTop from 'discourse/mixins/scroll-top'; import SiteSetting from 'admin/models/site-setting'; +import { propertyNotEqual } from 'discourse/lib/computed'; +import computed from 'ember-addons/ember-computed-decorators'; -const CustomTypes = ['bool', 'enum', 'list', 'url_list']; +const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list']; export default Ember.Component.extend(BufferedContent, ScrollTop, { classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'], content: Ember.computed.alias('setting'), - dirty: Discourse.computed.propertyNotEqual('buffered.value', 'setting.value'), + dirty: propertyNotEqual('buffered.value', 'setting.value'), validationMessage: null, - preview: function() { - const preview = this.get('setting.preview'); + @computed("setting.preview", "buffered.value") + preview(preview, value) { if (preview) { - return new Handlebars.SafeString("
" + - preview.replace("{{value}}", this.get('buffered.value')) + - "
"); + return new Handlebars.SafeString("
" + preview.replace(/\{\{value\}\}/g, value) + "
"); } - }.property('buffered.value'), + }, - typeClass: function() { - return this.get('partialType').replace("_", "-"); - }.property('partialType'), + @computed('componentType') + typeClass(componentType) { + return componentType.replace(/\_/g, '-'); + }, - enabled: function(key, value) { - if (arguments.length > 1) { - this.set('buffered.value', value ? 'true' : 'false'); - } + @computed("setting.setting") + settingName(setting) { + return setting.replace(/\_/g, ' '); + }, - const bufferedValue = this.get('buffered.value'); - if (Ember.isEmpty(bufferedValue)) { return false; } - return bufferedValue === 'true'; - }.property('buffered.value'), + @computed("setting.type") + componentType(type) { + return CustomTypes.indexOf(type) !== -1 ? type : 'string'; + }, - settingName: function() { - return this.get('setting.setting').replace(/\_/g, ' '); - }.property('setting.setting'), - - partialType: function() { - let type = this.get('setting.type'); - return (CustomTypes.indexOf(type) !== -1) ? type : 'string'; - }.property('setting.type'), - - partialName: function() { - return 'admin/templates/site-settings/' + this.get('partialType'); - }.property('partialType'), + @computed("typeClass") + componentName(typeClass) { + return "site-settings/" + typeClass; + }, _watchEnterKey: function() { const self = this; @@ -60,8 +53,8 @@ export default Ember.Component.extend(BufferedContent, ScrollTop, { }.on("willDestroyElement"), _save() { - const setting = this.get('buffered'); - const self = this; + const self = this, + setting = this.get('buffered'); SiteSetting.update(setting.get('setting'), setting.get('value')).then(function() { self.set('validationMessage', null); self.commitBuffer(); diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js.es6 new file mode 100644 index 0000000000..40fcfb354b --- /dev/null +++ b/app/assets/javascripts/admin/components/site-settings/bool.js.es6 @@ -0,0 +1,17 @@ +import computed from "ember-addons/ember-computed-decorators"; + +export default Ember.Component.extend({ + + @computed("value") + enabled: { + get(value) { + if (Ember.isEmpty(value)) { return false; } + return value === "true"; + }, + set(value) { + this.set("value", value ? "true" : "false"); + return value; + } + }, + +}); diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 new file mode 100644 index 0000000000..487239b78f --- /dev/null +++ b/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 @@ -0,0 +1,16 @@ +import computed from "ember-addons/ember-computed-decorators"; + +export default Ember.Component.extend({ + + @computed("value") + selectedCategories: { + get(value) { + return Discourse.Category.findByIds(value.split("|")); + }, + set(value) { + this.set("value", value.mapBy("id").join("|")); + return value; + } + } + +}); diff --git a/app/assets/javascripts/admin/components/url-list.js.es6 b/app/assets/javascripts/admin/components/url-list.js.es6 deleted file mode 100644 index 4562c4b20e..0000000000 --- a/app/assets/javascripts/admin/components/url-list.js.es6 +++ /dev/null @@ -1,32 +0,0 @@ -export default Ember.Component.extend({ - _setupUrls: function() { - const value = this.get('value'); - this.set('urls', (value && value.length) ? value.split("\n") : []); - }.on('init').observes('value'), - - _urlsChanged: function() { - this.set('value', this.get('urls').join("\n")); - }.observes('urls.@each'), - - urlInvalid: Ember.computed.empty('newUrl'), - - keyDown(e) { - if (e.keyCode === 13) { - this.send('addUrl'); - } - }, - - actions: { - addUrl() { - if (this.get('urlInvalid')) { return; } - - this.get('urls').addObject(this.get('newUrl')); - this.set('newUrl', ''); - }, - - removeUrl(url) { - const urls = this.get('urls'); - urls.removeObject(url); - } - } -}); diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6 new file mode 100644 index 0000000000..3aa66ff187 --- /dev/null +++ b/app/assets/javascripts/admin/components/value-list.js.es6 @@ -0,0 +1,104 @@ +export default Ember.Component.extend({ + classNameBindings: [':value-list'], + + _enableSorting: function() { + const self = this; + const placeholder = document.createElement("div"); + placeholder.className = "placeholder"; + + let dragging = null; + let over = null; + let nodePlacement; + + this.$().on('dragstart.discourse', '.values .value', function(e) { + dragging = e.currentTarget; + e.dataTransfer.effectAllowed = 'move'; + e.dataTransfer.setData("text/html", e.currentTarget); + }); + + this.$().on('dragend.discourse', '.values .value', function() { + Ember.run(function() { + dragging.parentNode.removeChild(placeholder); + dragging.style.display = 'block'; + + // Update data + const from = Number(dragging.dataset.index); + let to = Number(over.dataset.index); + if (from < to) to--; + if (nodePlacement === "after") to++; + + const collection = self.get('collection'); + const fromObj = collection.objectAt(from); + collection.replace(from, 1); + collection.replace(to, 0, [fromObj]); + self._saveValues(); + }); + return false; + }); + + this.$().on('dragover.discourse', '.values', function(e) { + e.preventDefault(); + dragging.style.display = 'none'; + if (e.target.className === "placeholder") { return; } + over = e.target; + + const relY = e.originalEvent.clientY - over.offsetTop; + const height = over.offsetHeight / 2; + const parent = e.target.parentNode; + + if (relY > height) { + nodePlacement = "after"; + parent.insertBefore(placeholder, e.target.nextElementSibling); + } else if(relY < height) { + nodePlacement = "before"; + parent.insertBefore(placeholder, e.target); + } + }); + }.on('didInsertElement'), + + _removeSorting: function() { + this.$().off('dragover.discourse').off('dragend.discourse').off('dragstart.discourse'); + }.on('willDestroyElement'), + + _setupCollection: function() { + const values = this.get('values'); + if (this.get('inputType') === "array") { + this.set('collection', values || []); + } else { + this.set('collection', (values && values.length) ? values.split("\n") : []); + } + }.on('init').observes('values'), + + _saveValues: function() { + if (this.get('inputType') === "array") { + this.set('values', this.get('collection')); + } else { + this.set('values', this.get('collection').join("\n")); + } + }, + + inputInvalid: Ember.computed.empty('newValue'), + + keyDown(e) { + if (e.keyCode === 13) { + this.send('addValue'); + } + }, + + actions: { + addValue() { + if (this.get('inputInvalid')) { return; } + + this.get('collection').addObject(this.get('newValue')); + this.set('newValue', ''); + + this._saveValues(); + }, + + removeValue(value) { + const collection = this.get('collection'); + collection.removeObject(value); + this._saveValues(); + } + } +}); diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 index 8eceb0bb7d..1617e6133a 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 @@ -1,20 +1,18 @@ export default Ember.ArrayController.extend({ needs: ["adminBackups"], - status: Em.computed.alias("controllers.adminBackups"), - isOperationRunning: Em.computed.alias("status.isOperationRunning"), - restoreDisabled: Em.computed.alias("status.restoreDisabled"), + status: Ember.computed.alias("controllers.adminBackups"), uploadLabel: function() { return I18n.t("admin.backups.upload.label"); }.property(), restoreTitle: function() { - if (!this.get('status.allowRestore')) { + if (!this.get('status.model.allowRestore')) { return "admin.backups.operations.restore.is_disabled"; - } else if (this.get("status.isOperationRunning")) { + } else if (this.get("status.model.isOperationRunning")) { return "admin.backups.operations.is_running"; } else { return "admin.backups.operations.restore.title"; } - }.property("status.{allowRestore,isOperationRunning}"), + }.property("status.model.{allowRestore,isOperationRunning}"), actions: { diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js.es6 index 64bb7ad105..a429883378 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-backups.js.es6 @@ -1,5 +1,5 @@ -export default Ember.ObjectController.extend({ - noOperationIsRunning: Em.computed.not("isOperationRunning"), - rollbackEnabled: Em.computed.and("canRollback", "restoreEnabled", "noOperationIsRunning"), - rollbackDisabled: Em.computed.not("rollbackEnabled") +export default Ember.Controller.extend({ + noOperationIsRunning: Ember.computed.not("model.isOperationRunning"), + rollbackEnabled: Ember.computed.and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning"), + rollbackDisabled: Ember.computed.not("rollbackEnabled") }); diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 index ac648462b2..96547435d8 100644 --- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 @@ -1,7 +1,8 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import BufferedContent from 'discourse/mixins/buffered-content'; +import { propertyNotEqual } from 'discourse/lib/computed'; -export default Ember.ObjectController.extend(BufferedContent, { +export default Ember.Controller.extend(BufferedContent, { needs: ['admin-badges'], saving: false, savingStatus: '', @@ -12,9 +13,18 @@ export default Ember.ObjectController.extend(BufferedContent, { protectedSystemFields: Em.computed.alias('controllers.admin-badges.protectedSystemFields'), readOnly: Ember.computed.alias('buffered.system'), - showDisplayName: Discourse.computed.propertyNotEqual('name', 'displayName'), + showDisplayName: propertyNotEqual('name', 'displayName'), canEditDescription: Em.computed.none('buffered.translatedDescription'), + hasQuery: function() { + const bQuery = this.get('buffered.query'); + if (bQuery) { + return bQuery.trim().length > 0; + } + const mQuery = this.get('model.query'); + return mQuery && mQuery.trim().length > 0; + }.property('model.query', 'buffered.query'), + _resetSaving: function() { this.set('saving', false); this.set('savingStatus', ''); diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 index 636905c009..4a6a58021b 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 @@ -1,13 +1,4 @@ -/** - This controller supports interface for creating custom CSS skins in Discourse. - - @class AdminCustomizeColorsController - @extends Ember.Controller - @namespace Discourse - @module Discourse -**/ export default Ember.ArrayController.extend({ - onlyOverridden: false, baseColorScheme: function() { diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6 new file mode 100644 index 0000000000..03c855a969 --- /dev/null +++ b/app/assets/javascripts/admin/controllers/admin-customize-css-html-show.js.es6 @@ -0,0 +1,79 @@ +import { url } from 'discourse/lib/computed'; + +const sections = ['css', 'header', 'top', 'footer', 'head-tag', 'body-tag', + 'mobile-css', 'mobile-header', 'mobile-top', 'mobile-footer', + 'embedded-css']; + +const activeSections = {}; +sections.forEach(function(s) { + activeSections[Ember.String.camelize(s) + "Active"] = Ember.computed.equal('section', s); +}); + + +export default Ember.Controller.extend(activeSections, { + maximized: false, + section: null, + + previewUrl: url("model.key", "/?preview-style=%@"), + downloadUrl: url('model.id', '/admin/site_customizations/%@'), + + mobile: function() { + return this.get('section').indexOf('mobile-') === 0; + }.property('section'), + + maximizeIcon: function() { + return this.get('maximized') ? 'compress' : 'expand'; + }.property('maximized'), + + saveButtonText: function() { + return this.get('model.isSaving') ? I18n.t('saving') : I18n.t('admin.customize.save'); + }.property('model.isSaving'), + + saveDisabled: function() { + return !this.get('model.changed') || this.get('model.isSaving'); + }.property('model.changed', 'model.isSaving'), + + needs: ['adminCustomizeCssHtml'], + + undoPreviewUrl: url('/?preview-style='), + defaultStyleUrl: url('/?preview-style=default'), + + actions: { + save() { + this.get('model').saveChanges(); + }, + + destroy() { + const self = this; + return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) { + if (result) { + const model = self.get('model'); + model.destroyRecord().then(function() { + self.get('controllers.adminCustomizeCssHtml').get('model').removeObject(model); + self.transitionToRoute('adminCustomizeCssHtml'); + }); + } + }); + }, + + toggleMaximize: function() { + this.toggleProperty('maximized'); + }, + + toggleMobile: function() { + const section = this.get('section'); + + // Try to send to the same tab as before + let dest; + if (this.get('mobile')) { + dest = section.replace('mobile-', ''); + if (sections.indexOf(dest) === -1) { dest = 'css'; } + } else { + dest = 'mobile-' + section; + if (sections.indexOf(dest) === -1) { dest = 'mobile-css'; } + } + this.replaceRoute('adminCustomizeCssHtml.show', this.get('model.id'), dest); + } + } + +}); diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 deleted file mode 100644 index 266f06c3e8..0000000000 --- a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 +++ /dev/null @@ -1,63 +0,0 @@ -/** - This controller supports interface for creating custom CSS skins in Discourse. - - @class AdminCustomizeCssHtmlController - @extends Ember.Controller - @namespace Discourse - @module Discourse -**/ -export default Ember.ArrayController.extend({ - - actions: { - - /** - Create a new customization style - - @method newCustomization - **/ - newCustomization: function() { - var item = Discourse.SiteCustomization.create({name: I18n.t("admin.customize.new_style")}); - this.pushObject(item); - this.set('selectedItem', item); - }, - - /** - Select a given style - - @method selectStyle - @param {Discourse.SiteCustomization} style The style we are selecting - **/ - selectStyle: function(style) { - this.set('selectedItem', style); - }, - - /** - Save the current customization - - @method save - **/ - save: function() { - this.get('selectedItem').save(); - }, - - /** - Destroy the current customization - - @method destroy - **/ - destroy: function() { - var _this = this; - return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) { - var selected; - if (result) { - selected = _this.get('selectedItem'); - selected.destroy(); - _this.set('selectedItem', null); - return _this.removeObject(selected); - } - }); - } - - } - -}); diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 index ad572337e0..c712a8ac5a 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 @@ -1,24 +1,19 @@ -/** - This controller supports the default interface when you enter the admin section. +import { setting } from 'discourse/lib/computed'; - @class AdminDashboardController - @extends Ember.Controller - @namespace Discourse - @module Discourse -**/ +// This controller supports the default interface when you enter the admin section. export default Ember.Controller.extend({ loading: true, versionCheck: null, problemsCheckMinutes: 1, - showVersionChecks: Discourse.computed.setting('version_checks'), + showVersionChecks: setting('version_checks'), foundProblems: function() { return(Discourse.User.currentProp('admin') && this.get('problems') && this.get('problems').length > 0); }.property('problems'), thereWereProblems: function() { - if(!Discourse.User.currentProp('admin')) { return false } + if(!Discourse.User.currentProp('admin')) { return false; } if( this.get('foundProblems') ) { this.set('hadProblems', true); return true; diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 index 341ca4f652..b4006391b2 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 @@ -1,6 +1,4 @@ -import DiscourseController from 'discourse/controllers/controller'; - -export default DiscourseController.extend({ +export default Ember.Controller.extend({ /** Is the "send test email" button disabled? diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 index 84d1f3e4b5..f259acba84 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 @@ -1,20 +1,17 @@ -import ObjectController from 'discourse/controllers/object'; - -export default ObjectController.extend({ +export default Ember.Controller.extend({ actions: { - refresh: function() { - var model = this.get('model'), - self = this; + refresh() { + const model = this.get('model'); - self.set('loading', true); - Discourse.EmailPreview.findDigest(this.get('lastSeen')).then(function (email) { + this.set('loading', true); + Discourse.EmailPreview.findDigest(this.get('lastSeen')).then(email => { model.setProperties(email.getProperties('html_content', 'text_content')); - self.set('loading', false); + this.set('loading', false); }); }, - toggleShowHtml: function() { + toggleShowHtml() { this.toggleProperty('showHtml'); } } diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 index 0b23e90268..a03bd8212d 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 @@ -1,8 +1,8 @@ -import DiscourseController from 'discourse/controllers/controller'; +import debounce from 'discourse/lib/debounce'; -export default DiscourseController.extend({ +export default Ember.Controller.extend({ - filterEmailLogs: Discourse.debounce(function() { + filterEmailLogs: debounce(function() { var self = this; Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) { self.set("model", logs); diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 index 9e3affff6a..1d83f14c6d 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 @@ -1,7 +1,7 @@ -import DiscourseController from 'discourse/controllers/controller'; +import debounce from 'discourse/lib/debounce'; -export default DiscourseController.extend({ - filterEmailLogs: Discourse.debounce(function() { +export default Ember.Controller.extend({ + filterEmailLogs: debounce(function() { var self = this; Discourse.EmailLog.findAll(this.get("filter")).then(function(logs) { self.set("model", logs); diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 new file mode 100644 index 0000000000..780c61f3f9 --- /dev/null +++ b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 @@ -0,0 +1,55 @@ +import computed from 'ember-addons/ember-computed-decorators'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +export default Ember.Controller.extend({ + saved: false, + embedding: null, + + // show settings if we have at least one created host + @computed('embedding.embeddable_hosts.@each.isCreated') + showSecondary() { + const hosts = this.get('embedding.embeddable_hosts'); + return hosts.length && hosts.findProperty('isCreated'); + }, + + @computed('embedding.base_url') + embeddingCode(baseUrl) { + + const html = +`
+ +`; + + return html; + }, + + actions: { + saveChanges() { + const embedding = this.get('embedding'); + const updates = embedding.getProperties(embedding.get('fields')); + + this.set('saved', false); + this.get('embedding').update(updates).then(() => { + this.set('saved', true); + }).catch(popupAjaxError); + }, + + addHost() { + const host = this.store.createRecord('embeddable-host'); + this.get('embedding.embeddable_hosts').pushObject(host); + }, + + deleteHost(host) { + this.get('embedding.embeddable_hosts').removeObject(host); + } + } +}); diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6 index 2256714084..dbe31af85e 100644 --- a/app/assets/javascripts/admin/controllers/admin-group.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6 @@ -1,21 +1,22 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; +import { propertyEqual } from 'discourse/lib/computed'; -export default Em.ObjectController.extend({ +export default Ember.Controller.extend({ needs: ['adminGroupsType'], disableSave: false, currentPage: function() { - if (this.get("user_count") === 0) { return 0; } - return Math.floor(this.get("offset") / this.get("limit")) + 1; - }.property("limit", "offset", "user_count"), + if (this.get("model.user_count") === 0) { return 0; } + return Math.floor(this.get("model.offset") / this.get("model.limit")) + 1; + }.property("model.limit", "model.offset", "model.user_count"), totalPages: function() { - if (this.get("user_count") === 0) { return 0; } - return Math.floor(this.get("user_count") / this.get("limit")) + 1; - }.property("limit", "user_count"), + if (this.get("model.user_count") === 0) { return 0; } + return Math.floor(this.get("model.user_count") / this.get("model.limit")) + 1; + }.property("model.limit", "model.user_count"), showingFirst: Em.computed.lte("currentPage", 1), - showingLast: Discourse.computed.propertyEqual("currentPage", "totalPages"), + showingLast: propertyEqual("currentPage", "totalPages"), aliasLevelOptions: function() { return [ @@ -26,6 +27,13 @@ export default Em.ObjectController.extend({ ]; }.property(), + trustLevelOptions: function() { + return [ + { name: I18n.t("groups.trust_levels.none"), value: 0 }, + { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 } + ]; + }.property(), + actions: { next() { if (this.get("showingLast")) { return; } @@ -51,7 +59,7 @@ export default Em.ObjectController.extend({ removeMember(member) { const self = this, - message = I18n.t("admin.groups.delete_member_confirm", { username: member.get("username"), group: this.get("name") }); + message = I18n.t("admin.groups.delete_member_confirm", { username: member.get("username"), group: this.get("model.name") }); return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), function(confirm) { if (confirm) { self.get("model").removeMember(member); @@ -60,21 +68,21 @@ export default Em.ObjectController.extend({ }, addMembers() { - if (Em.isEmpty(this.get("usernames"))) { return; } - this.get("model").addMembers(this.get("usernames")); - // clear the user selector - this.set("usernames", null); + if (Em.isEmpty(this.get("model.usernames"))) { return; } + this.get("model").addMembers(this.get("model.usernames")).catch(popupAjaxError); + this.set("model.usernames", null); }, save() { const group = this.get('model'), - groupsController = this.get("controllers.adminGroupsType"); + groupsController = this.get("controllers.adminGroupsType"), + groupType = groupsController.get("type"); this.set('disableSave', true); let promise = group.get("id") ? group.save() : group.create().then(() => groupsController.addObject(group)); - promise.then(() => this.transitionToRoute("adminGroup", group)) + promise.then(() => this.transitionToRoute("adminGroup", groupType, group.get('name'))) .catch(popupAjaxError) .finally(() => this.set('disableSave', false)); }, @@ -84,6 +92,11 @@ export default Em.ObjectController.extend({ groupsController = this.get('controllers.adminGroupsType'), self = this; + if (!group.get('id')) { + self.transitionToRoute('adminGroupsType.index', 'custom'); + return; + } + this.set('disableSave', true); bootbox.confirm( diff --git a/app/assets/javascripts/admin/controllers/admin-log-screened-ip-address.js.es6 b/app/assets/javascripts/admin/controllers/admin-log-screened-ip-address.js.es6 index 81486978a4..199296d823 100644 --- a/app/assets/javascripts/admin/controllers/admin-log-screened-ip-address.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-log-screened-ip-address.js.es6 @@ -1,4 +1,4 @@ -export default Ember.ObjectController.extend({ +export default Ember.Controller.extend({ editing: false, savedIpAddress: null, diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 index 0ae12ff2c5..987b07a3b6 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 @@ -1,3 +1,4 @@ +import debounce from 'discourse/lib/debounce'; import { outputExportResult } from 'discourse/lib/export-result'; import { exportEntity } from 'discourse/lib/export-csv'; @@ -6,7 +7,7 @@ export default Ember.ArrayController.extend({ itemController: 'admin-log-screened-ip-address', filter: null, - show: Discourse.debounce(function() { + show: debounce(function() { var self = this; self.set('loading', true); Discourse.ScreenedIpAddress.findAll(this.get("filter")).then(function(result) { diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 new file mode 100644 index 0000000000..a0d38e7b8c --- /dev/null +++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 @@ -0,0 +1,38 @@ +import debounce from 'discourse/lib/debounce'; + +export default Ember.ArrayController.extend({ + loading: false, + filter: null, + + show: debounce(function() { + var self = this; + self.set('loading', true); + Discourse.Permalink.findAll(self.get("filter")).then(function(result) { + self.set('model', result); + self.set('loading', false); + }); + }, 250).observes("filter"), + + actions: { + recordAdded(arg) { + this.get("model").unshiftObject(arg); + }, + + destroy: function(record) { + const self = this; + return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) { + if (result) { + record.destroy().then(function(deleted) { + if (deleted) { + self.removeObject(record); + } else { + bootbox.alert(I18n.t("generic_error")); + } + }, function(){ + bootbox.alert(I18n.t("generic_error")); + }); + } + }); + } + } +}); diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 index 52b7cb6d8b..b2eb1335ed 100644 --- a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 @@ -1,6 +1,10 @@ export default Ember.ArrayController.extend({ adminRoutes: function() { - return this.get('model').map(p => p.admin_route).compact(); + return this.get('model').map(function(p) { + if (p.get('enabled')) { + return p.admin_route; + } + }).compact(); }.property() }); diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index 6bb36989b7..d11e67305a 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -1,28 +1,47 @@ -export default Ember.ObjectController.extend({ +import { exportEntity } from 'discourse/lib/export-csv'; +import { outputExportResult } from 'discourse/lib/export-result'; + +export default Ember.Controller.extend({ viewMode: 'table', viewingTable: Em.computed.equal('viewMode', 'table'), viewingBarChart: Em.computed.equal('viewMode', 'barChart'), startDate: null, endDate: null, + categoryId: null, refreshing: false, + categoryOptions: function() { + var arr = [{name: I18n.t('category.all'), value: 'all'}]; + return arr.concat( Discourse.Site.currentProp('sortedCategories').map(function(i) { return {name: i.get('name'), value: i.get('id') }; }) ); + }.property(), + actions: { - refreshReport: function() { - var self = this; - this.set('refreshing', true); - Discourse.Report.find(this.get('type'), this.get('startDate'), this.get('endDate')).then(function(r) { - self.set('model', r); - }).finally(function() { - self.set('refreshing', false); - }); + refreshReport() { + var q; + this.set("refreshing", true); + if (this.get('categoryId') === "all") { + q = Discourse.Report.find(this.get("model.type"), this.get("startDate"), this.get("endDate")); + } else { + q = Discourse.Report.find(this.get("model.type"), this.get("startDate"), this.get("endDate"), this.get("categoryId")); + } + q.then(m => this.set("model", m)).finally(() => this.set("refreshing", false)); }, - viewAsTable: function() { + viewAsTable() { this.set('viewMode', 'table'); }, - viewAsBarChart: function() { + viewAsBarChart() { this.set('viewMode', 'barChart'); + }, + + exportCsv() { + exportEntity('report', { + name: this.get("model.type"), + start_date: this.get('startDate'), + end_date: this.get('endDate'), + category_id: this.get('categoryId') === 'all' ? undefined : this.get('categoryId') + }).then(outputExportResult); } } }); diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 index 37bc9b3765..b16db34e3e 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 @@ -1,4 +1,4 @@ -export default Ember.ObjectController.extend({ +export default Ember.Controller.extend({ categoryNameKey: null, needs: ['adminSiteSettings'], diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 index 9e67e638b5..97b1c9ace9 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 @@ -1,14 +1,13 @@ -import Presence from 'discourse/mixins/presence'; +import debounce from 'discourse/lib/debounce'; -export default Ember.ArrayController.extend(Presence, { +export default Ember.ArrayController.extend({ filter: null, onlyOverridden: false, filtered: Ember.computed.notEmpty('filter'), - filterContent: Discourse.debounce(function() { - + filterContentNow: function(category) { // If we have no content, don't bother filtering anything - if (!this.present('allSiteSettings')) return; + if (!!Ember.isEmpty(this.get('allSiteSettings'))) return; let filter; if (this.get('filter')) { @@ -39,11 +38,24 @@ export default Ember.ArrayController.extend(Presence, { }); if (matches.length > 0) { matchesGroupedByCategory[0].siteSettings.pushObjects(matches); + matchesGroupedByCategory.pushObject({ + nameKey: settingsCategory.nameKey, + name: I18n.t('admin.site_settings.categories.' + settingsCategory.nameKey), + siteSettings: matches + }); } }); this.set('model', matchesGroupedByCategory); - this.transitionToRoute("adminSiteSettingsCategory", "all_results"); + this.transitionToRoute("adminSiteSettingsCategory", category || "all_results"); + }, + + filterContent: debounce(function() { + if (this.get("_skipBounce")) { + this.set("_skipBounce", false); + } else { + this.filterContentNow(); + } }, 250).observes('filter', 'onlyOverridden'), actions: { @@ -52,6 +64,10 @@ export default Ember.ArrayController.extend(Presence, { filter: '', onlyOverridden: false }); + }, + + toggleMenu() { + $('.admin-detail').toggleClass('mobile-closed mobile-open'); } } diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 index c95db1e8b8..943317b1bf 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 @@ -1,20 +1,16 @@ -export default Ember.ObjectController.extend({ - saving: false, +export default Ember.Controller.extend({ saved: false, saveDisabled: function() { - if (this.get('saving')) { return true; } - if ((!this.get('allow_blank')) && Ember.isEmpty(this.get('value'))) { return true; } + if (this.get('model.isSaving')) { return true; } + if ((!this.get('allow_blank')) && Ember.isEmpty(this.get('model.value'))) { return true; } return false; - }.property('saving', 'value'), + }.property('model.iSaving', 'model.value'), actions: { - saveChanges: function() { - var self = this; - self.setProperties({saving: true, saved: false}); - self.get('model').save().then(function () { - self.setProperties({saving: false, saved: true}); - }); + saveChanges() { + const model = this.get('model'); + model.save(model.getProperties('value')).then(() => this.set('saved', true)); } } }); diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 index 5e6bb325fd..b85fbaf069 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 @@ -1,25 +1,18 @@ -/** - This controller supports the interface for granting and revoking badges from - individual users. +import UserBadge from 'discourse/models/user-badge'; - @class AdminUserBadgesController - @extends Ember.ArrayController - @namespace Discourse - @module Discourse -**/ export default Ember.ArrayController.extend({ needs: ["adminUser"], - user: Em.computed.alias('controllers.adminUser'), + user: Em.computed.alias('controllers.adminUser.model'), sortProperties: ['granted_at'], sortAscending: false, groupedBadges: function(){ - const badges = this.get('model'); + const allBadges = this.get('model'); - var grouped = _.groupBy(badges, badge => badge.badge_id); + var grouped = _.groupBy(allBadges, badge => badge.badge_id); var expanded = []; - const expandedBadges = badges.get('expandedBadges'); + const expandedBadges = allBadges.get('expandedBadges'); _(grouped).each(function(badges){ var lastGranted = badges[0].granted_at; @@ -95,7 +88,7 @@ export default Ember.ArrayController.extend({ **/ grantBadge: function(badgeId) { var self = this; - Discourse.UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(function(userBadge) { + UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(function(userBadge) { self.set('badgeReason', ''); self.pushObject(userBadge); Ember.run.next(function() { @@ -111,12 +104,6 @@ export default Ember.ArrayController.extend({ }); }, - /** - Revoke the selected userBadge. - - @method revokeBadge - @param {Discourse.UserBadge} userBadge the `Discourse.UserBadge` instance that needs to be revoked. - **/ revokeBadge: function(userBadge) { var self = this; return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) { diff --git a/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 deleted file mode 100644 index f4b9ba2a79..0000000000 --- a/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 +++ /dev/null @@ -1,64 +0,0 @@ -import UserField from 'admin/models/user-field'; -import BufferedContent from 'discourse/mixins/buffered-content'; - -export default Ember.ObjectController.extend(BufferedContent, { - needs: ['admin-user-fields'], - editing: Ember.computed.empty('id'), - - fieldName: function() { - return UserField.fieldTypeById(this.get('field_type')).get('name'); - }.property('field_type'), - - flags: function() { - var ret = []; - if (this.get('editable')) { - ret.push(I18n.t('admin.user_fields.editable.enabled')); - } - if (this.get('required')) { - ret.push(I18n.t('admin.user_fields.required.enabled')); - } - if (this.get('show_on_profile')) { - ret.push(I18n.t('admin.user_fields.show_on_profile.enabled')); - } - - return ret.join(', '); - }.property('editable', 'required', 'show_on_profile'), - - actions: { - save: function() { - var self = this; - - var attrs = this.get('buffered').getProperties('name', 'description', 'field_type', 'editable', 'required', 'show_on_profile'); - - this.get('model').save(attrs).then(function(res) { - self.set('model.id', res.user_field.id); - self.set('editing', false); - self.commitBuffer(); - }).catch(function(e) { - var msg = I18n.t("generic_error"); - if (e.responseJSON && e.responseJSON.errors) { - msg = I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}); - } - bootbox.alert(msg); - }); - }, - - edit: function() { - this.set('editing', true); - }, - - destroy: function() { - this.get('controllers.admin-user-fields').send('destroy', this.get('model')); - }, - - cancel: function() { - var id = this.get('id'); - if (Ember.isEmpty(id)) { - this.get('controllers.admin-user-fields').send('destroy', this.get('model')); - } else { - this.rollbackBuffer(); - this.set('editing', false); - } - } - } -}); diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 index 0eb041c55b..70963a147e 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 @@ -1,39 +1,60 @@ -import UserField from 'admin/models/user-field'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; -export default Ember.ArrayController.extend({ +const MAX_FIELDS = 20; + +export default Ember.Controller.extend({ fieldTypes: null, - createDisabled: Em.computed.gte('model.length', 20), + createDisabled: Em.computed.gte('model.length', MAX_FIELDS), - userFieldsDescription: function() { - return I18n.t('admin.user_fields.description'); - }.property(), - - userFieldsName: function() { - return I18n.t('admin.user_fields.name'); - }.property(), - - _performDestroy: function(f, model) { - return f.destroy().then(function() { - model.removeObject(f); + arrangedContent: function() { + return Ember.ArrayProxy.extend(Ember.SortableMixin).create({ + sortProperties: ['position'], + content: this.get('model') }); - }, + }.property('model'), actions: { - createField: function() { - this.pushObject(UserField.create({ field_type: 'text' })); + createField() { + const f = this.store.createRecord('user-field', { field_type: 'text', position: MAX_FIELDS }); + this.get('model').pushObject(f); }, - destroy: function(f) { - var model = this.get('model'), - self = this; + moveUp(f) { + const idx = this.get('arrangedContent').indexOf(f); + if (idx) { + const prev = this.get('arrangedContent').objectAt(idx-1); + const prevPos = prev.get('position'); + + prev.update({ position: f.get('position') }); + f.update({ position: prevPos }); + } + }, + + moveDown(f) { + const idx = this.get('arrangedContent').indexOf(f); + if (idx > -1) { + const next = this.get('arrangedContent').objectAt(idx+1); + const nextPos = next.get('position'); + + next.update({ position: f.get('position') }); + f.update({ position: nextPos }); + } + }, + + destroy(f) { + const model = this.get('model'); // Only confirm if we already been saved if (f.get('id')) { bootbox.confirm(I18n.t("admin.user_fields.delete_confirm"), function(result) { - if (result) { self._performDestroy(f, model); } + if (result) { + f.destroyRecord().then(function() { + model.removeObject(f); + }).catch(popupAjaxError); + } }); } else { - self._performDestroy(f, model); + model.removeObject(f); } } } diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index b544aafc63..fdea272ab1 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -1,15 +1,15 @@ -import ObjectController from 'discourse/controllers/object'; import CanCheckEmails from 'discourse/mixins/can-check-emails'; +import { propertyNotEqual, setting } from 'discourse/lib/computed'; -export default ObjectController.extend(CanCheckEmails, { +export default Ember.Controller.extend(CanCheckEmails, { editingTitle: false, originalPrimaryGroupId: null, availableGroups: null, - showApproval: Discourse.computed.setting('must_approve_users'), - showBadges: Discourse.computed.setting('enable_badges'), + showApproval: setting('must_approve_users'), + showBadges: setting('enable_badges'), - primaryGroupDirty: Discourse.computed.propertyNotEqual('originalPrimaryGroupId', 'model.primary_group_id'), + primaryGroupDirty: propertyNotEqual('originalPrimaryGroupId', 'model.primary_group_id'), automaticGroups: function() { return this.get("model.automaticGroups").map((g) => g.name).join(", "); @@ -36,8 +36,8 @@ export default ObjectController.extend(CanCheckEmails, { saveTitle() { const self = this; - return Discourse.ajax("/users/" + this.get('username').toLowerCase(), { - data: {title: this.get('title')}, + return Discourse.ajax("/users/" + this.get('model.username').toLowerCase(), { + data: {title: this.get('model.title')}, type: 'PUT' }).catch(function(e) { bootbox.alert(I18n.t("generic_error_with_reason", {error: "http: " + e.status + " - " + e.body})); @@ -65,7 +65,7 @@ export default ObjectController.extend(CanCheckEmails, { savePrimaryGroup() { const self = this; - return Discourse.ajax("/admin/users/" + this.get('id') + "/primary_group", { + return Discourse.ajax("/admin/users/" + this.get('model.id') + "/primary_group", { type: 'PUT', data: {primary_group_id: this.get('model.primary_group_id')} }).then(function () { diff --git a/app/assets/javascripts/admin/controllers/admin-user.js.es6 b/app/assets/javascripts/admin/controllers/admin-user.js.es6 index 33f6459f8e..77c79b724a 100644 --- a/app/assets/javascripts/admin/controllers/admin-user.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user.js.es6 @@ -1,3 +1 @@ -import ObjectController from 'discourse/controllers/object'; - -export default ObjectController.extend(); +export default Ember.Controller.extend(); diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 index 708207f84a..a0eaf6e162 100644 --- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 @@ -1,3 +1,6 @@ +import debounce from 'discourse/lib/debounce'; +import { i18n } from 'discourse/lib/computed'; + export default Ember.ArrayController.extend({ query: null, showEmails: false, @@ -9,7 +12,7 @@ export default Ember.ArrayController.extend({ queryPending: Em.computed.equal('query', 'pending'), queryHasApproval: Em.computed.or('queryNew', 'queryPending'), showApproval: Em.computed.and('siteSettings.must_approve_users', 'queryHasApproval'), - searchHint: Discourse.computed.i18n('search_hint'), + searchHint: i18n('search_hint'), hasSelection: Em.computed.gt('selectedCount', 0), selectedCount: function() { @@ -31,7 +34,7 @@ export default Ember.ArrayController.extend({ return I18n.t('admin.users.titles.' + this.get('query')); }.property('query'), - _filterUsers: Discourse.debounce(function() { + _filterUsers: debounce(function() { this._refreshUsers(); }, 250).observes('listFilter'), diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6 index ae2b81f087..3bdfbe6b50 100644 --- a/app/assets/javascripts/admin/controllers/admin.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin.js.es6 @@ -1,6 +1,4 @@ -import DiscourseController from 'discourse/controllers/controller'; - -export default DiscourseController.extend({ +export default Ember.Controller.extend({ showBadges: function() { return this.get('currentUser.admin') && this.siteSettings.enable_badges; }.property() diff --git a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 index 635b8c87fe..2924eb6699 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 @@ -1,7 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import ObjectController from 'discourse/controllers/object'; -export default ObjectController.extend(ModalFunctionality, { +export default Ember.Controller.extend(ModalFunctionality, { needs: ["admin-flags-list"], _agreeFlag: function (actionOnPost) { diff --git a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 index de26828eca..284b8bfd09 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 @@ -1,8 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import ObjectController from 'discourse/controllers/object'; - -export default ObjectController.extend(ModalFunctionality, { +export default Ember.Controller.extend(ModalFunctionality, { needs: ["admin-flags-list"], actions: { diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 index 2034d10368..74c4f79e6c 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 @@ -56,8 +56,8 @@ export default Ember.Controller.extend({ saveAll: function(){ var self = this; var items = this.get('workingCopy'); - var groupIds = items.map(function(i){return i.get("id") || -1}); - var names = items.map(function(i){return i.get("name")}); + var groupIds = items.map(function(i){return i.get("id") || -1;}); + var names = items.map(function(i){return i.get("name");}); Discourse.ajax('/admin/badges/badge_groupings',{ data: {ids: groupIds, names: names}, diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 index 9d525e9827..1e2ae5adca 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 @@ -1,5 +1,3 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import ObjectController from 'discourse/controllers/object'; - -export default ObjectController.extend(ModalFunctionality); +export default Ember.Controller.extend(ModalFunctionality); diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 index 1af962e41c..682b1ba25d 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 @@ -1,7 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import Controller from 'discourse/controllers/controller'; -export default Controller.extend(ModalFunctionality, { +export default Ember.Controller.extend(ModalFunctionality, { needs: ["adminBackupsLogs"], _startBackup: function (withUploads) { diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 index 49999aa092..d3e19de569 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 @@ -1,7 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import ObjectController from 'discourse/controllers/object'; -export default ObjectController.extend(ModalFunctionality, { +export default Ember.Controller.extend(ModalFunctionality, { submitDisabled: function() { return (!this.get('reason') || this.get('reason').length < 1); diff --git a/app/assets/javascripts/admin/controllers/modals/change-site-customization-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/change-site-customization-details.js.es6 index 1ef3e217d5..ca6ac31db1 100644 --- a/app/assets/javascripts/admin/controllers/modals/change-site-customization-details.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/change-site-customization-details.js.es6 @@ -1,7 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import ObjectController from 'discourse/controllers/object'; -export default ObjectController.extend(ModalFunctionality, { +export default Ember.Controller.extend(ModalFunctionality, { previousSelected: Ember.computed.equal('selectedTab', 'previous'), newSelected: Ember.computed.equal('selectedTab', 'new'), diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6 index 8416f53585..7cda05c820 100644 --- a/app/assets/javascripts/admin/models/admin-user.js.es6 +++ b/app/assets/javascripts/admin/models/admin-user.js.es6 @@ -1,3 +1,4 @@ +import { propertyNotEqual } from 'discourse/lib/computed'; import { popupAjaxError } from 'discourse/lib/ajax-error'; const AdminUser = Discourse.User.extend({ @@ -144,7 +145,7 @@ const AdminUser = Discourse.User.extend({ this.set('originalTrustLevel', this.get('trust_level')); }, - dirty: Discourse.computed.propertyNotEqual('originalTrustLevel', 'trustLevel.id'), + dirty: propertyNotEqual('originalTrustLevel', 'trustLevel.id'), saveTrustLevel() { return Discourse.ajax("/admin/users/" + this.id + "/trust_level", { diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js.es6 new file mode 100644 index 0000000000..2de301f955 --- /dev/null +++ b/app/assets/javascripts/admin/models/backup-status.js.es6 @@ -0,0 +1,12 @@ +import computed from "ember-addons/ember-computed-decorators"; + +export default Discourse.Model.extend({ + + restoreDisabled: Em.computed.not("restoreEnabled"), + + @computed("allowRestore", "isOperationRunning") + restoreEnabled(allowRestore, isOperationRunning) { + return allowRestore && !isOperationRunning; + } + +}); diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js deleted file mode 100644 index 8c11c9fe33..0000000000 --- a/app/assets/javascripts/admin/models/backup.js +++ /dev/null @@ -1,90 +0,0 @@ -/** - Data model for representing a backup - - @class Backup - @extends Discourse.Model - @namespace Discourse - @module Discourse -**/ -Discourse.Backup = Discourse.Model.extend({ - - /** - Destroys the current backup - - @method destroy - @returns {Promise} a promise that resolves when the backup has been destroyed - **/ - destroy: function() { - return Discourse.ajax("/admin/backups/" + this.get("filename"), { type: "DELETE" }); - }, - - /** - Starts the restoration of the current backup - - @method restore - @returns {Promise} a promise that resolves when the backup has started being restored - **/ - restore: function() { - return Discourse.ajax("/admin/backups/" + this.get("filename") + "/restore", { type: "POST" }); - } - -}); - -Discourse.Backup.reopenClass({ - - /** - Finds a list of backups - - @method find - @returns {Promise} a promise that resolves to the array of {Discourse.Backup} backup - **/ - find: function() { - return PreloadStore.getAndRemove("backups", function() { - return Discourse.ajax("/admin/backups.json"); - }).then(function(backups) { - return backups.map(function (backup) { return Discourse.Backup.create(backup); }); - }); - }, - - /** - Starts a backup - - @method start - @returns {Promise} a promise that resolves when the backup has started - **/ - start: function (withUploads) { - if (withUploads === undefined) { withUploads = true; } - return Discourse.ajax("/admin/backups", { type: "POST", data: { with_uploads: withUploads } }).then(function(result) { - if (!result.success) { bootbox.alert(result.message); } - }); - }, - - /** - Cancels a backup - - @method cancel - @returns {Promise} a promise that resolves when the backup has been cancelled - **/ - cancel: function() { - return Discourse.ajax("/admin/backups/cancel.json").then(function(result) { - if (!result.success) { bootbox.alert(result.message); } - }); - }, - - /** - Rollbacks the database to the previous working state - - @method rollback - @returns {Promise} a promise that resolves when the rollback is done - **/ - rollback: function() { - return Discourse.ajax("/admin/backups/rollback.json").then(function(result) { - if (!result.success) { - bootbox.alert(result.message); - } else { - // redirect to homepage (session might be lost) - window.location.pathname = Discourse.getURL("/"); - } - }); - } -}); diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js.es6 new file mode 100644 index 0000000000..8b4991b728 --- /dev/null +++ b/app/assets/javascripts/admin/models/backup.js.es6 @@ -0,0 +1,56 @@ +const Backup = Discourse.Model.extend({ + + destroy() { + return Discourse.ajax("/admin/backups/" + this.get("filename"), { type: "DELETE" }); + }, + + restore() { + return Discourse.ajax("/admin/backups/" + this.get("filename") + "/restore", { + type: "POST", + data: { client_id: window.MessageBus.clientId } + }); + } + +}); + +Backup.reopenClass({ + + find() { + return PreloadStore.getAndRemove("backups", () => Discourse.ajax("/admin/backups.json")) + .then(backups => backups.map(backup => Backup.create(backup))); + }, + + start(withUploads) { + if (withUploads === undefined) { withUploads = true; } + return Discourse.ajax("/admin/backups", { + type: "POST", + data: { + with_uploads: withUploads, + client_id: window.MessageBus.clientId + } + }).then(result => { + if (!result.success) { bootbox.alert(result.message); } + }); + }, + + cancel() { + return Discourse.ajax("/admin/backups/cancel.json") + .then(result => { + if (!result.success) { bootbox.alert(result.message); } + }); + }, + + rollback() { + return Discourse.ajax("/admin/backups/rollback.json") + .then(result => { + if (!result.success) { + bootbox.alert(result.message); + } else { + // redirect to homepage (session might be lost) + window.location.pathname = Discourse.getURL("/"); + } + }); + } +}); + +export default Backup; diff --git a/app/assets/javascripts/admin/models/backup_status.js b/app/assets/javascripts/admin/models/backup_status.js deleted file mode 100644 index e67a34bc3f..0000000000 --- a/app/assets/javascripts/admin/models/backup_status.js +++ /dev/null @@ -1,9 +0,0 @@ -Discourse.BackupStatus = Discourse.Model.extend({ - - restoreDisabled: Em.computed.not("restoreEnabled"), - - restoreEnabled: function() { - return this.get('allowRestore') && !this.get("isOperationRunning"); - }.property("isOperationRunning", "allowRestore") - -}); diff --git a/app/assets/javascripts/admin/models/flagged_post.js b/app/assets/javascripts/admin/models/flagged_post.js index 0696067806..e3a01948ca 100644 --- a/app/assets/javascripts/admin/models/flagged_post.js +++ b/app/assets/javascripts/admin/models/flagged_post.js @@ -47,7 +47,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({ }, wasEdited: function () { - if (this.blank("last_revised_at")) { return false; } + if (Ember.isEmpty(this.get("last_revised_at"))) { return false; } var lastRevisedAt = Date.parse(this.get("last_revised_at")); return _.some(this.get("post_actions"), function (postAction) { return Date.parse(postAction.created_at) < lastRevisedAt; diff --git a/app/assets/javascripts/admin/models/permalink.js.es6 b/app/assets/javascripts/admin/models/permalink.js.es6 new file mode 100644 index 0000000000..761cd4ab51 --- /dev/null +++ b/app/assets/javascripts/admin/models/permalink.js.es6 @@ -0,0 +1,22 @@ +const Permalink = Discourse.Model.extend({ + save: function() { + return Discourse.ajax("/admin/permalinks.json", { + type: 'POST', + data: {url: this.get('url'), permalink_type: this.get('permalink_type'), permalink_type_value: this.get('permalink_type_value')} + }); + }, + + destroy: function() { + return Discourse.ajax("/admin/permalinks/" + this.get('id') + ".json", {type: 'DELETE'}); + } +}); + +Permalink.reopenClass({ + findAll: function(filter) { + return Discourse.ajax("/admin/permalinks.json", { data: { filter: filter } }).then(function(permalinks) { + return permalinks.map(p => Discourse.Permalink.create(p)); + }); + } +}); + +export default Permalink; diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js deleted file mode 100644 index 6f8bfdfff3..0000000000 --- a/app/assets/javascripts/admin/models/report.js +++ /dev/null @@ -1,164 +0,0 @@ -Discourse.Report = Discourse.Model.extend({ - reportUrl: function() { - return("/admin/reports/" + this.get('type')); - }.property('type'), - - valueAt: function(numDaysAgo) { - if (this.data) { - var wantedDate = moment().subtract(numDaysAgo, 'days').format('YYYY-MM-DD'); - var item = this.data.find( function(d) { return d.x === wantedDate; } ); - if (item) { - return item.y; - } - } - return 0; - }, - - sumDays: function(startDaysAgo, endDaysAgo) { - if (this.data) { - var earliestDate = moment().subtract(endDaysAgo, 'days').startOf('day'); - var latestDate = moment().subtract(startDaysAgo, 'days').startOf('day'); - var d, sum = 0; - _.each(this.data,function(datum){ - d = moment(datum.x); - if(d >= earliestDate && d <= latestDate) { - sum += datum.y; - } - }); - return sum; - } - }, - - todayCount: function() { - return this.valueAt(0); - }.property('data'), - - yesterdayCount: function() { - return this.valueAt(1); - }.property('data'), - - lastSevenDaysCount: function() { - return this.sumDays(1,7); - }.property('data'), - - lastThirtyDaysCount: function() { - return this.sumDays(1,30); - }.property('data'), - - sevenDaysAgoCount: function() { - return this.valueAt(7); - }.property('data'), - - thirtyDaysAgoCount: function() { - return this.valueAt(30); - }.property('data'), - - yesterdayTrend: function() { - var yesterdayVal = this.valueAt(1); - var twoDaysAgoVal = this.valueAt(2); - if ( yesterdayVal > twoDaysAgoVal ) { - return 'trending-up'; - } else if ( yesterdayVal < twoDaysAgoVal ) { - return 'trending-down'; - } else { - return 'no-change'; - } - }.property('data'), - - sevenDayTrend: function() { - var currentPeriod = this.sumDays(1,7); - var prevPeriod = this.sumDays(8,14); - if ( currentPeriod > prevPeriod ) { - return 'trending-up'; - } else if ( currentPeriod < prevPeriod ) { - return 'trending-down'; - } else { - return 'no-change'; - } - }.property('data'), - - thirtyDayTrend: function() { - if( this.get('prev30Days') ) { - var currentPeriod = this.sumDays(1,30); - if( currentPeriod > this.get('prev30Days') ) { - return 'trending-up'; - } else if ( currentPeriod < this.get('prev30Days') ) { - return 'trending-down'; - } - } - return 'no-change'; - }.property('data', 'prev30Days'), - - icon: function() { - switch( this.get('type') ) { - case 'flags': - return 'flag'; - case 'likes': - return 'heart'; - default: - return null; - } - }.property('type'), - - percentChangeString: function(val1, val2) { - var val = ((val1 - val2) / val2) * 100; - if( isNaN(val) || !isFinite(val) ) { - return null; - } else if( val > 0 ) { - return '+' + val.toFixed(0) + '%'; - } else { - return val.toFixed(0) + '%'; - } - }, - - changeTitle: function(val1, val2, prevPeriodString) { - var title = ''; - var percentChange = this.percentChangeString(val1, val2); - if( percentChange ) { - title += percentChange + ' change. '; - } - title += 'Was ' + val2 + ' ' + prevPeriodString + '.'; - return title; - }, - - yesterdayCountTitle: function() { - return this.changeTitle( this.valueAt(1), this.valueAt(2),'two days ago'); - }.property('data'), - - sevenDayCountTitle: function() { - return this.changeTitle( this.sumDays(1,7), this.sumDays(8,14), 'two weeks ago'); - }.property('data'), - - thirtyDayCountTitle: function() { - return this.changeTitle( this.sumDays(1,30), this.get('prev30Days'), 'in the previous 30 day period'); - }.property('data'), - - dataReversed: function() { - return this.get('data').toArray().reverse(); - }.property('data') - -}); - -Discourse.Report.reopenClass({ - find: function(type, startDate, endDate) { - - return Discourse.ajax("/admin/reports/" + type, {data: { - start_date: startDate, - end_date: endDate - }}).then(function (json) { - // Add a percent field to each tuple - var maxY = 0; - json.report.data.forEach(function (row) { - if (row.y > maxY) maxY = row.y; - }); - if (maxY > 0) { - json.report.data.forEach(function (row) { - row.percentage = Math.round((row.y / maxY) * 100); - }); - } - var model = Discourse.Report.create({type: type}); - model.setProperties(json.report); - return model; - }); - } -}); diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6 new file mode 100644 index 0000000000..a28601d0ce --- /dev/null +++ b/app/assets/javascripts/admin/models/report.js.es6 @@ -0,0 +1,157 @@ +import round from "discourse/lib/round"; +import { fmt } from 'discourse/lib/computed'; + +const Report = Discourse.Model.extend({ + reportUrl: fmt("type", "/admin/reports/%@"), + + valueAt(numDaysAgo) { + if (this.data) { + const wantedDate = moment().subtract(numDaysAgo, "days").format("YYYY-MM-DD"); + const item = this.data.find(d => d.x === wantedDate); + if (item) { + return item.y; + } + } + return 0; + }, + + valueFor(startDaysAgo, endDaysAgo) { + if (this.data) { + const earliestDate = moment().subtract(endDaysAgo, "days").startOf("day"); + const latestDate = moment().subtract(startDaysAgo, "days").startOf("day"); + var d, sum = 0, count = 0; + _.each(this.data, datum => { + d = moment(datum.x); + if (d >= earliestDate && d <= latestDate) { + sum += datum.y; + count++; + } + }); + if (this.get("method") === "average" && count > 0) { sum /= count; } + return round(sum, -2); + } + }, + + todayCount: function() { return this.valueAt(0); }.property("data"), + yesterdayCount: function() { return this.valueAt(1); }.property("data"), + sevenDaysAgoCount: function() { return this.valueAt(7); }.property("data"), + thirtyDaysAgoCount: function() { return this.valueAt(30); }.property("data"), + + lastSevenDaysCount: function() { return this.valueFor(1, 7); }.property("data"), + lastThirtyDaysCount: function() { return this.valueFor(1, 30); }.property("data"), + + yesterdayTrend: function() { + const yesterdayVal = this.valueAt(1); + const twoDaysAgoVal = this.valueAt(2); + if (yesterdayVal > twoDaysAgoVal) { + return "trending-up"; + } else if (yesterdayVal < twoDaysAgoVal) { + return "trending-down"; + } else { + return "no-change"; + } + }.property("data"), + + sevenDayTrend: function() { + const currentPeriod = this.valueFor(1, 7); + const prevPeriod = this.valueFor(8, 14); + if (currentPeriod > prevPeriod) { + return "trending-up"; + } else if (currentPeriod < prevPeriod) { + return "trending-down"; + } else { + return "no-change"; + } + }.property("data"), + + thirtyDayTrend: function() { + if (this.get("prev30Days")) { + const currentPeriod = this.valueFor(1, 30); + if (currentPeriod > this.get("prev30Days")) { + return "trending-up"; + } else if (currentPeriod < this.get("prev30Days")) { + return "trending-down"; + } + } + return "no-change"; + }.property("data", "prev30Days"), + + icon: function() { + switch (this.get("type")) { + case "flags": return "flag"; + case "likes": return "heart"; + default: return null; + } + }.property("type"), + + method: function() { + if (this.get("type") === "time_to_first_response") { + return "average"; + } else { + return "sum"; + } + }.property("type"), + + percentChangeString(val1, val2) { + const val = ((val1 - val2) / val2) * 100; + if (isNaN(val) || !isFinite(val)) { + return null; + } else if (val > 0) { + return "+" + val.toFixed(0) + "%"; + } else { + return val.toFixed(0) + "%"; + } + }, + + changeTitle(val1, val2, prevPeriodString) { + const percentChange = this.percentChangeString(val1, val2); + var title = ""; + if (percentChange) { title += percentChange + " change. "; } + title += "Was " + val2 + " " + prevPeriodString + "."; + return title; + }, + + yesterdayCountTitle: function() { + return this.changeTitle(this.valueAt(1), this.valueAt(2), "two days ago"); + }.property("data"), + + sevenDayCountTitle: function() { + return this.changeTitle(this.valueFor(1, 7), this.valueFor(8, 14), "two weeks ago"); + }.property("data"), + + thirtyDayCountTitle: function() { + return this.changeTitle(this.valueFor(1, 30), this.get("prev30Days"), "in the previous 30 day period"); + }.property("data"), + + dataReversed: function() { + return this.get("data").toArray().reverse(); + }.property("data") + +}); + +Report.reopenClass({ + + find(type, startDate, endDate, categoryId) { + return Discourse.ajax("/admin/reports/" + type, { + data: { + start_date: startDate, + end_date: endDate, + category_id: categoryId + } + }).then(json => { + // Add a percent field to each tuple + let maxY = 0; + json.report.data.forEach(row => { + if (row.y > maxY) maxY = row.y; + }); + if (maxY > 0) { + json.report.data.forEach(row => row.percentage = Math.round((row.y / maxY) * 100)); + } + const model = Discourse.Report.create({ type: type }); + model.setProperties(json.report); + return model; + }); + } +}); + +export default Report; diff --git a/app/assets/javascripts/admin/models/site-customization.js.es6 b/app/assets/javascripts/admin/models/site-customization.js.es6 new file mode 100644 index 0000000000..fe2176bf11 --- /dev/null +++ b/app/assets/javascripts/admin/models/site-customization.js.es6 @@ -0,0 +1,31 @@ +import RestModel from 'discourse/models/rest'; + +const trackedProperties = [ + 'enabled', 'name', 'stylesheet', 'header', 'top', 'footer', 'mobile_stylesheet', + 'mobile_header', 'mobile_top', 'mobile_footer', 'head_tag', 'body_tag', 'embedded_css' +]; + +function changed() { + const originals = this.get('originals'); + if (!originals) { return false; } + return _.some(trackedProperties, (p) => originals[p] !== this.get(p)); +} + +const SiteCustomization = RestModel.extend({ + description: function() { + return "" + this.name + (this.enabled ? ' (*)' : ''); + }.property('selected', 'name', 'enabled'), + + changed: changed.property.apply(changed, trackedProperties.concat('originals')), + + startTrackingChanges: function() { + this.set('originals', this.getProperties(trackedProperties)); + }.on('init'), + + saveChanges() { + return this.save(this.getProperties(trackedProperties)).then(() => this.startTrackingChanges()); + }, + +}); + +export default SiteCustomization; diff --git a/app/assets/javascripts/admin/models/site-text-type.js.es6 b/app/assets/javascripts/admin/models/site-text-type.js.es6 new file mode 100644 index 0000000000..7cb1171e90 --- /dev/null +++ b/app/assets/javascripts/admin/models/site-text-type.js.es6 @@ -0,0 +1,2 @@ +import RestModel from 'discourse/models/rest'; +export default RestModel.extend(); diff --git a/app/assets/javascripts/admin/models/site-text.js.es6 b/app/assets/javascripts/admin/models/site-text.js.es6 new file mode 100644 index 0000000000..edbaf2a444 --- /dev/null +++ b/app/assets/javascripts/admin/models/site-text.js.es6 @@ -0,0 +1,8 @@ +import RestModel from 'discourse/models/rest'; + +export default RestModel.extend({ + markdown: Em.computed.equal('format', 'markdown'), + plainText: Em.computed.equal('format', 'plain'), + html: Em.computed.equal('format', 'html'), + css: Em.computed.equal('format', 'css'), +}); diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js deleted file mode 100644 index 27b6ddbdd9..0000000000 --- a/app/assets/javascripts/admin/models/site_customization.js +++ /dev/null @@ -1,111 +0,0 @@ -/** - Our data model for interacting with site customizations. - - @class SiteCustomization - @extends Discourse.Model - @namespace Discourse - @module Discourse -**/ -Discourse.SiteCustomization = Discourse.Model.extend({ - trackedProperties: [ - 'enabled', 'name', - 'stylesheet', 'header', 'top', 'footer', - 'mobile_stylesheet', 'mobile_header', 'mobile_top', 'mobile_footer', - 'head_tag', 'body_tag' - ], - - description: function() { - return "" + this.name + (this.enabled ? ' (*)' : ''); - }.property('selected', 'name', 'enabled'), - - changed: function() { - var self = this; - - if (!this.originals) { return false; } - - var changed = _.some(this.trackedProperties, function (p) { - return self.originals[p] !== self.get(p); - }); - - if (changed) { this.set('savingStatus', ''); } - - return changed; - }.property('enabled', 'name', 'originals', - 'stylesheet', 'header', 'top', 'footer', - 'mobile_stylesheet', 'mobile_header', 'mobile_top', 'mobile_footer', - 'head_tag', 'body_tag'), - - startTrackingChanges: function() { - var self = this; - var originals = {}; - _.each(this.trackedProperties, function (prop) { - originals[prop] = self.get(prop); - }); - this.set('originals', originals); - }.on('init'), - - previewUrl: function() { return "/?preview-style=" + this.get('key'); }.property('key'), - disableSave: function() { return !this.get('changed') || this.get('saving'); }.property('changed'), - - save: function() { - this.set('savingStatus', I18n.t('saving')); - this.set('saving',true); - - var data = { - name: this.name, - enabled: this.enabled, - stylesheet: this.stylesheet, - header: this.header, - top: this.top, - footer: this.footer, - mobile_stylesheet: this.mobile_stylesheet, - mobile_header: this.mobile_header, - mobile_top: this.mobile_top, - mobile_footer: this.mobile_footer, - head_tag: this.head_tag, - body_tag: this.body_tag - }; - - var siteCustomization = this; - return Discourse.ajax("/admin/site_customizations" + (this.id ? '/' + this.id : ''), { - data: { site_customization: data }, - type: this.id ? 'PUT' : 'POST' - }).then(function (result) { - if (!siteCustomization.id) { - siteCustomization.set('id', result.id); - siteCustomization.set('key', result.key); - } - siteCustomization.set('savingStatus', I18n.t('saved')); - siteCustomization.set('saving',false); - siteCustomization.startTrackingChanges(); - }); - }, - - destroy: function() { - if (!this.id) return; - return Discourse.ajax("/admin/site_customizations/" + this.id, { type: 'DELETE' }); - } -}); - -var SiteCustomizations = Ember.ArrayProxy.extend({ - selectedItemChanged: function() { - var selected = this.get('selectedItem'); - _.each(this.get('content'), function (i) { - i.set('selected', selected === i); - }); - }.observes('selectedItem') -}); - -Discourse.SiteCustomization.reopenClass({ - findAll: function() { - return Discourse.ajax("/admin/site_customizations").then(function (data) { - var content = []; - if (data) { - content = data.site_customizations.map(function(c) { - return Discourse.SiteCustomization.create(c); - }); - } - return SiteCustomizations.create({ content: content }); - }); - } -}); diff --git a/app/assets/javascripts/admin/models/site_text.js b/app/assets/javascripts/admin/models/site_text.js deleted file mode 100644 index 0d671c4334..0000000000 --- a/app/assets/javascripts/admin/models/site_text.js +++ /dev/null @@ -1,21 +0,0 @@ -Discourse.SiteText = Discourse.Model.extend({ - markdown: Em.computed.equal('format', 'markdown'), - plainText: Em.computed.equal('format', 'plain'), - html: Em.computed.equal('format', 'html'), - css: Em.computed.equal('format', 'css'), - - save: function() { - return Discourse.ajax("/admin/customize/site_text/" + this.get('text_type'), { - type: 'PUT', - data: {value: this.get('value')} - }); - } -}); - -Discourse.SiteText.reopenClass({ - find: function(type) { - return Discourse.ajax("/admin/customize/site_text/" + type).then(function (data) { - return Discourse.SiteText.create(data.site_text); - }); - } -}); diff --git a/app/assets/javascripts/admin/models/site_text_type.js b/app/assets/javascripts/admin/models/site_text_type.js deleted file mode 100644 index 1a181bd8e8..0000000000 --- a/app/assets/javascripts/admin/models/site_text_type.js +++ /dev/null @@ -1,11 +0,0 @@ -Discourse.SiteTextType = Discourse.Model.extend(); - -Discourse.SiteTextType.reopenClass({ - findAll: function() { - return Discourse.ajax("/admin/customize/site_text_types").then(function(data) { - return data.map(function(ct) { - return Discourse.SiteTextType.create(ct); - }); - }); - } -}); diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js.es6 index e5c3348efd..9e657f2204 100644 --- a/app/assets/javascripts/admin/models/user-field.js.es6 +++ b/app/assets/javascripts/admin/models/user-field.js.es6 @@ -1,54 +1,26 @@ -var UserField = Ember.Object.extend({ - destroy: function() { - var self = this; - return new Ember.RSVP.Promise(function(resolve) { - var id = self.get('id'); - if (id) { - return Discourse.ajax("/admin/customize/user_fields/" + id, { type: 'DELETE' }).then(function() { - resolve(); - }); - } - resolve(); - }); - }, +import RestModel from 'discourse/models/rest'; +import { i18n } from 'discourse/lib/computed'; - save: function(attrs) { - var id = this.get('id'); - if (!id) { - return Discourse.ajax("/admin/customize/user_fields", { - type: "POST", - data: { user_field: attrs } - }); - } else { - return Discourse.ajax("/admin/customize/user_fields/" + id, { - type: "PUT", - data: { user_field: attrs } - }); - } - } +const UserField = RestModel.extend(); + +const UserFieldType = Ember.Object.extend({ + name: i18n('id', 'admin.user_fields.field_types.%@') }); UserField.reopenClass({ - findAll: function() { - return Discourse.ajax("/admin/customize/user_fields").then(function(result) { - return result.user_fields.map(function(uf) { - return UserField.create(uf); - }); - }); - }, - - fieldTypes: function() { + fieldTypes() { if (!this._fieldTypes) { this._fieldTypes = [ - Ember.Object.create({id: 'text', name: I18n.t('admin.user_fields.field_types.text') }), - Ember.Object.create({id: 'confirm', name: I18n.t('admin.user_fields.field_types.confirm') }) + UserFieldType.create({ id: 'text' }), + UserFieldType.create({ id: 'confirm' }), + UserFieldType.create({ id: 'dropdown', hasOptions: true }) ]; } return this._fieldTypes; }, - fieldTypeById: function(id) { + fieldTypeById(id) { return this.fieldTypes().findBy('id', id); } }); diff --git a/app/assets/javascripts/admin/routes/admin-api.js.es6 b/app/assets/javascripts/admin/routes/admin-api.js.es6 new file mode 100644 index 0000000000..82212c9657 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-api.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + model() { + return Discourse.ApiKey.find(); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 new file mode 100644 index 0000000000..651551f857 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + model() { + return Discourse.Backup.find(); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin_backups_logs_route.js b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 similarity index 71% rename from app/assets/javascripts/admin/routes/admin_backups_logs_route.js rename to app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 index e1f3101d69..8a6d32fddf 100644 --- a/app/assets/javascripts/admin/routes/admin_backups_logs_route.js +++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 @@ -1,15 +1,15 @@ -Discourse.AdminBackupsLogsRoute = Discourse.Route.extend({ +export default Ember.Route.extend({ // since the logs are pushed via the message bus // we only want to preload them (hence the beforeModel hook) - beforeModel: function() { - var logsController = this.controllerFor("adminBackupsLogs"); + beforeModel() { + const logsController = this.controllerFor("adminBackupsLogs"); // preload the logs if any PreloadStore.getAndRemove("logs").then(function (preloadedLogs) { if (preloadedLogs && preloadedLogs.length) { // we need to filter out message like: "[SUCCESS]" // and convert POJOs to Ember Objects - var logs = _.chain(preloadedLogs) + const logs = _.chain(preloadedLogs) .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; }) .map(function (log) { return Em.Object.create(log); }) .value(); @@ -18,6 +18,6 @@ Discourse.AdminBackupsLogsRoute = Discourse.Route.extend({ }); }, - setupController: function() { /* prevent default behavior */ } + setupController() { /* prevent default behavior */ } }); diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6 index 981dc5394b..ac7f963cd4 100644 --- a/app/assets/javascripts/admin/routes/admin-backups.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6 @@ -10,14 +10,14 @@ export default Discourse.Route.extend({ _processLogMessage(log) { if (log.message === "[STARTED]") { - this.controllerFor("adminBackups").set("isOperationRunning", true); + this.controllerFor("adminBackups").set("model.isOperationRunning", true); this.controllerFor("adminBackupsLogs").clear(); } else if (log.message === "[FAILED]") { - this.controllerFor("adminBackups").set("isOperationRunning", false); + this.controllerFor("adminBackups").set("model.isOperationRunning", false); bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation })); } else if (log.message === "[SUCCESS]") { Discourse.User.currentProp("hideReadOnlyAlert", false); - this.controllerFor("adminBackups").set("isOperationRunning", false); + this.controllerFor("adminBackups").set("model.isOperationRunning", false); if (log.operation === "restore") { // redirect to homepage when the restore is done (session might be lost) window.location.pathname = Discourse.getURL("/"); @@ -30,7 +30,7 @@ export default Discourse.Route.extend({ model() { return PreloadStore.getAndRemove("operations_status", function() { return Discourse.ajax("/admin/backups/status.json"); - }).then(function (status) { + }).then(status => { return Discourse.BackupStatus.create({ isOperationRunning: status.is_operation_running, canRollback: status.can_rollback, @@ -50,7 +50,7 @@ export default Discourse.Route.extend({ }, backupStarted() { - this.modelFor("adminBackups").set("isOperationRunning", true); + this.controllerFor("adminBackups").set("isOperationRunning", true); this.transitionTo("admin.backups.logs"); this.send("closeModal"); }, @@ -82,7 +82,7 @@ export default Discourse.Route.extend({ Discourse.User.currentProp("hideReadOnlyAlert", true); backup.restore().then(function() { self.controllerFor("adminBackupsLogs").clear(); - self.modelFor("adminBackups").set("isOperationRunning", true); + self.controllerFor("adminBackups").set("model.isOperationRunning", true); self.transitionTo("admin.backups.logs"); }); } @@ -99,7 +99,7 @@ export default Discourse.Route.extend({ function(confirmed) { if (confirmed) { Discourse.Backup.cancel().then(function() { - self.controllerFor("adminBackups").set("isOperationRunning", false); + self.controllerFor("adminBackups").set("model.isOperationRunning", false); }); } } diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 index 648730d9b0..c283ff737b 100644 --- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 @@ -1,3 +1,4 @@ +import Badge from 'discourse/models/badge'; import showModal from 'discourse/lib/show-modal'; export default Ember.Route.extend({ @@ -7,7 +8,7 @@ export default Ember.Route.extend({ model(params) { if (params.badge_id === "new") { - return Discourse.Badge.create({ + return Badge.create({ name: I18n.t('admin.badges.new_badge') }); } diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6 index 3d417f53c2..5927437669 100644 --- a/app/assets/javascripts/admin/routes/admin-badges.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6 @@ -1,3 +1,5 @@ +import Badge from 'discourse/models/badge'; + export default Discourse.Route.extend({ _json: null, @@ -5,7 +7,7 @@ export default Discourse.Route.extend({ var self = this; return Discourse.ajax('/admin/badges.json').then(function(json) { self._json = json; - return Discourse.Badge.createFromJson(json); + return Badge.createFromJson(json); }); }, diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 new file mode 100644 index 0000000000..b0f4745a38 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 @@ -0,0 +1,12 @@ +export default Ember.Route.extend({ + + model() { + return Discourse.ColorScheme.findAll(); + }, + + deactivate() { + this._super(); + this.controllerFor('adminCustomizeColors').set('selectedItem', null); + }, + +}); diff --git a/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6 new file mode 100644 index 0000000000..dc38f3c51f --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-css-html-show.js.es6 @@ -0,0 +1,11 @@ +export default Ember.Route.extend({ + model(params) { + const all = this.modelFor('adminCustomizeCssHtml'); + const model = all.findProperty('id', parseInt(params.site_customization_id)); + return model ? { model, section: params.section } : this.replaceWith('adminCustomizeCssHtml.index'); + }, + + setupController(controller, hash) { + controller.setProperties(hash); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 new file mode 100644 index 0000000000..5bbb460959 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-css-html.js.es6 @@ -0,0 +1,26 @@ +import showModal from 'discourse/lib/show-modal'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; + +export default Ember.Route.extend({ + model() { + return this.store.findAll('site-customization'); + }, + + actions: { + importModal() { + showModal('upload-customization'); + }, + + newCustomization(obj) { + obj = obj || {name: I18n.t("admin.customize.new_style")}; + const item = this.store.createRecord('site-customization'); + + const all = this.modelFor('adminCustomizeCssHtml'); + const self = this; + item.save(obj).then(function() { + all.pushObject(item); + self.transitionTo('adminCustomizeCssHtml.show', item.get('id'), 'css'); + }).catch(popupAjaxError); + } + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 new file mode 100644 index 0000000000..725b9fa8dd --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 @@ -0,0 +1,5 @@ +export default Ember.Route.extend({ + beforeModel() { + this.replaceWith('adminCustomize.colors'); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 index bbe4c79845..7bdb274e43 100644 --- a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 @@ -12,8 +12,9 @@ export default Discourse.Route.extend({ if (versionChecks) { c.set('versionCheck', Discourse.VersionCheck.create(d.version_check)); } - _.each(d.reports,function(report){ - c.set(report.type, Discourse.Report.create(report)); + + ['global_reports', 'page_view_reports', 'private_message_reports', 'http_reports', 'user_reports', 'mobile_reports'].forEach(name => { + c.set(name, d[name].map(r => Discourse.Report.create(r))); }); var topReferrers = d.top_referrers; diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 new file mode 100644 index 0000000000..94d48e400d --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 @@ -0,0 +1,16 @@ +export default Discourse.Route.extend({ + + model() { + return Discourse.EmailPreview.findDigest(); + }, + + afterModel(model) { + const controller = this.controllerFor('adminEmailPreviewDigest'); + controller.setProperties({ + model: model, + lastSeen: moment().subtract(7, 'days').format('YYYY-MM-DD'), + showHtml: true + }); + } + +}); diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js.es6 new file mode 100644 index 0000000000..d9a249c60c --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-embedding.js.es6 @@ -0,0 +1,9 @@ +export default Ember.Route.extend({ + model() { + return this.store.find('embedding'); + }, + + setupController(controller, model) { + controller.set('embedding', model); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6 index f397297767..b46022a646 100644 --- a/app/assets/javascripts/admin/routes/admin-group.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-group.js.es6 @@ -1,8 +1,17 @@ +import Group from 'discourse/models/group'; + export default Discourse.Route.extend({ model: function(params) { - var groups = this.modelFor('adminGroupsType'), - group = groups.findProperty('name', params.name); + var groups = this.modelFor('adminGroupsType'); + if (params.name === 'new') { + return Group.create({ + automatic: false, + visible: true + }); + } + + var group = groups.findProperty('name', params.name); if (!group) { return this.transitionTo('adminGroups.index'); } @@ -11,9 +20,7 @@ export default Discourse.Route.extend({ setupController: function(controller, model) { controller.set("model", model); - // clear the user selector - controller.set("usernames", null); - // load the members of the group + controller.set("model.usernames", null); model.findMembers(); } diff --git a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 index c8226f04dc..def99aa7c1 100644 --- a/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-groups-type.js.es6 @@ -9,15 +9,5 @@ export default Discourse.Route.extend({ setupController(controller, model){ controller.set("type", this.get("type")); controller.set("model", model); - }, - - actions: { - newGroup() { - const self = this; - this.transitionTo("adminGroupsType", "custom").then(function() { - var group = Discourse.Group.create({ automatic: false, visible: true }); - self.transitionTo("adminGroup", group); - }); - } } }); diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 new file mode 100644 index 0000000000..72b7f444d2 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 @@ -0,0 +1,9 @@ +export default Discourse.Route.extend({ + model() { + return Discourse.Permalink.findAll(); + }, + + setupController(controller, model) { + controller.set('model', model); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js.es6 index ae7f961fd1..820c5207d4 100644 --- a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-plugins.js.es6 @@ -4,8 +4,21 @@ export default Ember.Route.extend({ }, actions: { - showSettings() { - this.transitionTo('adminSiteSettingsCategory', 'plugins'); + showSettings(plugin) { + const controller = this.controllerFor('adminSiteSettings'); + this.transitionTo('adminSiteSettingsCategory', 'plugins').then(() => { + if (plugin) { + const match = /^(.*)_enabled/.exec(plugin.get('enabled_setting')); + if (match[1]) { + // filterContent() is normally on a debounce from typing. + // Because we don't want the default of "All Results", we tell it + // to skip the next debounce. + controller.set('filter', match[1]); + controller.set('_skipBounce', true); + controller.filterContentNow('plugins'); + } + } + }); } } }); diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 index ab5f2e16c9..e01d0f8f0d 100644 --- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 @@ -16,12 +16,18 @@ export default { this.resource('adminCustomize', { path: '/customize' } ,function() { this.route('colors'); - this.route('css_html'); - this.resource('adminSiteText', { path: '/site_text' }, function() { + + this.resource('adminCustomizeCssHtml', { path: 'css_html' }, function() { + this.route('show', {path: '/:site_customization_id/:section'}); + }); + + this.resource('adminSiteText', { path: '/site_texts' }, function() { this.route('edit', {path: '/:text_type'}); }); this.resource('adminUserFields', { path: '/user_fields' }); this.resource('adminEmojis', { path: '/emojis' }); + this.resource('adminPermalinks', { path: '/permalinks' }); + this.resource('adminEmbedding', { path: '/embedding' }); }); this.route('api'); diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 index 6eba6e76e1..847746d039 100644 --- a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 @@ -1,5 +1,5 @@ export default Discourse.Route.extend({ - model: function(params) { - return Discourse.SiteText.find(params.text_type); + model(params) { + return this.store.find('site-text', params.text_type); } }); diff --git a/app/assets/javascripts/admin/routes/admin-site-text.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text.js.es6 index e850fd6c6c..f69c3c3954 100644 --- a/app/assets/javascripts/admin/routes/admin-site-text.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-site-text.js.es6 @@ -1,5 +1,5 @@ export default Discourse.Route.extend({ - model: function() { - return Discourse.SiteTextType.findAll(); + model() { + return this.store.findAll('site-text-type'); } }); diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 new file mode 100644 index 0000000000..205c1647c9 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 @@ -0,0 +1,26 @@ +import UserBadge from 'discourse/models/user-badge'; +import Badge from 'discourse/models/badge'; + +export default Discourse.Route.extend({ + model() { + const username = this.modelFor('adminUser').get('username'); + return UserBadge.findByUsername(username); + }, + + setupController(controller, model) { + // Find all badges. + controller.set('loading', true); + Badge.findAll().then(function(badges) { + controller.set('badges', badges); + if (badges.length > 0) { + var grantableBadges = controller.get('grantableBadges'); + if (grantableBadges.length > 0) { + controller.set('selectedBadgeId', grantableBadges[0].get('id')); + } + } + controller.set('loading', false); + }); + // Set the model. + controller.set('model', model); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 index a540f343cc..5770165ff7 100644 --- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 @@ -2,13 +2,10 @@ import UserField from 'admin/models/user-field'; export default Discourse.Route.extend({ model: function() { - return UserField.findAll(); + return this.store.findAll('user-field'); }, setupController: function(controller, model) { - controller.setProperties({ - model: model, - fieldTypes: UserField.fieldTypes() - }); + controller.setProperties({ model, fieldTypes: UserField.fieldTypes() }); } }); diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6 index 0472077f69..1a2b08d29e 100644 --- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6 @@ -9,7 +9,7 @@ export default Discourse.Route.extend({ }, sendInvites: function() { - this.transitionTo('user.invited', Discourse.User.current()); + this.transitionTo('userInvited', Discourse.User.current()); }, deleteUser: function(user) { diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js.es6 new file mode 100644 index 0000000000..c1b80b2df5 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin.js.es6 @@ -0,0 +1,16 @@ +export default Discourse.Route.extend({ + titleToken() { + return I18n.t('admin_title'); + }, + + activate() { + this.controllerFor("application").setProperties({ + showTop: false, + showFooter: false, + }); + }, + + deactivate() { + this.controllerFor("application").set("showTop", true); + } +}); diff --git a/app/assets/javascripts/admin/routes/admin_api_route.js b/app/assets/javascripts/admin/routes/admin_api_route.js deleted file mode 100644 index e13085fa1a..0000000000 --- a/app/assets/javascripts/admin/routes/admin_api_route.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - Handles routes related to api - - @class AdminApiRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ -Discourse.AdminApiRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.ApiKey.find(); - } - -}); diff --git a/app/assets/javascripts/admin/routes/admin_backups_index_route.js b/app/assets/javascripts/admin/routes/admin_backups_index_route.js deleted file mode 100644 index 8ba5e6539f..0000000000 --- a/app/assets/javascripts/admin/routes/admin_backups_index_route.js +++ /dev/null @@ -1,7 +0,0 @@ -Discourse.AdminBackupsIndexRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.Backup.find(); - } - -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_colors_route.js b/app/assets/javascripts/admin/routes/admin_customize_colors_route.js deleted file mode 100644 index 953031ab40..0000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_colors_route.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - Handles routes related to colors customization - - @class AdminCustomizeColorsRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ -Discourse.AdminCustomizeColorsRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.ColorScheme.findAll(); - }, - - deactivate: function() { - this._super(); - this.controllerFor('adminCustomizeColors').set('selectedItem', null); - }, - -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js b/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js deleted file mode 100644 index a9684add0f..0000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_css_html_route.js +++ /dev/null @@ -1,5 +0,0 @@ -Discourse.AdminCustomizeCssHtmlRoute = Discourse.Route.extend({ - model: function() { - return Discourse.SiteCustomization.findAll(); - } -}); diff --git a/app/assets/javascripts/admin/routes/admin_customize_route.js b/app/assets/javascripts/admin/routes/admin_customize_route.js deleted file mode 100644 index 5b6d853170..0000000000 --- a/app/assets/javascripts/admin/routes/admin_customize_route.js +++ /dev/null @@ -1,5 +0,0 @@ -Discourse.AdminCustomizeIndexRoute = Discourse.Route.extend({ - beforeModel: function() { - this.replaceWith('adminCustomize.colors'); - } -}); diff --git a/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js b/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js deleted file mode 100644 index 511b56bbfe..0000000000 --- a/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - Previews the Email Digests - - @class AdminEmailPreviewDigest - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ - -Discourse.AdminEmailPreviewDigestRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.EmailPreview.findDigest(); - }, - - afterModel: function(model) { - var controller = this.controllerFor('adminEmailPreviewDigest'); - controller.setProperties({ - model: model, - lastSeen: moment().subtract(7, 'days').format('YYYY-MM-DD'), - showHtml: true - }); - } - -}); diff --git a/app/assets/javascripts/admin/routes/admin_reports_route.js b/app/assets/javascripts/admin/routes/admin_reports_route.js index 21b842a9f8..2e11a0d39e 100644 --- a/app/assets/javascripts/admin/routes/admin_reports_route.js +++ b/app/assets/javascripts/admin/routes/admin_reports_route.js @@ -14,6 +14,7 @@ Discourse.AdminReportsRoute = Discourse.Route.extend({ setupController: function(controller, model) { controller.setProperties({ model: model, + categoryId: 'all', startDate: moment(model.get('start_date')).format('YYYY-MM-DD'), endDate: moment(model.get('end_date')).format('YYYY-MM-DD') }); diff --git a/app/assets/javascripts/admin/routes/admin_route.js b/app/assets/javascripts/admin/routes/admin_route.js deleted file mode 100644 index 07fc597f03..0000000000 --- a/app/assets/javascripts/admin/routes/admin_route.js +++ /dev/null @@ -1,5 +0,0 @@ -Discourse.AdminRoute = Discourse.Route.extend({ - titleToken: function() { - return I18n.t('admin_title'); - } -}); diff --git a/app/assets/javascripts/admin/routes/admin_user_badges_route.js b/app/assets/javascripts/admin/routes/admin_user_badges_route.js deleted file mode 100644 index f681e6f919..0000000000 --- a/app/assets/javascripts/admin/routes/admin_user_badges_route.js +++ /dev/null @@ -1,32 +0,0 @@ -/** - Shows all of the badges that have been granted to a user, and allow granting and - revoking badges. - - @class AdminUserBadgesRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse -**/ -Discourse.AdminUserBadgesRoute = Discourse.Route.extend({ - model: function() { - var username = this.modelFor('adminUser').get('username'); - return Discourse.UserBadge.findByUsername(username); - }, - - setupController: function(controller, model) { - // Find all badges. - controller.set('loading', true); - Discourse.Badge.findAll().then(function(badges) { - controller.set('badges', badges); - if (badges.length > 0) { - var grantableBadges = controller.get('grantableBadges'); - if (grantableBadges.length > 0) { - controller.set('selectedBadgeId', grantableBadges[0].get('id')); - } - } - controller.set('loading', false); - }); - // Set the model. - controller.set('model', model); - } -}); diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs index df56d57bf8..c7746a6d4a 100644 --- a/app/assets/javascripts/admin/templates/admin.hbs +++ b/app/assets/javascripts/admin/templates/admin.hbs @@ -1,29 +1,28 @@
- {{global-notice}}
    - {{admin-nav-item route='admin.dashboard' label='admin.dashboard.title'}} + {{nav-item route='admin.dashboard' label='admin.dashboard.title'}} {{#if currentUser.admin}} - {{admin-nav-item route='adminSiteSettings' label='admin.site_settings.title'}} + {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}} {{/if}} - {{admin-nav-item route='adminUsersList.show' routeParam='active' label='admin.users.title'}} + {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.title'}} {{#if showBadges}} - {{admin-nav-item route='adminBadges.index' label='admin.badges.title'}} + {{nav-item route='adminBadges.index' label='admin.badges.title'}} {{/if}} {{#if currentUser.admin}} - {{admin-nav-item route='adminGroups' label='admin.groups.title'}} + {{nav-item route='adminGroups' label='admin.groups.title'}} {{/if}} - {{admin-nav-item route='adminEmail' label='admin.email.title'}} - {{admin-nav-item route='adminFlags' label='admin.flags.title'}} - {{admin-nav-item route='adminLogs' label='admin.logs.title'}} + {{nav-item route='adminEmail' label='admin.email.title'}} + {{nav-item route='adminFlags' label='admin.flags.title'}} + {{nav-item route='adminLogs' label='admin.logs.title'}} {{#if currentUser.admin}} - {{admin-nav-item route='adminCustomize.colors' label='admin.customize.title'}} - {{admin-nav-item route='admin.api' label='admin.api.title'}} - {{admin-nav-item route='admin.backups' label='admin.backups.title'}} + {{nav-item route='adminCustomize.colors' label='admin.customize.title'}} + {{nav-item route='admin.api' label='admin.api.title'}} + {{nav-item route='admin.backups' label='admin.backups.title'}} {{/if}} - {{admin-nav-item route='adminPlugins' label='admin.plugins.title'}} + {{nav-item route='adminPlugins' label='admin.plugins.title'}} {{plugin-outlet "admin-menu" tagName="li"}}
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs index 510b965308..7562754c08 100644 --- a/app/assets/javascripts/admin/templates/backups.hbs +++ b/app/assets/javascripts/admin/templates/backups.hbs @@ -1,12 +1,12 @@
    - {{admin-nav-item route='admin.backups.index' label='admin.backups.menu.backups'}} - {{admin-nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}} + {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}} + {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
- {{#if canRollback}} + {{#if model.canRollback}} {{d-button action="rollback" class="btn-rollback" label="admin.backups.operations.rollback.label" @@ -14,7 +14,7 @@ icon="ambulance" disabled=rollbackDisabled}} {{/if}} - {{#if isOperationRunning}} + {{#if model.isOperationRunning}} {{d-button action="cancelOperation" class="btn-danger" title="admin.backups.operations.cancel.title" diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs index ca8830a0e8..09bf83bc63 100644 --- a/app/assets/javascripts/admin/templates/backups_index.hbs +++ b/app/assets/javascripts/admin/templates/backups_index.hbs @@ -6,9 +6,9 @@
{{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}} {{#if site.isReadOnly}} - {{d-button icon="eye" action="toggleReadOnlyMode" disabled=isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}} + {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}} {{else}} - {{d-button icon="eye" action="toggleReadOnlyMode" disabled=isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}} + {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.model.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}} {{/if}}
@@ -20,12 +20,12 @@
{{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}} - {{#if isOperationRunning}} - {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" disabled="true" title="admin.backups.operations.is_running"}} - {{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} + {{#if status.model.isOperationRunning}} + {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} + {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{else}} - {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" title="admin.backups.operations.destroy.title"}} - {{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} + {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}} + {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs new file mode 100644 index 0000000000..aee95b6701 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs @@ -0,0 +1,14 @@ +
+ {{#if label}} + + {{else}} +   + {{/if}} +
+
+ {{#if wrapLabel}} + + {{else}} + {{yield}} + {{/if}} +
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs b/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs deleted file mode 100644 index d6341fdce8..0000000000 --- a/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{#if routeParam}} - {{#link-to route routeParam}}{{i18n label}}{{/link-to}} -{{else}} - {{#if route}} - {{#link-to route}}{{i18n label}}{{/link-to}} - {{else}} - {{i18n label}} - {{/if}} -{{/if}} diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs new file mode 100644 index 0000000000..36fa8c3b81 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs @@ -0,0 +1,53 @@ +{{#if editing}} + {{#admin-form-row label="admin.user_fields.type"}} + {{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}} + {{/admin-form-row}} + + {{#admin-form-row label="admin.user_fields.name"}} + {{input value=buffered.name class="user-field-name"}} + {{/admin-form-row}} + + {{#admin-form-row label="admin.user_fields.description"}} + {{input value=buffered.description class="user-field-desc"}} + {{/admin-form-row}} + + {{#if bufferedFieldType.hasOptions}} + {{#admin-form-row label="admin.user_fields.options"}} + {{value-list values=buffered.options inputType="array"}} + {{/admin-form-row}} + {{/if}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.editable}} {{i18n 'admin.user_fields.editable.title'}} + {{/admin-form-row}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.required}} {{i18n 'admin.user_fields.required.title'}} + {{/admin-form-row}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.show_on_profile}} {{i18n 'admin.user_fields.show_on_profile.title'}} + {{/admin-form-row}} + + {{#admin-form-row}} + {{d-button action="save" class="btn-primary" icon="check" label="admin.user_fields.save"}} + {{d-button action="cancel" class="btn-danger" icon="times" label="admin.user_fields.cancel"}} + {{/admin-form-row}} +{{else}} +
+
+ {{userField.name}} +
+ {{{userField.description}}} +
+
{{fieldName}}
+
+ {{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}} + {{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}} + {{d-button action="moveUp" icon="arrow-up" disabled=cantMoveUp}} + {{d-button action="moveDown" icon="arrow-down" disabled=cantMoveDown}} +
+
+
{{flags}}
+{{/if}} +
diff --git a/app/assets/javascripts/admin/templates/components/customize-link.hbs b/app/assets/javascripts/admin/templates/components/customize-link.hbs new file mode 100644 index 0000000000..dd3c4104c7 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/customize-link.hbs @@ -0,0 +1,5 @@ +
  • + + {{customization.description}} + +
    • diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs new file mode 100644 index 0000000000..c35d40e1d6 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs @@ -0,0 +1,19 @@ +{{#if editing}} + + {{input value=buffered.host placeholder="example.com" enter="save" class="host-name"}} + + + {{category-chooser value=categoryId}} + + + {{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}} + {{d-button icon="times" action="cancel" class="btn-danger" disabled=host.isSaving}} + +{{else}} + {{host.host}} + {{category-badge host.category}} + + {{d-button icon="pencil" action="edit"}} + {{d-button icon="trash-o" action="delete" class='btn-danger'}} + +{{/if}} diff --git a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs new file mode 100644 index 0000000000..36dbb88692 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/embedding-setting.hbs @@ -0,0 +1,11 @@ +{{#if isCheckbox}} + +{{else}} + + {{input value=value id=inputId}} +{{/if}} + +
    diff --git a/app/assets/javascripts/admin/templates/components/group-member.hbs b/app/assets/javascripts/admin/templates/components/group-member.hbs new file mode 100644 index 0000000000..d476fdf033 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/group-member.hbs @@ -0,0 +1 @@ +{{avatar member imageSize="small"}} {{member.username}} {{#unless automatic}}{{fa-icon "times"}}{{/unless}} diff --git a/app/assets/javascripts/admin/templates/components/highlighted-code.hbs b/app/assets/javascripts/admin/templates/components/highlighted-code.hbs new file mode 100644 index 0000000000..4d67dd6fd2 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/highlighted-code.hbs @@ -0,0 +1 @@ +
    {{code}}
    diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs new file mode 100644 index 0000000000..f5155c27c2 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs @@ -0,0 +1,5 @@ +{{i18n 'admin.permalink.form.label'}} +{{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}} +{{combo-box content=permalinkTypes value=permalinkType}} +{{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}} + diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs index eb117c0f4d..be0d4d8a08 100644 --- a/app/assets/javascripts/admin/templates/components/site-setting.hbs +++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs @@ -2,12 +2,12 @@

    {{unbound settingName}}

    - {{partial partialName}} +{{component componentName setting=setting value=buffered.value validationMessage=validationMessage}}
    {{#if dirty}}
    - {{d-button class="ok no-text" action="save" icon="check"}} - {{d-button class="cancel no-text" action="cancel" icon="times"}} + {{d-button class="ok" action="save" icon="check"}} + {{d-button class="cancel" action="cancel" icon="times"}}
    {{else if setting.overridden}} {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}} diff --git a/app/assets/javascripts/admin/templates/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs similarity index 62% rename from app/assets/javascripts/admin/templates/site-settings/bool.hbs rename to app/assets/javascripts/admin/templates/components/site-settings/bool.hbs index 1f441c421c..f1ac669900 100644 --- a/app/assets/javascripts/admin/templates/site-settings/bool.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs @@ -1,4 +1,5 @@ diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs new file mode 100644 index 0000000000..621f3fa70e --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs @@ -0,0 +1,3 @@ +{{category-group categories=selectedCategories blacklist=selectedCategories}} +
    {{{unbound setting.description}}}
    +{{setting-validation-message message=validationMessage}} diff --git a/app/assets/javascripts/admin/templates/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs similarity index 80% rename from app/assets/javascripts/admin/templates/site-settings/enum.hbs rename to app/assets/javascripts/admin/templates/components/site-settings/enum.hbs index 67cbfc92ac..765a0e20d1 100644 --- a/app/assets/javascripts/admin/templates/site-settings/enum.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs @@ -1,4 +1,4 @@ -{{combo-box valueAttribute="value" content=setting.validValues value=buffered.value none=setting.allowsNone}} +{{combo-box valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}} {{preview}} {{setting-validation-message message=validationMessage}}
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs new file mode 100644 index 0000000000..5107f5b4af --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs @@ -0,0 +1,3 @@ +{{value-list values=value addKey="admin.site_settings.add_host"}} +{{setting-validation-message message=validationMessage}} +
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs similarity index 54% rename from app/assets/javascripts/admin/templates/site-settings/list.hbs rename to app/assets/javascripts/admin/templates/components/site-settings/list.hbs index bc1cf2b51e..e741bea5ed 100644 --- a/app/assets/javascripts/admin/templates/site-settings/list.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs @@ -1,3 +1,3 @@ -{{list-setting settingValue=buffered.value choices=setting.choices settingName=setting.setting}} +{{list-setting settingValue=value choices=setting.choices settingName=setting.setting}} {{setting-validation-message message=validationMessage}}
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs similarity index 62% rename from app/assets/javascripts/admin/templates/site-settings/string.hbs rename to app/assets/javascripts/admin/templates/components/site-settings/string.hbs index f8427094ab..71d7216f27 100644 --- a/app/assets/javascripts/admin/templates/site-settings/string.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs @@ -1,3 +1,3 @@ -{{text-field value=buffered.value classNames="input-setting-string"}} +{{text-field value=value classNames="input-setting-string"}} {{setting-validation-message message=validationMessage}}
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs new file mode 100644 index 0000000000..41213777e3 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs @@ -0,0 +1,3 @@ +{{value-list values=value addKey="admin.site_settings.add_url"}} +{{setting-validation-message message=validationMessage}} +
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs similarity index 77% rename from app/assets/javascripts/admin/templates/site-settings/url_list.hbs rename to app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs index bd22e1b033..caaf3739d7 100644 --- a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs @@ -1,3 +1,3 @@ -{{url-list value=buffered.value}} +{{value-list values=value}} {{setting-validation-message message=validationMessage}}
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/admin/templates/components/url-list.hbs b/app/assets/javascripts/admin/templates/components/url-list.hbs deleted file mode 100644 index d313c5b30a..0000000000 --- a/app/assets/javascripts/admin/templates/components/url-list.hbs +++ /dev/null @@ -1,18 +0,0 @@ -{{#if urls}} -
    - {{#each url in urls}} -
    - {{d-button action="removeUrl" - actionParam=url - icon="times" - class="btn-small no-text"}} - {{url}} -
    - {{/each}} -
    -{{/if}} - -
    - {{text-field value=newUrl placeholderKey="admin.site_settings.add_url"}} - {{d-button action="addUrl" icon="plus" class="btn-primary btn-small no-text" disabled=urlInvalid}} -
    diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs new file mode 100644 index 0000000000..6f6e1aa194 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/value-list.hbs @@ -0,0 +1,18 @@ +{{#if collection}} +
    + {{#each collection as |value index|}} +
    + {{d-button action="removeValue" + actionParam=value + icon="times" + class="btn-small"}} + {{value}} +
    + {{/each}} +
    +{{/if}} + +
    + {{text-field value=newValue placeholderKey=addKey}} + {{d-button action="addValue" icon="plus" class="btn-primary btn-small" disabled=inputInvalid}} +
    diff --git a/app/assets/javascripts/admin/templates/customize-css-html-index.hbs b/app/assets/javascripts/admin/templates/customize-css-html-index.hbs new file mode 100644 index 0000000000..781d063c7f --- /dev/null +++ b/app/assets/javascripts/admin/templates/customize-css-html-index.hbs @@ -0,0 +1 @@ +

    {{i18n 'admin.customize.about'}}

    diff --git a/app/assets/javascripts/admin/templates/customize-css-html-show.hbs b/app/assets/javascripts/admin/templates/customize-css-html-show.hbs new file mode 100644 index 0000000000..95b82ba97b --- /dev/null +++ b/app/assets/javascripts/admin/templates/customize-css-html-show.hbs @@ -0,0 +1,75 @@ +
    +
    + {{text-field class="style-name" value=model.name}} + {{fa-icon "download"}} {{i18n 'admin.export_json.button_text'}} + +
    +
      + {{#if mobile}} +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'mobile-css' replace=true}}{{i18n "admin.customize.css"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'mobile-header' replace=true}}{{i18n "admin.customize.header"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'mobile-top' replace=true}}{{i18n "admin.customize.top"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'mobile-footer' replace=true}}{{i18n "admin.customize.footer"}}{{/link-to}}
      • + {{else}} +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'css' replace=true}}{{i18n "admin.customize.css"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'header' replace=true}}{{i18n "admin.customize.header"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'top' replace=true}}{{i18n "admin.customize.top"}}{{/link-to}}
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'footer' replace=true}}{{i18n "admin.customize.footer"}}{{/link-to}}
      • +
    • + {{#link-to 'adminCustomizeCssHtml.show' model.id 'head-tag'}} + {{fa-icon "file-text-o"}} {{i18n 'admin.customize.head_tag.text'}} + {{/link-to}} +
      • +
    • + {{#link-to 'adminCustomizeCssHtml.show' model.id 'body-tag'}} + {{fa-icon "file-text-o"}} {{i18n 'admin.customize.body_tag.text'}} + {{/link-to}} +
      • +
    • {{#link-to 'adminCustomizeCssHtml.show' model.id 'embedded-css' replace=true}}{{i18n "admin.customize.embedded_css"}}{{/link-to}}
      • + {{/if}} +
    • + {{fa-icon "mobile"}} +
      • +
    • + + {{fa-icon-bound maximizeIcon}} + +
      • +
    +
    + +
    + {{#if cssActive}}{{ace-editor content=model.stylesheet mode="scss"}}{{/if}} + {{#if headerActive}}{{ace-editor content=model.header mode="html"}}{{/if}} + {{#if topActive}}{{ace-editor content=model.top mode="html"}}{{/if}} + {{#if footerActive}}{{ace-editor content=model.footer mode="html"}}{{/if}} + {{#if headTagActive}}{{ace-editor content=model.head_tag mode="html"}}{{/if}} + {{#if bodyTagActive}}{{ace-editor content=model.body_tag mode="html"}}{{/if}} + {{#if embeddedCssActive}}{{ace-editor content=model.embedded_css mode="css"}}{{/if}} + {{#if mobileCssActive}}{{ace-editor content=model.mobile_stylesheet mode="scss"}}{{/if}} + {{#if mobileHeaderActive}}{{ace-editor content=model.mobile_header mode="html"}}{{/if}} + {{#if mobileTopActive}}{{ace-editor content=model.mobile_top mode="html"}}{{/if}} + {{#if mobileFooterActive}}{{ace-editor content=model.mobile_footer mode="html"}}{{/if}} +
    + +
    +
    + {{i18n 'admin.customize.enabled'}} {{input type="checkbox" checked=model.enabled}} + {{#unless model.changed}} + {{i18n 'admin.customize.preview'}} + | + {{i18n 'admin.customize.undo_preview'}} + | + {{i18n 'admin.customize.rescue_preview'}}
    + {{/unless}} +
    + +
    + {{#d-button action="save" disabled=saveDisabled class='btn-primary'}} + {{saveButtonText}} + {{/d-button}} + {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}} +
    +
    +
    +
    diff --git a/app/assets/javascripts/admin/templates/customize-css-html.hbs b/app/assets/javascripts/admin/templates/customize-css-html.hbs new file mode 100644 index 0000000000..73b8e22c9f --- /dev/null +++ b/app/assets/javascripts/admin/templates/customize-css-html.hbs @@ -0,0 +1,13 @@ +
    +

    {{i18n 'admin.customize.css_html.long_title'}}

    +
      + {{#each model as |c|}} + {{customize-link customization=c}} + {{/each}} +
    + + {{d-button label="admin.customize.new" icon="plus" action="newCustomization" class="btn-primary"}} + {{d-button action="importModal" icon="upload" label="admin.customize.import"}} +
    + +{{outlet}} diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs index 75dcdbab9f..8ab4c662e7 100644 --- a/app/assets/javascripts/admin/templates/customize.hbs +++ b/app/assets/javascripts/admin/templates/customize.hbs @@ -1,9 +1,11 @@ {{#admin-nav}} - {{admin-nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}} - {{admin-nav-item route='adminCustomize.css_html' label='admin.customize.css_html.title'}} - {{admin-nav-item route='adminSiteText' label='admin.site_text.title'}} - {{admin-nav-item route='adminUserFields' label='admin.user_fields.title'}} - {{admin-nav-item route='adminEmojis' label='admin.emoji.title'}} + {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}} + {{nav-item route='adminCustomizeCssHtml.index' label='admin.customize.css_html.title'}} + {{nav-item route='adminSiteText' label='admin.site_text.title'}} + {{nav-item route='adminUserFields' label='admin.user_fields.title'}} + {{nav-item route='adminEmojis' label='admin.emoji.title'}} + {{nav-item route='adminPermalinks' label='admin.permalink.title'}} + {{nav-item route='adminEmbedding' label='admin.embedding.title'}} {{/admin-nav}}
    diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs deleted file mode 100644 index 004318e1eb..0000000000 --- a/app/assets/javascripts/admin/templates/customize_css_html.hbs +++ /dev/null @@ -1,82 +0,0 @@ -
    -

    {{i18n 'admin.customize.css_html.long_title'}}

    - - -
    - -{{#if selectedItem}} -
    -
    - {{text-field class="style-name" value=selectedItem.name}} - -
    - -
    - -
    - {{#if view.stylesheetActive}}{{ace-editor content=selectedItem.stylesheet mode="scss"}}{{/if}} - {{#if view.headerActive}}{{ace-editor content=selectedItem.header mode="html"}}{{/if}} - {{#if view.topActive}}{{ace-editor content=selectedItem.top mode="html"}}{{/if}} - {{#if view.footerActive}}{{ace-editor content=selectedItem.footer mode="html"}}{{/if}} - {{#if view.headTagActive}}{{ace-editor content=selectedItem.head_tag mode="html"}}{{/if}} - {{#if view.bodyTagActive}}{{ace-editor content=selectedItem.body_tag mode="html"}}{{/if}} - {{#if view.mobileStylesheetActive}}{{ace-editor content=selectedItem.mobile_stylesheet mode="scss"}}{{/if}} - {{#if view.mobileHeaderActive}}{{ace-editor content=selectedItem.mobile_header mode="html"}}{{/if}} - {{#if view.mobileTopActive}}{{ace-editor content=selectedItem.mobile_top mode="html"}}{{/if}} - {{#if view.mobileFooterActive}}{{ace-editor content=selectedItem.mobile_footer mode="html"}}{{/if}} -
    -
    -
    - {{i18n 'admin.customize.enabled'}} {{input type="checkbox" checked=selectedItem.enabled}} - {{#unless selectedItem.changed}} - {{i18n 'admin.customize.preview'}} - | - {{i18n 'admin.customize.undo_preview'}} - | - {{i18n 'admin.customize.rescue_preview'}}
    - {{/unless}} -
    - -
    - - {{selectedItem.savingStatus}} - {{i18n 'admin.customize.delete'}} -
    -
    -
    -
    -{{else}} -

    {{i18n 'admin.customize.about'}}

    -{{/if}} diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs index 32ce15f9c2..9a3d98496a 100644 --- a/app/assets/javascripts/admin/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/templates/dashboard.hbs @@ -17,7 +17,9 @@ {{#unless loading}} - {{admin-report-trust-level-counts report=users_by_trust_level}} + {{#each r in user_reports}} + {{admin-report-trust-level-counts report=r}} + {{/each}} {{/unless}} @@ -26,15 +28,15 @@
    - + - + - + - +
    {{i18n 'admin.dashboard.admins'}}{{fa-icon "shield"}} {{i18n 'admin.dashboard.admins'}} {{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}} {{i18n 'admin.dashboard.suspended'}}{{fa-icon "ban"}} {{i18n 'admin.dashboard.suspended'}} {{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}
    {{i18n 'admin.dashboard.moderators'}}{{fa-icon "shield"}} {{i18n 'admin.dashboard.moderators'}} {{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}} {{i18n 'admin.dashboard.blocked'}}{{fa-icon "ban"}} {{i18n 'admin.dashboard.blocked'}} {{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}
    @@ -54,14 +56,9 @@ {{#unless loading}} - {{admin-report-per-day-counts report=visits}} - {{admin-report-counts report=signups}} - {{admin-report-counts report=topics}} - {{admin-report-counts report=posts}} - {{admin-report-counts report=likes}} - {{admin-report-counts report=flags}} - {{admin-report-counts report=bookmarks}} - {{admin-report-counts report=emails}} + {{#each r in global_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}} @@ -81,21 +78,19 @@ {{#unless loading}} - {{admin-report-counts report=page_view_anon_reqs}} - {{admin-report-counts report=page_view_logged_in_reqs}} - {{admin-report-counts report=page_view_crawler_reqs}} - {{admin-report-counts report=page_view_total_reqs}} + {{#each r in page_view_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}}
    -
    - + @@ -105,11 +100,31 @@ {{#unless loading}} - {{admin-report-counts report=user_to_user_private_messages}} - {{admin-report-counts report=system_private_messages}} - {{admin-report-counts report=notify_moderators_private_messages}} - {{admin-report-counts report=notify_user_private_messages}} - {{admin-report-counts report=moderator_warning_private_messages}} + {{#each r in private_message_reports}} + {{admin-report-counts report=r}} + {{/each}} + {{/unless}} + +
    {{i18n 'admin.dashboard.private_messages_short'}}{{fa-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}} {{i18n 'admin.dashboard.reports.today'}} {{i18n 'admin.dashboard.reports.yesterday'}} {{i18n 'admin.dashboard.reports.last_7_days'}}
    +
    + +
    + + + + + + + + + + + + + {{#unless loading}} + {{#each r in mobile_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}}
    {{i18n 'admin.dashboard.mobile_title'}}{{i18n 'admin.dashboard.reports.today'}}{{i18n 'admin.dashboard.reports.yesterday'}}{{i18n 'admin.dashboard.reports.last_7_days'}}{{i18n 'admin.dashboard.reports.last_30_days'}}{{i18n 'admin.dashboard.reports.all'}}
    @@ -154,12 +169,9 @@ {{#unless loading}} - {{admin-report-counts report=http_2xx_reqs}} - {{admin-report-counts report=http_3xx_reqs}} - {{admin-report-counts report=http_4xx_reqs}} - {{admin-report-counts report=http_5xx_reqs}} - {{admin-report-counts report=http_background_reqs}} - {{admin-report-counts report=http_total_reqs}} + {{#each r in http_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}} @@ -176,7 +188,7 @@ {{#if foundProblems}}
    -
    +
    {{fa-icon "exclamation-triangle"}}

    {{i18n 'admin.dashboard.problems_found'}} diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs index 0ec147207e..7388653777 100644 --- a/app/assets/javascripts/admin/templates/email.hbs +++ b/app/assets/javascripts/admin/templates/email.hbs @@ -1,9 +1,9 @@ {{#admin-nav}} - {{admin-nav-item route='adminEmail.index' label='admin.email.settings'}} - {{admin-nav-item route='adminEmail.all' label='admin.email.all'}} - {{admin-nav-item route='adminEmail.sent' label='admin.email.sent'}} - {{admin-nav-item route='adminEmail.skipped' label='admin.email.skipped'}} - {{admin-nav-item route='adminEmail.previewDigest' label='admin.email.preview_digest'}} + {{nav-item route='adminEmail.index' label='admin.email.settings'}} + {{nav-item route='adminEmail.all' label='admin.email.all'}} + {{nav-item route='adminEmail.sent' label='admin.email.sent'}} + {{nav-item route='adminEmail.skipped' label='admin.email.skipped'}} + {{nav-item route='adminEmail.previewDigest' label='admin.email.preview_digest'}} {{/admin-nav}}

    diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email_preview_digest.hbs index 7670d6194b..83d99db35f 100644 --- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs +++ b/app/assets/javascripts/admin/templates/email_preview_digest.hbs @@ -4,24 +4,22 @@
    {{input type="date" value=lastSeen id="last-seen"}} -
    -
    -
    -
    - - {{#if showHtml}} - {{i18n 'admin.email.html'}} | {{i18n 'admin.email.text'}} - {{else}} - {{i18n 'admin.email.html'}} | {{i18n 'admin.email.text'}} - {{/if}} +
    + + {{#if showHtml}} + {{i18n 'admin.email.html'}} | {{i18n 'admin.email.text'}} + {{else}} + {{i18n 'admin.email.html'}} | {{i18n 'admin.email.text'}} + {{/if}} +
    {{#conditional-loading-spinner condition=loading}} {{#if showHtml}} - {{{html_content}}} + {{{model.html_content}}} {{else}} - 
    {{{text_content}}}
    + 
    {{{model.text_content}}}
    {{/if}} {{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs new file mode 100644 index 0000000000..15d021a9c1 --- /dev/null +++ b/app/assets/javascripts/admin/templates/embedding.hbs @@ -0,0 +1,61 @@ +
    + {{#if embedding.embeddable_hosts}} + + + + + + + {{#each embedding.embeddable_hosts as |host|}} + {{embeddable-host host=host deleteHost="deleteHost"}} + {{/each}} +
    {{i18n "admin.embedding.host"}}{{i18n "admin.embedding.category"}} 
    + {{else}} +

    {{i18n "admin.embedding.get_started"}}

    + {{/if}} + + {{d-button label="admin.embedding.add_host" action="addHost" icon="plus" class="btn-primary add-host"}} +
    + +{{#if showSecondary}} +
    +

    {{{i18n "admin.embedding.sample"}}}

    + {{highlighted-code code=embeddingCode lang="html"}} +
    + +
    + +
    +

    {{i18n "admin.embedding.settings"}}

    + + {{embedding-setting field="embed_by_username" value=embedding.embed_by_username}} + {{embedding-setting field="embed_post_limit" value=embedding.embed_post_limit}} + {{embedding-setting field="embed_truncate" value=embedding.embed_truncate type="checkbox"}} +
    + +
    +

    {{i18n "admin.embedding.feed_settings"}}

    +

    {{i18n "admin.embedding.feed_description"}}

    + + {{embedding-setting field="feed_polling_enabled" value=embedding.feed_polling_enabled type="checkbox"}} + {{embedding-setting field="feed_polling_url" value=embedding.feed_polling_url}} + {{embedding-setting field="embed_username_key_from_feed" value=embedding.embed_username_key_from_feed}} +
    + +
    +

    {{i18n "admin.embedding.crawling_settings"}}

    +

    {{i18n "admin.embedding.crawling_description"}}

    + + {{embedding-setting field="embed_whitelist_selector" value=embedding.embed_whitelist_selector}} + {{embedding-setting field="embed_blacklist_selector" value=embedding.embed_blacklist_selector}} +
    + +
    + {{d-button label="admin.embedding.save" + action="saveChanges" + class="btn-primary embed-save" + disabled=embedding.isSaving}} + + {{#if saved}}{{i18n "saved"}}{{/if}} +
    +{{/if}} diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs index e001e92ae8..9b404b9929 100644 --- a/app/assets/javascripts/admin/templates/flags-list.hbs +++ b/app/assets/javascripts/admin/templates/flags-list.hbs @@ -32,7 +32,7 @@ {{fa-icon "envelope"}} {{/if}} {{topic-status topic=flaggedPost.topic}} - {{flaggedPost.topic.title}} + {{{unbound flaggedPost.topic.fancyTitle}}} {{#if flaggedPost.postAuthorFlagged}} {{{flaggedPost.excerpt}}} diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs index a1ecf47875..b19e8e2276 100644 --- a/app/assets/javascripts/admin/templates/flags.hbs +++ b/app/assets/javascripts/admin/templates/flags.hbs @@ -1,6 +1,6 @@ {{#admin-nav}} - {{admin-nav-item route='adminFlags.list' routeParam='active' label='admin.flags.active'}} - {{admin-nav-item route='adminFlags.list' routeParam='old' label='admin.flags.old'}} + {{nav-item route='adminFlags.list' routeParam='active' label='admin.flags.active'}} + {{nav-item route='adminFlags.list' routeParam='old' label='admin.flags.old'}} {{/admin-nav}}
    diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs index d17167a66f..ac1f979691 100644 --- a/app/assets/javascripts/admin/templates/group.hbs +++ b/app/assets/javascripts/admin/templates/group.hbs @@ -1,47 +1,49 @@
    - {{#if automatic}} -

    {{name}}

    + {{#if model.automatic}} +

    {{model.name}}

    {{else}} - {{text-field name="name" value=name placeholderKey="admin.groups.name_placeholder"}} + {{text-field name="name" value=model.name placeholderKey="admin.groups.name_placeholder"}} {{/if}}
    - {{#if id}} + {{#if model.id}}
    - +
    - {{each member in members itemView="group-member"}} + {{#each model.members as |member|}} + {{group-member member=member automatic=model.automatic removeAction="removeMember"}} + {{/each}}
    - {{#unless automatic}} + {{#unless model.automatic}}
    - {{user-selector usernames=usernames placeholderKey="admin.groups.selector_placeholder" id="user-selector"}} - + {{user-selector usernames=model.usernames placeholderKey="admin.groups.selector_placeholder" id="user-selector"}} + {{d-button action="addMembers" class="add" icon="plus" label="admin.groups.add"}}
    {{/unless}} {{/if}}
    - {{#unless automatic}} + {{#unless model.automatic}}
    @@ -49,15 +51,15 @@
    - {{combo-box name="alias" valueAttribute="value" value=alias_level content=aliasLevelOptions}} + {{combo-box name="alias" valueAttribute="value" value=model.alias_level content=aliasLevelOptions}}
    - {{#unless automatic}} + {{#unless model.automatic}}
    - {{list-setting name="automatic_membership" settingValue=emailDomains}} + {{list-setting name="automatic_membership" settingValue=model.emailDomains}}
    @@ -66,13 +68,18 @@ - {{input value=title}} + {{input value=model.title}} +
    + +
    + + {{combo-box name="grant_trust_level" valueAttribute="value" value=model.grant_trust_level content=trustLevelOptions}}
    {{/unless}}
    - {{#unless automatic}} + {{#unless model.automatic}} {{/unless}}
    diff --git a/app/assets/javascripts/admin/templates/group_member.hbs b/app/assets/javascripts/admin/templates/group_member.hbs deleted file mode 100644 index 1c344ba739..0000000000 --- a/app/assets/javascripts/admin/templates/group_member.hbs +++ /dev/null @@ -1 +0,0 @@ -{{avatar member imageSize="small"}} {{member.username}} {{#unless automatic}}{{fa-icon "times"}}{{/unless}} diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs index 0de3fc5c79..2d767c3844 100644 --- a/app/assets/javascripts/admin/templates/groups.hbs +++ b/app/assets/javascripts/admin/templates/groups.hbs @@ -1,6 +1,6 @@ {{#admin-nav}} - {{admin-nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}} - {{admin-nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}} + {{nav-item route='adminGroupsType' routeParam='custom' label='admin.groups.custom'}} + {{nav-item route='adminGroupsType' routeParam='automatic' label='admin.groups.automatic'}} {{/admin-nav}}
    diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups_type.hbs index 8188752a9a..980ca08c8f 100644 --- a/app/assets/javascripts/admin/templates/groups_type.hbs +++ b/app/assets/javascripts/admin/templates/groups_type.hbs @@ -9,7 +9,9 @@ {{/each}}
    - {{d-button action="newGroup" icon="plus" label="admin.groups.new"}} + {{#link-to 'adminGroup' 'new' class="btn"}} + {{fa-icon "plus"}} {{i18n 'admin.groups.new'}} + {{/link-to}} {{#if controller.isAuto}} {{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs index 38654fefca..5c412949fa 100644 --- a/app/assets/javascripts/admin/templates/logs.hbs +++ b/app/assets/javascripts/admin/templates/logs.hbs @@ -1,10 +1,10 @@ {{#admin-nav}} - {{admin-nav-item route='adminLogs.staffActionLogs' label='admin.logs.staff_actions.title'}} - {{admin-nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}} - {{admin-nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}} - {{admin-nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}} + {{nav-item route='adminLogs.staffActionLogs' label='admin.logs.staff_actions.title'}} + {{nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}} + {{nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}} + {{nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}} {{#if currentUser.admin}} - {{admin-nav-item href='/logs' label='admin.logs.logster.title'}} + {{nav-item path='/logs' label='admin.logs.logster.title'}} {{/if}} {{/admin-nav}} diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details_modal.hbs index d789dd9cc8..874e4ea858 100644 --- a/app/assets/javascripts/admin/templates/logs/details_modal.hbs +++ b/app/assets/javascripts/admin/templates/logs/details_modal.hbs @@ -1,5 +1,5 @@
    - 
    {{details}}
    + 
    {{model.details}}
    diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs index 7fb1a8d253..556f6310db 100644 --- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs +++ b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs @@ -1,16 +1,16 @@
    - {{#if new_value}} - {{#with new_value}} + {{#if model.new_value}} + {{#with model.new_value}} {{partial "admin/templates/logs/site_customization_change_details"}} {{/with}} {{else}} @@ -18,8 +18,8 @@ {{/if}}
    - {{#if previous_value}} - {{#with previous_value}} + {{#if model.previous_value}} + {{#with model.previous_value}} {{partial "admin/templates/logs/site_customization_change_details"}} {{/with}} {{else}} diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs new file mode 100644 index 0000000000..7d6e1ff8fc --- /dev/null +++ b/app/assets/javascripts/admin/templates/permalinks.hbs @@ -0,0 +1,25 @@ +

    {{i18n 'admin.permalink.title'}}

    +
    + {{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}} +
    +{{permalink-form action="recordAdded"}} +
    + +{{#conditional-loading-spinner condition=loading}} + {{#if model.length}} +
    +
    +
    {{i18n 'admin.permalink.url'}}
    +
    {{i18n 'admin.permalink.topic_title'}}
    +
    {{i18n 'admin.permalink.post_title'}}
    +
    {{i18n 'admin.permalink.category_title'}}
    +
    {{i18n 'admin.permalink.external_url'}}
    +
    +
    +
    + {{view 'permalinks-list' content=controller}} +
    + {{else}} + {{i18n 'search.no_results'}} + {{/if}} +{{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs new file mode 100644 index 0000000000..2a143e07ed --- /dev/null +++ b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs @@ -0,0 +1,23 @@ +
    {{url}}
    +
    + {{#if topic_id}} + {{topic_title}} + {{/if}} +
    +
    + {{#if post_id}} + #{{post_number}} {{post_topic_title}} + {{/if}} +
    +
    + {{#if category_id}} + {{category_name}} + {{/if}} +
    +
    + {{#if external_url}} + {{external_url}} + {{/if}} +
    +
    +
    diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index 1bbdf5e7d9..5236d9d999 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -9,11 +9,13 @@
    - +
    + + @@ -27,6 +29,25 @@ {{/if}} + + {{/each}} diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs index 7150e14cdb..96ed1fc7d0 100644 --- a/app/assets/javascripts/admin/templates/plugins.hbs +++ b/app/assets/javascripts/admin/templates/plugins.hbs @@ -1,9 +1,9 @@
      - {{admin-nav-item route='adminPlugins.index' label="admin.plugins.title"}} + {{nav-item route='adminPlugins.index' label="admin.plugins.title"}} {{#each route in adminRoutes}} - {{admin-nav-item route=route.full_location label=route.label}} + {{nav-item route=route.full_location label=route.label}} {{/each}}
    diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 0bc26a8739..718a61a2c1 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -1,9 +1,11 @@ -

    {{title}}

    +

    {{model.title}}

    {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}} {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} + {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} + {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
    @@ -23,11 +25,11 @@ {{#conditional-loading-spinner condition=refreshing}}
    {{i18n "admin.plugins.name"}} {{i18n "admin.plugins.version"}}{{i18n "admin.plugins.enabled"}}
    {{plugin.version}} + {{#if plugin.enabled_setting}} + {{#if plugin.enabled}} + {{i18n "admin.plugins.is_enabled"}} + {{else}} + {{i18n "admin.plugins.not_enabled"}} + {{/if}} + {{else}} + {{i18n "admin.plugins.is_enabled"}} + {{/if}} + + {{#if plugin.enabled_setting}} + + {{/if}} +
    - - + + - {{#each row in dataReversed}} + {{#each row in model.dataReversed}} - - - - -
    {{xaxis}}{{yaxis}}{{model.xaxis}}{{model.yaxis}}
    {{row.x}} diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs index 8587e6707e..b7f400a242 100644 --- a/app/assets/javascripts/admin/templates/site-settings.hbs +++ b/app/assets/javascripts/admin/templates/site-settings.hbs @@ -6,7 +6,8 @@
    - {{text-field value=filter placeholderKey="type_to_filter"}} + + {{text-field value=filter placeholderKey="type_to_filter" class="no-blur"}}
    @@ -26,7 +27,7 @@ -
    +
    {{outlet}}
    diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs new file mode 100644 index 0000000000..438887f85f --- /dev/null +++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs @@ -0,0 +1,26 @@ +

    {{model.title}}

    +

    {{model.description}}

    + +{{#if model.markdown}} + {{pagedown-editor value=model.value}} +{{/if}} +{{#if model.plainText}} + {{textarea value=model.value class="plain"}} +{{/if}} +{{#if model.html}} + {{ace-editor content=model.value mode="html"}} +{{/if}} +{{#if model.css}} + {{ace-editor content=model.value mode="css"}} +{{/if}} + +
    + + {{#if saved}}{{i18n 'saved'}}{{/if}} +
    diff --git a/app/assets/javascripts/admin/templates/site_text_index.hbs b/app/assets/javascripts/admin/templates/site-text-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site_text_index.hbs rename to app/assets/javascripts/admin/templates/site-text-index.hbs diff --git a/app/assets/javascripts/admin/templates/site_text.hbs b/app/assets/javascripts/admin/templates/site-text.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site_text.hbs rename to app/assets/javascripts/admin/templates/site-text.hbs diff --git a/app/assets/javascripts/admin/templates/site_text_edit.hbs b/app/assets/javascripts/admin/templates/site_text_edit.hbs deleted file mode 100644 index ac3d0e540f..0000000000 --- a/app/assets/javascripts/admin/templates/site_text_edit.hbs +++ /dev/null @@ -1,26 +0,0 @@ -

    {{title}}

    -

    {{description}}

    - -{{#if markdown}} - {{pagedown-editor value=value}} -{{/if}} -{{#if plainText}} - {{textarea value=value class="plain"}} -{{/if}} -{{#if html}} - {{ace-editor content=value mode="html"}} -{{/if}} -{{#if css}} - {{ace-editor content=value mode="css"}} -{{/if}} - -
    - - {{#if saved}}{{i18n 'saved'}}{{/if}} -
    diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs index 2412dfd1ad..3a89a0e06e 100644 --- a/app/assets/javascripts/admin/templates/user-fields.hbs +++ b/app/assets/javascripts/admin/templates/user-fields.hbs @@ -4,59 +4,21 @@

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

    {{#if model}} - {{#each f in model itemController="admin-user-field-item" itemView="admin-user-field-item"}} - {{#if f.editing}} -
    -
    - {{input value=f.buffered.name class="user-field-name" placeholder=userFieldsName}} -
    -
    - {{input value=f.buffered.description class="user-field-desc" placeholder=userFieldsDescription}} -
    -
    - {{combo-box content=fieldTypes valueAttribute="id" value=f.buffered.field_type}} -
    -
    - - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - {{else}} -
    -
    {{f.name}}
    -
    {{{f.description}}}
    -
    {{f.fieldName}}
    -
    -
    - - -
    -
    -
    {{f.flags}}
    - {{/if}} -
    + {{#each arrangedContent as |uf|}} + {{admin-user-field-item userField=uf + fieldTypes=fieldTypes + firstField=arrangedContent.firstObject + lastField=arrangedContent.lastObject + destroyAction="destroy" + moveUpAction="moveUp" + moveDownAction="moveDown"}} {{/each}} {{/if}} - + {{d-button disabled=createDisabled + class="btn-primary" + action="createField" + label="admin.user_fields.create" + icon="plus"}} +
    diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs similarity index 95% rename from app/assets/javascripts/admin/templates/user_index.hbs rename to app/assets/javascripts/admin/templates/user-index.hbs index 9d2c510b31..1df8394671 100644 --- a/app/assets/javascripts/admin/templates/user_index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -32,6 +32,11 @@ +
    +
    {{i18n 'user.name.title'}}
    +
    {{model.name}}
    +
    + {{#if canCheckEmails}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs similarity index 52% rename from app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs rename to app/assets/javascripts/discourse/templates/components/edit-category-images.hbs index c6cac30f59..f4d7995dfd 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs @@ -1,9 +1,9 @@
    - {{image-uploader imageUrl=model.logo_url type="category_logo"}} + {{image-uploader imageUrl=category.logo_url type="category_logo"}}
    - {{image-uploader imageUrl=model.background_url type="category_background"}} + {{image-uploader imageUrl=category.background_url type="category_background"}}
    diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs new file mode 100644 index 0000000000..2fe3ab6dd3 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/edit-category-panel.hbs @@ -0,0 +1 @@ +{{component customComponent tab=tab selectedTab=selectedTab category=category}} diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs new file mode 100644 index 0000000000..1b323792a9 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs @@ -0,0 +1,26 @@ +
    + {{#if category.is_special}} +

    {{i18n 'category.special_warning'}}

    + {{/if}} +
      + {{#each category.permissions as |p|}} +
    • + {{p.group_name}} + {{{i18n "category.can"}}} + {{p.permission.description}} + {{#if editingPermissions}} + {{fa-icon "times-circle"}} + {{/if}} +
      • + {{/each}} +
    + {{#if editingPermissions}} + {{view 'select' content=category.availableGroups value=selectedGroup}} + {{view 'select' class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=category.availablePermissions value=selectedPermission}} + + {{else}} + {{#unless category.is_special}} + + {{/unless}} + {{/if}} +
    diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs new file mode 100644 index 0000000000..722a9f5e1f --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs @@ -0,0 +1,61 @@ +
    + {{auto-close-form autoCloseTime=category.auto_close_hours + autoCloseBasedOnLastPost=category.auto_close_based_on_last_post + autoCloseExamples="" + limited="true" }} +
    + +
    + +
    + +
    + +
    + +{{#if emailInEnabled}} +
    + +
    +
    + +
    +{{/if}} + +{{#if showPositionInput}} +
    + +
    +{{/if}} + +{{#unless emailInEnabled}} +
    + {{i18n 'category.email_in_disabled'}} + {{i18n 'category.email_in_disabled_click'}} +
    +{{/unless}} + +{{#unless showPositionInput}} +
    + {{i18n 'category.position_disabled'}} + {{i18n 'category.position_disabled_click'}} +
    +{{/unless}} + +{{plugin-outlet "category-custom-settings"}} diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs new file mode 100644 index 0000000000..7a410abbd8 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/edit-category-topic-template.hbs @@ -0,0 +1,2 @@ + +{{pagedown-editor value=category.topic_template}} diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs index 8d9b297cf9..a58498a91b 100644 --- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs +++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs @@ -1,6 +1,6 @@ {{text-field name="name" placeholderKey="admin.emoji.name" value=name}} - \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs index e047595301..8cbb7ac518 100644 --- a/app/assets/javascripts/discourse/templates/components/featured-topic.hbs +++ b/app/assets/javascripts/discourse/templates/components/featured-topic.hbs @@ -1,5 +1,5 @@ {{topic-status topic=topic}} -{{{unbound topic.fancy_title}}} +{{{unbound topic.fancyTitle}}} {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}} {{#if latestTopicOnly}} diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs new file mode 100644 index 0000000000..9204b3d42d --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs @@ -0,0 +1,9 @@ +{{category-link category allowUncategorized="true"}} + +{{#if unreadTotal}} + {{unreadTotal}} +{{/if}} + +{{#if showTopicCount}} + {{category.topic_count}} +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs new file mode 100644 index 0000000000..0deea8e1a7 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -0,0 +1,98 @@ +{{#menu-panel visible=visible}} + {{#if prioritizeFaq}} + {{#menu-links}} +
  • + {{#d-link path=faqUrl class="faq-link"}} + {{i18n "faq"}} + {{i18n "new_item"}} + {{/d-link}} +
    • + {{/menu-links}} + {{/if}} + + {{#if currentUser.staff}} + {{#menu-links}} +
  • {{d-link route="admin" class="admin-link" icon="wrench" label="admin_title"}}
    • +
  • + {{#d-link route="adminFlags" class="flagged-posts-link"}} + {{fa-icon "flag"}} {{i18n 'flags_title'}} + {{#if currentUser.site_flagged_posts_count}} + {{currentUser.site_flagged_posts_count}} + {{/if}} + {{/d-link}} +
    • + + {{#if currentUser.show_queued_posts}} +
  • + {{#d-link route='queued-posts'}} + {{i18n "queue.title"}} + {{#if currentUser.post_queue_new_count}} + {{currentUser.post_queue_new_count}} + {{/if}} + {{/d-link}} +
    • + {{/if}} + {{#if currentUser.admin}} +
  • {{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}
    • + {{/if}} + + {{plugin-outlet "hamburger-admin"}} + {{/menu-links}} + {{/if}} + + {{#menu-links}} +
  • {{d-link route="discovery.latest" class="latest-topics-link" label="filters.latest.title.zero"}}
    • + + {{#if currentUser}} +
  • + {{d-link route="discovery.new" class="new-topics-link" label="filters.new.title" count=newCount}} +
    • +
  • + {{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title" count=unreadCount}} +
    • + {{/if}} +
  • {{d-link route="discovery.top" class="top-topics-link" label="filters.top.title"}}
    • + + {{#if siteSettings.enable_badges}} +
  • {{d-link route="badges" class="badge-link" label="badges.title"}}
    • + {{/if}} + + {{#if siteSettings.enable_user_directory}} +
  • {{d-link route="users" class="user-directory-link" label="directory.title"}}
    • + {{/if}} + + {{plugin-outlet "site-map-links"}} + + {{plugin-outlet "site-map-links-last"}} + {{/menu-links}} + + {{#if categories}} +
      +
    • + {{d-link class="heading" + route="discovery.categories" + class="categories-link" + label="filters.categories.title"}} +
      • + {{#each categories as |c|}} + {{hamburger-category category=c}} + {{/each}} +
    + {{/if}} +
    + + {{#menu-links omitRule="true"}} +
  • {{d-link route="about" class="about-link" label="about.simple_title"}}
    • + {{#unless prioritizeFaq}} +
  • {{d-link path=faqUrl class="faq-link" label="faq"}}
    • + {{/unless}} + + {{#if showKeyboardShortcuts}} +
  • {{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}
    • + {{/if}} + + {{#if showMobileToggle}} +
  • {{d-link action="toggleMobileView" class="mobile-toggle-link" label=mobileViewLinkTextKey}}
    • + {{/if}} + {{/menu-links}} +{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs new file mode 100644 index 0000000000..6cb4af742b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs @@ -0,0 +1,9 @@ + + {{#if showUser}} + {{bound-avatar currentUser "medium"}} + {{else}} + {{fa-icon icon}} + {{/if}} + + +{{yield}} diff --git a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs index 10c176dd6f..614e48e38b 100644 --- a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs +++ b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs @@ -8,11 +8,7 @@ {{#if topic.details.loaded}} {{topic-status topic=topic}} - {{{topic.fancy_title}}} - {{else}} - {{#if topic.errorLoading}} - {{topic.errorTitle}} - {{/if}} + {{{topic.fancyTitle}}} {{/if}} {{#if topic.details.loaded}} diff --git a/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs new file mode 100644 index 0000000000..b34f6c4b9f --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs @@ -0,0 +1,12 @@ +
    +
    + + {{d-button class="fileSelect" action="selectFile" class="" icon="upload" label="upload_selector.select_file"}} + {{conditional-loading-spinner condition=loading size="small"}} +
    +
    {{i18n "alternation"}}
    +
    + {{textarea value=value}} +
    +
    {{fa-icon "upload"}}
    +
    diff --git a/app/assets/javascripts/discourse/templates/components/menu-links.hbs b/app/assets/javascripts/discourse/templates/components/menu-links.hbs new file mode 100644 index 0000000000..fe9b872fcb --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/menu-links.hbs @@ -0,0 +1,7 @@ +
      + {{yield}} +
      +
    +{{#unless omitRule}} +
    +{{/unless}} diff --git a/app/assets/javascripts/discourse/templates/components/menu-panel.hbs b/app/assets/javascripts/discourse/templates/components/menu-panel.hbs new file mode 100644 index 0000000000..bbb72a5736 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/menu-panel.hbs @@ -0,0 +1,7 @@ +{{#if visible}} +
    +
    + {{yield}} +
    +
    +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/templates/components/nav-item.hbs new file mode 100644 index 0000000000..96c49a6fc3 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/nav-item.hbs @@ -0,0 +1,17 @@ +{{#if routeParam}} + {{#if i18nLabel}} + {{#link-to route routeParam}}{{i18nLabel}}{{/link-to}} + {{else}} + {{#link-to route routeParam}}{{i18n label}}{{/link-to}} + {{/if}} +{{else}} + {{#if route}} + {{#link-to route}}{{i18n label}}{{/link-to}} + {{else}} + {{#if path}} + {{i18n label}} + {{else}} + {{i18n label}} + {{/if}} + {{/if}} +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs new file mode 100644 index 0000000000..078b8b9315 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs @@ -0,0 +1,4 @@ +{{#each navItem in navItems}} + {{navigation-item content=navItem filterMode=filterMode}} +{{/each}} +{{custom-html "extraNavItem"}} diff --git a/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs b/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs index 0c3cfc69a2..b12fad0228 100644 --- a/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs +++ b/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs @@ -1,4 +1,4 @@ -
    -{{textarea value=value elementId="wmd-input"}} -
    +
    +{{textarea value=value class="wmd-input"}} +
    diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs index 8f7fddc94f..570d7034e7 100644 --- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs +++ b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs @@ -1,4 +1,4 @@ -

    {{period-title period}}

    +

    {{period-title period showDateRange=true}}

    diff --git a/app/assets/javascripts/discourse/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/templates/components/popup-menu.hbs new file mode 100644 index 0000000000..5c5c8a9ed2 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/popup-menu.hbs @@ -0,0 +1,4 @@ +

    {{i18n title}}

    +
      + {{yield}} +
    diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs index fa82b721e8..716f6078ee 100644 --- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs +++ b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs @@ -1,20 +1,20 @@ -

    {{i18n 'private_message_info.title'}}

    +

    {{fa-icon "envelope"}} {{i18n 'private_message_info.title'}}

    - {{#each ag in details.allowed_groups}} + {{#each details.allowed_groups as |ag|}}
    #{{unbound ag.name}}
    {{/each}} - {{#each au in details.allowed_users}} + {{#each details.allowed_users as |au|}}
    - {{#link-to 'user' au}} + {{#user-link user=au}} {{avatar au imageSize="small"}} - {{/link-to}} - {{#link-to 'user' au}} + {{/user-link}} + {{#user-link user=au}} {{unbound au.username}} - {{/link-to}} - {{#if au.details.can_remove_allowed_users}} - + {{/user-link}} + {{#if details.can_remove_allowed_users}} + {{fa-icon "times"}} {{/if}}
    {{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-menu.hbs b/app/assets/javascripts/discourse/templates/components/search-menu.hbs new file mode 100644 index 0000000000..1f9cc018a9 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-menu.hbs @@ -0,0 +1,40 @@ +{{#menu-panel visible=visible onVisible="showedSearch" onHidden="cancelHighlight" maxWidth="500"}} + {{plugin-outlet "above-search"}} + {{search-text-field value=searchService.term id="search-term"}} + +
    + {{#if searchService.searchContext}} + + {{/if}} + {{i18n "show_help"}} +
    +
    + {{#if loading}} +
    {{loading-spinner}}
    + {{else}} +
    + {{#if noResults}} +
    + {{i18n "search.no_results"}} +
    + {{else}} + {{#each content.resultTypes as |resultType|}} +
      +
    • {{resultType.name}}
      • + {{component resultType.componentName results=resultType.results term=searchService.term}} +
    +
    + {{#if resultType.moreUrl}} + {{i18n "show_more"}} {{fa-icon "chevron-down"}} + {{/if}} + {{#if resultType.more}} + {{i18n "show_more"}} {{fa-icon "chevron-down"}} + {{/if}} +
    + {{/each}} + {{/if}} +
    + {{/if}} +{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs new file mode 100644 index 0000000000..071eba1841 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs @@ -0,0 +1,7 @@ +{{#each results as |result|}} +
  • + + {{category-badge result}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs new file mode 100644 index 0000000000..f89090ac24 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs @@ -0,0 +1,14 @@ +{{#each results as |result|}} +
  • + + + {{i18n 'search.post_format' post_number=result.post_number username=result.username}} + + {{#unless site.mobileView}} + + {{{unbound result.blurb}}} + + {{/unless}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs new file mode 100644 index 0000000000..132e56360b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs @@ -0,0 +1,14 @@ +{{#each results as |result|}} +
  • + + + {{topic-status topic=result.topic disableActions=true}}{{{unbound result.topic.fancyTitle}}}{{category-badge result.topic.category}}{{plugin-outlet "search-category"}} + + {{#unless site.mobileView}} + + {{format-age result.created_at}} - {{{unbound result.blurb}}} + + {{/unless}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs new file mode 100644 index 0000000000..9cf46a1519 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs @@ -0,0 +1,8 @@ +{{#each results as |result|}} +
  • + + {{avatar result imageSize="small"}} + {{unbound result.username}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs new file mode 100644 index 0000000000..721c38158e --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs @@ -0,0 +1,19 @@ + diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs new file mode 100644 index 0000000000..091f0e07df --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs @@ -0,0 +1,18 @@ +
    {{fa-icon icon}}
    +
    + {{#if post}} + {{#if post.can_delete}} + + {{/if}} + {{#if post.can_edit}} + + {{/if}} + + {{avatar post imageSize="small"}} + + {{/if}} +

    {{description}}

    + {{#if post.cooked}} +
    {{{post.cooked}}}
    + {{/if}} +
    diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs new file mode 100644 index 0000000000..22900bbb27 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs @@ -0,0 +1,31 @@ +
    +
    {{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}
     + {{format-date item.created_at}} + {{topic-status topic=item disableActions=true}} + + {{{item.title}}} + +
    {{category-link item.category}}
    +
    + +{{#if actionDescription}} +

    {{actionDescription}}

    +{{/if}} + +

    {{{item.excerpt}}}

    + +{{#each item.children as |child|}} +
    + + {{#each child.items as |grandChild|}} + {{#if grandChild.removableBookmark}} + + {{else}} +
    {{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}
     + {{#if grandChild.edit_reason}} — {{grandChild.edit_reason}}{{/if}} + {{/if}} + {{/each}} +
    +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs index 8043f66028..05a1cbab34 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs @@ -1,10 +1,8 @@ -
    +
    • @@ -14,7 +12,7 @@
    • - +

      {{i18n 'last_reply_lowercase'}}

      {{avatar details.last_poster imageSize="tiny"}} {{format-date topic.last_posted_at}} @@ -45,8 +43,8 @@
      • {{/if}} {{#if showPosterAvatar}} -
    • - {{#each p in details.fewParticipants}} +
    • + {{#each details.fewParticipants as |p|}} {{topic-participant participant=p}} {{/each}}
      • @@ -57,35 +55,35 @@ {{#unless mapCollapsed}}

      {{i18n 'topic_map.participants_title'}}

      - {{#each p in details.participants}} + {{#each details.participants as |p|}} {{topic-participant participant=p}} {{/each}}
      {{#if infoLinks}}
      -

      {{i18n 'topic_map.links_title'}}

      - - {{#each infoLinks as |link|}} - - - - - {{/each}} -
      - {{link.clicks}} - - - {{#if link.title}}{{link.title}}{{else}}{{shorten-url link.url}}{{/if}} - - {{link-domain link}} -
      +

      {{i18n 'topic_map.links_title'}}

      + + {{#each infoLinks as |link|}} + + + + + {{/each}} +
      + {{link.clicks}} + + + {{#if link.title}}{{link.title}}{{else}}{{shorten-url link.url}}{{/if}} + + {{link-domain link}} +
      - {{#if showAllLinksControls}} -
      - {{i18n 'topic_map.links_shown' totalLinks=details.links.length}} -
      - {{/if}} + {{#if showAllLinksControls}} +
      + {{i18n 'topic_map.links_shown' totalLinks=details.links.length}} +
      + {{/if}}
      {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs index 8233edb58a..0389b002ff 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs @@ -1,4 +1,4 @@ - + {{#if showPostCount}} {{unbound participant.post_count}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/templates/components/track-selected.hbs new file mode 100644 index 0000000000..dcc6152950 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/track-selected.hbs @@ -0,0 +1 @@ +{{input type="checkbox" checked=selected}} diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs new file mode 100644 index 0000000000..9c5d37ec0b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs @@ -0,0 +1,6 @@ + +
      + {{combo-box content=field.options value=value none=noneLabel}} + {{#if field.required}}*{{/if}} +

      {{{field.description}}}

      +
      diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs new file mode 100644 index 0000000000..0fa99d740a --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs @@ -0,0 +1,46 @@ +{{#menu-panel visible=visible}} +
      +
        +
      • {{d-link route='user' model=currentUser class="user-activity-link" icon="user" label="user.profile"}}
        • + + {{#if showDisableAnon}} +
      • {{d-link action="toggleAnon" label="switch_from_anon"}}
        • + {{/if}} +
      • + {{d-link path=bookmarksPath title="user.bookmarks" icon="bookmark"}} + {{#if siteSettings.enable_private_messages}} + {{d-link path=messagesPath title="user.private_messages" icon="envelope"}} + {{/if}} + {{#if showEnableAnon}} + {{d-link action="toggleAnon" title="switch_to_anon" icon="user-secret"}} + {{/if}} + {{d-link path=preferencesPath title="user.preferences" icon="gear"}} +
        • +
      +
      + +
      + {{#conditional-loading-spinner condition=loadingNotifications containerClass="spinner-container"}} +
      + {{#if notifications}} +
        + {{#each notifications as |n|}} + {{notification-item notification=n}} + {{/each}} +
      • + {{#d-link path=notificationsPath}} + {{i18n 'notifications.more'}}… + {{/d-link}} +
        • +
      + {{/if}} + {{/conditional-loading-spinner}} +
      + {{plugin-outlet "user-menu-bottom"}} + {{#if siteSettings.show_logout_in_header}} +
      +
        +
      • {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}}
        • +
      + {{/if}} +{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index f561b20f64..6496731207 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -1,8 +1,17 @@ {{#if visible}}
      + + {{#if currentUser.staff}} + {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}} +
    • + {{d-button action="toggleWhisper" icon="eye-slash" label="composer.toggle_whisper"}} +
      • + {{/popup-menu}} + {{/if}} + {{render "composer-messages"}}
      - + {{#if model.viewOpen}}
      @@ -11,6 +20,10 @@
      {{{model.actionTitle}}} + {{#if model.whisper}} + ({{i18n "composer.whisper"}}) + {{/if}} + {{#if canEdit}} {{#if showEditReason}}
      @@ -48,7 +61,7 @@ {{popup-input-tip validation=view.titleValidation shownAt=view.showTitleTip}}
      - {{#unless model.privateMessage}} + {{#if model.showCategoryChooser}}
      {{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}} {{popup-input-tip validation=view.categoryValidation shownAt=view.showCategoryTip}} @@ -57,33 +70,37 @@ {{/if}} {{render "additional-composer-buttons" model}} - {{/unless}} + {{/if}}
      {{/if}} + {{plugin-outlet "composer-fields"}}
      -
      -
      +
      +
      {{composer-text-area tabindex="4" value=model.reply}} {{popup-input-tip validation=view.replyValidation shownAt=view.showReplyTip}}
      -
      +
      - {{{model.toggleText}}} -
      - {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}% {{i18n 'cancel'}} -
      {{#if site.mobileView}} - {{i18n 'upload'}} + {{i18n 'upload'}} + {{else}} + {{{model.toggleText}}} {{/if}} -
      + {{#if view.isUploading}} +
      + {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}% {{fa-icon "times"}} +
      + {{/if}} +
      {{model.draftStatus}}
      @@ -93,7 +110,7 @@
      {{plugin-outlet "composer-fields-below"}} - {{i18n 'cancel'}} + {{i18n 'cancel'}}
      {{/if}} diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs index bb818e700e..b59da973c3 100644 --- a/app/assets/javascripts/discourse/templates/composer/education.hbs +++ b/app/assets/javascripts/discourse/templates/composer/education.hbs @@ -1,2 +1,2 @@ - + {{{body}}} diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs index 73b5ee6e78..ed326e488e 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs +++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs @@ -1,8 +1,6 @@ -{{fa-icon "times-circle"}} +{{fa-icon "times-circle"}}

      {{i18n 'composer.similar_topics'}}

        - {{#each t in similarTopics}} -
      • {{topic-link t}} {{t.posts_count}}
        • - {{/each}} + {{search-result-topic results=similarTopics}}
      diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs index be18d07bae..1e4548bbe2 100644 --- a/app/assets/javascripts/discourse/templates/discovery.hbs +++ b/app/assets/javascripts/discourse/templates/discovery.hbs @@ -1,10 +1,8 @@ -
      - {{custom-html "top"}} - {{global-notice}} +
      {{discourse-banner user=currentUser banner=site.banner}}
      -
      +
      {{outlet "navigation-bar"}}
      @@ -12,17 +10,17 @@ {{conditional-loading-spinner condition=loading}} -
      +
      -
      +
      {{outlet "header-list-container"}}
      -
      +
      {{plugin-outlet "discovery-list-container-top"}} {{outlet "list-container"}}
      diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 9c573ee3d2..f3e452a4ab 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -23,7 +23,7 @@
      {{/if}} {{#if topicTrackingState.hasIncoming}} -
      +
      {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}} {{i18n 'click_to_show'}} diff --git a/app/assets/javascripts/discourse/templates/embedded-post.hbs b/app/assets/javascripts/discourse/templates/embedded-post.hbs index 66366ee5aa..03bfc30a26 100644 --- a/app/assets/javascripts/discourse/templates/embedded-post.hbs +++ b/app/assets/javascripts/discourse/templates/embedded-post.hbs @@ -1,10 +1,6 @@
      -
      -
      - {{raw "post/poster-avatar" post=this classNames="main-avatar"}} -
      -
      + {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
      diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs index 8a519786e8..e7ed62a92a 100644 --- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs +++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs @@ -1,6 +1,6 @@
        - {{#each item in toolbarItems}}
        • {{/each}} + {{#each item in toolbarItems}}
        • {{/each}}
      diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs new file mode 100644 index 0000000000..344c28985b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -0,0 +1,101 @@ +
      + {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} + {{d-button action="search" icon="search" class="btn-primary" disabled=searchButtonDisabled}} + {{#if canBulkSelect}} + {{#if model.posts}} + {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} + {{bulk-select-button selected=selected refreshTarget=controller}} + {{/if}} + {{/if}} +
      + +{{#if model.posts}} + {{#if bulkSelectEnabled}} +
      + {{i18n "search.select_all"}} + {{i18n "search.clear_all"}} +
      + {{/if}} +{{/if}} + +{{#if context}} +
      + +
      +{{/if}} + +{{#conditional-loading-spinner condition=loading}} + + {{#unless model.posts}} +

      + {{#if searchActive}} + {{i18n "search.no_results"}} + {{/if}} + {{i18n "search.search_help"}} +

      + {{/unless}} + + {{#if model.posts}} +
      +
      + + {{{i18n "search.result_count" count=resultCount term=noSortQ}}} + +
      +
      + + {{i18n "search.sort_by"}} + + {{combo-box value=sortOrder content=sortOrders castInteger="true"}} +
      +
      + {{/if}} + + {{#each model.posts as |result|}} +
      +
      + {{#if bulkSelectEnabled}} + {{track-selected selectedList=selected selectedId=result.topic}} + {{/if}} + {{avatar result imageSize="tiny"}} + + {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=controller.q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}} + +
      + {{category-link result.topic.category}} + {{plugin-outlet "full-page-search-category"}} +
      +
      +
      + + {{format-age result.created_at}} + {{#if result.blurb}} + - + {{/if}} + + {{#if result.blurb}} + {{#highlight-text highlight=controller.q}} + {{{unbound result.blurb}}} + {{/highlight-text}} + {{/if}} +
      + {{#if showLikeCount}} + {{#if result.like_count}} + + {{/if}} + {{/if}} +
      + {{/each}} + + {{#if model.posts}} +

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

      + {{/if}} + +{{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/discourse/templates/group/index.hbs b/app/assets/javascripts/discourse/templates/group/index.hbs index e64d5673d2..5ed985396c 100644 --- a/app/assets/javascripts/discourse/templates/group/index.hbs +++ b/app/assets/javascripts/discourse/templates/group/index.hbs @@ -8,9 +8,9 @@ {{unbound p.title}}{{category-link p.category}} - diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs index fcfd0374b5..8421949e04 100644 --- a/app/assets/javascripts/discourse/templates/group/members.hbs +++ b/app/assets/javascripts/discourse/templates/group/members.hbs @@ -1,19 +1,17 @@ {{#if model}}
      - + + {{#each model.members as |m|}} - + - {{/each}} diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 4d71d1eb22..9624352a34 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -1,7 +1,7 @@ -
      +
      - {{home-logo minimized=showExtraInfo}} + {{plugin-outlet "header-after-home-logo"}}
      {{#unless currentUser}} @@ -12,82 +12,49 @@ {{/unless}} - - {{#if view.renderDropdowns}} - {{render "search"}} - {{render "notifications" notifications}} - - {{#if view.renderSiteMap}} - {{render "site-map"}} - {{/if}} - - {{render "user-dropdown"}} - {{/if}} + {{plugin-outlet "header-before-dropdowns"}} + {{user-menu visible=userMenuVisible logoutAction="logout"}} + {{hamburger-menu visible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}} + {{search-menu visible=searchVisible}}
      {{#if showExtraInfo}} diff --git a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs index e74f1586fa..31a907f655 100644 --- a/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/activity-column.raw.hbs @@ -1 +1 @@ -<{{this.tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle=true}} +<{{this.tagName}} class="{{class}} {{cold-age-class topic.createdAt startDate=topic.bumpedAt class=""}} activity" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}} diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs new file mode 100644 index 0000000000..88dfe8f000 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs @@ -0,0 +1,8 @@ +{{#if view.showBadges}} + {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} +{{else}} + {{#if topic.unseen}} + + {{/if}} + {{raw "list/posts-count-column" topic=topic tagName="div"}} +{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs index 1b837fb5a7..5adbfd3d72 100644 --- a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs @@ -1,5 +1,5 @@
      diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs index 92f0bd68e9..26c958c4ec 100644 --- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs @@ -10,6 +10,7 @@ {{#if controller.showTopicPostBadges}} {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} {{/if}} + {{plugin-outlet "topic-list-tags"}} {{#if expandPinned}} {{raw "list/topic-excerpt" topic=topic}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs index 2dfeb9ad4a..06af1df5d1 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs @@ -5,13 +5,9 @@ {{#each t in topics}} - {{#if showTimeRead}} + {{#if controller.parentController.showTimeRead}} {{/if}} {{/with}} diff --git a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 index ed60610505..6fcc5c9bc4 100644 --- a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 +++ b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 @@ -1,3 +1,4 @@ +import { on, observes } from "ember-addons/ember-computed-decorators"; import ModalBodyView from "discourse/views/modal-body"; export default ModalBodyView.extend({ @@ -5,9 +6,15 @@ export default ModalBodyView.extend({ classNames: ['avatar-selector'], title: I18n.t('user.change_avatar.title'), - // *HACK* used to select the proper radio button, cause {{action}} - // stops the default behavior - selectedChanged: function() { - Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')]) ); - }.observes('controller.selected') + // *HACK* used to select the proper radio button, because {{action}} stops the default behavior + @on("didInsertElement") + @observes("controller.selected") + selectedChanged() { + Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')])); + }, + + @on("didInsertElement") + _focusSelectedButton() { + Em.run.next(() => $('input:radio[value="' + this.get('controller.selected') + '"]').focus()); + } }); diff --git a/app/assets/javascripts/discourse/views/badges-show.js.es6 b/app/assets/javascripts/discourse/views/badges-show.js.es6 index 9b74c3e3f9..9f94ae6a3a 100644 --- a/app/assets/javascripts/discourse/views/badges-show.js.es6 +++ b/app/assets/javascripts/discourse/views/badges-show.js.es6 @@ -1,6 +1,6 @@ import LoadMore from "discourse/mixins/load-more"; -export default Discourse.View.extend(LoadMore, { +export default Ember.View.extend(LoadMore, { eyelineSelector: '.badge-user', tickOrX: function(field){ var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times"; diff --git a/app/assets/javascripts/discourse/views/button.js.es6 b/app/assets/javascripts/discourse/views/button.js.es6 index a791db4a60..9811e71956 100644 --- a/app/assets/javascripts/discourse/views/button.js.es6 +++ b/app/assets/javascripts/discourse/views/button.js.es6 @@ -1,6 +1,6 @@ import StringBuffer from 'discourse/mixins/string-buffer'; -export default Discourse.View.extend(StringBuffer, { +export default Ember.View.extend(StringBuffer, { tagName: 'button', classNameBindings: [':btn', ':standard', 'dropDownToggle'], attributeBindings: ['title', 'data-toggle', 'data-share-url'], diff --git a/app/assets/javascripts/discourse/views/choose-topic.js.es6 b/app/assets/javascripts/discourse/views/choose-topic.js.es6 index b064528efa..cb2a346614 100644 --- a/app/assets/javascripts/discourse/views/choose-topic.js.es6 +++ b/app/assets/javascripts/discourse/views/choose-topic.js.es6 @@ -1,32 +1,38 @@ -import searchForTerm from 'discourse/lib/search-for-term'; +import debounce from 'discourse/lib/debounce'; +import { searchForTerm } from 'discourse/lib/search'; -export default Discourse.View.extend({ +export default Ember.View.extend({ templateName: 'choose_topic', topicTitleChanged: function() { - this.set('loading', true); - this.set('noResults', true); - this.set('selectedTopicId', null); + this.setProperties({ + loading: true, + noResults: true, + selectedTopicId: null, + }); this.search(this.get('topicTitle')); }.observes('topicTitle'), topicsChanged: function() { - var topics = this.get('topics'); + const topics = this.get('topics'); if (topics) { this.set('noResults', topics.length === 0); } this.set('loading', false); }.observes('topics'), - search: Discourse.debounce(function(title) { - var self = this; + search: debounce(function(title) { + const self = this, + currentTopicId = this.get("currentTopicId"); + if (Em.isEmpty(title)) { self.setProperties({ topics: null, loading: false }); return; } - searchForTerm(title, {typeFilter: 'topic', searchForId: true}).then(function (results) { + + searchForTerm(title, { typeFilter: 'topic', searchForId: true }).then(function (results) { if (results && results.posts && results.posts.length > 0) { - self.set('topics', results.posts.mapBy('topic')); + self.set('topics', results.posts.mapBy('topic').filter(t => t.get("id") !== currentTopicId)); } else { self.setProperties({ topics: null, loading: false }); } @@ -35,7 +41,7 @@ export default Discourse.View.extend({ actions: { chooseTopic: function (topic) { - var topicId = Em.get(topic, 'id'); + const topicId = Em.get(topic, 'id'); this.set('selectedTopicId', topicId); Em.run.next(function () { diff --git a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 b/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 index 03a121efe8..a00c4fa13d 100644 --- a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 +++ b/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 @@ -1,5 +1,4 @@ -import CloakedView from 'discourse/views/cloaked'; - +/*eslint no-bitwise:0 */ const CloakedCollectionView = Ember.CollectionView.extend({ cloakView: Ember.computed.alias('itemViewClass'), topVisible: null, @@ -9,7 +8,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({ loadingHTML: 'Loading...', scrollDebounce: 10, - init: function() { + init() { const cloakView = this.get('cloakView'), idProperty = this.get('idProperty'), uncloakDefault = !!this.get('uncloakDefault'); @@ -18,6 +17,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({ const slackRatio = parseFloat(this.get('slackRatio')); if (!slackRatio) { this.set('slackRatio', 1.0); } + const CloakedView = this.container.lookupFactory('view:cloaked'); this.set('itemViewClass', CloakedView.extend({ classNames: [cloakView + '-cloak'], cloaks: cloakView, @@ -25,7 +25,7 @@ const CloakedCollectionView = Ember.CollectionView.extend({ cloaksController: this.get('itemController'), defaultHeight: this.get('defaultHeight'), - init: function() { + init() { this._super(); if (idProperty) { diff --git a/app/assets/javascripts/discourse/views/composer-messages.js.es6 b/app/assets/javascripts/discourse/views/composer-messages.js.es6 index 39f911ec78..4541ff90c6 100644 --- a/app/assets/javascripts/discourse/views/composer-messages.js.es6 +++ b/app/assets/javascripts/discourse/views/composer-messages.js.es6 @@ -4,7 +4,7 @@ export default Ember.CollectionView.extend({ hidden: Em.computed.not('controller.controllers.composer.model.viewOpen'), - itemViewClass: Discourse.View.extend({ + itemViewClass: Ember.View.extend({ classNames: ['composer-popup', 'hidden'], templateName: Em.computed.alias('content.templateName'), diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 462f65a149..841ec655e6 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -1,11 +1,12 @@ import userSearch from 'discourse/lib/user-search'; import afterTransition from 'discourse/lib/after-transition'; import loadScript from 'discourse/lib/load-script'; -import avatarTemplate from 'discourse/lib/avatar-template'; import positioningWorkaround from 'discourse/lib/safari-hacks'; +import debounce from 'discourse/lib/debounce'; import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; +import { headerHeight } from 'discourse/views/header'; -const ComposerView = Discourse.View.extend(Ember.Evented, { +const ComposerView = Ember.View.extend(Ember.Evented, { _lastKeyTimeout: null, templateName: 'composer', elementId: 'reply-control', @@ -30,17 +31,17 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { // Disable fields when we're loading loadingChanged: function() { if (this.get('loading')) { - $('#wmd-input, #reply-title').prop('disabled', 'disabled'); + this.$('.wmd-input, #reply-title').prop('disabled', 'disabled'); } else { - $('#wmd-input, #reply-title').prop('disabled', ''); + this.$('.wmd-input, #reply-title').prop('disabled', ''); } }.observes('loading'), postMade: function() { - return this.present('model.createdPost') ? 'created-post' : null; + return !Ember.isEmpty(this.get('model.createdPost')) ? 'created-post' : null; }.property('model.createdPost'), - refreshPreview: Discourse.debounce(function() { + refreshPreview: debounce(function() { if (this.editor) { this.editor.refreshPreview(); } @@ -59,23 +60,22 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }, resize: function() { - const self = this; - Ember.run.scheduleOnce('afterRender', function() { - const h = $('#reply-control').height() || 0; - self.movePanels.apply(self, [h + "px"]); + Ember.run.scheduleOnce('afterRender', () => { + let h = $('#reply-control').height() || 0; + this.movePanels(h + "px"); // Figure out the size of the fields - const $fields = self.$('.composer-fields'); + const $fields = this.$('.composer-fields'); let pos = $fields.position(); if (pos) { - self.$('.wmd-controls').css('top', $fields.height() + pos.top + 5); + this.$('.wmd-controls').css('top', $fields.height() + pos.top + 5); } // get the submit panel height - pos = self.$('.submit-panel').position(); + pos = this.$('.submit-panel').position(); if (pos) { - self.$('.wmd-controls').css('bottom', h - pos.top + 7); + this.$('.wmd-controls').css('bottom', h - pos.top + 7); } }); @@ -85,6 +85,8 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { const controller = this.get('controller'); controller.checkReplyLength(); + this.get('controller.model').typing(); + const lastKeyUp = new Date(); this.set('lastKeyUp', lastKeyUp); @@ -114,21 +116,21 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }, _enableResizing: function() { - const $replyControl = $('#reply-control'), - self = this; + const $replyControl = $('#reply-control'); - const resizer = function() { - Ember.run(function() { - self.resize(); - }); + const runResize = () => { + Ember.run(() => this.resize()); }; $replyControl.DivResizer({ - resize: resizer, - onDrag(sizePx) { self.movePanels.apply(self, [sizePx]); } + maxHeight(winHeight) { + return winHeight - headerHeight(); + }, + resize: runResize, + onDrag: (sizePx) => this.movePanels(sizePx) }); - afterTransition($replyControl, resizer); - this.ensureMaximumDimensionForImagesInPreview(); + + afterTransition($replyControl, runResize); this.set('controller.view', this); positioningWorkaround(this.$()); @@ -138,28 +140,15 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { this.set('controller.view', null); }.on('willDestroyElement'), - ensureMaximumDimensionForImagesInPreview() { - // This enforce maximum dimensions of images in the preview according - // to the current site settings. - // For interactivity, we immediately insert the locally cooked version - // of the post into the stream when the user hits reply. We therefore also - // need to enforce these rules on the .cooked version. - // Meanwhile, the server is busy post-processing the post and generating thumbnails. - const style = Discourse.Mobile.mobileView ? - 'max-width: 100%; height: auto;' : - 'max-width:' + Discourse.SiteSettings.max_image_width + 'px;' + - 'max-height:' + Discourse.SiteSettings.max_image_height + 'px;'; - - $('').appendTo('head'); - }, - click() { this.get('controller').send('openIfDraft'); }, // Called after the preview renders. Debounced for performance afterRender() { - const $wmdPreview = $('#wmd-preview'); + if (this._state !== "inDOM") { return; } + + const $wmdPreview = this.$('.wmd-preview'); if ($wmdPreview.length === 0) return; const post = this.get('model.post'); @@ -196,7 +185,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { if (!this.siteSettings.enable_emoji) { return; } const template = this.container.lookup('template:emoji-selector-autocomplete.raw'); - $('#wmd-input').autocomplete({ + this.$('.wmd-input').autocomplete({ template: template, key: ":", transformComplete(v) { return v.code + ":"; }, @@ -228,9 +217,11 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { initEditor() { // not quite right, need a callback to pass in, meaning this gets called once, // but if you start replying to another topic it will get the avatars wrong - let $wmdInput, editor; + let $wmdInput; const self = this; - this.wmdInput = $wmdInput = $('#wmd-input'); + const controller = this.get('controller'); + + this.wmdInput = $wmdInput = this.$('.wmd-input'); if ($wmdInput.length === 0 || $wmdInput.data('init') === true) return; loadScript('defer/html-sanitizer-bundle'); @@ -244,7 +235,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { dataSource(term) { return userSearch({ term: term, - topicId: self.get('controller.controllers.topic.model.id'), + topicId: controller.get('controllers.topic.model.id'), includeGroups: true }); }, @@ -254,20 +245,40 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { } }); - this.editor = editor = Discourse.Markdown.createEditor({ - lookupAvatarByPostNumber(postNumber) { - const posts = self.get('controller.controllers.topic.model.postStream.posts'); - if (posts) { + + const options ={ + containerElement: this.element, + lookupAvatarByPostNumber(postNumber, topicId) { + const posts = controller.get('controllers.topic.model.postStream.posts'); + if (posts && topicId === controller.get('controllers.topic.model.id')) { const quotedPost = posts.findProperty("post_number", postNumber); if (quotedPost) { - const username = quotedPost.get('username'), - uploadId = quotedPost.get('uploaded_avatar_id'); - - return Discourse.Utilities.tinyAvatar(avatarTemplate(username, uploadId)); + return Discourse.Utilities.tinyAvatar(quotedPost.get('avatar_template')); } } } - }); + }; + + const showOptions = controller.get('canWhisper'); + if (showOptions) { + options.appendButtons = [{ + id: 'wmd-composer-options', + description: I18n.t("composer.options"), + execute() { + const toolbarPos = self.$('.wmd-controls').position(); + const pos = self.$('.wmd-composer-options').position(); + + const location = { + position: "absolute", + left: toolbarPos.left + pos.left, + top: toolbarPos.top + pos.top, + }; + controller.send('showOptions', location); + } + }]; + } + + this.editor = Discourse.Markdown.createEditor(options); // HACK to change the upload icon of the composer's toolbar if (!Discourse.Utilities.allowsAttachments()) { @@ -278,7 +289,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { this.editor.hooks.insertImageDialog = function(callback) { callback(null); - self.get('controller').send('showUploadSelector', self); + controller.send('showUploadSelector', self); return true; }; @@ -290,8 +301,8 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { this.set('editor', this.editor); this.loadingChanged(); - const saveDraft = Discourse.debounce((function() { - return self.get('controller').saveDraft(); + const saveDraft = debounce((function() { + return controller.saveDraft(); }), 2000); $wmdInput.keyup(function() { @@ -329,16 +340,18 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { var cancelledByTheUser; this.messageBus.subscribe("/uploads/composer", upload => { - if (!cancelledByTheUser) { - if (upload && upload.url) { - const markdown = Discourse.Utilities.getUploadMarkdown(upload); - this.addMarkdown(markdown + " "); - } else { - Discourse.Utilities.displayErrorForUpload(upload); - } - } // reset upload state reset(); + // replace upload placeholder + if (upload && upload.url) { + if (!cancelledByTheUser) { + const uploadPlaceholder = Discourse.Utilities.getUploadPlaceholder(), + markdown = Discourse.Utilities.getUploadMarkdown(upload); + this.replaceMarkdown(uploadPlaceholder, markdown); + } + } else { + Discourse.Utilities.displayErrorForUpload(upload); + } }); $uploadTarget.fileupload({ @@ -356,9 +369,13 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { $uploadTarget.on("fileuploadsend", (e, data) => { // hide the "file selector" modal - this.get("controller").send("closeModal"); + controller.send("closeModal"); // deal with cancellation cancelledByTheUser = false; + // add upload placeholder + const uploadPlaceholder = Discourse.Utilities.getUploadPlaceholder(); + this.addMarkdown(uploadPlaceholder); + if (data["xhr"]) { const jqHXR = data.xhr(); if (jqHXR) { @@ -367,7 +384,10 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { const $cancel = $("#cancel-file-upload"); $cancel.on("click", () => { if (jqHXR) { + // signal the upload was cancelled by the user cancelledByTheUser = true; + // immediately remove upload placeholder + this.replaceMarkdown(uploadPlaceholder, ""); // might trigger a "fileuploadfail" event with status = 0 jqHXR.abort(); // make sure we always reset the uploading status @@ -387,8 +407,14 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }); $uploadTarget.on("fileuploadfail", (e, data) => { + // reset upload state reset(); + if (!cancelledByTheUser) { + // remove upload placeholder when there's a failure + const uploadPlaceholder = Discourse.Utilities.getUploadPlaceholder(); + this.replaceMarkdown(uploadPlaceholder, ""); + // display the error Discourse.Utilities.displayErrorForUpload(data); } }); @@ -480,7 +506,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { } if (Discourse.Mobile.mobileView) { - $(".mobile-file-upload").on("click", function () { + $(".mobile-file-upload").on("click.uploader", function () { // redirect the click on the hidden file input $("#mobile-uploader").click(); }); @@ -501,7 +527,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }, addMarkdown(text) { - const ctrl = $('#wmd-input').get(0), + const ctrl = this.$('.wmd-input').get(0), caretPosition = Discourse.Utilities.caretPosition(ctrl), current = this.get('model.reply'); this.set('model.reply', current.substring(0, caretPosition) + text + current.substring(caretPosition, current.length)); @@ -511,10 +537,15 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }); }, + replaceMarkdown(old, text) { + const reply = this.get("model.reply"); + this.set("model.reply", reply.replace(old, text)); + }, + // Uses javascript to get the image sizes from the preview, if present imageSizes() { const result = {}; - $('#wmd-preview img').each(function(i, e) { + this.$('.wmd-preview img').each(function(i, e) { const $img = $(e), src = $img.prop('src'); @@ -529,7 +560,7 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { this.initEditor(); // Disable links in the preview - $('#wmd-preview').on('click.preview', (e) => { + this.$('.wmd-preview').on('click.preview', (e) => { e.preventDefault(); return false; }); @@ -538,12 +569,18 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { childWillDestroyElement() { this._unbindUploadTarget(); - $('#wmd-preview').off('click.preview'); + this.$('.wmd-preview').off('click.preview'); + + const self = this; Em.run.next(() => { $('#main-outlet').css('padding-bottom', 0); // need to wait a bit for the "slide down" transition of the composer Em.run.later(() => { + if (self.get('composeState') !== Discourse.Composer.CLOSED) { + $('#main-outlet').css('padding-bottom', $('#reply-control').height()); + } + this.appEvents.trigger("composer:closed"); }, 400); }); @@ -581,15 +618,18 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }.property('model.categoryId'), replyValidation: function() { + const postType = this.get('model.post.post_type'); + if (postType === this.site.get('post_types.small_action')) { return; } + const replyLength = this.get('model.replyLength'), - missingChars = this.get('model.missingReplyCharacters'); + missingChars = this.get('model.missingReplyCharacters'); let reason; if (replyLength < 1) { reason = I18n.t('composer.error.post_missing'); } else if (missingChars > 0) { reason = I18n.t('composer.error.post_length', {min: this.get('model.minimumPostLength')}); - let tl = Discourse.User.currentProp("trust_level"); + const tl = Discourse.User.currentProp("trust_level"); if (tl === 0 || tl === 1) { reason += "
      " + I18n.t('composer.error.try_like'); } diff --git a/app/assets/javascripts/discourse/views/container.js.es6 b/app/assets/javascripts/discourse/views/container.js.es6 index 68c6533532..f7a474fc02 100644 --- a/app/assets/javascripts/discourse/views/container.js.es6 +++ b/app/assets/javascripts/discourse/views/container.js.es6 @@ -1,8 +1,11 @@ -import Presence from 'discourse/mixins/presence'; - -export default Ember.ContainerView.extend(Presence, { +export default Ember.ContainerView.extend({ attachViewWithArgs(viewArgs, viewClass) { + if (typeof viewClass === "string") { + viewClass = this.container.lookupFactory("view:" + viewClass) || + this.container.lookupFactory("component:" + viewClass); + } + if (!viewClass) { viewClass = Ember.View.extend(); } this.pushObject(this.createChildView(viewClass, viewArgs)); }, diff --git a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 b/app/assets/javascripts/discourse/views/discovery-categories.js.es6 index 4d111d66cd..59721af089 100644 --- a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-categories.js.es6 @@ -1,6 +1,6 @@ import UrlRefresh from 'discourse/mixins/url-refresh'; -export default Discourse.View.extend(UrlRefresh, { +export default Ember.View.extend(UrlRefresh, { _addBodyClass: function() { $('body').addClass('categories-list'); }.on('didInsertElement'), diff --git a/app/assets/javascripts/discourse/views/discovery-top.js.es6 b/app/assets/javascripts/discourse/views/discovery-top.js.es6 index 62950838e5..72d1e7167e 100644 --- a/app/assets/javascripts/discourse/views/discovery-top.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-top.js.es6 @@ -1,4 +1,4 @@ import UrlRefresh from 'discourse/mixins/url-refresh'; import ScrollTop from 'discourse/mixins/scroll-top'; -export default Discourse.View.extend(ScrollTop, UrlRefresh); +export default Ember.View.extend(ScrollTop, UrlRefresh); diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 index 25b66239b6..82bded3239 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 @@ -1,37 +1,40 @@ import UrlRefresh from 'discourse/mixins/url-refresh'; import LoadMore from "discourse/mixins/load-more"; +import { on, observes } from "ember-addons/ember-computed-decorators"; -export default Discourse.View.extend(LoadMore, UrlRefresh, { +export default Ember.View.extend(LoadMore, UrlRefresh, { eyelineSelector: '.topic-list-item', actions: { loadMore() { const self = this; Discourse.notifyTitle(0); - this.get('controller').loadMoreTopics().then(function (hasMoreResults) { - Em.run.schedule('afterRender', function() { - self.saveScrollPosition(); - }); + this.get('controller').loadMoreTopics().then(hasMoreResults => { + Ember.run.schedule('afterRender', () => self.saveScrollPosition()); if (!hasMoreResults) { - self.get('eyeline').flushRest(); + this.get('eyeline').flushRest(); + } else if ($(window).height() >= $(document).height()) { + this.send("loadMore"); } }); } }, - _readjustScrollPosition: function() { + @on("didInsertElement") + @observes("controller.model") + _readjustScrollPosition() { const scrollTo = this.session.get('topicListScrollPosition'); - - if (typeof scrollTo !== "undefined") { - Em.run.schedule('afterRender', function() { - $(window).scrollTop(scrollTo+1); - }); + if (scrollTo && scrollTo >= 0) { + Ember.run.schedule('afterRender', () => $(window).scrollTop(scrollTo + 1)); + } else { + this.loadMoreUnlessFull(); } - }.on('didInsertElement'), + }, - _updateTitle: function() { + @observes("controller.topicTrackingState.incomingCount") + _updateTitle() { Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount')); - }.observes('controller.topicTrackingState.incomingCount'), + }, // Remember where we were scrolled to saveScrollPosition() { diff --git a/app/assets/javascripts/discourse/views/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/views/edit-category-panel.js.es6 deleted file mode 100644 index fcf77c5763..0000000000 --- a/app/assets/javascripts/discourse/views/edit-category-panel.js.es6 +++ /dev/null @@ -1,9 +0,0 @@ -export default Em.View.extend({ - classNameBindings: [':modal-tab', 'invisible'], - invisible: Discourse.computed.propertyNotEqual('controller.selectedTab', 'tab'), - - templateName: function() { - return "modal/edit-category-" + this.get('tab'); - }.property('tab') -}); - diff --git a/app/assets/javascripts/discourse/views/edit-category.js.es6 b/app/assets/javascripts/discourse/views/edit-category.js.es6 deleted file mode 100644 index ea93cc99be..0000000000 --- a/app/assets/javascripts/discourse/views/edit-category.js.es6 +++ /dev/null @@ -1,9 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/edit-category', - - _initializePanels: function() { - this.set('panels', []); - }.on('init') -}); diff --git a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 new file mode 100644 index 0000000000..6265d41b80 --- /dev/null +++ b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 @@ -0,0 +1,7 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + templateName: "modal/edit-topic-auto-close", + title: I18n.t("topic.auto_close_title"), + focusInput: false +}); diff --git a/app/assets/javascripts/discourse/views/embedded-post.js.es6 b/app/assets/javascripts/discourse/views/embedded-post.js.es6 index 4697e43906..4bccf52199 100644 --- a/app/assets/javascripts/discourse/views/embedded-post.js.es6 +++ b/app/assets/javascripts/discourse/views/embedded-post.js.es6 @@ -1,13 +1,15 @@ +import ScreenTrack from 'discourse/lib/screen-track'; + export default Discourse.GroupedView.extend({ templateName: 'embedded-post', classNames: ['reply'], _startTracking: function() { const post = this.get('content'); - Discourse.ScreenTrack.current().track(this.get('elementId'), post.get('post_number')); + ScreenTrack.current().track(this.get('elementId'), post.get('post_number')); }.on('didInsertElement'), _stopTracking: function() { - Discourse.ScreenTrack.current().stopTracking(this.get('elementId')); + ScreenTrack.current().stopTracking(this.get('elementId')); }.on('willDestroyElement') }); diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6 new file mode 100644 index 0000000000..7a8aa550ea --- /dev/null +++ b/app/assets/javascripts/discourse/views/full-page-search.js.es6 @@ -0,0 +1 @@ +export default Ember.View.extend(); diff --git a/app/assets/javascripts/discourse/views/group-index.js.es6 b/app/assets/javascripts/discourse/views/group-index.js.es6 index f16ebf262b..4e25173395 100644 --- a/app/assets/javascripts/discourse/views/group-index.js.es6 +++ b/app/assets/javascripts/discourse/views/group-index.js.es6 @@ -1,6 +1,6 @@ import ScrollTop from 'discourse/mixins/scroll-top'; import LoadMore from "discourse/mixins/load-more"; -export default Discourse.View.extend(ScrollTop, LoadMore, { +export default Ember.View.extend(ScrollTop, LoadMore, { eyelineSelector: '.user-stream .item', }); diff --git a/app/assets/javascripts/discourse/views/group-members.js.es6 b/app/assets/javascripts/discourse/views/group-members.js.es6 index e3715a47e0..cae92ca87e 100644 --- a/app/assets/javascripts/discourse/views/group-members.js.es6 +++ b/app/assets/javascripts/discourse/views/group-members.js.es6 @@ -1,6 +1,6 @@ import ScrollTop from 'discourse/mixins/scroll-top'; import LoadMore from "discourse/mixins/load-more"; -export default Discourse.View.extend(ScrollTop, LoadMore, { +export default Ember.View.extend(ScrollTop, LoadMore, { eyelineSelector: '.group-members tr', }); diff --git a/app/assets/javascripts/discourse/views/grouped.js.es6 b/app/assets/javascripts/discourse/views/grouped.js.es6 index ed06f49b50..988c166127 100644 --- a/app/assets/javascripts/discourse/views/grouped.js.es6 +++ b/app/assets/javascripts/discourse/views/grouped.js.es6 @@ -1,6 +1,4 @@ -import Presence from 'discourse/mixins/presence'; - -export default Ember.View.extend(Presence, { +export default Ember.View.extend({ _groupInit: function() { this.set('context', this.get('content')); diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 index 59bb77f41d..eb5ebec50f 100644 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ b/app/assets/javascripts/discourse/views/header.js.es6 @@ -1,168 +1,55 @@ -let originalZIndex; +import { on } from 'ember-addons/ember-computed-decorators'; -export default Discourse.View.extend({ +export default Ember.View.extend({ tagName: 'header', classNames: ['d-header', 'clearfix'], classNameBindings: ['editingTopic'], templateName: 'header', - renderDropdowns: false, - - showDropdown: function($target) { - var self = this; - - if (!this.get("renderDropdowns")) { - this.set("renderDropdowns", true); - Em.run.next(function(){ - self.showDropdown($target); - }); - return; - } - - const elementId = $target.data('dropdown') || $target.data('notifications'), - $dropdown = $("#" + elementId), - $li = $target.closest('li'), - $ul = $target.closest('ul'), - $html = $('html'), - $header = $('header'), - replyZIndex = parseInt($('#reply-control').css('z-index'), 10); - - originalZIndex = originalZIndex || $('header').css('z-index'); - - if (replyZIndex > 0) { - $header.css("z-index", replyZIndex + 1); - } - - const controller = self.get('controller'); - if (controller && !controller.isDestroyed) { - controller.set('visibleDropdown', elementId); - } - // we need to ensure we are rendered, - // this optimises the speed of the initial render - const render = $target.data('render'); - if (render){ - if (!this.get(render)){ - this.set(render, true); - Em.run.next(this, function(){ - this.showDropdown.apply(self, [$target]); - }); - return; - } - } - - const hideDropdown = function() { - $header.css("z-index", originalZIndex); - $dropdown.fadeOut('fast'); - $li.removeClass('active'); - $html.data('hide-dropdown', null); - - const controller = self.get('controller'); - if (controller && !controller.isDestroyed){ - controller.set('visibleDropdown', null); - } - $html.off('click.d-dropdown'); - }; - - // if a dropdown is active and the user clicks on it, close it - if ($li.hasClass('active')) { return hideDropdown(); } - // otherwhise, mark it as active - $li.addClass('active'); - // hide the other dropdowns - $('li', $ul).not($li).removeClass('active'); - $('.d-dropdown').not($dropdown).fadeOut('fast'); - // fade it fast - $dropdown.fadeIn('fast'); - // autofocus any text input field - $dropdown.find('input[type=text]').focus().select(); - - $html.on('click.d-dropdown', function(e) { - return $(e.target).closest('.d-dropdown').length > 0 ? true : hideDropdown.apply(self); - }); - - $html.data('hide-dropdown', hideDropdown); - - return false; - }, - - showDropdownBySelector: function(selector) { - this.showDropdown($(selector)); - }, - - showNotifications: function() { - this.get("controller").send("showNotifications", this); - }, - - examineDockHeader: function() { - - var headerView = this; + examineDockHeader() { // Check the dock after the current run loop. While rendering, // it's much slower to calculate `outlet.offset()` - Em.run.next(function () { - if (!headerView.docAt) { - var outlet = $('#main-outlet'); + Ember.run.next(() => { + if (this.docAt === undefined) { + const outlet = $('#main-outlet'); if (!(outlet && outlet.length === 1)) return; - headerView.docAt = outlet.offset().top; + this.docAt = outlet.offset().top; } - var offset = window.pageYOffset || $('html').scrollTop(); - if (offset >= headerView.docAt) { - if (!headerView.dockedHeader) { + const offset = window.pageYOffset || $('html').scrollTop(); + if (offset >= this.docAt) { + if (!this.dockedHeader) { $('body').addClass('docked'); - headerView.dockedHeader = true; + this.dockedHeader = true; } } else { - if (headerView.dockedHeader) { + if (this.dockedHeader) { $('body').removeClass('docked'); - headerView.dockedHeader = false; + this.dockedHeader = false; } } }); - }, - _tearDown: function() { + @on('willDestroyElement') + _tearDown() { $(window).unbind('scroll.discourse-dock'); $(document).unbind('touchmove.discourse-dock'); this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').off('click.notifications'); - this.$('a[data-dropdown]').off('click.dropdown'); $('body').off('keydown.header'); - }.on('willDestroyElement'), + }, - _setup: function() { - - const self = this; - - this.$('a[data-dropdown]').on('click.dropdown', function(e) { - self.showDropdown.apply(self, [$(e.currentTarget)]); - return false; - }); - this.$().on('click.notifications','a.unread-private-messages, a.unread-notifications, a[data-notifications]', function(e) { - self.showNotifications(e); - return false; - }); - $(window).bind('scroll.discourse-dock', function() { - self.examineDockHeader(); - }); - $(document).bind('touchmove.discourse-dock', function() { - self.examineDockHeader(); - }); - self.examineDockHeader(); - - // Delegate ESC to the composer - $('body').on('keydown.header', function(e) { - // Hide dropdowns - if (e.which === 27) { - self.$('li').removeClass('active'); - self.$('.d-dropdown').fadeOut('fast'); - } - if (self.get('editingTopic')) { - if (e.which === 13) { - self.finishedEdit(); - } - if (e.which === 27) { - return self.cancelEdit(); - } - } - }); - }.on('didInsertElement') + @on('didInsertElement') + _setup() { + $(window).bind('scroll.discourse-dock', () => this.examineDockHeader()); + $(document).bind('touchmove.discourse-dock', () => this.examineDockHeader()); + this.examineDockHeader(); + } }); + +export function headerHeight() { + const $header = $('header.d-header'); + const headerOffset = $header.offset(); + const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; + return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); +} diff --git a/app/assets/javascripts/discourse/views/invite.js.es6 b/app/assets/javascripts/discourse/views/invite.js.es6 index 0c4a5b67a6..811097ec14 100644 --- a/app/assets/javascripts/discourse/views/invite.js.es6 +++ b/app/assets/javascripts/discourse/views/invite.js.es6 @@ -11,6 +11,14 @@ export default ModalBodyView.extend({ } else { return I18n.t('user.invited.create'); } - }.property('controller.{invitingToTopic,isMessage}') + }.property('controller.{invitingToTopic,isMessage}'), + + inviteLinkChanged: function() { + if (!Ember.isEmpty(this.get('controller.model.inviteLink'))) { + Em.run.next(function() { + $('.invite-link-input').select().focus(); + }); + } + }.observes('controller.model.inviteLink') }); diff --git a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 new file mode 100644 index 0000000000..40faddcde2 --- /dev/null +++ b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 @@ -0,0 +1,4 @@ +export default Ember.Object.extend({ + postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts'), + showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent') +}); diff --git a/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6 index 19bed7d0d2..d602636673 100644 --- a/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6 +++ b/app/assets/javascripts/discourse/views/list/posts-count-column.js.es6 @@ -1,3 +1,5 @@ +import { fmt } from 'discourse/lib/computed'; + export default Ember.Object.extend({ tagName: "td", ratio: function() { @@ -26,6 +28,6 @@ export default Ember.Object.extend({ return ''; }.property(), - likesHeat: Discourse.computed.fmt('ratioText', 'heatmap-%@'), + likesHeat: fmt('ratioText', 'heatmap-%@'), }); diff --git a/app/assets/javascripts/discourse/views/modal-body.js.es6 b/app/assets/javascripts/discourse/views/modal-body.js.es6 index ee621d5e31..f164c8dbbe 100644 --- a/app/assets/javascripts/discourse/views/modal-body.js.es6 +++ b/app/assets/javascripts/discourse/views/modal-body.js.es6 @@ -1,7 +1,10 @@ -export default Discourse.View.extend({ +import { observes, on } from "ember-addons/ember-computed-decorators"; + +export default Ember.View.extend({ focusInput: true, - _setupModal: function() { + @on("didInsertElement") + _setupModal() { $('#modal-alert').hide(); $('#discourse-modal').modal('show'); @@ -14,9 +17,10 @@ export default Discourse.View.extend({ if (title) { this.set('controller.controllers.modal.title', title); } - }.on('didInsertElement'), + }, - flashMessageChanged: function() { + @observes("controller.flashMessage") + flashMessageChanged() { const flashMessage = this.get('controller.flashMessage'); if (flashMessage) { const messageClass = flashMessage.get('messageClass') || 'success'; @@ -25,6 +29,6 @@ export default Discourse.View.extend({ .addClass("alert alert-" + messageClass).html(flashMessage.get('message')) .fadeIn(); } - }.observes('controller.flashMessage') + } }); diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6 index e69cd3c517..07f2bbeb14 100644 --- a/app/assets/javascripts/discourse/views/modal.js.es6 +++ b/app/assets/javascripts/discourse/views/modal.js.es6 @@ -1,3 +1,5 @@ +import { on } from "ember-addons/ember-computed-decorators"; + export default Ember.View.extend({ elementId: 'discourse-modal', templateName: 'modal/modal', @@ -7,17 +9,19 @@ export default Ember.View.extend({ // We handle ESC ourselves 'data-keyboard': 'false', - _bindOnInsert: function() { + @on("didInsertElement") + setUp() { $('html').on('keydown.discourse-modal', e => { if (e.which === 27) { Em.run.next(() => $('.modal-header a.close').click()); } }); - }.on('didInsertElement'), + }, - _bindOnDestroy: function() { + @on("willDestroyElement") + cleanUp() { $('html').off('keydown.discourse-modal'); - }.on('willDestroyElement'), + }, click(e) { const $target = $(e.target); diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6 index 7ab66fc2e0..cceef1e3ce 100644 --- a/app/assets/javascripts/discourse/views/post.js.es6 +++ b/app/assets/javascripts/discourse/views/post.js.es6 @@ -1,17 +1,39 @@ +import ScreenTrack from 'discourse/lib/screen-track'; +import { number } from 'discourse/lib/formatter'; +import DiscourseURL from 'discourse/lib/url'; +import { default as computed, on } from 'ember-addons/ember-computed-decorators'; +import { fmt } from 'discourse/lib/computed'; + const DAY = 60 * 50 * 1000; const PostView = Discourse.GroupedView.extend(Ember.Evented, { classNames: ['topic-post', 'clearfix'], - templateName: 'post', classNameBindings: ['needsModeratorClass:moderator:regular', 'selected', 'post.hidden:post-hidden', 'post.deleted:deleted', 'post.topicOwner:topic-owner', 'groupNameClass', - 'post.wiki:wiki'], + 'post.wiki:wiki', + 'whisper'], post: Ember.computed.alias('content'), + postElementId: fmt('post.post_number', 'post_%@'), + likedUsers: null, + + @on('init') + initLikedUsers() { + this.set('likedUsers', []); + }, + + @computed('post.post_type') + whisper(postType) { + return postType === this.site.get('post_types.whisper'); + }, + + templateName: function() { + return (this.get('post.post_type') === this.site.get('post_types.small_action')) ? 'post-small-action' : 'post'; + }.property('post.post_type'), historyHeat: function() { const updatedAt = this.get('post.updated_at'); @@ -90,21 +112,21 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { // If it's the same topic as ours, build the URL from the topic object if (topic && topic.get('id') === topicId) { - navLink = ""; + navLink = ``; } else { // Made up slug should be replaced with canonical URL - navLink = ""; + navLink = ``; } } else if (topic = this.get('controller.content')) { // assume the same topic - navLink = ""; + navLink = ``; } } // Only add the expand/contract control if it's not a full post let expandContract = ""; if (!$aside.data('full')) { - expandContract = ""; + expandContract = ``; $('.title', $aside).css('cursor', 'pointer'); } $('.quote-controls', $aside).html(expandContract + navLink); @@ -112,20 +134,18 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { _toggleQuote($aside) { if (this.get('expanding')) { return; } + this.set('expanding', true); $aside.data('expanded', !$aside.data('expanded')); - const self = this, - finished = function() { - self.set('expanding', false); - }; + const finished = () => this.set('expanding', false); if ($aside.data('expanded')) { this._updateQuoteElements($aside, 'chevron-up'); // Show expanded quote const $blockQuote = $('blockquote', $aside); - $aside.data('original-contents',$blockQuote.html()); + $aside.data('original-contents', $blockQuote.html()); const originalText = $blockQuote.text().trim(); $blockQuote.html(I18n.t("loading")); @@ -137,7 +157,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { const postId = parseInt($aside.data('post'), 10); topicId = parseInt(topicId, 10); - Discourse.ajax("/posts/by_number/" + topicId + "/" + postId).then(function (result) { + Discourse.ajax(`/posts/by_number/${topicId}/${postId}`).then(result => { const div = $("
      "); div.html(result.cooked); div.highlight(originalText, {caseSensitive: true, element: 'span', className: 'highlighted'}); @@ -174,7 +194,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { // don't display badge counts on category badge & oneboxes (unless when explicitely stated) if ($link.hasClass("track-link") || $link.closest('.badge-category,.onebox-result,.onebox-body').length === 0) { - $link.append("" + Discourse.Formatter.number(lc.clicks) + ""); + $link.append("" + number(lc.clicks) + ""); } } }); @@ -182,6 +202,33 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { }, actions: { + toggleLike() { + const currentUser = this.get('controller.currentUser'); + const post = this.get('post'); + const likeAction = post.get('likeAction'); + if (likeAction && likeAction.get('canToggle')) { + const users = this.get('likedUsers'); + if (likeAction.toggle(post) && users.length) { + users.addObject(currentUser); + } else { + users.removeObject(currentUser); + } + } + }, + + toggleWhoLiked() { + const post = this.get('post'); + const likeAction = post.get('likeAction'); + if (likeAction) { + const users = this.get('likedUsers'); + if (users.length) { + users.clear(); + } else { + likeAction.loadUsers(post).then(newUsers => this.set('likedUsers', newUsers)); + } + } + }, + // Toggle the replies this post is a reply to toggleReplyHistory(post) { const replyHistory = post.get('replyHistory'), @@ -192,7 +239,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { self = this; if (Discourse.Mobile.mobileView) { - Discourse.URL.routeTo(this.get('post.topic').urlForPostNumber(replyPostNumber)); + DiscourseURL.routeTo(this.get('post.topic').urlForPostNumber(replyPostNumber)); return; } @@ -248,8 +295,8 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { // Unless it's a full quote, allow click to expand if (!($aside.data('full') || $title.data('has-quote-controls'))) { - $title.on('click', function(e) { - if ($(e.target).is('a')) return true; + $title.on('click', function(e2) { + if ($(e2.target).is('a')) return true; self._toggleQuote($aside); }); $title.data('has-quote-controls', true); @@ -259,7 +306,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { }, _destroyedPostView: function() { - Discourse.ScreenTrack.current().stopTracking(this.get('elementId')); + ScreenTrack.current().stopTracking(this.get('elementId')); }.on('willDestroyElement'), _postViewInserted: function() { @@ -268,7 +315,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { this._showLinkCounts(); - Discourse.ScreenTrack.current().track($post.prop('id'), postNumber); + ScreenTrack.current().track($post.prop('id'), postNumber); this.trigger('postViewInserted', $post); @@ -278,24 +325,51 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { this._applySearchHighlight(); }.on('didInsertElement'), + _fixImageSizes: function(){ + var maxWidth; + this.$('img:not(.avatar)').each(function(idx,img){ + + // deferring work only for posts with images + // we got to use screen here, cause nothing is rendered yet. + // long term we may want to allow for weird margins that are enforced, instead of hardcoding at 70/20 + maxWidth = maxWidth || $(window).width() - (Discourse.Mobile.mobileView ? 20 : 70); + if (Discourse.SiteSettings.max_image_width < maxWidth) { + maxWidth = Discourse.SiteSettings.max_image_width; + } + + var aspect = img.height / img.width; + if (img.width > maxWidth) { + img.width = maxWidth; + img.height = parseInt(maxWidth * aspect,10); + } + + // very unlikely but lets fix this too + if (img.height > Discourse.SiteSettings.max_image_height) { + img.height = Discourse.SiteSettings.max_image_height; + img.width = parseInt(maxWidth / aspect,10); + } + + }); + }.on('willInsertElement'), + _applySearchHighlight: function() { - const highlight = this.get('controller.searchHighlight'); + const highlight = this.get('searchService.highlightTerm'); const cooked = this.$('.cooked'); - if(!cooked){ return; } + if (!cooked) { return; } - if(highlight && highlight.length > 2){ - if(this._highlighted){ + if (highlight && highlight.length > 2) { + if (this._highlighted) { cooked.unhighlight(); } cooked.highlight(highlight.split(/\s+/)); this._highlighted = true; - } else if(this._highlighted){ + } else if (this._highlighted) { cooked.unhighlight(); this._highlighted = false; } - }.observes('controller.searchHighlight', 'cooked') + }.observes('searchService.highlightTerm', 'cooked') }); export default PostView; diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6 index dad4b4d79e..1d4f7b7606 100644 --- a/app/assets/javascripts/discourse/views/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/views/quote-button.js.es6 @@ -1,4 +1,4 @@ -export default Discourse.View.extend({ +export default Ember.View.extend({ classNames: ['quote-button'], classNameBindings: ['visible'], isMouseDown: false, @@ -50,7 +50,9 @@ export default Discourse.View.extend({ // deselects only when the user left click // (allows anyone to `extend` their selection using shift+click) - if (e.which === 1 && !e.shiftKey) controller.deselectText(); + if (!window.getSelection().isCollapsed && + e.which === 1 && + !e.shiftKey) controller.deselectText(); }) .on('mouseup.quote-button', function(e) { view.selectText(e.target, controller); diff --git a/app/assets/javascripts/discourse/views/reorder-categories.js.es6 b/app/assets/javascripts/discourse/views/reorder-categories.js.es6 new file mode 100644 index 0000000000..570c9ec963 --- /dev/null +++ b/app/assets/javascripts/discourse/views/reorder-categories.js.es6 @@ -0,0 +1,80 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + title: I18n.t('categories.reorder.title'), + templateName: 'modal/reorder-categories', + + _setup: function() { + this.get('controller').on('scrollIntoView', this, this.scrollIntoView); + }.on('didInsertElement'), + _teardown: function() { + this.get('controller').off('scrollIntoView', this, this.scrollIntoView); + this.set('prevScrollElem', null); + }.on('willClearRender'), + + scrollIntoView() { + const elem = this.$('tr[data-category-id="' + this.get('controller.scrollIntoViewId') + '"]'); + const scrollParent = this.$('.modal-body'); + const eoff = elem.position(); + const poff = $(document.getElementById('rc-scroll-anchor')).position(); + const currHeight = scrollParent.height(); + + elem[0].className = "highlighted"; + + const goal = eoff.top - poff.top - currHeight / 2, + current = scrollParent.scrollTop(); + scrollParent.scrollTop(9999999); + const max = scrollParent.scrollTop(); + scrollParent.scrollTop(current); + + const doneTimeout = setTimeout(function() { + elem[0].className = "highlighted done"; + setTimeout(function() { + elem[0].className = ""; + }, 2000); + }, 0); + + if (goal > current - currHeight / 4 && goal < current + currHeight / 4) { + // Too close to goal + return; + } + if (max - current < 10 && goal > current) { + // Too close to bottom + return; + } + if (current < 10 && goal < current) { + // Too close to top + return; + } + + if (!window.requestAnimationFrame) { + scrollParent.scrollTop(goal); + } else { + clearTimeout(doneTimeout); + const startTime = performance.now(); + const duration = 100; + + function doScroll(timestamp) { + let progress = (timestamp - startTime) / duration; + if (progress > 1) { + progress = 1; + setTimeout(function() { + elem[0].className = "highlighted done"; + setTimeout(function() { + elem[0].className = ""; + }, 2000); + }, 0); + } else if (progress < 0) { + progress = 0; + } + if (progress < 1) { + window.requestAnimationFrame(doScroll); + } + + const iprogress = 1 - progress; + scrollParent.scrollTop(goal * progress + current * iprogress); + } + window.requestAnimationFrame(doScroll); + } + } +}); diff --git a/app/assets/javascripts/discourse/views/search-results-type.js.es6 b/app/assets/javascripts/discourse/views/search-results-type.js.es6 deleted file mode 100644 index f90de08c1e..0000000000 --- a/app/assets/javascripts/discourse/views/search-results-type.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -export default Ember.CollectionView.extend({ - tagName: 'ul', - itemViewClass: Discourse.GroupedView.extend({ - tagName: 'li', - classNameBindings: ['selected'], - templateName: Discourse.computed.fmt('parentView.displayType', "search/%@_result") - }), - didInsertElement: function(){ - var term = this.get('controller.term'); - if(!_.isEmpty(term)) { - this.$('.blurb').highlight(term.split(/\s+/), {className: 'search-highlight'}); - this.$('.topic-title').highlight(term.split(/\s+/), {className: 'search-highlight'} ); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/search-text-field.js.es6 b/app/assets/javascripts/discourse/views/search-text-field.js.es6 deleted file mode 100644 index 4db554a7de..0000000000 --- a/app/assets/javascripts/discourse/views/search-text-field.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -/** - This is a text field that supports a dynamic placeholder based on search context. - - @class SearchTextField - @extends Discourse.TextField - @namespace Discourse - @module Discourse -**/ - -import TextField from 'discourse/components/text-field'; - -export default TextField.extend({ - - /** - A dynamic placeholder for the search field based on our context - - @property placeholder - **/ - placeholder: function() { - - if(this.get('searchContextEnabled')){ - return ""; - } - - return I18n.t('search.title'); - }.property('searchContextEnabled') -}); diff --git a/app/assets/javascripts/discourse/views/search.js.es6 b/app/assets/javascripts/discourse/views/search.js.es6 deleted file mode 100644 index 92490c1a7f..0000000000 --- a/app/assets/javascripts/discourse/views/search.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -export default Discourse.View.extend({ - tagName: 'div', - classNames: ['d-dropdown'], - elementId: 'search-dropdown', - templateName: 'search' -}); diff --git a/app/assets/javascripts/discourse/views/selected-posts.js.es6 b/app/assets/javascripts/discourse/views/selected-posts.js.es6 index d173337d75..f54618bab1 100644 --- a/app/assets/javascripts/discourse/views/selected-posts.js.es6 +++ b/app/assets/javascripts/discourse/views/selected-posts.js.es6 @@ -1,4 +1,4 @@ -export default Discourse.View.extend({ +export default Ember.View.extend({ elementId: 'selected-posts', classNameBindings: ['customVisibility'], templateName: "selected-posts", diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index 8d9db1dc57..dc0925d7ae 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -1,4 +1,5 @@ -export default Discourse.View.extend({ + +export default Ember.View.extend({ templateName: 'share', elementId: 'share-link', classNameBindings: ['hasLink'], @@ -14,14 +15,14 @@ export default Discourse.View.extend({ }.property('controller.type', 'controller.postNumber'), hasLink: function() { - if (this.present('controller.link')) return 'visible'; + if (!Ember.isEmpty(this.get('controller.link'))) return 'visible'; return null; }.property('controller.link'), linkChanged: function() { - var self=this; - if (this.present('controller.link')) { - Em.run.next(function(){ + const self = this; + if (!Ember.isEmpty(this.get('controller.link'))) { + Em.run.next(function() { if (!self.capabilities.touch) { var $linkInput = $('#share-link input'); $linkInput.val(self.get('controller.link')); @@ -34,6 +35,9 @@ export default Discourse.View.extend({ var $linkForTouch = $('#share-link .share-for-touch a'); $linkForTouch.attr('href',self.get('controller.link')); $linkForTouch.html(self.get('controller.link')); + var range = window.document.createRange(); + range.selectNode($linkForTouch[0]); + window.getSelection().addRange(range); } }); } diff --git a/app/assets/javascripts/discourse/views/split-topic.js.es6 b/app/assets/javascripts/discourse/views/split-topic.js.es6 index 5ee0d76554..9291495adc 100644 --- a/app/assets/javascripts/discourse/views/split-topic.js.es6 +++ b/app/assets/javascripts/discourse/views/split-topic.js.es6 @@ -2,6 +2,6 @@ import SelectedPostsCount from 'discourse/mixins/selected-posts-count'; import ModalBodyView from "discourse/views/modal-body"; export default ModalBodyView.extend(SelectedPostsCount, { - templateName: 'modal/split_topic', + templateName: 'modal/split-topic', title: I18n.t('topic.split_topic.title') }); diff --git a/app/assets/javascripts/discourse/views/static.js.es6 b/app/assets/javascripts/discourse/views/static.js.es6 index 12dbfdf603..35ce3d6749 100644 --- a/app/assets/javascripts/discourse/views/static.js.es6 +++ b/app/assets/javascripts/discourse/views/static.js.es6 @@ -1,24 +1,28 @@ import isElementInViewport from "discourse/lib/is-element-in-viewport"; import ScrollTop from 'discourse/mixins/scroll-top'; - -var readFaq = false; +import { on } from 'ember-addons/ember-computed-decorators'; export default Ember.View.extend(ScrollTop, { - _checkRead: function() { - const path = this.get('controller.model.path'); - if (path === "faq" || path === "guidelines") { - const controller = this.get('controller'); - $(window).on('load.faq resize.faq scroll.faq', function() { - if (!readFaq && isElementInViewport($(".contents p").last())) { - readFaq = true; - controller.send('markFaqRead'); - } - }); + @on('didInsertElement') + _checkRead() { + const currentUser = this.get('controller.currentUser'); + if (currentUser) { + const path = this.get('controller.model.path'); + if (path === "faq" || path === "guidelines") { + const controller = this.get('controller'); + $(window).on('load.faq resize.faq scroll.faq', function() { + const faqUnread = !currentUser.get('read_faq'); + if (faqUnread && isElementInViewport($(".contents p").last())) { + controller.send('markFaqRead'); + } + }); + } } - }.on('didInsertElement'), + }, - _stopChecking: function(){ + @on('willDestroyElement') + _stopChecking() { $(window).off('load.faq resize.faq scroll.faq'); - }.on('willDestroyElement') + } }); diff --git a/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 deleted file mode 100644 index cdd00b78dc..0000000000 --- a/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import ButtonView from "discourse/views/button"; - -export default ButtonView.extend({ - classNameBindings: [":no-text"], - helpKey: "topic_admin_menu", - - renderIcon: function(buffer) { - buffer.push(""); - }, - - click: function() { - var offset = this.$().offset(); - var location = { - position: "absolute", - left: offset.left, - top: offset.top, - }; - this.get("controller").appEvents.trigger("topic-admin-menu:open", location); - return this.get("controller").send("showTopicAdminMenu"); - } -}); diff --git a/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 deleted file mode 100644 index d19b33d970..0000000000 --- a/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 +++ /dev/null @@ -1,52 +0,0 @@ -/** - This view is used for rendering the topic admin menu - - @class TopicAdminMenuView - @extends Discourse.View - @namespace Discourse - @module Discourse -**/ -export default Discourse.View.extend({ - classNameBindings: ["controller.menuVisible::hidden", ":topic-admin-menu"], - - _setup: function() { - var self = this; - - this.appEvents.on("topic-admin-menu:open", this, "_changeLocation"); - - $("html").on("mouseup.discourse-topic-admin-menu", function(e) { - var $target = $(e.target); - if ($target.is("button") || self.$().has($target).length === 0) { - self.get("controller").send("hide"); - } - }); - }.on("didInsertElement"), - - _changeLocation: function(location) { - var $this = this.$(); - switch (location.position) { - case "absolute": { - $this.css({ - position: "absolute", - top: location.top - $this.innerHeight() + 5, - left: location.left, - }); - break; - } - case "fixed": { - $this.css({ - position: "fixed", - top: location.top, - left: location.left - $this.innerWidth(), - }); - break; - } - } - }, - - _cleanup: function() { - $("html").off("mouseup.discourse-topic-admin-menu"); - this.appEvents.off("topic-admin-menu:open"); - }.on("willDestroyElement"), - -}); diff --git a/app/assets/javascripts/discourse/views/topic-closing.js.es6 b/app/assets/javascripts/discourse/views/topic-closing.js.es6 index c5f22d503a..52c97c9dbb 100644 --- a/app/assets/javascripts/discourse/views/topic-closing.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-closing.js.es6 @@ -1,6 +1,6 @@ import StringBuffer from 'discourse/mixins/string-buffer'; -export default Discourse.View.extend(StringBuffer, { +export default Ember.View.extend(StringBuffer, { elementId: 'topic-closing-info', delayedRerender: null, @@ -10,7 +10,7 @@ export default Discourse.View.extend(StringBuffer, { 'topic.details.auto_close_hours'], renderString: function(buffer) { - if (!this.present('topic.details.auto_close_at')) return; + if (!!Ember.isEmpty(this.get('topic.details.auto_close_at'))) return; if (this.get("topic.closed")) return; var autoCloseAt = moment(this.get('topic.details.auto_close_at')); diff --git a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 index 1598eb1ae9..5fba8abcdb 100644 --- a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 @@ -1,52 +1,24 @@ -import TopicAdminMenuButton from 'discourse/views/topic-admin-menu-button'; -import LoginReplyButton from 'discourse/views/login-reply-button'; -import FlagTopicButton from 'discourse/views/flag-topic-button'; -import BookmarkButton from 'discourse/views/bookmark-button'; -import ShareButton from 'discourse/views/share-button'; -import InviteReplyButton from 'discourse/views/invite-reply-button'; -import ReplyButton from 'discourse/views/reply-button'; -import PinnedButton from 'discourse/components/pinned-button'; -import TopicNotificationsButton from 'discourse/components/topic-notifications-button'; -import DiscourseContainerView from 'discourse/views/container'; +import ContainerView from 'discourse/views/container'; +import { on } from 'ember-addons/ember-computed-decorators'; -export default DiscourseContainerView.extend({ +export default ContainerView.extend({ elementId: 'topic-footer-buttons', - topicBinding: 'controller.content', - init() { - this._super(); - this.createButtons(); - }, - - // Add the buttons below a topic + @on('init') createButtons() { const topic = this.get('topic'); - if (Discourse.User.current()) { - const viewArgs = {topic}; - if (Discourse.User.currentProp("staff")) { - this.attachViewClass(TopicAdminMenuButton); - } - if (!topic.get('isPrivateMessage')) { - // We hide some controls from private messages - if (this.get('topic.details.can_invite_to')) { - this.attachViewClass(InviteReplyButton); - } - this.attachViewClass(BookmarkButton); - this.attachViewClass(ShareButton); - if (this.get('topic.details.can_flag_topic')) { - this.attachViewClass(FlagTopicButton); - } - } - if (this.get('topic.details.can_create_post')) { - this.attachViewClass(ReplyButton); - } - this.attachViewWithArgs(viewArgs, PinnedButton); - this.attachViewWithArgs(viewArgs, TopicNotificationsButton); + const currentUser = this.get('controller.currentUser'); + + if (currentUser) { + const viewArgs = { topic, currentUser }; + this.attachViewWithArgs(viewArgs, 'topic-footer-main-buttons'); + this.attachViewWithArgs(viewArgs, 'pinned-button'); + this.attachViewWithArgs(viewArgs, 'topic-notifications-button'); this.trigger('additionalButtons', this); } else { // If not logged in give them a login control - this.attachViewClass(LoginReplyButton); + this.attachViewClass('login-reply-button'); } } }); diff --git a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 new file mode 100644 index 0000000000..8ee4409353 --- /dev/null +++ b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 @@ -0,0 +1,30 @@ +import ContainerView from 'discourse/views/container'; +import { on } from 'ember-addons/ember-computed-decorators'; + +export default ContainerView.extend({ + elementId: 'topic-footer-main-buttons', + + @on('init') + createButtons() { + if (this.currentUser.get('staff')) { + const viewArgs = {action: 'showTopicAdminMenu', title: 'topic_admin_menu', icon: 'wrench', position: 'absolute'}; + this.attachViewWithArgs(viewArgs, 'show-popup-button'); + } + + const topic = this.get('topic'); + if (!topic.get('isPrivateMessage')) { + // We hide some controls from private messages + if (this.get('topic.details.can_invite_to')) { + this.attachViewClass('invite-reply-button'); + } + this.attachViewClass('bookmark-button'); + this.attachViewClass('share-button'); + if (this.get('topic.details.can_flag_topic')) { + this.attachViewClass('flag-topic-button'); + } + } + if (this.get('topic.details.can_create_post')) { + this.attachViewClass('reply-button'); + } + } +}); diff --git a/app/assets/javascripts/discourse/views/topic-list-item.js.es6 b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 index d1d0ca7e6d..cf550a204a 100644 --- a/app/assets/javascripts/discourse/views/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 @@ -1,6 +1,6 @@ import StringBuffer from 'discourse/mixins/string-buffer'; -export default Discourse.View.extend(StringBuffer, { +export default Ember.View.extend(StringBuffer, { topic: Em.computed.alias("content"), rerenderTriggers: ['controller.bulkSelectEnabled', 'topic.pinned'], tagName: 'tr', diff --git a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 b/app/assets/javascripts/discourse/views/topic-map-container.js.es6 index b12cdd45e3..e13a1ae410 100644 --- a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-map-container.js.es6 @@ -1,57 +1,46 @@ -import PrivateMessageMapComponent from 'discourse/components/private-message-map'; -import TopicMapComponent from 'discourse/components/topic-map'; -import ToggleSummaryComponent from 'discourse/components/toggle-summary'; -import ToggleDeletedComponent from 'discourse/components/toggle-deleted'; -import DiscourseContainerView from 'discourse/views/container'; +import ContainerView from 'discourse/views/container'; +import { default as property, observes, on } from 'ember-addons/ember-computed-decorators'; -export default DiscourseContainerView.extend({ +export default ContainerView.extend({ classNameBindings: ['hidden', ':topic-map'], - _postsChanged: function() { + @observes('topic.posts_count') + _postsChanged() { Ember.run.once(this, 'rerender'); - }.observes('topic.posts_count'), + }, - hidden: function() { + @property + hidden() { if (!this.get('post.firstPost')) return true; - var topic = this.get('topic'); + const topic = this.get('topic'); if (topic.get('archetype') === 'private_message') return false; if (topic.get('archetype') !== 'regular') return true; return topic.get('posts_count') < 2; - }.property(), + }, - init: function() { - this._super(); + @on('init') + startAppending() { if (this.get('hidden')) return; - this.attachViewWithArgs({ topic: this.get('topic') }, TopicMapComponent); + this.attachViewWithArgs({ topic: this.get('topic') }, 'topic-map'); this.trigger('appendMapInformation', this); }, - appendMapInformation: function(container) { - var topic = this.get('topic'); + appendMapInformation(view) { + const topic = this.get('topic'); - // If we have a summary capability if (topic.get('has_summary')) { - container.attachViewWithArgs({ - topic: topic, - filterBinding: 'controller.filter' - }, ToggleSummaryComponent); + view.attachViewWithArgs({ topic, filterBinding: 'controller.filter' }, 'toggle-summary'); } - if (Discourse.User.currentProp('staff')) { - // If we have deleted post filtering - if (topic.get('has_deleted')) { - container.attachViewWithArgs({ - topic: topic, - filterBinding: 'controller.filter' - }, ToggleDeletedComponent); - } + const currentUser = this.get('controller.currentUser'); + if (currentUser && currentUser.get('staff') && topic.get('has_deleted')) { + view.attachViewWithArgs({ topic, filterBinding: 'controller.filter' }, 'topic-deleted'); } - // If we have a private message if (this.get('topic.isPrivateMessage')) { - container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showInvite' }, PrivateMessageMapComponent); + view.attachViewWithArgs({ topic, showPrivateInviteAction: 'showInvite' }, 'private-message-map'); } } }); diff --git a/app/assets/javascripts/discourse/views/topic-status.js.es6 b/app/assets/javascripts/discourse/views/topic-status.js.es6 index c47026e3c4..17e370bc6e 100644 --- a/app/assets/javascripts/discourse/views/topic-status.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-status.js.es6 @@ -26,11 +26,11 @@ export default Ember.Object.extend({ results.push({extraClasses: extraClasses, icon: 'bookmark', key: 'bookmarked', href: url}); } - if(topic.get('closed')){ + if (topic.get('closed') && topic.get('archived')) { + results.push({icon: 'lock', key: 'locked_and_archived'}); + } else if(topic.get('closed')){ results.push({icon: 'lock', key: 'locked'}); - } - - if(topic.get('archived')){ + } else if(topic.get('archived')){ results.push({icon: 'lock', key: 'archived'}); } diff --git a/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 b/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 new file mode 100644 index 0000000000..46ac72e0f0 --- /dev/null +++ b/app/assets/javascripts/discourse/views/topic-unsubscribe.js.es6 @@ -0,0 +1,3 @@ +export default Ember.View.extend({ + classNames: ["topic-unsubscribe"] +}); diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 206133422f..8a18282362 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -3,8 +3,9 @@ import AddArchetypeClass from 'discourse/mixins/add-archetype-class'; import ClickTrack from 'discourse/lib/click-track'; import { listenForViewEvent } from 'discourse/lib/app-events'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; +import Scrolling from 'discourse/mixins/scrolling'; -const TopicView = Discourse.View.extend(AddCategoryClass, AddArchetypeClass, Discourse.Scrolling, { +const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolling, { templateName: 'topic', topicBinding: 'controller.model', @@ -120,10 +121,6 @@ const TopicView = Discourse.View.extend(AddCategoryClass, AddArchetypeClass, Dis this.appEvents.trigger('topic:scrolled', offset); }, - topicTrackingState: function() { - return Discourse.TopicTrackingState.current(); - }.property(), - browseMoreMessage: function() { var opts = { latestLink: "" + I18n.t("topic.view_latest_topics") + "" }, category = this.get('controller.content.category'); diff --git a/app/assets/javascripts/discourse/views/upload-customization.js.es6 b/app/assets/javascripts/discourse/views/upload-customization.js.es6 new file mode 100644 index 0000000000..c6e336157c --- /dev/null +++ b/app/assets/javascripts/discourse/views/upload-customization.js.es6 @@ -0,0 +1,6 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + templateName: 'modal/upload-customization', + title: I18n.t('admin.customize.import_title') +}); diff --git a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 new file mode 100644 index 0000000000..86fbaefd8f --- /dev/null +++ b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 @@ -0,0 +1,27 @@ +import LoadMore from "discourse/mixins/load-more"; + +export default Ember.View.extend(LoadMore, { + loading: false, + eyelineSelector: '.user-stream .item', + classNames: ['user-stream'], + + _scrollTopOnModelChange: function() { + Em.run.schedule('afterRender', function() { + $(document).scrollTop(0); + }); + }.observes('controller.model.user.id'), + + actions: { + loadMore() { + const self = this; + if (this.get('loading')) { return; } + + this.set('loading', true); + const stream = this.get('controller.model'); + stream.findItems().then(function() { + self.set('loading', false); + self.get('eyeline').flushRest(); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index bdc35d5438..6e1b42d22b 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -1,15 +1,15 @@ +import { setting } from 'discourse/lib/computed'; import CleansUp from 'discourse/mixins/cleans-up'; - import afterTransition from 'discourse/lib/after-transition'; const clickOutsideEventName = "mousedown.outside-user-card", clickDataExpand = "click.discourse-user-card", clickMention = "click.discourse-user-mention"; -export default Discourse.View.extend(CleansUp, { +export default Ember.View.extend(CleansUp, { elementId: 'user-card', classNameBindings: ['controller.visible:show', 'controller.showBadges', 'controller.hasCardBadgeImage'], - allowBackgrounds: Discourse.computed.setting('allow_profile_backgrounds'), + allowBackgrounds: setting('allow_profile_backgrounds'), addBackground: function() { const url = this.get('controller.user.card_background'); @@ -84,18 +84,31 @@ export default Discourse.View.extend(CleansUp, { }, _willShow(target) { + const rtl = ($('html').css('direction')) === 'rtl'; if (!target) { return; } const width = this.$().width(); + Ember.run.schedule('afterRender', () => { if (target) { let position = target.offset(); if (position) { - position.left += target.width() + 10; - const overage = ($(window).width() - 50) - (position.left + width); - if (overage < 0) { - position.left += overage; - position.top += target.height() + 48; + if (rtl) { // The site direction is rtl + position.right = $(window).width() - position.left + 10; + position.left = 'auto'; + let overage = ($(window).width() - 50) - (position.right + width); + if (overage < 0) { + position.right += overage; + position.top += target.height() + 48; + } + } else { // The site direction is ltr + position.left += target.width() + 10; + + let overage = ($(window).width() - 50) - (position.left + width); + if (overage < 0) { + position.left += overage; + position.top += target.height() + 48; + } } position.top -= $('#main-outlet').offset().top; diff --git a/app/assets/javascripts/discourse/views/user-invited.js.es6 b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 similarity index 58% rename from app/assets/javascripts/discourse/views/user-invited.js.es6 rename to app/assets/javascripts/discourse/views/user-invited-show.js.es6 index a94430b7ce..25ae5e30d6 100644 --- a/app/assets/javascripts/discourse/views/user-invited.js.es6 +++ b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 @@ -2,6 +2,6 @@ import LoadMore from "discourse/mixins/load-more"; export default Ember.View.extend(LoadMore, { classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list .invite-list tr', - templateName: 'user/invited' + eyelineSelector: '.paginated-topics-list .user-invite-list tr', + templateName: 'user-invited-show' }); diff --git a/app/assets/javascripts/discourse/views/user-stream.js.es6 b/app/assets/javascripts/discourse/views/user-stream.js.es6 index 367c089ed0..86fbaefd8f 100644 --- a/app/assets/javascripts/discourse/views/user-stream.js.es6 +++ b/app/assets/javascripts/discourse/views/user-stream.js.es6 @@ -12,12 +12,12 @@ export default Ember.View.extend(LoadMore, { }.observes('controller.model.user.id'), actions: { - loadMore: function() { - var self = this; + loadMore() { + const self = this; if (this.get('loading')) { return; } this.set('loading', true); - var stream = this.get('controller.model'); + const stream = this.get('controller.model'); stream.findItems().then(function() { self.set('loading', false); self.get('eyeline').flushRest(); diff --git a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 index 3f21ea2459..b60d907613 100644 --- a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 +++ b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 @@ -1,6 +1,6 @@ import LoadMore from "discourse/mixins/load-more"; -export default Discourse.View.extend(LoadMore, { +export default Ember.View.extend(LoadMore, { classNames: ['paginated-topics-list'], eyelineSelector: '.paginated-topics-list .topic-list tr', }); diff --git a/app/assets/javascripts/discourse/views/users.js.es6 b/app/assets/javascripts/discourse/views/users.js.es6 index 9fdb9eb2d8..1af01b7481 100644 --- a/app/assets/javascripts/discourse/views/users.js.es6 +++ b/app/assets/javascripts/discourse/views/users.js.es6 @@ -1,5 +1,5 @@ import LoadMore from 'discourse/mixins/load-more'; -export default Discourse.View.extend(LoadMore, { +export default Ember.View.extend(LoadMore, { eyelineSelector: '.directory tbody tr' }); diff --git a/app/assets/javascripts/discourse/views/view.js.es6 b/app/assets/javascripts/discourse/views/view.js.es6 deleted file mode 100644 index 03f49906f8..0000000000 --- a/app/assets/javascripts/discourse/views/view.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import Presence from 'discourse/mixins/presence'; - -export default Ember.View.extend(Presence); diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js.es6 new file mode 100644 index 0000000000..615b6cc1e6 --- /dev/null +++ b/app/assets/javascripts/ember-addons/decorator-alias.js.es6 @@ -0,0 +1,22 @@ +import extractValue from './utils/extract-value'; + +export default function decoratorAlias(fn, errorMessage) { + return function(...params) { + // determine if user called as @computed('blah', 'blah') or @computed + if (params.length === 0) { + throw new Error(errorMessage); + } else { + return function(target, key, desc) { + return { + enumerable: desc.enumerable, + configurable: desc.configurable, + writable: desc.writable, + initializer: function() { + var value = extractValue(desc); + return fn.apply(null, params.concat(value)); + } + }; + }; + } + }; +} diff --git a/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6 b/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6 new file mode 100644 index 0000000000..e8d3b7ba88 --- /dev/null +++ b/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6 @@ -0,0 +1,63 @@ +import handleDescriptor from './utils/handle-descriptor'; +import isDescriptor from './utils/is-descriptor'; +import extractValue from './utils/extract-value'; + +export default function computedDecorator(...params) { + // determine if user called as @computed('blah', 'blah') or @computed + if (isDescriptor(params[params.length - 1])) { + return handleDescriptor(...arguments); + } else { + return function(/* target, key, desc */) { + return handleDescriptor(...arguments, params); + }; + } +} + +export function readOnly(target, name, desc) { + return { + writable: false, + enumerable: desc.enumerable, + configurable: desc.configurable, + initializer: function() { + var value = extractValue(desc); + return value.readOnly(); + } + }; +} + +import decoratorAlias from './decorator-alias'; + +export var on = decoratorAlias(Ember.on, 'Can not `on` without event names'); +export var observes = decoratorAlias(Ember.observer, 'Can not `observe` without property names'); + +import macroAlias from './macro-alias'; + +export var alias = macroAlias(Ember.computed.alias); +export var and = macroAlias(Ember.computed.and); +export var bool = macroAlias(Ember.computed.bool); +export var collect = macroAlias(Ember.computed.collect); +export var empty = macroAlias(Ember.computed.empty); +export var equal = macroAlias(Ember.computed.equal); +export var filter = macroAlias(Ember.computed.filter); +export var filterBy = macroAlias(Ember.computed.filterBy); +export var gt = macroAlias(Ember.computed.gt); +export var gte = macroAlias(Ember.computed.gte); +export var lt = macroAlias(Ember.computed.lt); +export var lte = macroAlias(Ember.computed.lte); +export var map = macroAlias(Ember.computed.map); +export var mapBy = macroAlias(Ember.computed.mapBy); +export var match = macroAlias(Ember.computed.match); +export var max = macroAlias(Ember.computed.max); +export var min = macroAlias(Ember.computed.min); +export var none = macroAlias(Ember.computed.none); +export var not = macroAlias(Ember.computed.not); +export var notEmpty = macroAlias(Ember.computed.notEmpty); +export var oneWay = macroAlias(Ember.computed.oneWay); +export var or = macroAlias(Ember.computed.or); +export var readOnly = macroAlias(Ember.computed.readOnly); +export var reads = macroAlias(Ember.computed.reads); +export var setDiff = macroAlias(Ember.computed.setDiff); +export var sort = macroAlias(Ember.computed.sort); +export var sum = macroAlias(Ember.computed.sum); +export var union = macroAlias(Ember.computed.union); +export var uniq = macroAlias(Ember.computed.uniq); diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js.es6 new file mode 100644 index 0000000000..640e703ca0 --- /dev/null +++ b/app/assets/javascripts/ember-addons/macro-alias.js.es6 @@ -0,0 +1,24 @@ +import isDescriptor from './utils/is-descriptor'; + +function handleDescriptor(target, property, desc, fn, params = []) { + return { + enumerable: desc.enumerable, + configurable: desc.configurable, + writable: desc.writable, + initializer: function() { + return fn(...params); + } + }; +} + +export default function macroAlias(fn) { + return function(...params) { + if (isDescriptor(params[params.length - 1])) { + return handleDescriptor(...params, fn); + } else { + return function(target, property, desc) { + return handleDescriptor(target, property, desc, fn, params); + }; + } + }; +} diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 new file mode 100644 index 0000000000..da83b54b37 --- /dev/null +++ b/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 @@ -0,0 +1,4 @@ +export default function extractValue(desc) { + return desc.value || + (typeof desc.initializer === 'function' && desc.initializer()); +} diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 new file mode 100644 index 0000000000..fee32cac71 --- /dev/null +++ b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 @@ -0,0 +1,67 @@ +import Ember from 'ember'; +import extractValue from './extract-value'; + +const { computed, get } = Ember; + +export default function handleDescriptor(target, key, desc, params = []) { + return { + enumerable: desc.enumerable, + configurable: desc.configurable, + writeable: desc.writeable, + initializer: function() { + let computedDescriptor; + + if (desc.writable) { + var val = extractValue(desc); + if (typeof val === 'object') { + let value = { }; + if (val.get) { value.get = callUserSuppliedGet(params, val.get); } + if (val.set) { value.set = callUserSuppliedSet(params, val.set); } + computedDescriptor = value; + } else { + computedDescriptor = callUserSuppliedGet(params, val); + } + } else { + throw new Error('ember-computed-decorators does not support using getters and setters'); + } + + return computed.apply(null, params.concat(computedDescriptor)); + } + }; +} + +function niceAttr(attr) { + const parts = attr.split('.'); + let i; + + for (i = 0; i < parts.length; i++) { + if (parts[i] === '@each' || + parts[i] === '[]' || + parts[i].indexOf('{') !== -1) { + break; + } + } + + return parts.slice(0, i).join('.'); +} + +function callUserSuppliedGet(params, func) { + params = params.map(niceAttr); + return function() { + let paramValues = params.map(p => get(this, p)); + + return func.apply(this, paramValues); + }; +} + + +function callUserSuppliedSet(params, func) { + params = params.map(niceAttr); + return function(key, value) { + let paramValues = params.map(p => get(this, p)); + paramValues.unshift(value); + + return func.apply(this, paramValues); + }; +} + diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 new file mode 100644 index 0000000000..f956952ab2 --- /dev/null +++ b/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 @@ -0,0 +1,7 @@ +export default function isDescriptor(item) { + return item && + typeof item === 'object' && + 'writable' in item && + 'enumerable' in item && + 'configurable' in item; +} diff --git a/app/assets/javascripts/ember_include.js.erb b/app/assets/javascripts/ember_include.js.erb index a5842eb6a7..72857343a4 100644 --- a/app/assets/javascripts/ember_include.js.erb +++ b/app/assets/javascripts/ember_include.js.erb @@ -1,7 +1,7 @@ <% if Rails.env.development? || Rails.env.test? require_asset ("ember-template-compiler.js") - require_asset ("ember.custom.debug.js") + require_asset ("ember.debug.js") else require_asset ("ember-template-compiler.js") require_asset ("ember.prod.js") diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js index 61ebac3941..c88b055160 100644 --- a/app/assets/javascripts/locales/i18n.js +++ b/app/assets/javascripts/locales/i18n.js @@ -52,6 +52,8 @@ I18n.PLACEHOLDER = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm; I18n.fallbackRules = {}; +I18n.noFallbacks = false; + I18n.pluralizationRules = { en: function(n) { return n === 0 ? ["zero", "none", "other"] : n === 1 ? "one" : "other"; @@ -192,6 +194,15 @@ I18n.interpolate = function(message, options) { I18n.translate = function(scope, options) { options = this.prepareOptions(options); var translation = this.lookup(scope, options); + // Fallback to the default locale + if (!translation && this.currentLocale() !== this.defaultLocale && !this.noFallbacks) { + options.locale = this.defaultLocale; + translation = this.lookup(scope, options); + } + if (!translation && this.currentLocale() !== 'en' && !this.noFallbacks) { + options.locale = 'en'; + translation = this.lookup(scope, options); + } try { if (typeof translation === "object") { @@ -513,6 +524,7 @@ I18n.enable_verbose_localization = function(){ var keys = {}; var t = I18n.t; + I18n.noFallbacks = true; I18n.t = I18n.translate = function(scope, value){ var current = keys[scope]; diff --git a/app/assets/javascripts/locales/ja.js.erb b/app/assets/javascripts/locales/ja.js.erb index 2bb653952a..b258ba577d 100644 --- a/app/assets/javascripts/locales/ja.js.erb +++ b/app/assets/javascripts/locales/ja.js.erb @@ -1,3 +1,7 @@ //= depend_on 'client.ja.yml' //= require locales/i18n <%= JsLocaleHelper.output_locale(:ja) %> + +I18n.pluralizationRules['ja'] = function (n) { + return n === 0 ? ["zero", "none", "other"] : "other"; +}; diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 742ccbbf8e..757f7308ec 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -5,53 +5,77 @@ //= require ./pagedown_custom.js // Stuff we need to load first +//= require_tree ./ember-addons/utils +//= require ./ember-addons/decorator-alias +//= require ./ember-addons/macro-alias +//= require ./ember-addons/ember-computed-decorators +//= require ./discourse/lib/hash +//= require ./discourse/lib/stale-result //= require ./discourse/lib/load-script //= require ./discourse/lib/notification-levels //= require ./discourse/lib/app-events +//= require ./discourse/lib/url +//= require ./discourse/lib/debounce +//= require ./discourse/lib/quote +//= require ./discourse/lib/key-value-store //= require ./discourse/helpers/i18n //= require ./discourse/helpers/fa-icon +//= require ./discourse/helpers/register-unbound //= require ./discourse/lib/ember_compat_handlebars //= require ./discourse/lib/computed +//= require ./discourse/lib/formatter +//= require ./discourse/lib/eyeline //= require ./discourse/helpers/register-unbound //= require ./discourse/mixins/scrolling +//= require ./discourse/models/rest +//= require ./discourse/models/badge-grouping +//= require ./discourse/models/badge +//= require ./discourse/models/category //= require_tree ./discourse/mixins //= require ./discourse/lib/ajax-error //= require ./discourse/lib/markdown -//= require ./discourse/lib/search-for-term +//= require ./discourse/lib/search //= require ./discourse/lib/user-search //= require ./discourse/lib/export-csv //= require ./discourse/lib/autocomplete //= require ./discourse/lib/after-transition //= require ./discourse/lib/debounce -//= require ./discourse/lib/avatar-template //= require ./discourse/lib/safari-hacks //= require_tree ./discourse/adapters //= require ./discourse/models/rest //= require ./discourse/models/model +//= require ./discourse/models/result-set +//= require ./discourse/models/store +//= require ./discourse/models/post-action-type +//= require ./discourse/models/action-summary //= require ./discourse/models/post //= require ./discourse/models/post-stream //= require ./discourse/models/topic-details //= require ./discourse/models/topic -//= require ./discourse/models/user_action +//= require ./discourse/models/user-action +//= require ./discourse/models/draft //= require ./discourse/models/composer -//= require ./discourse/controllers/controller +//= require ./discourse/models/invite +//= require ./discourse/models/user-badge //= require ./discourse/controllers/discovery-sortable -//= require ./discourse/controllers/object //= require ./discourse/controllers/navigation/default -//= require ./discourse/views/view //= require ./discourse/views/grouped //= require ./discourse/views/container //= require ./discourse/views/modal-body //= require ./discourse/views/flag //= require ./discourse/views/cloaked //= require ./discourse/components/combo-box +//= require ./discourse/components/edit-category-panel //= require ./discourse/views/button +//= require ./discourse/components/search-result //= require ./discourse/components/dropdown-button //= require ./discourse/components/notifications-button //= require ./discourse/components/topic-notifications-button //= require ./discourse/lib/link-mentions +//= require ./discourse/views/header //= require ./discourse/views/composer //= require ./discourse/lib/show-modal +//= require ./discourse/lib/screen-track //= require ./discourse/routes/discourse //= require ./discourse/routes/build-topic-route //= require ./discourse/routes/restricted-user @@ -68,17 +92,17 @@ //= require ./discourse/lib/export-result //= require ./discourse/dialects/dialect //= require ./discourse/lib/emoji/emoji -//= require ./discourse/lib/sharing -//= require discourse/lib/desktop-notifications +//= require_tree ./discourse/lib //= require ./discourse/router //= require_tree ./discourse/dialects //= require_tree ./discourse/controllers -//= require_tree ./discourse/lib //= require_tree ./discourse/models //= require_tree ./discourse/components //= require_tree ./discourse/views //= require_tree ./discourse/helpers //= require_tree ./discourse/templates //= require_tree ./discourse/routes +//= require_tree ./discourse/pre-initializers //= require_tree ./discourse/initializers +//= require_tree ./discourse/services diff --git a/app/assets/javascripts/preload_store.js b/app/assets/javascripts/preload_store.js index b4b0e8b0de..4911d4e54a 100644 --- a/app/assets/javascripts/preload_store.js +++ b/app/assets/javascripts/preload_store.js @@ -42,7 +42,7 @@ window.PreloadStore = { var result = finder(); // If the finder returns a promise, we support that too - if (result.then) { + if (result && result.then) { result.then(function(result) { return resolve(result); }, function(result) { diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js index 16aa64e59d..1a52785b5f 100644 --- a/app/assets/javascripts/vendor.js +++ b/app/assets/javascripts/vendor.js @@ -1,6 +1,6 @@ //= require logster //= require ./env -//= require ./discourse/lib/probes.js +//= require probes.js //= require handlebars.js //= require jquery_include.js @@ -19,6 +19,8 @@ //= require bootstrap-modal.js //= require bootstrap-transition.js //= require select2.js +//= require div_resizer +//= require caret_position //= require favcount.js //= require jquery.ba-resize.min.js //= require jquery.color.js diff --git a/app/assets/stylesheets/admin.css b/app/assets/stylesheets/admin.css deleted file mode 100644 index 0bd2f7e77e..0000000000 --- a/app/assets/stylesheets/admin.css +++ /dev/null @@ -1,3 +0,0 @@ -// Manifest -// -//= require_tree ./common/admin diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss new file mode 100644 index 0000000000..498dae55e2 --- /dev/null +++ b/app/assets/stylesheets/admin.scss @@ -0,0 +1 @@ +@import "common/admin/admin_base"; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 3ffc2babd9..771ff63a37 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,11 +1,13 @@ @import "vendor/normalize"; +@import "vendor/font_awesome/font-awesome"; @import "common/foundation/helpers"; @import "common/foundation/base"; -@import "vendor/font_awesome/font-awesome"; @import "vendor/select2"; @import "common/foundation/mixins"; @import "common/foundation/variables"; @import "common/components/*"; @import "common/input_tip"; @import "common/topic-entrance"; +@import "common/printer-friendly"; @import "common/base/*"; +@import "vendor/pikaday"; diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 6659f61a7f..6007fd8305 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -3,12 +3,36 @@ @import "common/foundation/mixins"; @import "common/foundation/helpers"; +$mobile-breakpoint: 700px; + +// Change the box model for .admin-content +@media (max-width: $mobile-breakpoint) { + .admin-content { + box-sizing: border-box; + *, *:before, *:after { + box-sizing: inherit; + } + + input[type="text"] { + // Desktop/_discourse.scss sets a height on text-input elements. Using `box-sizing: border-box` + // this value either needs to be increased or set to auto. `mobile.css` seems to not set a height on text-inputs. + height: auto; + } + } +} + +.admin-contents { + position: relative; + margin-left: -10px; + margin-right: -10px; +} + .admin-contents table { width: 100%; tr {text-align: left;} td, th {padding: 8px;} - th {border-top: 1px solid scale-color-diff();} - td {border-bottom: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();} + th {border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);} + td {border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);} tr:hover { background-color: darken($secondary, 2.5%); } tr.selected { background-color: lighten($primary, 80%); } .filters input { margin-bottom: 0; } @@ -23,7 +47,7 @@ td.flaggers td { font-size: 0.857em; float: right; margin-right: 10px; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); padding: 2px 5px; border-radius: 5px; color: $primary; @@ -32,7 +56,7 @@ td.flaggers td { .admin-content { margin-bottom: 50px; .admin-contents { - padding: 8px; + padding: 8px 0; @include clearfix(); } @@ -96,21 +120,25 @@ td.flaggers td { margin-top: 20px; } +.admin-container .controls { + @include clearfix; +} + .admin-title { height: 45px; } .admin-controls { - background-color: dark-light-diff($primary, $secondary, 90%, -75%); + background-color: dark-light-diff($primary, $secondary, 90%, -65%); padding: 10px 10px 3px 0; - height: 35px; + @include clearfix; .nav.nav-pills { li.active { a { - border-color: scale-color-diff(); - background-color: lighten($primary, 40%); + border-color: dark-light-diff($primary, $secondary, 90%, -90%); + background-color: dark-light-diff($primary, $secondary, 40%, -10%); &:hover { - background-color: lighten($primary, 40%); + background-color: dark-light-diff($primary, $secondary, 40%, -10%); } } } @@ -123,6 +151,24 @@ td.flaggers td { .controls { margin-left: 10px; } + + .controls .menu-toggle { + display: none; + float: left; + font-size: 24px; + padding: 3px 6px; + margin-right: 32px; + border: 1px solid lighten($primary, 40%); + border-radius: 3px; + background: transparent; + color: $primary; + &:hover { + background-color: lighten($primary, 60%); + } + @media (max-width: $mobile-breakpoint) { + display: inline-block; + } + } button { margin-right: 5px; @@ -147,6 +193,14 @@ td.flaggers td { label { margin-top: 5px; } + .controls { + margin-left: 0; + } + // Hide the search checkbox for very small screens + // Todo: find somewhere to display it - probably requires switching its order in the html + @media (max-width: 550px) { + display: none; + } } .toggle { margin-top: 8px; @@ -184,9 +238,19 @@ td.flaggers td { .admin-nav { width: 18.018%; + position: relative; + // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint + @media (max-width: $mobile-breakpoint) { + position: absolute; + z-index: 0; + width: 50%; + } margin-top: 30px; .nav-stacked { border-right: none; + @media (max-width: $mobile-breakpoint) { + //margin-right: 10px; + } } li a.active { color: $secondary; @@ -196,13 +260,39 @@ td.flaggers td { .admin-detail { width: 76.5765%; - min-height: 800px; + @media (max-width: $mobile-breakpoint) { + z-index: 10; + width: 100%; + } + background-color: $secondary; + // Todo: set this properly - it needs to be >= the menu height + min-height: 875px; margin-left: 0; - border-left: solid 1px scale-color-diff(); + border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%); padding: 30px 0 30px 30px; + @media (max-width: $mobile-breakpoint) { + padding: 30px 0; + border: none; + } +} + +.admin-detail.mobile-open { + @media (max-width: $mobile-breakpoint) { + transition: transform 0.3s ease; + @include transform(translateX(50%)); + } +} + +.admin-detail.mobile-closed { + @media (max-width: $mobile-breakpoint) { + transition: transform 0.3s ease; + @include transform(translateX(0)); + } } .settings { + margin-left: 10px; + margin-right: 10px; .setting { padding-bottom: 20px; @@ -210,13 +300,30 @@ td.flaggers td { float: left; width: 17.6576%; margin-right: 12px; + @media (max-width: $mobile-breakpoint) { + float: none; + margin-right: 0; + width: 100%; + h3 { + margin-bottom: 6px; + } + } } .setting-value { float: left; width: 53%; - .select2-container { + .category-group { + width: 95%; + } + @media (max-width: $mobile-breakpoint) { width: 100%; } + .select2-container { + width: 100% !important; // Needs !important to override hard-coded value + @media (max-width: $mobile-breakpoint) { + width: 100% !important; // !important overrides hard-coded mobile width of 68px + } + } .select2-container-multi .select2-choices { border: none; } @@ -227,13 +334,18 @@ td.flaggers td { .input-setting-string { width: 404px; @include medium-width { width: 314px; } - @include small-width { width: 284px; } + @media (max-width: $mobile-breakpoint) { + width: 100%; + } } .input-setting-list { width: 408px; + @media (max-width: $mobile-breakpoint) { + width: 100%; + } padding: 1px; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3); transition: border linear 0.2s, box-shadow linear 0.2s; @@ -255,7 +367,7 @@ td.flaggers td { border-radius: 3px; background-clip: padding-box; -moz-user-select: none; - background-color: none; + background-color: transparent; width: 3em; height: 1em; } @@ -273,7 +385,7 @@ td.flaggers td { } .desc { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } h3 { @@ -301,7 +413,7 @@ section.details { color: $primary; padding: 5px 10px; margin: 30px 0 5px 0; - border-bottom: 5px solid scale-color-diff(); + border-bottom: 5px solid dark-light-diff($primary, $secondary, 90%, -60%); } } @@ -333,7 +445,7 @@ section.details { &.highlight-danger { background-color: scale-color($danger, $lightness: 50%); } - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); &:before, &:after { display: table; content: ""; @@ -394,7 +506,7 @@ section.details { p.help { margin: 0; - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); font-size: 0.9em; } } @@ -412,7 +524,7 @@ section.details { .current-badge-actions { margin: 10px; padding: 10px; - border-top: 1px solid scale-color($primary, $lightness: 80%); + border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 80%), scale-color($secondary, $lightness: 20%)); } .buttons { @@ -436,14 +548,14 @@ section.details { font-size: 1em; line-height: 16px; padding: 4px; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } .badge-query-plan { font-size: 0.857em; line-height: 13px; padding: 4px; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } .count-warning { @@ -465,7 +577,7 @@ section.details { .groups { .ac-wrap { width: 100% !important; - border-color: scale-color($primary, $lightness: 75%); + border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); .item { width: 190px; margin-right: 0 !important; @@ -488,7 +600,7 @@ section.details { } .select2-choices { width: 100%; - border-color: scale-color($primary, $lightness: 75%); + border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); } } @@ -545,11 +657,16 @@ section.details { .preview-link { margin-left: 15px; } + .export { + float: right; + } padding-left: 10px; width: 70%; .style-name { width: 350px; height: 25px; + // Remove height to for `box-sizing: border-box` + height: auto; } .ace-wrapper { position: relative; @@ -609,7 +726,7 @@ section.details { td.actions { width: 200px; } .hex-input { width: 80px; margin-bottom: 0; } .hex { text-align: center; } - .description { color: scale-color($primary, $lightness: 50%); } + .description { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } .invalid .hex input { background-color: white; @@ -681,15 +798,12 @@ section.details { .dashboard-left { float: left; - margin-top: 10px; width: 60%; } + .dashboard-right { float: right; - margin-top: 10px; width: 40%; - - .dashboard-stats { width: 100%; margin-left: 0; @@ -697,12 +811,14 @@ section.details { } .version-check { - margin-top: 10px; + + th { + text-align: left !important; + } .version-number { font-size: 1.286em; font-weight: bold; - text-align: center; } .face { @@ -774,6 +890,9 @@ table.api-keys { i.fa { color: $primary; } + i.fa-heart { + color: $love; + } } th { @@ -817,20 +936,27 @@ table.api-keys { } } } + + tr.reverse-colors { + td.value.trending-down i.down { + color: $success; + } + td.value.trending-up i.up { + color: $danger; + } + } } &.detected-problems { background: dark-light-diff($primary, $secondary, 90%, -75%); margin-bottom: 20px; - margin-top: 10px; .look-here { float: left; margin: 20px 10px 0 10px; .fa { - font-size: 2.286em -; + font-size: 2.286em; vertical-align: middle; color: $primary } @@ -892,7 +1018,7 @@ table.api-keys { .commits-widget { - border: solid 1px scale-color-diff(); + border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%); height: 180px; margin-bottom: 36px; @@ -938,7 +1064,7 @@ table.api-keys { @extend .clearfix; line-height: 1.0em; padding: 6px 8px; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); .left { float: left; } @@ -948,7 +1074,7 @@ table.api-keys { img { margin-top: 2px; - border: solid 1px scale-color-diff(); + border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%); padding: 2px; background-color: $secondary; } @@ -983,14 +1109,14 @@ table.api-keys { -webkit-border-radius: 3px; } ::-webkit-scrollbar-track { - border-left: solid 1px scale-color-diff(); + border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%); } } .content-list { h3 { - color: dark-light-diff($primary, $secondary, 50%, -60%); + color: dark-light-diff($primary, $secondary, 50%, -20%); font-size: 1.071em; padding-left: 5px; margin-bottom: 10px; @@ -1001,10 +1127,10 @@ table.api-keys { margin: 0; li:first-of-type { - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } li { - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } li a { @@ -1013,7 +1139,7 @@ table.api-keys { color: $primary; &:hover { - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); color: $primary; } @@ -1040,7 +1166,7 @@ table.api-keys { margin-top: 10px; } - #pagedown-editor { + .pagedown-editor { width: 98%; } @@ -1049,7 +1175,7 @@ table.api-keys { height: 200px; } - #wmd-input { + .wmd-input { width: 98%; height: 200px; } @@ -1134,6 +1260,7 @@ table.api-keys { .staff-actions { width: 100%; + min-width: 990px; .action { width: 10.810%; } @@ -1167,14 +1294,14 @@ table.api-keys { margin: 0 0 20px 6px; a.filter { display: inline-block; - background-color: scale-color($primary, $lightness: 75%); + background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); padding: 3px 10px; border-radius: 3px; color: $primary; &:hover { color: $primary; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } @@ -1202,13 +1329,13 @@ table.api-keys { position: absolute; } -.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses { +.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks { - border-bottom: dotted 1px scale-color($primary, $lightness: 75%); + border-bottom: dotted 1px dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); .heading-container { width: 100%; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } .col.heading { font-weight: bold; @@ -1224,7 +1351,7 @@ table.api-keys { .ember-list-item-view { width: 100%; - border-top: solid 1px scale-color-diff(); + border-top: solid 1px dark-light-diff($primary, $secondary, 90%, -60%); } } @@ -1243,6 +1370,10 @@ table.api-keys { } } +.admin-plugins .col-enabled { + width: 20px; +} + // Backups // -------------------------------------------------- @@ -1348,7 +1479,7 @@ and (max-width : 500px) { .content-editor { width: 100%; - #pagedown-editor { + .pagedown-editor { box-sizing: border-box; } } @@ -1414,7 +1545,7 @@ tr.not-activated { .user-field { padding: 10px; margin-bottom: 10px; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .form-display { width: 25%; @@ -1422,15 +1553,31 @@ tr.not-activated { float: left; } - .form-element { + .form-element, .form-element-desc { float: left; - width: 25%; + min-height: 30px; + padding: 0.25em 0; + + &.input-area { + width: 75%; + input[type=text] { + width: 50%; + } + } + + &.label-area { + width: 25%; + label { + margin: 0.5em 1em 0 0; + text-align: right; + font-weight: bold; + } + } } .controls { float: right; text-align: right; - width: 20%; } .clearfix { @@ -1449,8 +1596,8 @@ table#user-badges { } } -.url-list { - .url { +.value-list { + .value { border-bottom: 1px solid #ddd; padding: 3px; margin-right: 10px; @@ -1458,13 +1605,150 @@ table#user-badges { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + + cursor: move; } - .urls { + .values { margin-bottom: 10px; } + .placeholder { + border-bottom: 1px solid #ddd; + padding: 3px; + margin-right: 10px; + height: 30px; + } + input[type=text] { width: 90%; } } + +// Permalinks + +.permalinks { + .url, .topic, .category, .external_url, .post { + text-overflow: ellipsis; + white-space: nowrap; + } + .url { + width: 200px; + } + .topic, .post, .external_url { + width: 180px; + } + .category { + width: 140px; + } + .action { + text-align: center; + width: 8%; + } +} + +.permalink-title { + margin-bottom: 10px; +} + + +// embedding + +.embeddable-hosts { + table { + margin-bottom: 1em; + } + margin-bottom: 2em; +} + +.embedding-secondary { + h3 { + margin: 1em 0; + } + margin-bottom: 2em; + + .embed-setting { + input[type=text] { + width: 50%; + } + margin: 0.75em 0; + } + + p.description { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + margin-bottom: 1em; + max-width: 700px; + } +} + +// Mobile specific styles +// Mobile view text-inputs need some padding +.mobile-view .admin-contents { + input[type="text"] { + padding: 4px; + } +} + +.mobile-view .admin-controls { + padding: 10px 10px 9px 0; +} + +.mobile-view .full-width { + margin: 0; +} + +.cboxcontainer { + display: inline-block; + padding: 8px; + padding-bottom: 4px; + + * { + width: 20px; + height: 20px; + display: inline-block; + border: 1px solid $tertiary; + } + &.primary { + background: $primary; + } + &.secondary { + background: $secondary; + } +} +.cbox0 { background: blend-primary-secondary(0%); } +.cbox10 { background: blend-primary-secondary(10%); } +.cbox20 { background: blend-primary-secondary(20%); } +.cbox30 { background: blend-primary-secondary(30%); } +.cbox40 { background: blend-primary-secondary(40%); } +.cbox50 { background: blend-primary-secondary(50%); } +.cbox60 { background: blend-primary-secondary(60%); } +.cbox70 { background: blend-primary-secondary(70%); } +.cbox80 { background: blend-primary-secondary(80%); } +.cbox90 { background: blend-primary-secondary(90%); } +.cbox100 { background: blend-primary-secondary(100%); } +.cbox5 { background: blend-primary-secondary(5%); } +.cbox7 { background: blend-primary-secondary(7%); } +.cbox15 { background: blend-primary-secondary(15%); } +.cbox17 { background: blend-primary-secondary(17%); } +.cbox25 { background: blend-primary-secondary(25%); } +.cbox95 { background: blend-primary-secondary(95%); } +.cbox85 { background: blend-primary-secondary(85%); } +.cbox75 { background: blend-primary-secondary(75%); } + +.dbox0 { background: dark-light-diff($primary, $secondary, 0%, -0%); } +.dbox10 { background: dark-light-diff($primary, $secondary, 10%, -10%); } +.dbox20 { background: dark-light-diff($primary, $secondary, 20%, -20%); } +.dbox30 { background: dark-light-diff($primary, $secondary, 30%, -30%); } +.dbox40 { background: dark-light-diff($primary, $secondary, 40%, -40%); } +.dbox50 { background: dark-light-diff($primary, $secondary, 50%, -50%); } +.dbox60 { background: dark-light-diff($primary, $secondary, 60%, -60%); } +.dbox70 { background: dark-light-diff($primary, $secondary, 70%, -70%); } +.dbox80 { background: dark-light-diff($primary, $secondary, 80%, -80%); } +.dbox90 { background: dark-light-diff($primary, $secondary, 90%, -90%); } +.dbox100 { background: dark-light-diff($primary, $secondary, 100%, -100%); } +.dbox5 { background: dark-light-diff($primary, $secondary, 5%, -5%); } +.dbox15 { background: dark-light-diff($primary, $secondary, 15%, -15%); } +.dbox25 { background: dark-light-diff($primary, $secondary, 25%, -25%); } +.dbox95 { background: dark-light-diff($primary, $secondary, 95%, -95%); } +.dbox85 { background: dark-light-diff($primary, $secondary, 85%, -85%); } +.dbox75 { background: dark-light-diff($primary, $secondary, 75%, -75%); } diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 028fc1b1c6..71a5ef8054 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -1,8 +1,10 @@ .show-more { - position: absolute; - top: 4px; width: 100%; z-index: 1; + &.has-topics { + position: absolute; + top: 7px; + } } .list-controls { @@ -14,10 +16,15 @@ } } +html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);} +.topic-list a.title.visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);} + .topic-list { width: 100%; border-collapse: collapse; + + > tbody > tr { &.has-excerpt .star { vertical-align: top; @@ -38,14 +45,14 @@ } th { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-weight: normal; font-size: 1em; - button i.fa {color: scale-color($primary, $lightness: 50%);} + button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));} } td { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-size: 1em; } @@ -59,7 +66,7 @@ .topic-excerpt { font-size: 0.929em; margin-top: 8px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); word-wrap: break-word; line-height: 1.4; padding-right: 20px; @@ -189,13 +196,17 @@ ol.category-breadcrumb { float: left; margin-right: 5px; } + + .bread-crumbs-right-outlet { + float: left; + } } .list-controls .category-dropdown-menu { overflow-x: hidden; overflow-y: auto; position: absolute; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); background-color: $secondary; z-index: 100; @@ -230,6 +241,13 @@ ol.category-breadcrumb { h2 { float: left; margin: 5px 0 10px; + + .top-date-string { + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); + font-weight: normal; + font-size: 0.7em; + text-transform: uppercase; + } } button { @@ -244,7 +262,7 @@ ol.category-breadcrumb { @include unselectable; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; background: $secondary; position: absolute; @@ -280,5 +298,5 @@ ol.category-breadcrumb { } div.education { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss index fe80bb2eba..1476a3f233 100644 --- a/app/assets/stylesheets/common/base/alert.scss +++ b/app/assets/stylesheets/common/base/alert.scss @@ -11,7 +11,6 @@ float: right; font-size: 1.429em; font-weight: bold; - line-height: 18px; color: $primary; opacity: 0.2; filter: alpha(opacity = 20); diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss new file mode 100644 index 0000000000..c1f1ea9943 --- /dev/null +++ b/app/assets/stylesheets/common/base/cat_reorder.scss @@ -0,0 +1,31 @@ +.reorder-categories { + input { + width: 4em; + } + .th-pos { + width: calc(4em + 150px); + } + tbody tr { + background-color: transparent; + transition: background 0s ease; + &.highlighted { + background-color: rgba($highlight, 0.4); + &.done { + background-color: transparent; + transition-duration: 1s; + } + } + &:first-child td { + padding-top: 7px; + } + } + tbody { + border-bottom: 1px solid blend-primary-secondary(50%); + } + table { + padding-bottom: 150px; + } +} +.category-admin-menu ul { + width: 320px; +} diff --git a/app/assets/stylesheets/common/base/code_highlighting.scss b/app/assets/stylesheets/common/base/code_highlighting.scss index 02aa19e727..25c8a72f00 100644 --- a/app/assets/stylesheets/common/base/code_highlighting.scss +++ b/app/assets/stylesheets/common/base/code_highlighting.scss @@ -7,14 +7,14 @@ github.com style (c) Vasily Polovnyov .hljs { display: block; padding: 0.5em; - color: #333; + color: dark-light-choose(#333, #f8f8f8); } .hljs-comment, .hljs-template_comment, .diff .hljs-header, .hljs-javadoc { - color: #998; + color: dark-light-choose(#998, #bba); font-style: italic; } @@ -26,21 +26,21 @@ github.com style (c) Vasily Polovnyov .hljs-subst, .hljs-request, .hljs-status { - color: #333; + color: dark-light-choose(#333, #f8f8f8); font-weight: bold; } .hljs-number, .hljs-hexcolor, .ruby .hljs-constant { - color: #099; + color: dark-light-choose(#099, #aff); } .hljs-string, .hljs-tag .hljs-value, .hljs-phpdoc, .tex .hljs-formula { - color: #d14; + color: dark-light-choose(#d14, #f99); } .hljs-title, @@ -62,7 +62,7 @@ github.com style (c) Vasily Polovnyov .haskell .hljs-type, .vhdl .hljs-literal, .tex .hljs-command { - color: #458; + color: dark-light-choose(#458, #9AE); font-weight: bold; } @@ -70,14 +70,14 @@ github.com style (c) Vasily Polovnyov .hljs-tag .hljs-title, .hljs-rules .hljs-property, .django .hljs-tag .hljs-keyword { - color: #000080; + color: dark-light-choose(#000080, #99f); font-weight: normal; } .hljs-attribute, .hljs-variable, .lisp .hljs-body { - color: #008080; + color: dark-light-choose(#008080, #0ee); } .hljs-regexp { @@ -89,7 +89,7 @@ github.com style (c) Vasily Polovnyov .lisp .hljs-keyword, .tex .hljs-special, .hljs-prompt { - color: #990073; + color: dark-light-choose(#990073, #fbe); } .hljs-built_in, @@ -132,8 +132,8 @@ github.com style (c) Vasily Polovnyov */ p > code, li > code, pre > code { - color: #333; - background: #f8f8f8; + color: dark-light-choose(#333, #f8f8f8); + background: dark-light-choose(#f8f8f8, #333); } // removed some unnecessary styles here diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss index e99830d88d..6bcf8ae659 100644 --- a/app/assets/stylesheets/common/base/colorpicker.scss +++ b/app/assets/stylesheets/common/base/colorpicker.scss @@ -18,7 +18,7 @@ max-width: 300px; .colorpicker { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); margin-right: 2px; width: 16px; height: 16px; diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss index 82c982ffbe..ac2f23a9b2 100644 --- a/app/assets/stylesheets/common/base/combobox.scss +++ b/app/assets/stylesheets/common/base/combobox.scss @@ -28,16 +28,22 @@ .select2-container { border-radius: 3px; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); &.select2-dropdown-open { border: 0; + margin-bottom: 2px; } &.select2-container-active { border-color: $tertiary; } } - +.select2-container-multi .select2-choices { + background-color: $secondary; +} +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: $secondary url(/assets/select2-spinner.gif) no-repeat 100% !important; +} .select2-container a.select2-choice { background: $secondary; @@ -51,7 +57,9 @@ border-radius: 3px 3px 0 0; border-color: $tertiary; } - +.select2-drop { + color: dark-light-diff($primary, $secondary, -50%, 50%); +} .select2-drop-active { border: 1px solid $tertiary; border-top: 0; diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 6078bda721..2838b2d890 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -3,13 +3,13 @@ position: absolute; width: 240px; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); ul { list-style: none; padding: 0; margin: 0; li { - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); a[href] { padding: 5px; display: block; @@ -50,7 +50,7 @@ div.ac-wrap.disabled { div.ac-wrap { background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px 4px 1px 4px; div.item { float: left; @@ -69,7 +69,7 @@ div.ac-wrap { border-radius: 12px; width: 10px; display: inline-block; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); &:hover { background-color: scale-color($danger, $lightness: 75%); border: 1px solid scale-color($danger, $lightness: 30%); @@ -130,6 +130,9 @@ div.ac-wrap { input[type=text] { width: 50px; } + label { + font-size: .929em; + } } } @@ -139,13 +142,34 @@ div.ac-wrap { left: 48%; top: 20%; } + .whisper { + margin-left: 1em; + font-style: italic; + } +} + +#cancel-file-upload { + font-size: 1.6em; +} + +#draft-status, #file-uploading { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); +} + +.composer-bottom-right { + .spinner.small { + width: 6px; + height: 6px; + } } // this removes the topmost margin from the first element in the topic post // if we don't do this, all posts would have extra space at the top -#wmd-preview > *:first-child { +.wmd-preview > *:first-child { margin-top: 0; } .cooked > *:first-child { margin-top: 0; } + + diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 67c6c2c87c..ad4004264f 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -22,11 +22,11 @@ td, th { padding: 0.5em; text-align: left; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .number, .time-read { font-size: 1.4em; - color: dark-light-diff($primary, $secondary, 50%, -50%); + color: dark-light-diff($primary, $secondary, 50%, -20%); } } @@ -35,7 +35,7 @@ background-color: dark-light-diff($highlight, $secondary, 70%, -80%); .username a, .name, .title, .number, .time-read { - color: scale-color($highlight, $lightness: -50%); + color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%)); } } } @@ -54,7 +54,7 @@ } &:hover { - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } } } diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 57736cd565..7a39495197 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -4,8 +4,13 @@ img.avatar { .container { @extend .clearfix; +} + +.wrap { + @extend .clearfix; margin-right: auto; margin-left: auto; + padding: 0 8px; .contents { position: relative; } @@ -27,8 +32,7 @@ small { blockquote { - background-color: dark-light-diff($primary, $secondary, 97%, -45%); - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); + @include post-aside; overflow: hidden; clear: both; } @@ -69,13 +73,13 @@ body { // is scale-color($primary, $lightness: 50%) // numbers get dimmer as they get colder .coldmap-high { - color: scale-color($primary, $lightness: 70%) !important; + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important; } .coldmap-med { - color: scale-color($primary, $lightness: 60%) !important; + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)) !important; } .coldmap-low { - color: scale-color($primary, $lightness: 50%) !important; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important; } .heatmap-high { color: #fe7a15 !important; @@ -102,7 +106,7 @@ body { margin: 0 10px 0 10px; } -.message { + .message { @include border-radius-all(8px); background-color: $secondary; padding: 14px; @@ -114,7 +118,8 @@ body { font-size: 1.429em; } } - #footer { + + #footer { .container { height: 50px; .contents { @@ -130,51 +135,51 @@ body { transition:none !important; } -.tip { - display: inline-block; - &.good { - color: $success; - } - &.bad { - color: $danger; - } -} - - -#wmd-input { - resize: none; -} - -#pagedown-editor { - width: 540px; - background-color: $secondary; - padding: 0 10px 13px 10px; - border: 1px solid scale-color-diff(); - .preview { - margin-top: 8px; - border: 1px dashed scale-color-diff(); - padding: 8px 8px 0 8px; - p { - margin: 0 0 10px 0; + .tip { + display: inline-block; + &.good { + color: $success; + } + &.bad { + color: $danger; } } - .preview.hidden { - display: none; + + input[type].invalid { + background-color: dark-light-choose(scale-color($danger, $lightness: 80%), scale-color($danger, $lightness: -60%)); } -} + .wmd-input { + resize: none; + } -.avatar-wrapper { - background-color: $secondary; - display: inline-block; - border-radius: 50%; -} - -.profiler-results.profiler-left { - top: 60px !important; -} + .pagedown-editor { + width: 540px; + background-color: $secondary; + padding: 0 10px 13px 10px; + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + .preview { + margin-top: 8px; + border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%); + padding: 8px 8px 0 8px; + p { + margin: 0 0 10px 0; + } + } + .preview.hidden { + display: none; + } + } + .avatar-wrapper { + background-color: $secondary; + display: inline-block; + border-radius: 50%; + } + .profiler-results.profiler-left { + top: 60px !important; + } } .unread-private-messages { diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss index 03264dfc52..69e111f445 100644 --- a/app/assets/stylesheets/common/base/emoji.scss +++ b/app/assets/stylesheets/common/base/emoji.scss @@ -4,7 +4,7 @@ body img.emoji { vertical-align: middle; } -#wmd-emoji-button:before { +.wmd-emoji-button:before { content: "\f118"; } @@ -15,12 +15,12 @@ body img.emoji { margin-top: -100px; left: 50%; top: 50%; - background-color: #dadada; + background-color: dark-light-choose(#dadada, blend-primary-secondary(5%)); } .emoji-page td { border: 1px solid transparent; - background-color: white; + background-color: dark-light-choose(white, $secondary); } .emoji-page a { @@ -30,13 +30,13 @@ body img.emoji { } .emoji-page a:hover { - background-color: rgb(210, 236, 252); + background-color: dark-light-choose(rgb(210, 236, 252), rgb(45, 19, 3)); } .emoji-table-wrapper { min-width: 442px; min-height: 185px; - background-color: white; + background-color: $secondary; } .emoji-modal-wrapper { @@ -46,14 +46,12 @@ body img.emoji { top: 0; width: 100%; height: 100%; - opacity: 0.8; + opacity: dark-light-choose(0.8, 0.5); background-color: black; } .emoji-modal .toolbar { - margin: 0; - margin-top: 8px; - margin-bottom: 5px + margin: 8px 0 5px; } .emoji-modal .toolbar li { @@ -63,11 +61,11 @@ body img.emoji { .emoji-modal .toolbar li a { padding: 8px; - background-color: #dadada; + background-color: dark-light-choose(#dadada, blend-primary-secondary(5%)); } .emoji-modal .toolbar li a.selected { - background-color: #fff; + background-color: $secondary; } .emoji-modal .info { @@ -80,6 +78,7 @@ body img.emoji { .emoji-modal .info span { margin-left: 5px; font-weight: bold; + color: $primary; } .emoji-modal .info { @@ -91,10 +90,10 @@ body img.emoji { } .emoji-modal .nav span { - color: #aaa; + color: dark-light-choose(#aaa, #555); margin-right: 10px; } .emoji-modal .nav a { - color: #333; + color: dark-light-choose(#333, #ccc); } diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index f19fe23076..bc20cefeaa 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -38,7 +38,7 @@ position: relative; } - button.login-button, button.sign-up-button { + .login-button, button.sign-up-button { float: left; margin-top: 7px; padding: 6px 10px; @@ -61,7 +61,7 @@ .icon { display: block; padding: 3px; - color: scale-color($header_primary, $lightness: 50%); + color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary); text-decoration: none; cursor: pointer; border-top: 1px solid transparent; @@ -72,37 +72,39 @@ &:hover { color: $primary; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); border-top: 1px solid transparent; border-left: 1px solid transparent; border-right: 1px solid transparent; } &:active { color: $primary; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } } - .active .icon { - position: relative; - color: #7b7b7b; - background-color: $secondary; - cursor: default; - border-top: 1px solid scale-color-diff(); - border-left: 1px solid scale-color-diff(); - border-right: 1px solid scale-color-diff(); - &:after { - display: block; - position: absolute; - top: 100%; - left: 0; - z-index: 1101; - width: 100%; - height: 0; - content: ""; - border-top: 1px solid $secondary; - } - &:hover { - border-bottom: none; + .drop-down-visible & { + .active .icon { + position: relative; + color: #7b7b7b; + background-color: $secondary; + cursor: default; + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + &:after { + display: block; + position: absolute; + top: 100%; + left: 0; + z-index: 1101; + width: 100%; + height: 0; + content: ""; + border-top: 1px solid $secondary; + } + &:hover { + border-bottom: none; + } } } [class^="fa fa-"] { @@ -126,7 +128,10 @@ background-color: scale-color($tertiary, $lightness: 50%); } .unread-private-messages { - left: -4px; + left: 82px; + } + .flagged-posts { + left: 40px; } } .flagged-posts { @@ -134,235 +139,15 @@ } } -.d-dropdown { - display: none; - position: absolute; - background: $secondary; - max-height: 417px; - top: 100%; - right: 0; - z-index: 1100; - overflow: auto; - border: 1px solid scale-color-diff(); - padding: 5px; - - box-shadow: 0 2px 2px rgba(0,0,0, .4); - - // note these topic counts only appear for anons in the category hamburger drop down - b.topics-count { - color: scale-color($primary, $lightness: 50%); - font-weight: normal; - font-size: 11px; - } - - ul { - margin: 0; - list-style: none; - } - - li:not(.category):not(.heading) { - font-size: 0.929em; - line-height: 16px; - - .fa { - font-size: inherit; - } - - a { - display: block; - padding: 5px; - transition: all linear .15s; - } - - &:hover a:not(.badge-notification) { - background-color: dark-light-diff($highlight, $secondary, 50%, -70%); - } - - button {margin-left: 5px;} - } - - .heading a:hover { - background-color: dark-light-diff($highlight, $secondary, 50%, -70%); - } - - .selected { - background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); - } - - - // Notifications - &#notifications-dropdown { - .fa { color: scale-color($primary, $lightness: 50%); } - .icon { color: scale-color($primary, $lightness: 30%); } - li { - background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); - i { - float: left; - margin-right: 5px; - padding-top: 2px; - } - span { color: $primary; } - &:hover a { background-color: dark-light-diff($highlight, $secondary, 50%, -70%); } - a { padding: 4px 0 3px 2px; } - p { - margin: 0; - overflow: hidden; - } - } - .is-warning { - i.fa-envelope-o { - &:before { - content: "\f0e0"; - } - color: $danger; - } - } - .read { - background-color: $secondary; - } - .none { - padding: 5px; - } - .spinner { - width: 20px; - height: 20px; - border-width: 2px; - margin: 0 auto; - } - /* as a big ol' click target, don't let text inside be selected */ - @include unselectable; - } - - // Site map - - &#site-map-dropdown { - .heading { - padding: 5px 5px 5px 0; - a {padding: 0 5px;} - } - } - - // Search - - &#search-dropdown { - .heading { - padding: 5px 0 5px 5px; - .filter { - padding: 0 5px; - } - } - } - - input[type='text'] { - width: 518px; - height: 22px; - margin: 5px; - padding: 5px; - } - - .search-context { - padding: 0 5px; - label { margin-bottom: 0; } - } - - .searching { - position: absolute; - top: 0; - right: 0; - .spinner { - width: 10px; - height: 10px; - border-width: 2px; - margin: 20px 0 0 0; - } - } - // I am ghetto using this to display "Show More".. be warned - .no-results { - padding: 5px; - text-align: center; - } - .filter { - padding: 0; - &:hover {background: transparent;} - } - - // Categories - - .category { - float: left; - background-color: transparent; - width: 45%; - margin: 5px 5px 0 5px; - .box {margin-top: 0;} - .badge-notification { - color: scale-color($primary, $lightness: 50%); - background-color: transparent; - vertical-align: top; - padding: 5px 5px 2px 5px; - } - } - - &#user-dropdown { - width: 118px; - } - - .btn { - padding: 2px 8px; - margin-bottom: 2px; - .fa { - margin-right: 5px; - } - } -} - -.search-link { - .badge-category-parent { - line-height: 0.8em; - } - .topic-title { - margin-right: 6px; - } - - .topic-statuses { - float: none; - display: inline-block; - color: scale-color($primary, $lightness: 50%); - margin: 0; - .fa { - margin: 0; - } - } -} .highlight-strong { - background-color: dark-light-diff($highlight, $secondary, 40%, -50%); + background-color: dark-light-diff($highlight, $secondary, 40%, -45%); } .search-highlight { font-weight: bold; } -.search-context .show-help { - position: absolute; - right: 10px; - top: 0; -} - -.search-context { - min-height: 30px; - position: relative; -} - -.d-dropdown#search-dropdown { - max-height: none; - overflow: inherit; -} - -#search-dropdown .results { - max-height: 300px; - overflow: auto; -} - #search-help table td { padding-right: 10px; } diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss index 681eec6253..61a93372f2 100644 --- a/app/assets/stylesheets/common/base/lightbox.scss +++ b/app/assets/stylesheets/common/base/lightbox.scss @@ -3,7 +3,6 @@ display: inline-block; &:hover .meta { - background: $primary; opacity: 1; transition: opacity .5s; } @@ -18,8 +17,8 @@ position: absolute; bottom: 0; width: 100%; - color: $secondary; - background: $primary; + color: dark-light-choose($secondary, $primary); + background: dark-light-choose($primary, lighten($secondary, 10%)); opacity: 0; transition: opacity .2s; @@ -29,6 +28,10 @@ .filename { margin: 5px; + max-width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; &:before { font-family: "FontAwesome"; content: "\F03E"; @@ -39,7 +42,7 @@ .informations { margin: 6px; padding-right: 20px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-diff($primary, $secondary, 50%, -50%); font-size: 1em; } diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index 6d30268e12..f66944b9d2 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -36,7 +36,7 @@ float: auto; } p { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin: 0; } } @@ -51,5 +51,5 @@ button#login-link, button#new-account-link background: transparent; padding-left: 0; margin-left: 20px; - color: scale-color($primary, $lightness: 35%); + color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%)); } diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss index 98ead180b7..b37047cb0c 100644 --- a/app/assets/stylesheets/common/base/magnific-popup.scss +++ b/app/assets/stylesheets/common/base/magnific-popup.scss @@ -337,9 +337,8 @@ button { @if $IE7support { filter: unquote("alpha(opacity=#{$controls-opacity*100})"); } - margin: 0; top: 50%; - margin-top: -55px; + margin: -55px 0 0; padding: 0; width: 90px; height: 110px; @@ -601,8 +600,7 @@ button { // Scale navigation arrows and reduce padding from sides @media all and (max-width: 900px) { .mfp-arrow { - transform: scale(0.75); - -webkit-transform: scale(0.75); + @include transform(scale(0.75)); } .mfp-arrow-left { transform-origin: 0; @@ -668,9 +666,7 @@ button { &.mfp-ready { .mfp-content { opacity: 1; - -webkit-transform: scale(1); - -ms-transform: scale(1); - transform: scale(1); + @include transform(scale(1)); } &.mfp-bg { opacity: 0.8; @@ -681,9 +677,7 @@ button { &.mfp-removing { .mfp-content { - -webkit-transform: scale(.8); - -ms-transform: scale(.8); - transform: scale(.8); + @include transform(scale(.8)); opacity: 0; } &.mfp-bg { diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss new file mode 100644 index 0000000000..fa773232b7 --- /dev/null +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -0,0 +1,295 @@ +.menu-panel.slide-in { + position: fixed; + right: 0; + + .panel-body { + position: absolute; + top: 3px; + bottom: 37px; + width: 97%; + } +} + +.menu-panel.drop-down { + position: absolute; + // positions are relative to the .d-header .panel div + top: 100%; // directly underneath .panel + right: -10px; // 10px to the right of .panel - adjust as needed +} + +.menu-panel { + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + box-shadow: 0 2px 2px rgba(0,0,0, .25); + background-color: $secondary; + z-index: 1100; + padding: 0.5em; + width: 300px; + + hr { + margin: 3px 0; + } + + .panel-header { + position: absolute; + right: 20px; + } + + ul { + list-style: none; + margin: 0; + padding: 0; + } + + .panel-body { + overflow-y: auto; + overflow-x: hidden; + } + +} + +.menu-links.columned { + li { + width: 50%; + float: left; + } +} + +.menu-panel { + ul.menu-links li, ul li.heading { + a { + padding: 0.25em 0.5em; + display: block; + &:hover { + background-color: dark-light-diff($highlight, $secondary, 50%, -55%); + } + } + + .new { + font-size: 0.8em; + margin-left: 0.5em; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + + } + + li.category-link { + float: left; + background-color: transparent; + width: 45%; + margin: 5px 5px 0 8px; + .box {margin-top: 0;} + .badge-notification { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + background-color: transparent; + display: inline; + padding: 0; + } + } + + // note these topic counts only appear for anons in the category hamburger drop down + b.topics-count { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + font-weight: normal; + font-size: 11px; + } + + span.badge-category { + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; + } + +} + +.search-menu { + + .search-context .show-help { + float: right; + } + + .heading { + padding: 5px 0 5px 5px; + .filter { + padding: 0 5px; + } + } + + input[type='text'] { + margin: 0.5em 3px; + box-sizing: border-box; + width: calc(100% - 6px); + height: 32px; + padding: 5px; + } + + .search-context { + padding: 0 5px; + label { margin-bottom: 0; } + } + + .searching { + position: absolute; + + top: -3px; + right: 0.75em; + .drop-down-visible & { + top: 0.2em; + right: 1.2em; + } + .spinner { + width: 10px; + height: 10px; + border-width: 2px; + margin: 20px 0 0 0; + } + } + // I am ghetto using this to display "Show More".. be warned + .no-results { + padding: 5px; + text-align: center; + } + .filter { + padding: 0; + &:hover {background: transparent;} + } + + .search-link { + .badge-category-parent { + line-height: 0.8em; + } + .topic-title { + margin-right: 6px; + } + + .topic-statuses { + float: none; + display: inline-block; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + margin: 0; + .fa { + margin: 0; + } + } + } + + li:not(.category):not(.heading) { + font-size: 0.929em; + line-height: 16px; + + .fa { + font-size: inherit; + } + + a { + display: block; + padding: 5px; + transition: all linear .15s; + } + + &:hover a:not(.badge-notification) { + background-color: dark-light-diff($highlight, $secondary, 50%, -55%); + } + + button {margin-left: 5px;} + } +} + +.user-menu { + + .notifications { + h3 { + padding: 0 0.4em; + font-weight: bold; + margin: 0.5em 0; + } + + .fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } + .icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); } + li { + background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); + padding: 0.25em 0.5em; + i { + float: left; + margin-right: 5px; + padding-top: 2px; + } + span { color: $primary; } + &:hover { background-color: dark-light-diff($highlight, $secondary, 50%, -55%); } + a { padding: 0; } + p { + margin: 0; + overflow: hidden; + } + } + .is-warning { + i.fa-envelope-o { + &:before { + content: "\f0e0"; + } + color: $danger; + } + } + .read { + background-color: $secondary; + } + .none { + padding-top: 5px; + } + .spinner-container.visible { + min-height: 30px; + } + .spinner { + width: 20px; + height: 20px; + border-width: 2px; + margin: 0 auto; + } + /* as a big ol' click target, don't let text inside be selected */ + @include unselectable; + } +} + +.notifications .logout { + padding: 0.25em; + &:hover { + background-color: dark-light-diff($highlight, $secondary, 50%, -55%); + } +} + +div.menu-links-header { + width: 100%; + display: table; + border-collapse: separate; + border-spacing: 0 0.5em; + .menu-links-row { + display: table-row; + } + a:hover { + background-color: dark-light-diff($highlight, $secondary, 50%, -55%); + } + a { + padding: 0.5em; + } + li { + display: table-cell; + width: auto; + text-align: center; + } + li:first-child { + text-align: left; + } + + li:last-child { + text-align: right; + } + .fa, a { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + + a { + font-size: 1.1em; + } + .fa-user { + margin-right: 0.2em; + } +} diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index f53892d2ad..74291ab406 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -50,8 +50,8 @@ } @-webkit-keyframes slidein { - from { transform: translateY(-20%); } - to { transform: translateY(0); } + from { -webkit-transform: translateY(-20%); } + to { -webkit-transform: translateY(0); } } .modal-outer-container { @@ -64,8 +64,7 @@ max-width: 710px; margin: 0 auto; background-color: $secondary; - border: 1px solid scale-color-diff(); - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); box-shadow: 0 3px 7px rgba(0,0,0, .8); background-clip: padding-box; @@ -91,7 +90,7 @@ } .modal-footer { padding: 14px 15px 15px; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } .modal-footer:before, .modal-footer:after { @@ -102,14 +101,26 @@ clear: both; } +.modal.edit-category-modal { + .modal-body { + .pagedown-editor { + width: 98%; + } + + textarea { + height: 10em; + } + } +} + .modal { - .nav { + .nav { padding: 10px 30px 10px 15px; background-color: dark-light-diff($secondary, $primary, 10%, -15%); li > a { font-size: 1em; } - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } @@ -118,6 +129,9 @@ } .modal-body { + &.full-height-modal { + max-height: calc(100vh - 150px); + } textarea { width: 99%; height: 80px; @@ -138,6 +152,55 @@ .raw-email-textarea { height: 300px; } + .json-uploader { + .jsfu-shade-container { + display: table-row; + width: 100%; + height: 100%; + position: relative; + } + .jsfu-shade { + z-index: 1; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); + .text { + color: rgb(255,255,255); + position: absolute; + top: 40%; + font-size: 36px; + text-align: center; + line-height: 38px; + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + } + } + .jsfu-file { + display: table-cell; + vertical-align: middle; + min-width: 120px; + } + .jsfu-separator { + vertical-align: middle; + display: table-cell; + font-size: 36px; + padding-left: 10px; + padding-right: 10px; + } + .jsfu-paste { + display: table-cell; + width: 100%; + textarea { + margin-bottom: 0; + margin-top: 4px; + } + } + } } .password-confirmation { display: none; @@ -168,7 +231,7 @@ font-weight: normal; } &.btn-reply-here { - background: scale-color-diff(); + background: dark-light-diff($primary, $secondary, 90%, -60%); text-shadow: none; color: $primary; } diff --git a/app/assets/stylesheets/common/base/notification-options.scss b/app/assets/stylesheets/common/base/notification-options.scss index c1d52c3b74..745f0aa650 100644 --- a/app/assets/stylesheets/common/base/notification-options.scss +++ b/app/assets/stylesheets/common/base/notification-options.scss @@ -1,5 +1,5 @@ .fa.muted { - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); } .fa.tracking, .fa.watching { color: $tertiary; diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index e02efc7d85..2db1ab7206 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -11,10 +11,10 @@ a.loading-onebox { .onebox-result { + @include post-aside; + margin-top: 15px; padding: 12px 25px 12px 12px; - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); - background: dark-light-diff($primary, $secondary, 97%, -45%); font-size: 1em; > .source { margin-bottom: 12px; @@ -48,7 +48,7 @@ a.loading-onebox { margin-right: 10px; } h3, h4 { - margin: 0 !important; + margin: 0; } code { max-height: 400px; @@ -82,16 +82,15 @@ a.loading-onebox { @mixin onebox-favicon($class, $image) { &.#{$class} .source { - background-image: image-url("favicons/#{$image}.png"); - background-repeat: no-repeat; + background: image-url("favicons/#{$image}.png") no-repeat; padding-left: 20px; } } aside.onebox { + @include post-aside; + padding: 12px 25px 12px 12px; - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); - background: dark-light-diff($primary, $secondary, 97%, -45%); font-size: 1em; header { @@ -117,16 +116,16 @@ aside.onebox { h3, h4 { font-size: 1.17em; - margin: 10px 0 !important; + margin: 10px 0; } a[href] { - color: scale-color($tertiary, $lightness: -20%); + color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary); text-decoration: none; } a[href]:visited { - color: scale-color($tertiary, $lightness: -20%); + color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary); } img { @@ -148,8 +147,7 @@ aside.onebox .onebox-body .onebox-avatar { blockquote { aside.onebox { - background: dark-light-diff($primary, $secondary, 97%, -45%); - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); + @include post-aside; } } @@ -159,7 +157,6 @@ pre.onebox code ol.lines li:before { display:inline-block; width:35px; left: -40px; - background: #F7F7F7; color:#AFAFAF; text-align:right; padding-right:5px; @@ -174,8 +171,10 @@ pre.onebox code ol{ margin-left:0px; line-height:1.5em; } +pre.onebox code { + background-color: dark-light-choose(#fff, #000); +} pre.onebox code li{ - background-color:#fff; padding-left:5px; } @@ -194,7 +193,7 @@ pre.onebox code ol.lines li { } pre.onebox code li.selected{ - background-color:#F8EEC7 + background-color: dark-light-choose(#F8EEC7, #541); } pre.onebox code { @@ -238,3 +237,26 @@ pre.onebox code { .onebox-body .github-content-right{ margin-left:100px; } + +//Onebox - Twitter - Status +aside.onebox.twitterstatus .onebox-body { + h4 { + margin-bottom: 0; + } +} +.onebox.twitterstatus { + .thumbnail { + float: left; + } + .tweet { + float: left; + display: inline-block; + white-space: pre-wrap; + padding-top: 3px; + width: 85%; + } + .date { + clear: left; + padding-top: 5px; + } +} diff --git a/app/assets/stylesheets/common/base/pagedown.scss b/app/assets/stylesheets/common/base/pagedown.scss index ec26be9829..1ee211aa50 100644 --- a/app/assets/stylesheets/common/base/pagedown.scss +++ b/app/assets/stylesheets/common/base/pagedown.scss @@ -13,10 +13,7 @@ } .wmd-button-row { - margin-left: 5px; - margin-right: 5px; - margin-bottom: 5px; - margin-top: 5px; + margin: 5px; padding: 0; height: 20px; overflow: hidden; @@ -27,24 +24,15 @@ height: 20px; margin-right: 8px; margin-left: 5px; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); display: inline-block; float: left; } .wmd-button { - width: 20px; - height: 20px; - padding-left: 2px; - padding-right: 3px; margin-right: 5px; - background-repeat: no-repeat; - background-position: 0 0; border: 0; - width: 20px; - height: 20px; position: relative; - border: 0; float: left; font-family: FontAwesome; font-weight: normal; @@ -63,75 +51,78 @@ } .wmd-button:hover { - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } -#wmd-bold-button:before { +.wmd-bold-button:before { content: "\f032"; } - -#wmd-italic-button:before { +.wmd-italic-button:before { content: "\f033"; } -#wmd-link-button:before { +.wmd-link-button:before { content: "\f0c1"; } -#wmd-quote-button:before { +.wmd-quote-button:before { content: "\f10e"; } -#wmd-code-button:before { +.wmd-code-button:before { content: "\f121"; } -#wmd-image-button:before { +.wmd-image-button:before { content: "\f093"; } -#wmd-image-button.image-only:before { +.wmd-image-button.image-only:before { content: "\f03e"; } -#wmd-olist-button:before { +.wmd-olist-button:before { content: "\f0cb"; } -#wmd-ulist-button:before { +.wmd-ulist-button:before { content: "\f0ca"; } -#wmd-heading-button:before { +.wmd-heading-button:before { content: "\f031"; } -#wmd-hr-button:before { +.wmd-hr-button:before { content: "\f068"; } -#wmd-undo-button:before { +.wmd-undo-button:before { content: "\f0e2"; } -#wmd-redo-button:before { +.wmd-redo-button:before { content: "\f01e"; } -#wmd-quote-post:before { +.wmd-quote-post:before { content: "\f0e5"; } +.wmd-composer-options:before { + content: "\f013"; +} + .wmd-prompt-background { background-color: #111; box-shadow: 0 3px 7px rgba(0,0,0, .8); } .wmd-prompt-dialog { - border: 1px solid scale-color-diff(); - background-color: scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } .wmd-prompt-dialog > div { @@ -140,12 +131,14 @@ } .wmd-prompt-dialog > form > input[type="text"] { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); color: $primary; } .wmd-prompt-dialog > form > input[type="button"] { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + background: dark-light-choose(initial, blend-primary-secondary(50%)); + color: dark-light-choose(inherit, $secondary); font-family: trebuchet MS, helvetica, sans-serif; font-size: 0.8em; font-weight: bold; diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss index fddbe54adb..bae997b469 100644 --- a/app/assets/stylesheets/common/base/rtl.scss +++ b/app/assets/stylesheets/common/base/rtl.scss @@ -1,9 +1,9 @@ // Right to left styles. // *** These styles are all going to be flipped by the r2 gem *** -// There may be a 'do not flip' flag that can be used, but I haven't found it. +// Adding the !important declaration to a rule prevents it from being flipped. // Keep the topic admin menu on the page -.rtl .topic-admin-menu { +.rtl .popup-menu { right: 0 !important; } @@ -33,11 +33,26 @@ } .rtl code { direction: ltr !important; - text-aligh: left !important; + text-align: left !important; } .rtl .pull-left { - float:right !important; + float: right !important; } -.rtl .autocomplete { -left: 360px !important; +.rtl .autocomplete { + left: 27px; +} + +.rtl .customize .current-style .toggle-mobile { +position: static !important; +float: left !important; +} +.rtl .customize .current-style .toggle-maximize { +position: static !important; +float: left !important; +} +.rtl .dashboard-left { + float: right !important; +} +.rtl .dashboard-right { + float: left !important; } diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss new file mode 100644 index 0000000000..a22ad9d0cc --- /dev/null +++ b/app/assets/stylesheets/common/base/search.scss @@ -0,0 +1,119 @@ +.fps-result { + + .like-count { + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); + .fa { color: $love; font-size: 12px; } + } + + .badge-wrapper span.badge-category { + max-width: inherit; + } + + .search-category { + margin-top: 3px; + } + + margin-bottom: 28px; + max-width: 675px; + .topic { + padding-bottom: 2px; + } + .avatar { + position: relative; + top: -3px; + margin-right: 4px; + } + a.search-link:visited .topic-title { + color: scale-color($tertiary, $lightness: 15%); + } + .search-link { + .topic-statuses, .topic-title { + font-size: 1.25em; + } + + .topic-statuses { + float: none; + display: inline-block; + color: $primary; + font-size: 1.0em; + } + } + .blurb { + font-size: 1.0em; + line-height: 20px; + word-wrap: break-word; + clear: both; + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); + .date { + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); + } + + .search-highlight { + color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%)); + } + } +} + +.fps-select { + margin-top: -15px; + margin-bottom: 15px; + a:hover { + color: $secondary; + background-color: $tertiary; + } + a { + margin-right: 15px; + font-size: 12px; + padding: 2px 5px; + } +} + +.search.row { + margin-bottom: 15px; + input { + height: 22px; + padding-left: 6px; + } +} + +.search-footer { + margin-bottom: 30px; +} + +.panel-body-contents .search-context label { + float: left; +} + +.search-title { + + .term { + font-weight: bold; + } + + position: relative; + .result-count { + float: left; + span { + line-height: 28px; + height: 28px; + display: inline-block; + } + margin-bottom: 4px; + } + margin: 10px 0 15px; + max-width: 675px; + border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -75%); + width: 100%; + .sort-by { + .desc { + margin-right: 5px; + } + select { + margin-bottom: 0; + width: auto; + min-width: 150px; + } + float: right; + margin-bottom: 4px; + } +} diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 15ee61bcbe..25f2fdfdc4 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -24,6 +24,18 @@ h3 { font-size: 0.929em; } + .copy-text { + display: inline-block; + position: absolute; + margin: 5px 5px 5px 15px; + color: $success; + opacity: 1; + transition: opacity 0.25s; + font-size: 13px; + &:not(.success) { + opacity: 0; + } + } .social-link { margin-left: 2px; margin-right: 8px; @@ -47,7 +59,7 @@ .date { float: right; margin: 5px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } input[type=text] { diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index 3301a1ea08..3e7e846e76 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -4,15 +4,15 @@ position: fixed; top: 120px; right: 10px; - z-index: 1000; + z-index: 999; outline: 0; } -.topic-admin-menu { +.popup-menu { background-color: $secondary; width: 205px; padding: 10px; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); z-index: 1001; ul { @@ -20,40 +20,53 @@ margin: 10px 0 0 0; } + .btn { + text-align: left; + } + button { width: 200px; margin-bottom: 5px; - i { width: 14px; } } } -.modal-body.feature-topic .feature-section { - display: block; - .button { - width: 33%; - display: inline-block; - vertical-align: top; - margin-top: 15px; +.modal-body.feature-topic { + padding: 5px; + max-height: 500px; + hr { + margin: 10px 0; } - .desc { - display: inline-block; - vertical-align: middle; - max-width: 60%; - margin-left: 10px; - p { - margin: 10px 0; + .feature-section { + display: block; + .badge-wrapper { + margin-right: 0; + } + .date-picker { + text-align: center; + width: 80px; + margin: 0; + } + .desc { + display: inline-block; + vertical-align: middle; + margin-left: 10px; + p:first-of-type { + margin: 0; + } + p { + margin: 10px 0 0; + } + } + .with-validation { + position: relative; } } } + .mobile-view .feature-topic .feature-section { - .button { - width: auto; - display: block; - margin: 0 10px; - } .desc { display: block; clear: both; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 18f869b73a..fc57a346c1 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -12,29 +12,31 @@ overflow: hidden; text-overflow: ellipsis; a { - color: scale-color($primary, $lightness: 30%); + color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); } } .fa { font-size: 11px; margin-left: 3px; - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); } .new_user a, .user-title, .user-title a { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } // global styles for the cooked HTML content in posts (and preview) -.cooked, #wmd-preview { +.cooked, .wmd-preview { word-wrap: break-word; h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; } h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */ a { word-wrap: break-word; } + ins { background-color: dark-light-choose(scale-color($success, $lightness: 90%), scale-color($success, $lightness: -60%)); } + del { background-color: dark-light-choose(scale-color($danger, $lightness: 90%), scale-color($danger, $lightness: -60%)); } } -.cooked, #wmd-preview { +.cooked, .wmd-preview { video { max-width: 100%; } @@ -50,9 +52,9 @@ aside.quote { .badge-wrapper { margin-left: 5px; } .title { - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); - background-color: dark-light-diff($primary, $secondary, 97%, -45%); - color: scale-color($primary, $lightness: 30%); + @include post-aside; + + color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); // IE will screw up the blockquote underneath if bottom padding is 0px padding: 12px 12px 1px 12px; // blockquote is underneath this and has top margin @@ -68,7 +70,7 @@ aside.quote { } .quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } .cooked .highlight { @@ -113,8 +115,8 @@ aside.quote { .quote-button { display: none; position: absolute; - background-color: scale-color($primary, $lightness: 50%); - color: $secondary; + background-color: dark-light-diff($primary, $secondary, 50%, -50%); + color: dark-light-choose($secondary, $primary); padding: 10px; z-index: 401; @@ -124,11 +126,16 @@ aside.quote { } &:hover { - background-color: scale-color($primary, $lightness: 40%); + background-color: dark-light-diff($primary, $secondary, 40%, -40%); cursor: pointer; } } +.topic-body { + &.highlighted { + background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); + } +} .wiki .topic-body { background-color: dark-light-diff($wiki, $secondary, 95%, -50%); } @@ -140,7 +147,7 @@ aside.quote { } .post-info { - &.wiki, &.via-email { + &.wiki, &.via-email, &.whisper { margin-right: 5px; i.fa { font-size: 1em; @@ -151,7 +158,7 @@ aside.quote { color: $wiki; } &.via-email { - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } &.raw-email { cursor: pointer; @@ -160,11 +167,11 @@ aside.quote { pre { code { - white-space: pre-wrap; + word-wrap: normal; display: block; padding: 5px 10px; color: $primary; - background: dark-light-diff($primary, $secondary, 97%, -45%); + background: blend-primary-secondary(5%); max-height: 500px; } } @@ -172,7 +179,7 @@ pre { kbd { background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: 0 1px 0 rgba(0,0,0, .8); color: $primary; @@ -197,3 +204,127 @@ blockquote > *:first-child { blockquote > *:last-child { margin-bottom: 0 !important; } + +.gap { + background-color: dark-light-diff($primary, $secondary, 90%, -60%); + padding: 5px 0; + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); + cursor: pointer; + text-align: center; + + &.jagged-border { + background-image: + linear-gradient( + 135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + 45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ); + background-position: + top center, top center, + bottom center, bottom center; + background-size: .9em .9em; + background-repeat: repeat-x; + padding: 20px 0; + margin-bottom: 20px; + margin-left: -10px; + margin-right: -10px; + } + +} + +.who-liked { + transition: height 0.5s; + a { + margin: 0 0.25em 0.5em 0; + display: inline-block; + } +} + + +table.md-table { + thead { + border-bottom: 2px solid lighten($primary, 80%); + th { + text-align: left; + padding-bottom: 2px; + } + } + + td,th { + padding: 3px 3px 3px 10px; + } + tr { + border-bottom: 1px solid lighten($primary, 80%); + } +} + +.small-action { + .topic-avatar { + padding: 5px 0; + border-top: none; + float: left; + i { + font-size: 35px; + width: 45px; + text-align: center; + color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); + } + } + + .small-action-desc { + padding: 0.5em 0 0.5em 4em; + margin-top: 5px; + text-transform: uppercase; + font-weight: bold; + font-size: 0.9em; + color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); + + .custom-message { + text-transform: none; + margin: 15px 0px 5px; + font-weight: normal; + font-size: 14px; + p { + margin: 5px 0; + } + } + + .avatar { + margin-right: 0.8em; + float: left; + } + + > p { + margin: 0; + padding-top: 4px; + } + } + + button { + background: transparent; + border: 0; + float: right; + } + + clear: both; +} + +.whisper { + .topic-body { + .cooked { + font-style: italic; + color: dark-light-diff($primary, $secondary, 55%, -40%); + } + } +} diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 17956cc16d..015b4b6871 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -43,3 +43,37 @@ float: right; } } + +// Target the .badge-category text, the bullet icon needs to maintain `display: block` +#suggested-topics h3 .badge-wrapper.bullet span.badge-category, +#suggested-topics h3 .badge-wrapper.box span, +#suggested-topics h3 .badge-wrapper.bar span { + display: inline; + overflow: inherit; +} + +#suggested-topics h3 .badge-wrapper.bullet span.badge-category, { + // Override vertical-align: text-top from `badges.css.scss` + vertical-align: baseline; +} + +#suggested-topics h3 .badge-wrapper.bullet, +#suggested-topics h3 .badge-wrapper.bullet span.badge-category-parent-bg, +#suggested-topics h3 .badge-wrapper.bullet span.badge-category-bg { + // Top of bullet aligns with top of line - adjust line height to vertically align bullet. + line-height: 0.8; +} + +.topic-unsubscribe { + .notification-options { + display: inline-block; + float: none; + line-height: 2em; + .dropdown-toggle { + float: none; + } + .dropdown-menu { + bottom: initial; + } + } +} diff --git a/app/assets/stylesheets/common/base/upload.scss b/app/assets/stylesheets/common/base/upload.scss index 60c1f55785..6afba003ef 100644 --- a/app/assets/stylesheets/common/base/upload.scss +++ b/app/assets/stylesheets/common/base/upload.scss @@ -1,17 +1,4 @@ -.add-upload .fa-plus { - font-size: 0.714em; - position: relative; - left: -5px; - bottom: -5px; - text-shadow: - -1px -1px 0 scale-color($tertiary, $lightness: -10%), - 1px 1px 0 scale-color($tertiary, $lightness: -10%), - 1px -1px 0 scale-color($tertiary, $lightness: -10%), - -1px 1px 0 scale-color($tertiary, $lightness: -10%); -} - .uploaded-image-preview { - background-position: center center; background-size: cover; - background-color: $primary; + background: $primary center center; } diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index 0ce5a3b128..9f812fa899 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -4,10 +4,9 @@ color: $primary; border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); line-height: 19px; - margin: 0; display: inline-block; background-color: $secondary; - margin-bottom: 3px; + margin: 0 0 3px; .fa { padding-right: 3px; @@ -51,7 +50,8 @@ } img { - display: inline-block; + display: block; + margin: auto auto 4px; width: 55px; height: 55px; } @@ -59,7 +59,7 @@ .count { display: block; font-size: 0.8em; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } } @@ -67,7 +67,7 @@ /* Badge listing in /badges. */ table.badges-listing { margin: 20px 0; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); width: 90%; .user-badge { @@ -94,7 +94,7 @@ table.badges-listing { td.grant-count { text-align: center; - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); font-size: 120%; } @@ -112,7 +112,7 @@ table.badges-listing { } tr { - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } } diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index a1d5a3f967..5843e84cae 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -15,6 +15,12 @@ } } +.user-main { + i.fa-heart { + color: $love !important; + } +} + .user-field { .required { text-align: top; @@ -65,7 +71,6 @@ } } - } .avatar-selector { @@ -111,17 +116,17 @@ .username a { font-weight: bold; - color: scale-color($primary, $lightness: 30%); + color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); } .name { margin-left: 5px; - color: scale-color($primary, $lightness: 30%); + color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); } .title { margin-top: 3px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss index 8e0f60dca9..c18494c18c 100644 --- a/app/assets/stylesheets/common/base/username_tagsinput.scss +++ b/app/assets/stylesheets/common/base/username_tagsinput.scss @@ -24,8 +24,17 @@ div.tagsinput span.tag { } div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; } -div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 0.929em; border:1px solid transparent; -padding:2px 5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; } +div.tagsinput input { + width:80px; + font-family: helvetica; + font-size: 0.929em; + border:1px solid transparent; + padding:2px 5px; + background: transparent; + color: #000; + outline:0px; + margin: 0px 5px 5px 0px; +} div.tagsinput div { display:block; float: left; } .tags_clear { clear: both; width: 100%; height: 0; } .not_valid {background: #FBD8DB !important; color: #90111A !important;} diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index 55d7b6f8d8..96eefe1577 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -52,21 +52,15 @@ &.bullet { //bullet category style - line-height: 1.25; - margin-right: 5px; - - h3 & { - line-height: .9; - } + display: inline-flex; + align-items: baseline; + margin-right: 10px; span.badge-category { color: $primary !important; - vertical-align: text-top; - line-height: 1; - margin-left: 4px; - padding: 3px 0 3px 3px; - margin-top: -4px; display: inline-block; + overflow: hidden; + text-overflow: ellipsis; #search-dropdown & { margin-top: -2px; @@ -78,9 +72,12 @@ } .badge-category-parent-bg, .badge-category-bg { - display: inline-block; width: 10px; height: 10px; + margin-right: 5px; + display: inline-block; + line-height: 1; + &:before { content: "\a0"; } @@ -89,10 +86,9 @@ span { &.badge-category-parent-bg { //subcategory style width: 5px; - line-height: 1; + margin-right: 0; & + .badge-category-bg { width: 5px; - line-height: 1; } } } @@ -107,6 +103,8 @@ span { display: block; + overflow: hidden; + text-overflow: ellipsis; &.badge-category-bg, &.badge-category-parent-bg { position: absolute; @@ -132,17 +130,6 @@ } } } - - span.badge-category { - max-width: 150px; - overflow: hidden; - text-overflow: ellipsis; - - .d-dropdown & { - max-width: 90px; - } - } - } // Category badge dropdown @@ -171,12 +158,12 @@ } li.bar>.badge-category { - background: dark-light-diff($primary, $secondary, 95%, -65%) !important; + background: dark-light-diff($primary, $secondary, 90%, -65%) !important; color: $primary !important; } li.bullet>.badge-category { - background: dark-light-diff($primary, $secondary, 95%, -65%) !important; + background: dark-light-diff($primary, $secondary, 90%, -65%) !important; color: $primary !important; .badge-category-bg { @@ -198,7 +185,7 @@ } } .cat { - line-height: 0; + line-height: 1; } .badge-wrapper { &.bar { @@ -242,17 +229,17 @@ font-size: 11px; line-height: 1; text-align: center; - background-color: scale-color($primary, $lightness: 70%); + background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 70%)); &[href] { - color: $secondary; + color: $secondary; } // New posts &.new-posts, &.unread-posts { - background-color: scale-color($tertiary, $lightness: 50%); - color: $secondary; - font-weight: normal; + background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), $tertiary); + color: dark-light-choose($secondary, $secondary); + font-weight: dark-light-choose(normal, bold); } &.new-topic { @@ -271,9 +258,9 @@ &.clicks { font-weight: normal; - background-color: dark-light-diff($primary, $secondary, 85%, -65%); + background-color: dark-light-diff($primary, $secondary, 85%, -60%); top: -1px; - color: dark-light-diff($primary, $secondary, 50%, -45%); + color: dark-light-diff($primary, $secondary, 50%, -20%); position: relative; margin-left: 2px; border: none; @@ -288,7 +275,7 @@ font-size: 1em; line-height: 1; &[href] { - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); } } diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index c4106aa28e..bf42ff0f08 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -5,6 +5,7 @@ // Base // -------------------------------------------------- + .btn { display: inline-block; margin: 0; @@ -54,27 +55,20 @@ background: dark-light-diff($primary, $secondary, 65%, -75%); color: #fff; } - &[disabled] { - background: scale-color-diff(); - &:hover { color: scale-color($primary, $lightness: 70%); } + &[disabled], &.disabled { + background: dark-light-diff($primary, $secondary, 90%, -60%); + &:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } cursor: not-allowed; } } -// Buttons used in admin panel -// -------------------------------------------------- -.btn-admin { - text-align:left; -} - // Primary button // -------------------------------------------------- .btn-primary { border: none; - color: $secondary; font-weight: normal; - color: #fff; + color: dark-light-choose(#fff, scale-color($primary, $lightness: 60%)); background: $tertiary; &[href] { @@ -82,13 +76,13 @@ } &:hover { color: #fff; - background: scale-color($tertiary, $lightness: -20%); + background: dark-light-choose(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -20%)); } &:active { @include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%)); color: #fff; } - &[disabled] { + &[disabled], &.disabled { background: $tertiary; } } @@ -109,7 +103,7 @@ &:active { @include linear-gradient(scale-color($danger, $lightness: -20%), $danger); } - &[disabled] { + &[disabled], &.disabled { background: $danger; } } @@ -125,20 +119,20 @@ color: $secondary; } &:before { - margin-right: 7px; - font-family: zocial; - line-height: 0.9; + margin-right: 9px; + font-family: FontAwesome; + font-size: 17px; } &.google, &.google_oauth2 { background: $google; &:before { - content: "G"; + content: $fa-var-google; } } &.facebook { background: $facebook; &:before { - content: "f"; + content: $fa-var-facebook; } } &.cas { @@ -147,19 +141,19 @@ &.twitter { background: $twitter; &:before { - content: "T"; + content: $fa-var-twitter; } } &.yahoo { background: $yahoo; &:before { - content: "Y"; + content: $fa-var-yahoo; } } &.github { background: $github; &:before { - content: "g"; + content: $fa-var-github; } } } diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss index 1aa845d893..aeff2b7774 100644 --- a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss +++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss @@ -28,18 +28,13 @@ } b { - color: #000; - background: #eee; - border-style: solid; - border-color: #ccc #aaa #888 #bbb; padding: 2px 6px; border-radius: 4px; - box-shadow: 0 2px 0 rgba(0,0,0,0.2),0 0 0 1px #fff inset; - background-color: #fafafa; - border-color: #ccc #ccc #fff; - border-style: solid solid none; - border-width: 1px 1px medium; - color: #444; + box-shadow: 0 2px 0 rgba(0,0,0,0.2),0 0 0 1px dark-light-choose(#fff,#000) inset; + background: dark-light-choose(#fafafa, #333); + border: 1px solid dark-light-choose(#ccc, #555); + border-bottom: medium none dark-light-choose(#fff, #000); + color: dark-light-choose(#444, #aaa); white-space: nowrap; display: inline-block; } diff --git a/app/assets/stylesheets/common/components/navs.css.scss b/app/assets/stylesheets/common/components/navs.css.scss index 5934c2fb74..d29d05a3d0 100644 --- a/app/assets/stylesheets/common/components/navs.css.scss +++ b/app/assets/stylesheets/common/components/navs.css.scss @@ -75,10 +75,9 @@ { left: 90%; top: 33%; - border: solid transparent; content: " "; position: absolute; - border-width: 8px; + border: 8px solid transparent; border-left-color: $secondary; } diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss index bec9a6395c..b4267e703f 100644 --- a/app/assets/stylesheets/common/foundation/base.scss +++ b/app/assets/stylesheets/common/foundation/base.scss @@ -41,7 +41,7 @@ hr { height: 1px; margin: 1em 0; border: 0; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 0; } diff --git a/app/assets/stylesheets/common/foundation/math.scss b/app/assets/stylesheets/common/foundation/math.scss new file mode 100644 index 0000000000..f7132c4270 --- /dev/null +++ b/app/assets/stylesheets/common/foundation/math.scss @@ -0,0 +1,165 @@ +// This file: +// Copyright (c) 2013 Takeru Suzuki +// Licensed under the MIT license. +// https://github.com/terkel/mathsass + +// Constants +$E: 2.718281828459045; +$PI: 3.141592653589793; +$LN2: 0.6931471805599453; +$SQRT2: 1.4142135623730951; + +@function error($message) { + @warn "#{_error("The direction used does not exist")}"; + @return null; +} + +// Returns the factorial of a non-negative integer. +// @param {Number} $x A non-negative integer. +// @return {Number} +// @example +// fact(0) // 1 +// fact(8) // 40320 +@function fact ($x) { + @if $x < 0 or $x != floor($x) { + @warn "Argument for `fact()` must be a positive integer."; + @return null; + } + $ret: 1; + @while $x > 0 { + $ret: $ret * $x; + $x: $x - 1; + } + @return $ret; +} + + +// Returns a two-element list containing the normalized fraction and exponent of number. +// @param {Number} $x +// @return {List} fraction, exponent +@function frexp ($x) { + $exp: 0; + @if $x < 0 { + $x: $x * -1; + } + @if $x < 0.5 { + @while $x < 0.5 { + $x: $x * 2; + $exp: $exp - 1; + } + } @else if $x >= 1 { + @while $x >= 1 { + $x: $x / 2; + $exp: $exp + 1; + } + } + @return $x, $exp; +} + +// Returns $x * 2^$exp +// @param {Number} $x +// @param {Number} $exp +@function ldexp ($x, $exp) { + $b: if($exp >= 0, 2, 1 / 2); + @if $exp < 0 { + $exp: $exp * -1; + } + @while $exp > 0 { + @if $exp % 2 == 1 { + $x: $x * $b; + } + $b: $b * $b; + $exp: floor($exp * 0.5); + } + @return $x; +} + +// Returns the natural logarithm of a number. +// @param {Number} $x +// @example +// log(2) // 0.69315 +// log(10) // 2.30259 +@function log ($x) { + @if $x <= 0 { + @return 0 / 0; + } + $k: nth(frexp($x / $SQRT2), 2); + $x: $x / ldexp(1, $k); + $x: ($x - 1) / ($x + 1); + $x2: $x * $x; + $i: 1; + $s: $x; + $sp: null; + @while $sp != $s { + $x: $x * $x2; + $i: $i + 2; + $sp: $s; + $s: $s + $x / $i; + } + @return $LN2 * $k + 2 * $s; +} + +@function ipow($base, $exp) { + @if $exp != floor($exp) { + @return error("Exponent for `ipow()` must be an integer."); + } + $r: 1; + $s: 0; + @if $exp < 0 { + $exp: $exp * -1; + $s: 1; + } + @while $exp > 0 { + @if $exp % 2 == 1 { + $r: $r * $base; + } + $exp: floor($exp * 0.5); + $base: $base * $base; + } + @return if($s != 0, 1 / $r, $r); +} + +// Returns E^x, where x is the argument, and E is Euler's constant, the base of the natural logarithms. +// @param {Number} $x +// @example +// exp(1) // 2.71828 +// exp(-1) // 0.36788 +@function exp ($x) { + $ret: 0; + @for $n from 0 to 24 { + $ret: $ret + ipow($x, $n) / fact($n); + } + @return $ret; +} + +// Returns base to the exponent power. +// @param {Number} $base The base number +// @param {Number} $exp The exponent to which to raise base +// @return {Number} +// @example +// pow(4, 2) // 16 +// pow(4, -2) // 0.0625 +// pow(4, 0.2) // 1.31951 +@function pow ($base, $exp) { + @if $exp == floor($exp) { + @return ipow($base, $exp); + } @else { + @return exp(log($base) * $exp); + } +} + +// Returns the square root of a number. +// @param {Number} $x +// @example +// sqrt(2) // 1.41421 +// sqrt(5) // 2.23607 +@function sqrt ($x) { + @if $x < 0 { + @return error("Argument for `sqrt()` must be a positive number."); + } + $ret: 1; + @for $i from 1 through 24 { + $ret: $ret - (pow($ret, 2) - $x) / (2 * $ret); + } + @return $ret; +} diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss index 60a682ac09..55b15a9b53 100644 --- a/app/assets/stylesheets/common/foundation/mixins.scss +++ b/app/assets/stylesheets/common/foundation/mixins.scss @@ -60,6 +60,7 @@ // Linear gradient +//noinspection CssOptimizeSimilarProperties @mixin linear-gradient($start-color, $end-color) { background-color: $start-color; background-image: linear-gradient(to bottom, $start-color, $end-color); @@ -92,3 +93,23 @@ -moz-user-select: none; -ms-user-select: none; } + + +// Stuff we repeat +@mixin post-aside { + border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%); + background-color: blend-primary-secondary(5%); +} + +// We definately need -webkit for latest iPhone and Safari +// When we deprecate IE9 we should clean up just to have webkit and non prefixed +// ms is left around for ie9 +// moz is for firefox 15 (do we even work with that?) +// -o would be for opera 11.5 +@mixin transform($transforms) { + -o-transform: $transforms; + -moz-transform: $transforms; + -ms-transform: $transforms; + -webkit-transform: $transforms; + transform: $transforms; +} diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index f16f13f4fe..b09dbc2893 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -19,6 +19,7 @@ $twitter: #00bced !default; $yahoo: #810293 !default; $github: #6d6d6d !default; + // Fonts // -------------------------------------------------- @@ -29,12 +30,39 @@ $base-font-family: Helvetica, Arial, sans-serif !default; /* These files don't actually exist. They're injected by DiscourseSassImporter. */ @import "theme_variables"; @import "plugins_variables"; +@import "common/foundation/math"; + +// Color Utilities // w3c definition of color brightness @function brightness($color) { @return ((red($color) * .299) + (green($color) * .587) + (blue($color) * .114)); } +// Uses an approximation of sRGB blending, GAMMA=2 instead of GAMMA=2.2 +@function srgb-scale($foreground, $background, $percent) { + $ratio: ($percent / 100%); + $iratio: 1 - $ratio; + $f_r2: red($foreground) * red($foreground); + $f_g2: green($foreground) * green($foreground); + $f_b2: blue($foreground) * blue($foreground); + $b_r2: red($background) * red($background); + $b_g2: green($background) * green($background); + $b_b2: blue($background) * blue($background); + $r_r2: $f_r2 * $ratio + $b_r2 * $iratio; + $r_g2: $f_g2 * $ratio + $b_g2 * $iratio; + $r_b2: $f_b2 * $ratio + $b_b2 * $iratio; + $r_r: sqrt($r_r2); + $r_g: sqrt($r_g2); + $r_b: sqrt($r_b2); + @return rgb($r_r, $r_g, $r_b); +} + +// Replaces dark-light-diff($primary, $secondary, 50%, -50%) +@function blend-primary-secondary($percent) { + @return srgb-scale($primary, $secondary, $percent); +} + @function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) { @if brightness($adjusted-color) < brightness($comparison-color) { @return scale-color($adjusted-color, $lightness: $lightness); @@ -42,12 +70,10 @@ $base-font-family: Helvetica, Arial, sans-serif !default; @return scale-color($adjusted-color, $lightness: $darkness); } } - -// phasing out scale-color-diff for dark-light-diff -@function scale-color-diff() { - @if lightness($primary) < lightness($secondary) { - @return scale-color($primary, $lightness: 90%); +@function dark-light-choose($light-theme-result, $dark-theme-result) { + @if brightness($primary) < brightness($secondary) { + @return $light-theme-result; } @else { - @return scale-color($primary, $lightness: -60%); + @return $dark-theme-result; } } diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss new file mode 100644 index 0000000000..5f2b7f81ab --- /dev/null +++ b/app/assets/stylesheets/common/printer-friendly.scss @@ -0,0 +1,79 @@ +@media print { + /* remove items N/A for print + ** visual clutter etc. */ + .avatar, + .topic-avatar, + header, + .topic-above-post-stream-outlet.topic-above-post-stream, + .topic-map, + .post-menu-area.clearfix, + div#topic-footer-buttons, + div#suggested-topics, + div#progress-topic-wrapper, + #topic-progress-wrapper, + div.nums, + ._flyout, + .show-topic-admin, + #topic-progress, + .quote-controls, + #topic-closing-info, + div.lazyYT, + .post-info.edits, + .post-action, + .saving-text, + .draft-text, + #discourse-modal, + div.read-state, + div.read-state.read, + .edit-topic, + a.reply-to-tab, + a.reply-new, + div.has-pending-posts, + div.time-gap, + #bottom, + #footer, + .alert-info, + .badge-category, + .badge-category-bg, + .badge-notification.clicks{ + display: none !important; + } + /* bottom border to help separate posts */ + div.row { + border-top: 1px solid #AAA; + } + .cooked pre code { max-height: none; } + #main-outlet { padding: 0 !important; } + html,body { min-width: 0; height: auto; } + .lightbox-wrapper img { max-width: 500px !important; height: auto !important; } + .topic-body { width: auto; margin: 0; padding: 0; float: none; } + .topic-post article.boxed .select-posts { width: auto; left: auto; right: 0; } + .gap { width: auto; } + .gutter { padding: 0; } + /* restyle div#topic-title */ + #topic-title { + margin: 0; + padding: 0; + } + #topic-title div div h1 { + margin: 2.5em 0 0 0; + padding: 0; + float: left; + font-weight: normal; + font-size: normal; + } + a, a:visited { + color: #DDD; + font-weight: bold; + } + /* hide OP Solved plugin stuff */ + .topic-after-cooked-outlet.solved-panel { + display: none; + } + /* localhost - MOOT for production */ + .topic-category-outlet.show-topic-category-location, + div.alert.alert-info.alert-emails-disabled, + div.profiler-results.profiler-left.profiler-no-controls { + display: none; + } +} diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss index b00d025168..847edc46a8 100644 --- a/app/assets/stylesheets/common/topic-entrance.scss +++ b/app/assets/stylesheets/common/topic-entrance.scss @@ -1,6 +1,6 @@ #topic-entrance { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; background: $secondary; box-shadow: 0 0px 2px rgba(0,0,0, .2); @@ -8,8 +8,6 @@ position: absolute; width: 133px; - padding: 5px; - @include unselectable; button.full { diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss index 426146d3be..e3a79437d2 100644 --- a/app/assets/stylesheets/desktop.scss +++ b/app/assets/stylesheets/desktop.scss @@ -17,6 +17,7 @@ @import "desktop/user"; @import "desktop/history"; @import "desktop/queued-posts"; +@import "desktop/menu-panel"; /* These files doesn't actually exist, they are injected by DiscourseSassImporter. */ diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index 032f6f505b..a874ce8994 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -59,20 +59,31 @@ li { font-weight: normal; - margin-top: 3px; + margin-top: 8px; } } } .similar-topics { - background-color: scale-color($tertiary, $lightness: 60%); + background-color: dark-light-choose(scale-color($tertiary, $lightness: 60%), scale-color($tertiary, $lightness: -60%)); a[href] { - color: #000; + color: dark-light-diff($primary, $secondary, -10%, 10%); } .posts-count { - background-color: scale-color($tertiary, $lightness: -40%); + background-color: dark-light-choose(scale-color($tertiary, $lightness: -40%), scale-color($tertiary, $lightness: 40%)); + } + + ul { + list-style: none; + margin: 0; + padding: 0; + } + .search-link { + .fa, .blurb { + color: dark-light-choose(scale-color($tertiary, $lightness: -40%), scale-color($tertiary, $lightness: 40%)); + } } } @@ -83,6 +94,11 @@ // hide cancel upload link on IE9 (not supported) .ie9 #cancel-file-upload { display: none; } +// todo, enable if we ever implement touch grippie... I question the value though (Sam) +.touch #reply-control.open .grippie { + display: none; +} + #reply-control { .toggle-preview, #draft-status, #file-uploading { position: absolute; @@ -94,16 +110,15 @@ } #draft-status, #file-uploading { right: 51%; - color: $primary; } #file-uploading { font-size: 0.857em; } transition: height 0.4s ease; width: 100%; - z-index: 1039; + z-index: 999; height: 0; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); bottom: 0; font-size: 1em; position: fixed; @@ -147,7 +162,7 @@ &.draft { height: 40px !important; cursor: pointer; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .draft-text { display: block; } @@ -160,7 +175,7 @@ } &.saving { height: 40px !important; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .saving-text { display: block; } @@ -209,6 +224,7 @@ padding: 10px; min-width: 1280px; .form-element { + position: relative; display: inline-block; .select2-container { width: 400px; @@ -255,18 +271,18 @@ margin-right: 10px; float: left; &:disabled { - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } } - #wmd-input:disabled { - background-color: scale-color-diff(); + .wmd-input:disabled { + background-color: dark-light-diff($primary, $secondary, 90%, -60%); } - #wmd-input, #wmd-preview { + .wmd-input, .wmd-preview { color: $primary; } - #wmd-preview { - border: 1px dashed scale-color-diff(); + .wmd-preview { + border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%); overflow: auto; visibility: visible; cursor: default; @@ -283,11 +299,12 @@ visibility: hidden; } } - #wmd-input { + .wmd-input { bottom: 35px; } .submit-panel { + width: 28%; position: absolute; display: block; bottom: 8px; @@ -303,7 +320,7 @@ .show-admin-options { vertical-align: top; margin-top: 8px; - background: scale-color-diff(); + background: dark-light-diff($primary, $secondary, 90%, -60%); &:hover { color: $secondary; background: $primary; @@ -311,8 +328,8 @@ } .title-input .popup-tip { width: 300px; - left: -8px; margin-top: 8px; + left: 150px; } .category-input .popup-tip { width: 240px; @@ -324,15 +341,15 @@ .reply-to { margin-bottom: 10px; - .reply-to-glyph { - color: scale-color($primary, $lightness: 50%); + i { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } #reply-control { &.hide-preview { .wmd-controls { - #wmd-input { + .wmd-input { width: 100%; } .preview-wrapper { @@ -351,17 +368,18 @@ top: 50px; - #wmd-input, #wmd-preview-scroller, #wmd-preview { + .wmd-input, .wmd-preview-scroller, .wmd-preview { + -moz-box-sizing: border-box; box-sizing: border-box; width: 100%; height: 100%; - min-height: 100%; + min-height: auto; padding: 7px; margin: 0; background-color: $secondary; word-wrap: break-word; } - #wmd-input, #wmd-preview-scroller { + .wmd-input, .wmd-preview-scroller { position: absolute; left: 0; top: 0; @@ -369,7 +387,7 @@ border-top: 30px solid transparent; @include border-radius-all(0); } - #wmd-preview-scroller { + .wmd-preview-scroller { font-size: 0.929em; line-height: 18px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -382,6 +400,7 @@ } .textarea-wrapper, .preview-wrapper { position: relative; + -moz-box-sizing: border-box; box-sizing: border-box; height: 100%; min-height: 100%; @@ -402,10 +421,11 @@ float: right; } } - #wmd-button-bar { + .wmd-button-bar { top: 0; position: absolute; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); background-color: $secondary; z-index: 100; } diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 63af52754a..17baebbc1c 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -2,22 +2,12 @@ // BEWARE: changing these styles implies they take effect anywhere they are seen // throughout the Discourse application -@include medium-width { - body { - min-width: $medium-width; - } - .container, - .full-width { - width: $medium-width; - } -} - @media all and (max-width : 570px) { body { min-width: 0; } - .container, + .wrap, .full-width { min-width: 0; } @@ -77,14 +67,12 @@ body { .grippie { width: 100%; - border: 1px solid scale-color-diff(); - border-width: 1px 0; cursor: row-resize; height: 11px; overflow: hidden; - background-color: scale-color-diff(); display:block; - background: image-url("grippie.png") scale-color-diff() no-repeat center 3px; + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + background: image-url("grippie.png") dark-light-diff($primary, $secondary, 90%, -60%) no-repeat center 3px; } } @@ -194,18 +182,16 @@ body { width: 210px; height: auto; background-color:$secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: inset 0 1px 1px rgba(0,0,0, .3); - transition: border linear 0.2s, box-shadow linear 0.2s; } input { &[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] { background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: inset 0 1px 1px rgba(0,0,0, .3); - transition: border linear 0.2s, box-shadow linear 0.2s; } } textarea:focus { @@ -238,7 +224,7 @@ body { select { width: 220px; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); &[multiple], &[size] { height: auto; } @@ -288,8 +274,8 @@ body { } input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] { cursor: not-allowed; - background-color: scale-color-diff(); - border-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); + border-color: dark-light-diff($primary, $secondary, 90%, -60%); } input { &[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] { @@ -388,7 +374,7 @@ body { text-align: center; vertical-align: middle; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } .input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn { margin-left: -1px; diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index b5c775d4c8..ff74c6714b 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -26,48 +26,13 @@ and (max-width : 570px) { padding-top: 82px; } -// Dropdowns -// -------------------------------------------------- - -.d-dropdown { - width: 320px; - overflow: auto; - // Common - - .heading { - border-top: 1px solid scale-color-diff(); - } - - // Categories - - .btn { - padding: 2px 8px; - margin-bottom: 2px; - .fa { - margin-right: 5px; - } - } -} - .search-link .blurb { - color: scale-color($primary, $lightness: 45%); + color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%)); display: block; word-wrap: break-word; font-size: 11px; + line-height: 1.3em; .search-highlight { - color: scale-color($primary, $lightness: 25%); + color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%)); } } - -.d-dropdown#search-dropdown { - width: 540px; -} - -.d-dropdown .searching { - right: 30px; -} - - -#search-dropdown .results { - max-height: 500px; -} diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss index d203f83ac0..5becce0f32 100644 --- a/app/assets/stylesheets/desktop/history.scss +++ b/app/assets/stylesheets/desktop/history.scss @@ -11,8 +11,12 @@ } #revision-controls { float: left; - .btn[disabled]:hover { - color: $primary; + .btn[disabled] { + cursor: not-allowed; + background-color: dark-light-diff($primary, $secondary, 90%, -60%); + } + .btn-danger[disabled] { + background-color: dark-light-diff($danger, $secondary, 30%, -60%); } } #display-modes { @@ -21,7 +25,7 @@ #revision-details { padding: 5px; margin-top: 10px; - border-bottom: 3px solid scale-color-diff(); + border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%); } #revisions { word-wrap: break-word; diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss index 39c86a70e6..1bf2a7988a 100644 --- a/app/assets/stylesheets/desktop/login.scss +++ b/app/assets/stylesheets/desktop/login.scss @@ -14,7 +14,7 @@ #login-form { a { - color: scale-color($primary, $lightness: 35%); + color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%)); } } @@ -45,7 +45,7 @@ tr.instructions { label { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } diff --git a/app/assets/stylesheets/desktop/menu-panel.scss b/app/assets/stylesheets/desktop/menu-panel.scss new file mode 100644 index 0000000000..74266de4cf --- /dev/null +++ b/app/assets/stylesheets/desktop/menu-panel.scss @@ -0,0 +1,12 @@ +.docked #hamburger-menu { + position: fixed; +} + +#hamburger-menu { + position: absolute; + top: 63px; + // compensate on the other end for this top + .hamburger-body { + bottom: 100px; + } +} diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index ae3c1f80a3..77e4ea12e7 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -16,8 +16,7 @@ height: auto; margin: -250px 0 0 -305px; background-color: $secondary; - border: 1px solid scale-color-diff(); - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); box-shadow: 0 3px 7px rgba(0,0,0, .8); background-clip: padding-box; @@ -48,13 +47,13 @@ } .modal-footer span.hint { - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); float: right; line-height: 30px; } .modal-header { - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); h3 { font-size: 1.429em; padding: 10px 15px 7px; @@ -65,7 +64,7 @@ float: right; font-size: 1.429em; text-decoration: none; - color: scale-color($primary, $lightness: 35%); + color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%)); cursor: pointer; &:hover { color: $primary; @@ -92,7 +91,7 @@ .custom-message-length { margin: -10px 0 10px 20px; - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); font-size: 85%; } @@ -115,11 +114,11 @@ li { margin: 0 4px 8px 0; a { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); cursor: pointer; } a:hover { - color: scale-color($primary, $lightness: 40%); + color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); } } } @@ -129,7 +128,7 @@ float: right; text-align: right; max-width: 380px; - color: scale-color($primary, $lightness: 60%); + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); } } @@ -151,6 +150,7 @@ .modal-tab { position: absolute; + width: 95%; } .split-modal { diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss index d927ce5b4c..06e24ab1e1 100644 --- a/app/assets/stylesheets/desktop/queued-posts.scss +++ b/app/assets/stylesheets/desktop/queued-posts.scss @@ -11,14 +11,14 @@ float: right; font-size: 0.929em; margin-top: 1px; - span {color: scale-color($primary, $lightness: 50%);} + span {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } .cooked { width: $topic-body-width; float: left; - #wmd-input { + .wmd-input { width: 98%; height: 15em; } @@ -31,7 +31,7 @@ } } .post-title { - color: darken(scale-color-diff(), 50%); + color: dark-light-diff($primary, $secondary, 20%, -60%); font-weight: bold; .badge-wrapper { diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index ceaa92c1d6..b0432b2fc2 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -36,10 +36,10 @@ .topic-list { margin: 0 0 10px; - .fa-thumb-tack { color: scale-color($primary, $lightness: 50%); } - .fa-thumb-tack.unpinned { color: scale-color($primary, $lightness: 50%); } + .fa-thumb-tack { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } + .fa-thumb-tack.unpinned { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } a.title {color: $primary;} - .fa-bookmark { color: scale-color($primary, $lightness: 50%); } + .fa-bookmark { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } th, td { padding: 12px 5px; @@ -51,7 +51,7 @@ } } th { - button i.fa {color: scale-color($primary, $lightness: 50%);} + button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } > tbody > tr { @@ -63,7 +63,7 @@ padding: 0; background: transparent; &:hover { - color: scale-color-diff(); + color: dark-light-diff($primary, $secondary, 90%, -60%); } } @@ -132,7 +132,7 @@ .post-actions { clear: both; width: auto; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); text-align: left; font-size: 12px; margin-top: 5px; @@ -141,7 +141,7 @@ } a { font-size: 11px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-right: 3px; line-height: 20px; } @@ -182,8 +182,7 @@ } td.latest { vertical-align: top; - padding: 8px; - padding-top: 0; + padding: 0 8px 8px; } .last-user-info { font-size: 0.857em; @@ -221,11 +220,11 @@ margin: 10px 0 0; /* topic status glyphs */ i { - color: scale-color($primary, $lightness: 50%) !important; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important; font-size: 0.929em; } a.last-posted-at, a.last-posted-at:visited { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-size: 0.88em; } .badge { @@ -242,7 +241,10 @@ // Misc. stuff // -------------------------------------------------- -#list-area .top-lists h2 { margin: 5px 0 10px; } +#list-area .top-lists h2 { + cursor: pointer; + margin: 5px 0 10px; +} #list-area { h2 { @@ -260,6 +262,7 @@ right: 20px; padding: 5px; background-color: $secondary; + z-index: 99999; } button.dismiss-read { @@ -295,15 +298,6 @@ button.dismiss-read { @media all and (max-width : 850px) { - // add some left padding to topics otherwise everything is 100% flush - // with left edge in portrait tablet, which looks awful - #topic-title { - padding-left: 10px; - } - .container.posts { - padding-left: 10px; - } - .nav-pills { > li > a { font-size: 1em; @@ -312,7 +306,6 @@ and (max-width : 850px) { } .list-controls { - padding: 0 5px; .btn { font-size: 1em diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 09ee591874..626ca0f6b5 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -1,8 +1,5 @@ -.container { - @extend .clearfix; +.wrap { max-width: $large-width; - margin-right: auto; - margin-left: auto; } .full-width { @@ -29,43 +26,43 @@ h1 .topic-statuses .topic-status i { border-top: none; } -.reply-to-tab { - z-index: 400; - font-size: 0.929em; - float: right; - margin: 1px 25px 0 0; - color: scale-color($primary, $lightness: 50%); -} - -.gutter { - .reply-new { - .discourse-no-touch & { - opacity:0; - transition: opacity 0.7s ease-in-out; - } - .discourse-touch & {opacity: 1;} - } -} - -div.actions, .post-actions { - .discourse-no-touch & { - opacity: 0.2; - transition: opacity 0.7s ease-in-out; - } - .discourse-touch & {opacity: 1;} + .reply-to-tab { + z-index: 400; + font-size: 0.929em; + float: right; + margin: 1px 25px 0 0; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } - &:hover div.actions, &:hover .post-actions { + .gutter { + .reply-new { + .discourse-no-touch & { + opacity:0; + transition: opacity 0.7s ease-in-out; + } + .discourse-touch & {opacity: 1;} + } + } + + .actions .fade-out { + .discourse-no-touch & { + opacity: 0.7; + transition: opacity 0.7s ease-in-out; + } + .discourse-touch & {opacity: 1;} + } + + &:hover .actions .fade-out, .selected .actions .fade-out { opacity: 1; - } - &:hover .gutter { + &:hover .gutter, .selected .gutter { .reply-new, .track-link { opacity:1; } - } + } + } section.post-menu-area { @@ -73,10 +70,25 @@ section.post-menu-area { } nav.post-controls { + + .like-count { + font-size: inherit; + margin-right: -5px; + } + padding: 0; - button { - color: scale-color($primary, $lightness: 60%); + .highlight-action { + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); + } + a, button { + color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); margin-right: 2px; + display: inline-block; + } + + a.toggle-likes { + padding: 8px 0; + margin-right: -3px; } span.badge-posts { @@ -96,34 +108,23 @@ nav.post-controls { } .show-replies { - margin-left: 0; - span.badge-posts {color: scale-color($primary, $lightness: 60%);} + margin-left: -10px; + font-size: inherit; + span.badge-posts {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); } &:hover { background: dark-light-diff($primary, $secondary, 90%, -65%); span.badge-posts {color: $primary;} } i { margin-left: 5px; + font-size: 90%; } } button.create { margin-right: 0; - color: $tertiary; - background: dark-light-diff($tertiary, $secondary, 85%, -65%); - padding: 8px 20px; + color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%)); margin-left: 10px; - - &:hover { color: $secondary; - background: dark-light-diff($tertiary, $secondary, 0%, -20%) - } - - &:active { - background: dark-light-diff($tertiary, $secondary, 50%, -35%); - box-shadow: inset 0 1px 3px rgba(0,0,0, .3); - - } - } .create i { @@ -139,13 +140,13 @@ nav.post-controls { margin-left: 3px; transition: all linear 0.15s; - &:hover { - background: scale-color-diff(); + &:hover { + background: dark-light-diff($primary, $secondary, 90%, -60%); color: $primary; } &:active { - box-shadow: inset 0 1px 3px rgba(0,0,0, .4); + box-shadow: inset 0 1px 3px rgba(0,0,0, .4); } &.hidden { @@ -169,6 +170,9 @@ nav.post-controls { &.has-like[disabled]:hover { background: transparent; } + &.has-like[disabled]:active { + box-shadow: none; + } &.bookmark {padding: 8px 11px; } @@ -194,7 +198,7 @@ nav.post-controls { background-color: $secondary; width: 205px; padding: 10px; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); position: absolute; text-align: left; bottom: -2px; @@ -256,7 +260,6 @@ nav.post-controls { } } &.bottom { - margin-top: -11px; .row { padding-top: 7px; } @@ -272,7 +275,7 @@ nav.post-controls { padding-right: 0; } - .post-date { color: scale-color($primary, $lightness: 60%); } + .post-date { color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); } .fa-arrow-up, .fa-arrow-down { margin-left: 5px; } .reply:first-of-type .row { border-top: none; } @@ -285,10 +288,10 @@ nav.post-controls { font-size: 0.929em; a { font-weight: bold; - color: scale-color($primary, $lightness: 30%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } } - .arrow {color: scale-color($primary, $lightness: 60%);} + .arrow {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); } } .post-action { @@ -305,7 +308,7 @@ a.star { .topic-map { margin: 20px 0 0 0; - background: dark-light-diff($primary, $secondary, 97%, -75%); + background: blend-primary-secondary(5%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: none; // would cause double top border @@ -315,7 +318,7 @@ a.star { h3 { margin-bottom: 4px; - color: scale-color($primary, $lightness: 20%); + color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%)); line-height: 23px; font-weight: normal; font-size: 1em; @@ -323,7 +326,7 @@ a.star { h4 { margin: 1px 0 2px 0; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-weight: normal; font-size: 0.857em; line-height: 15px; @@ -336,7 +339,7 @@ a.star { span.domain { font-size: 0.714em; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } .avatars { @@ -376,7 +379,7 @@ a.star { line-height: 20px; } .number, i { - color: scale-color($primary, $lightness: 20%); + color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%)); font-size: 130%; } .avatar a { @@ -410,8 +413,8 @@ a.star { .btn { border: 0; padding: 0 23px; - color: $primary; - background: dark-light-diff($primary, $secondary, 97%, -75%); + color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); + background: blend-primary-secondary(5%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); &:hover { @@ -562,7 +565,8 @@ video { a.mention { padding: 2px 4px; color: $primary; - background: scale-color-diff(); + background: dark-light-diff($primary, $secondary, 90%, -60%); + border-radius: 8px; } @@ -573,7 +577,7 @@ a.mention { } .deleted { - .topic-body { + .topic-body, .small-action { background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); } } @@ -589,14 +593,7 @@ a.mention { margin-top: -20px; } -#show-topic-admin { - right: 20px; - padding: 5px 8px; - margin-top: 5px; - -} - -.topic-admin-menu { +.popup-menu { h3 {margin-top: 0;} } @@ -622,13 +619,13 @@ blockquote { .quote { &>blockquote { .onebox-result { - background-color: dark-light-diff($primary, $secondary, 97%, -45%); + background-color: blend-primary-secondary(5%); } } aside { .quote, .title, blockquote, .onebox, .onebox-result { - background: dark-light-diff($primary, $secondary, 97%, -45%); + background: blend-primary-secondary(5%); border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); } @@ -695,9 +692,6 @@ $topic-avatar-width: 45px; z-index: 2; border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%); padding: 12px $topic-body-width-padding 15px $topic-body-width-padding; - &.highlighted { - background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); - } } .topic-avatar { border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%); @@ -709,18 +703,18 @@ $topic-avatar-width: 45px; } .gap { - background-color: scale-color-diff(); - padding: 5px 0; - color: lighten($primary, 30%); - cursor: pointer; - text-align: center; width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}); } +.small-action { + width: 755px; + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%); +} + .posts-wrapper { position: relative; -webkit-font-smoothing: subpixel-antialiased; - } +} .dropdown { position: relative; @@ -747,7 +741,7 @@ $topic-avatar-width: 45px; margin: 1px 0 0; list-style: none; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); box-shadow: 0 1px 5px rgba(0,0,0, .4); background-clip: padding-box; span {font-size: 0.857em;} @@ -795,17 +789,20 @@ $topic-avatar-width: 45px; } #selected-posts { - - padding-left: 20px; - margin-left: 330px; width: 200px; position: fixed; z-index: 1000; - left: 50%; background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); border: 1px solid $tertiary; padding: 5px; margin-bottom: 5px; + right: 10px; + + @include large-width { + right: auto; + margin-left: 330px; + left: 50%; + } button { width: 180px; @@ -862,6 +859,7 @@ $topic-avatar-width: 45px; } } } + .topic-post { &.selected { article.boxed { @@ -886,14 +884,14 @@ $topic-avatar-width: 45px; left: 100%; z-index: 490; top: 8px; - width: 800px; + width: 200px; height: 100px; background-color: $secondary; button { margin-left: 8px; - background-color: scale-color($primary, $lightness: 70%); - border: 1px solid scale-color($primary, $lightness: 60%); + background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); + border: 1px solid dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); color: $primary; } } @@ -937,17 +935,24 @@ a.attachment:before { float: right; font-size: 0.929em; margin-top: 1px; - a {color: scale-color($primary, $lightness: 50%);} + a {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } } +.who-liked { + margin-top: 20px; + margin-bottom: 0px; + width: 100%; + text-align: right; +} + span.highlighted { background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); } .username.new-user a { - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } .read-state { @@ -963,6 +968,13 @@ span.highlighted { transition: opacity ease-out 1s; } +.signup-cta { + width: $topic-body-width; + a { + float: right; + text-decoration: underline; + } +} /* Tablet (portrait) ----------- */ @@ -998,6 +1010,8 @@ and (max-width : 870px) { } + + /* below standard tablet portrait ----------- */ @media all diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 49d1d1370c..c3929fd250 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -58,7 +58,7 @@ } .private-message-glyph { - color: scale-color($primary, $lightness: 75%); + color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); float: left; margin: 0 5px 0 0; } @@ -66,7 +66,7 @@ a.reply-new { margin-top: 3px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); i { margin-right: 3px; background: $secondary; @@ -120,7 +120,7 @@ a:hover.reply-new { } #topic-progress-expanded { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; background: $secondary; @include box-shadow(0 0px 2px rgba(0,0,0, .2)); @@ -161,7 +161,7 @@ a:hover.reply-new { #topic-progress { position: relative; - left: 345px; + left: 340px; &.hidden { display: none; } @@ -228,40 +228,36 @@ a:hover.reply-new { } @media all -and (max-width : 940px) { +and (max-width : 1000px) { #topic-progress, #topic-progress-expanded { - left: 295px; + right: 0; + left: 0; } -} - - -@media all -and (max-width : 870px) { - - #topic-progress, #topic-progress-expanded { - left: 210px; - } - -} - - -@media all -and (max-width : 724px) { #topic-progress-wrapper { - right: 0; - #topic-progress, #topic-progress-expanded { left: auto; right: 145px; } + right: 160px; } + #topic-progress-wrapper.docked { + right: 152px; + } + + #topic-footer-main-buttons { + max-width: 70%; + } } + @media all and (max-width : 485px) { #topic-progress-wrapper.docked { display: none; - } + } + #topic-footer-main-buttons { + max-width: 100%; + } } diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss index 431130be68..5dc9fe66e4 100644 --- a/app/assets/stylesheets/desktop/upload.scss +++ b/app/assets/stylesheets/desktop/upload.scss @@ -17,7 +17,7 @@ line-height: 18px; } .description, .hint { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } .hint { font-style: italic; diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index 6781e222d3..dbe2f757fc 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -1,4 +1,8 @@ // styles that apply to the "share" popup when sharing a link to a post or topic +// Colors should mostly be absolute here, it will look the same in dark & light themes + +$user_card_primary: #fff; +$user_card_background: #222; #user-card { position: absolute; @@ -6,30 +10,26 @@ left: -9999px; top: -9999px; z-index: 990; - box-shadow: 0 2px 6px rgba(0,0,0,.6); + box-shadow: 0 2px 12px rgba($primary, .6); margin-top: -2px; - background-color: $primary; - color: $secondary; + color: $user_card_primary; background-size: cover; - background-position: center center; + background: $user_card_background center center; min-height: 175px; - opacity: 0; - -webkit-transform: scale(.9); - -ms-transform: scale(.9); - transform: scale(.9); -webkit-transition: opacity .2s, -webkit-transform .2s; transition: opacity .2s, transform .2s; + opacity: 0; + @include transform(scale(.9)); + &.show { opacity: 1; - -webkit-transform: scale(1); - -ms-transform: scale(1); - transform: scale(1); + @include transform(scale(1)); } .card-content { padding: 12px 12px 0 12px; - background: rgba($primary, .85); + background: rgba($user_card_background, .85); margin-top: 80px; &:after { @@ -55,7 +55,6 @@ } h1 { - display: inline-block; min-width: 120px; font-size: 1.786em; line-height: 1.25; @@ -65,11 +64,11 @@ overflow: hidden; text-overflow: ellipsis; a { - color: $secondary; + color: $user_card_primary; } i { font-size: .8em; - color: $secondary; + color: $user_card_primary; } } @@ -83,7 +82,7 @@ overflow: hidden; text-overflow: ellipsis; a { - color: $secondary; + color: $user_card_primary; } } @@ -91,11 +90,11 @@ font-size: 0.929em; font-weight: normal; margin-top: 0; - color: dark-light-diff($secondary, $primary, 25%, -25%); + color: scale-color($user_card_primary, $lightness: 25%); overflow: hidden; text-overflow: ellipsis; a { - color: dark-light-diff($primary, $secondary, 50%, -50%); + color: scale-color($user_card_background, $lightness: 50%); } } @@ -103,10 +102,10 @@ font-size: 0.929em; font-weight: normal; margin-top: 0; - color: $primary; + color: $user_card_background; .group-link { - color: $primary; + color: $user_card_background; } } @@ -118,11 +117,11 @@ display: inline; margin-right: 5px; .desc, a { - color: dark-light-diff($secondary, $primary, 50%, -50%); + color: scale-color($user_card_primary, $lightness: 50%); } } - div {display: inline; color: scale-color($primary, $lightness: 50%); - .group-link {color: scale-color($primary, $lightness: 50%);} + div {display: inline; color: scale-color($user_card_background, $lightness: 50%); + .group-link {color: scale-color($user_card_background, $lightness: 50%);} } } @@ -140,7 +139,7 @@ clear: left; a { - color: $secondary; + color: $user_card_primary; text-decoration: underline; } img { @@ -148,7 +147,7 @@ } a.mention { - background-color: dark-light-diff($secondary, $primary, 50%, -60%); + background-color: scale-color($user_card_primary, $lightness: -60%); } .overflow { max-height: 60px; @@ -180,7 +179,7 @@ } .new-user a { - color: scale-color($primary, $lightness: 70%); + color: scale-color($user_card_background, $lightness: 70%); } &.show-badges { @@ -210,12 +209,12 @@ .user-badge { background: transparent; - color: dark-light-diff($primary, $secondary, 50%, -50%); - border-color: dark-light-diff($primary, $secondary, 50%, -50%); + color: scale-color($user_card_background, $lightness: 50%); + border-color: scale-color($user_card_background, $lightness: 50%); } h3 { - color: $primary; + color: $user_card_background; font-size: 1em; margin-bottom: -8px; } @@ -242,6 +241,6 @@ right: 12px; bottom: 12px; font-size: 2.143em; - i {color: $secondary;} + i {color: $user_card_primary;} } } diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index fc26148d32..ea4202fb0c 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -39,7 +39,7 @@ } } - #pagedown-editor { + .pagedown-editor { width: 450px; textarea { @@ -56,7 +56,7 @@ display: inline-block; } .instructions { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-left: 160px; margin-top: 5px; margin-bottom: 10px; @@ -104,6 +104,12 @@ } +.viewing-self .user-main .about.collapsed-info { + .secondary, .staff-counters { + display: inherit; + } +} + .user-main { margin-bottom: 50px; @@ -115,19 +121,24 @@ overflow: hidden; text-overflow: ellipsis; } - th.seen { + th { + padding: 0.5em; text-align: right; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } td.avatar { width: 60px; } td { + padding: 0.5em; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); img { margin-right: 10px; } - span.last-seen-at { + span.text { float: right; - color: $primary; + font-size: 1.2em; + color: dark-light-diff($primary, $secondary, 50%, -50%); } } } @@ -145,7 +156,7 @@ .user-content { padding: 10px 8px; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); margin-bottom: 10px; box-sizing: border-box; @@ -163,13 +174,15 @@ th { text-align: left; - border-bottom: 1px solid scale-color-diff(); - padding: 5px; + border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%); + padding: 0 0 10px 0; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + font-weight: normal; } td { - padding: 5px; - border-bottom: 1px solid scale-color-diff(); + padding: 10px 0 10px 0; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } } @@ -179,6 +192,26 @@ max-height: 45px; } } + + .user-invite-list { + margin-top: 15px; + } + + .user-invite-controls { + background-color: dark-light-diff($primary, $secondary, 90%, -75%); + padding: 5px 10px 0px 0; + height: 35px; + } + + .user-invite-search { + clear: both; + margin: 15px 0px -15px 0px; + } + + .user-invite-none { + clear: both; + padding: 15px; + } } .about { @@ -187,12 +220,12 @@ width: 100%; margin-bottom: 10px; overflow: hidden; - color: $secondary; &.group { .details { padding: 15px; margin: 0; + color: dark-light-choose($secondary, lighten($primary, 10%)); } } @@ -242,7 +275,7 @@ .details { padding: 15px 15px 4px 15px; margin-top: -200px; - background: rgba($primary, .85); + background: dark-light-choose(rgba($primary, .85), rgba($secondary, .85)); transition: margin .15s linear; h1 { @@ -289,20 +322,20 @@ width: 100%; position: relative; float: left; - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); h1 {font-weight: bold;} .primary-textual { padding: 3px; a[href] { - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); } } .bio { - color: $secondary; + color: dark-light-choose($secondary, lighten($primary, 10%)); max-height: 300px; overflow: auto; max-width: 750px; @@ -333,7 +366,7 @@ padding: 5px 10px; width: 140px; margin-bottom: 10px; - } + } .right { float: right; @@ -369,7 +402,7 @@ .details { padding: 12px 15px 2px 15px; margin-top: 0; - background: rgba($primary, 1); + background: dark-light-choose(rgba($primary, 1), scale-color($secondary, $lightness: 15%)); .bio { display: none; } .primary { @@ -422,7 +455,7 @@ .item { padding: 20px 8px 15px 8px; background-color: $secondary; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } .type { color: $primary; @@ -445,10 +478,10 @@ margin-right: 4px; } .title { - font-size: 1em; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + display: block; } .name { font-size: 1em; @@ -458,7 +491,7 @@ text-overflow: ellipsis; } .edit-reason { - background-color: scale-color($highlight, $lightness: 25%); + background-color: dark-light-choose(scale-color($highlight, $lightness: 25%), scale-color($highlight, $lightness: -50%)); padding: 3px 5px 5px 5px; } .remove-bookmark { @@ -485,30 +518,42 @@ } // common/base/header.scss .fa, .icon { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-size: 1.714em; } } + .group-member-info { + .name { + display: inline-block; + margin-top: 5px; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + .title { + display: inline-block; + margin-top: 5px; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + } } .staff-counters { text-align: left; background: $primary; + color: $secondary; + a { + color: $secondary; + } > div { margin: 0 10px 0 0; display: inline-block; padding: 5px 0; &:first-of-type { padding-left: 10px; - } + } span { padding: 1px 5px; border-radius: 10px; - } - - } - a { - color: $secondary; + } } .active { font-weight: bold; @@ -562,7 +607,7 @@ float: auto; } p { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-top: 5px; margin-bottom: 10px; font-size: 80%; diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 6aa22e1e9c..acf5fc3031 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -3,6 +3,7 @@ @import "./common/foundation/variables"; @import "./common/foundation/colors"; +@import "./common/foundation/mixins"; @import "./common/base/onebox"; article.post { @@ -13,8 +14,8 @@ article.post { } .quote .title { - border-left: 5px solid darken(scale-color-diff(), 10%); - background-color: scale-color-diff(); + border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%); + background-color: dark-light-diff($primary, $secondary, 97%, -45%); padding: 10px 10px 0 12px; .avatar { margin-right: 7px; } } @@ -26,8 +27,8 @@ article.post { blockquote { padding: 10px 8px 10px 13px; margin: 0 0 10px 0; - background-color: scale-color-diff(); - border-left: 5px solid darken(scale-color-diff(), 10%); + background-color: dark-light-diff($primary, $secondary, 97%, -45%); + border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%); overflow: hidden; p { margin: 0 0 10px 0; @@ -50,32 +51,13 @@ article.post { img { max-width: 45px; + border-radius: 50%; } } - h3.username { - font-size: 0.929em; - margin: 0 0 10px 0; - - a { - color: #5c5c5c - } - a.staff { - background-color: #ffffc2; - } - - a.new-user { - color: scale-color($primary, $lightness: 70%); - } - - span.title { - font-weight: normal; - color: #999; - } - } .cooked { - padding: 10px 0 20px 0; + padding: 10px 0; margin-left: 65px; word-wrap: break-word; word-break: break-word; @@ -92,17 +74,32 @@ article.post { } } +.username { + font-size: 0.929em; + margin: 0 0 10px 0; + + a { + color: #5c5c5c + } + a.staff { + background-color: #ffffc2; + } + + a.new-user { + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); + } + + span.title { + font-weight: normal; + color: #999; + } +} + img.emoji { width: 20px; height: 20px; } -.post-replies { - background-color: #eee; - padding: 5px; - display: inline-block; -} - .in-reply-to { font-size: 0.929em; text-align: center; @@ -117,22 +114,25 @@ img.emoji { color: #999; } -header.embedded { - padding: 10px 10px 20px 10px; +header.discourse { + padding-left: 10px; + padding-bottom: 8px; font-size: 1.286em; - border-bottom: 1px solid #ddd; + border-bottom: 3px solid #ddd; + + .button { + float:right; + } } footer { font-size: 1.286em; - - .logo { - margin-right: 10px; - margin-top: 10px; - } - - a[href].button { - margin: 10px 0 0 10px; + margin-top: 0.5em; + .button { + color: white; + padding: 6px 8px; + background-color: #0088cc; + display: inline-block; } } @@ -140,9 +140,3 @@ footer { float: right; max-height: 30px; } - -a[href].button { - background-color: #eee; - padding: 5px; - display: inline-block; -} diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 91bf389d17..8434f8c731 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -18,6 +18,8 @@ @import "mobile/user"; @import "mobile/history"; @import "mobile/directory"; +@import "mobile/menu-panel"; +@import "mobile/search"; /* These files doesn't actually exist, they are injected by DiscourseSassImporter. */ diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index b35bd8096b..d63afa772d 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -13,33 +13,26 @@ display: none !important; // can be removed if inline JS CSS is removed from com display: none !important; // can be removed if inline JS CSS is removed from composer-popup } +input { + background: $secondary; + color: $primary; + border-color: blend-primary-secondary(15%); +} + #reply-control { // used for upload link .composer-bottom-right { - position: absolute; - bottom: -32px; - right: -5px; - } - .toggle-preview { display:none; } - .preview-wrapper { display:none; } - #mobile-uploader { display: none; } - #draft-status, #file-uploading, .mobile-file-upload { float: right; - margin-right: 8px; + line-height: 3em; } - #file-uploading { - left: 51%; - font-size: 0.857em; - color: scale-color($secondary, $lightness: 50%); - } - #draft-status { - color: scale-color($primary, $lightness: 75%); - } - transition: height 0.4s ease; + #mobile-uploader { display: none; } + .mobile-file-upload.hidden { display: none; } + #draft-status, #file-uploading, .mobile-file-upload { display: inline-block; } + transition: height .4s ease; width: 100%; z-index: 1039; height: 0; - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); bottom: 0; font-size: 1em; position: fixed; @@ -48,7 +41,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com right: 1px; position: absolute; font-size: 1.071em; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); padding: 0 10px 5px 10px; &:before { font-family: "FontAwesome"; @@ -57,8 +50,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com } a.cancel { padding-left: 7px; - float: left; - margin-top: 6px; + line-height: 30px; } .control-row { margin: 0 0 0 5px; @@ -66,6 +58,9 @@ display: none !important; // can be removed if inline JS CSS is removed from com overflow: hidden; max-width: 92%; white-space: nowrap; + i { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } } } .saving-text { @@ -88,7 +83,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com &.draft { height: 35px !important; cursor: pointer; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .draft-text { display: block; position: absolute; @@ -103,7 +98,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com } &.saving { height: 40px !important; - border-top: 1px solid scale-color-diff(); + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); .saving-text { display: block; } @@ -165,19 +160,20 @@ display: none !important; // can be removed if inline JS CSS is removed from com #reply-title { margin-right: 10px; &:disabled { - background-color: scale-color($primary, $lightness: 75%); + background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); } } - #wmd-input:disabled { - background-color: scale-color($primary, $lightness: 75%); + .wmd-input:disabled { + background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); } - #wmd-input { - color: darken($primary, 40%); + .wmd-input { + color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%)); } - #wmd-input { + .wmd-input { bottom: 35px; } .submit-panel { + width: 50%; position: absolute; display: block; bottom: 2px; @@ -226,7 +222,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com bottom: 50px; display: block; - #wmd-input { + .wmd-input { width: 100%; height: 100%; min-height: 100%; @@ -236,7 +232,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com word-wrap: break-word; box-sizing: border-box; } - #wmd-input { + .wmd-input { position: absolute; left: 0; top: 0; @@ -254,7 +250,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com } } } - #wmd-button-bar { + .wmd-button-bar { display: none; } } diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss index e1229ad08e..bbdbf8cf02 100644 --- a/app/assets/stylesheets/mobile/directory.scss +++ b/app/assets/stylesheets/mobile/directory.scss @@ -40,7 +40,6 @@ margin-left: 0.2em; color: dark-light-diff($primary, $secondary, 50%, -50%); } - i.fa-heart { color: $love; } diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss index 30ebb6a6ee..d88232804a 100644 --- a/app/assets/stylesheets/mobile/discourse.scss +++ b/app/assets/stylesheets/mobile/discourse.scss @@ -6,12 +6,19 @@ body { background-color: $secondary; } +// This sets the space between the application content and the edge of the +// screen. This value is required in 'mobile/header.scss' to set the position +// of the drop-down menu. +$mobile-wrapper-padding: 10px; +.wrap { + padding: 0 $mobile-wrapper-padding; +} + body { .boxed { - height: 100%; .contents { - padding: 10px; + padding: 10px 0 0 0; } &.white { background-color: $secondary; @@ -80,8 +87,7 @@ blockquote { // we must remove margins for text site titles h2#site-text-logo { - margin: 0; - margin-left: 10px; + margin: 0 0 0 10px; } // categories should not be bold on mobile; they fight with the topic title too much diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index bfabc70897..25fd40d141 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -5,12 +5,12 @@ .d-header { #site-logo { - max-width: 135px; + max-width: 155px; } // some protection for text-only site titles .title { - max-width: 140px; + max-width: 160px; height: 39px; overflow: hidden; padding: 0; @@ -19,6 +19,7 @@ .icons { .badge-notification { + top: -5px; color: $secondary; } @@ -36,47 +37,6 @@ padding-top: 60px; } -// Dropdowns -// -------------------------------------------------- - -.d-dropdown { - width: 290px; - margin-top: -1px; - - // Common - - .heading { - color: $primary; - font-weight: bold; - font-size: 0.857em; - line-height: 15px; - } - - // Search - - .searching { - position: absolute; - top: 0; - right: 25px; - } - - input[type='text'] { - width: 265px; - font-size: 1.143em; - } - - &#user-dropdown { - width: 155px; - } - - .btn { - padding: 2px 8px; - .fa { - margin-right: 5px; - } - } -} - .search-link .badge-category { display: none; } @@ -84,7 +44,3 @@ .search-link .topic-statuses .topic-status i { font-size: 1em; } - -.d-dropdown#search-dropdown .heading { - padding: 0; -} diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss index f2a04ae88b..0f52dbb84a 100644 --- a/app/assets/stylesheets/mobile/history.scss +++ b/app/assets/stylesheets/mobile/history.scss @@ -9,7 +9,7 @@ line-height: 2em; } #revision-details { - background-color: scale-color-diff(); + background-color: dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; margin-top: 10px; } diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss index 6093849bfe..790d84864c 100644 --- a/app/assets/stylesheets/mobile/login.scss +++ b/app/assets/stylesheets/mobile/login.scss @@ -14,7 +14,7 @@ #login-form { a { - color: scale-color($primary, $lightness: 35%); + color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%)); } label { float: left; display: block; } textarea, input, select {font-size: 1.143em; clear: left; margin-top: 0; } @@ -42,7 +42,7 @@ a#forgot-password-link {clear: left; float: left; } tr.instructions { label { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } diff --git a/app/assets/stylesheets/mobile/menu-panel.scss b/app/assets/stylesheets/mobile/menu-panel.scss new file mode 100644 index 0000000000..972ea30ab2 --- /dev/null +++ b/app/assets/stylesheets/mobile/menu-panel.scss @@ -0,0 +1,7 @@ +.menu-panel { + span.badge-category { + max-width: 85px; + overflow: hidden; + text-overflow: ellipsis; + } +} diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 8c94edf25c..6431e56b99 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -17,7 +17,6 @@ width: 100%; height: auto; background-color: $secondary; - border: 1px solid scale-color($secondary, $lightness: 90%); border: 1px solid rgba(0, 0, 0, 0.3); @include border-radius-all (6px); @@ -89,9 +88,14 @@ form { margin-top: 20px; input[type=text] { - width: 500px; + box-sizing: border-box; + width: 100%; } } + + .category-combobox { + width: 100%; + } } .flag-modal { @@ -100,7 +104,7 @@ .custom-message-length { margin: -10px 0 10px 20px; - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); font-size: 85%; } @@ -168,14 +172,27 @@ } #search-help { - max-width: 300px; + max-width: 98%; } -#search-help h2 { - margin: 0; - font-size: 0.857em; +// this makes the table behave like a flat list +#search-help td { + display: block; + padding-left: 10px; +} + +#search-help h3 { + display: none; } #search-help p { - margin: 5px; -} \ No newline at end of file + margin: 10px; +} + +#search-help .btn-primary { + float: none; +} + +#google-search form { + padding-left: 10px; +} diff --git a/app/assets/stylesheets/mobile/search.scss b/app/assets/stylesheets/mobile/search.scss new file mode 100644 index 0000000000..0438c41c05 --- /dev/null +++ b/app/assets/stylesheets/mobile/search.scss @@ -0,0 +1,16 @@ +.search button.btn-primary, .search button.btn { + float: none; +} + +.search.row { + margin-top: 5px; +} + +.search.row input.search { + height: 25px; + width: 69%; +} + +.fps-search-context { + margin-bottom: 15px; +} diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 1ae24f4ef5..043fe85f6d 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -6,7 +6,10 @@ // -------------------------------------------------- .list-controls { - margin: 5px; + .category-breadcrumb.hidden { + display: none; + } + margin: 5px 0; .nav { float: left; margin-right: 15px; @@ -17,6 +20,37 @@ .btn { float: right; margin-left: 8px; + margin-top: 5px; + } + .nav-pills { + position: relative; + } + .nav-pills .drop { + border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); + position: absolute; + z-index: 1000; + background-color: $secondary; + padding: 0 10px 10px 10px; + width: 150px; + top: 100%; + margin: 0; + li { + list-style-type: none; + margin-left: 0; + margin-top: 5px; + padding-top: 10px; + a { + width: 100%; + display: inline-block; + } + } + + } + .nav-pills > li { + background: dark-light-diff($primary, $secondary, 90%, -65%); + i.fa-caret-down { + margin-left: 8px; + } } } @@ -31,22 +65,38 @@ > tbody > tr { &.highlighted { - background-color: scale-color($tertiary, $lightness: 85%); + background-color: dark-light-choose(scale-color($tertiary, $lightness: 85%), scale-color($tertiary, $lightness: -55%)); } } th, td { - padding: 7px 5px; - color: scale-color($primary, $lightness: 50%); + padding: 7px 0; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } a.title {color: $primary;} - .badge-notification { + .badge-notification, .category-topic-link td.num .badge-notification { position: relative; top: -1px; - i {color: $secondary;} + font-size: 1.071em; + padding: 4px 6px 3px 6px; + i {color: $secondary;} + + &.new-topic::before { + margin-right: 0; + } + &.new-topic { + padding-right: 0; + top: -3px; + } + } + + .category-topic-link td.num .badge-notification { + &.new-posts, &.unread-posts { + color: dark-light-choose($secondary, $secondary); + } } .topic-item-stats { @@ -57,13 +107,14 @@ .category a { max-width: 160px; } - .num .fa { - color: scale-color($primary, $lightness: 50%); + .num .fa, a, a:visited { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } .num.posts { font-weight: bold; + text-align: right; } .age { @@ -76,6 +127,25 @@ // Category list // -------------------------------------------------- +.categories-list .list-container { + margin-left: -10px; // Extend past the .wrap padding to the edge of the window +} + +.category-list-item.category { + // Allow percentage widths on table cells to include their padding + box-sizing: border-box; + *, *:before, *:after { + box-sizing: inherit; + } + + .posts { + width: 10%; + } + + .age { + margin-left: 5px; + } +} tr.category-topic-link { border-top: darken($secondary, 3%) 1px solid; @@ -109,7 +179,7 @@ tr.category-topic-link { .featured-topic { margin: 8px 0; a.last-posted-at, a.last-posted-at:visited { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } } @@ -126,7 +196,7 @@ tr.category-topic-link { h3 { display: inline-block; font-size: 1.286em; - margin: 10px 0 0 5px; + margin: 0 0 0 10px; i { margin-right: 5px; } @@ -139,6 +209,10 @@ tr.category-topic-link { padding-left: 10px; } + .category-topic-link .main-link .age { + font-size: 0.857em; + } + .category-description td { padding-top: 0; padding-bottom: 15px; @@ -162,6 +236,13 @@ tr.category-topic-link { font-size: 110%; } + .category-topic-link .num { + white-space: nowrap; + .number { + font-size: 1.071em; + } + } + .posters { float: left; @@ -172,7 +253,7 @@ tr.category-topic-link { figure { float: left; margin: 3px 7px 0 0; - color: scale-color($primary, $lightness: 10%); + color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%)); font-weight: bold; font-size: 0.857em; } @@ -189,7 +270,7 @@ tr.category-topic-link { .topic-list-bottom { - margin: 20px 12px 0 12px; + margin: 20px 0 0 0; } @@ -234,17 +315,14 @@ tr.category-topic-link { float: left; width: 280px; padding: 4px 0; - margin: 1px 0 0; list-style: none; background-color: $secondary; - border: 1px solid scale-color-diff(); - border: 1px solid rgba(0, 0, 0, 0.2); + border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), scale-color($primary, $lightness: -60%)); border-radius: 5px; box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); background-clip: padding-box; - margin-bottom: 20px; -.title {font-weight: bold; display: block;} - + margin: 1px 0 20px; + .title {font-weight: bold; display: block;} } .dropdown-menu a { display: block; @@ -307,20 +385,23 @@ ol.category-breadcrumb { padding: 8px 0; } -.period-chooser { - button { - margin-top: 10px; - } -} - button.dismiss-read { margin-right: 10px; } // base defines extra padding for easier click/top of title field // this is a bit too much for mobile -td.main-link { +td .main-link { + width: 80%; + display: inline-block; a.title { padding: 5px 10px 5px 0; } } +.topic-list { + .posts-map { + display: inline; + font-size: 1.071em; + padding-top: 2px; + } +} diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 97544907a7..0fc61f2977 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -1,14 +1,22 @@ .gap { - background-color: scale-color-diff(); - padding: 5px 15px; - color: $primary; - text-align: center; - margin: 10px 0; + /* may not need this */ +} + +.time-gap { + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + color: lighten($primary, 50%); + padding-bottom: 3px; + margin-bottom: 10px; + text-transform: uppercase; + font-weight: bold; + .topic-avatar { + margin: 0 5px 0 10px; + } } .topic-post { - border-top: 1px solid scale-color-diff(); - padding: 6px 0 3px 0; + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + padding: 6px 0; } span.badge-posts { @@ -17,22 +25,28 @@ span.badge-posts { .show-replies { display: none; - i { - margin-left: 5px; - } } nav.post-controls { clear: both; } +.who-liked { + margin-left: 10px; +} + +button.like-count { + font-size: 1em; + padding: 8px 4px; +} + button { border: none; font-size: 1.214em; padding: 8px 10px; vertical-align: top; background: transparent; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); float: left; &.hidden { display: none; @@ -74,7 +88,7 @@ button { background-color: $secondary; width: 205px; padding: 10px; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); position: absolute; text-align: left; bottom: 0; @@ -116,8 +130,7 @@ button { } .post-actions { - display: inline-block; - width: 100%; + /* overriding display: here was causing hidden element to take up space */ } .post-action { @@ -134,7 +147,7 @@ a.reply-to-tab { position: absolute; z-index: 400; right: 80px; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); span { display: none; } } @@ -145,16 +158,13 @@ a.star { } .topic-post .boxed .contents { - float: none; - padding-top: 5px; clear: both; - position: relative; } .topic-map { - margin: 10px; - background: dark-light-diff($primary, $secondary, 97%, -45%); + margin: 10px 0; + background: blend-primary-secondary(5%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: none; // would cause double top border @@ -165,7 +175,7 @@ a.star { h3 { margin-bottom: 4px; margin-top: 0; - color: scale-color($primary, $lightness: 20%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); line-height: 23px; font-weight: normal; font-size: 1em; @@ -173,7 +183,7 @@ a.star { h4 { margin: 0 0 3px 0; - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-weight: normal; font-size: 0.857em; line-height: 15px; @@ -230,7 +240,7 @@ a.star { line-height: 20px; } .number, i { - color: scale-color($primary, $lightness: 20%); + color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%)); font-size: 110%; } @@ -253,7 +263,7 @@ a.star { } .domain { - color: scale-color($primary, $lightness: 75%); + color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); } .topic-links { @@ -273,7 +283,7 @@ a.star { border: 0; padding: 0 15px; color: $primary; - background: dark-light-diff($primary, $secondary, 97%, -75%); + background: blend-primary-secondary(5%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); .fa { @@ -286,8 +296,9 @@ a.star { } #topic-footer-buttons { - border-top: 1px solid scale-color-diff(); - padding: 20px 10px 0 10px; + @include clearfix; + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + padding: 20px 0 0 0; .fa-bookmark.bookmarked { color: $tertiary; } } @@ -299,7 +310,7 @@ a.star { #suggested-topics { clear: left; - padding: 20px 10px 15px 10px; + padding: 20px 0 15px 0; th.views, td.views, td.activity, th.activity, th.likes, td.likes { display: none; } @@ -330,7 +341,7 @@ span.post-count { #topic-title { z-index: 1000; margin: 0 0 0 0 !important; - padding: 15px 10px 15px 10px; + padding: 15px 0; } .topic-post { @@ -381,14 +392,13 @@ iframe { } #selected-posts { - float: left; width: 97%; padding-left: 3%; - background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); + background-color: srgb-scale($tertiary, $secondary, 15%); .btn { margin-bottom: 10px; color: $secondary; - background: scale-color($tertiary, $lightness: 50%); + background: $tertiary; clear: both; } p { @@ -405,7 +415,7 @@ button.select-post { position: absolute; z-index: 401; // 400 is the reply-to tab left: 200px; - background-color: scale-color($tertiary, $lightness: 50%); + background-color: srgb-scale($tertiary, $secondary, 60%); color: $secondary; padding: 5px; } @@ -423,14 +433,6 @@ button.select-post { background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); } -#show-topic-admin { - color: scale-color($primary, $lightness: 50%); - right: 0; - border-right: 0; - padding-right: 4px; - padding-left: 5px; -} - .deleted-user-avatar { font-size: 2.571em; } @@ -448,17 +450,13 @@ blockquote { .posts-wrapper { position: relative; } -.topic-body.highlighted { - background-color: scale-color($tertiary, $lightness: 75%); -} - span.highlighted { - background-color: scale-color($highlight, $lightness: 70%); + background-color: dark-light-choose(scale-color($highlight, $lightness: 70%), $highlight); } .topic-avatar { float: left; - position: relative; + padding-top: 5px; z-index:999; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */ } @@ -470,7 +468,7 @@ span.highlighted { .names { margin: 5px 0 0 5px; line-height: 17px; - padding-left: 60px; + padding-left: 50px; span { display: block; } @@ -484,7 +482,7 @@ span.highlighted { } .username.new-user a { - color: scale-color($primary, $lightness: 70%); + color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); } .user-title { @@ -497,3 +495,35 @@ span.highlighted { .read-state { display: none; } + +.signup-cta { + margin-left: auto; + margin-right: auto; + width: calc(100% - 50px); + a { + float: right; + text-decoration: underline; + margin-top: 7px; + } + button { + margin-right: 7px; + } +} + +.small-action .small-action-desc { + p { + padding-top: 0; + } + .custom-message { + margin-left: -40px; + } +} + +.small-action .topic-avatar { + padding: 0; + margin: 0; +} + +.small-action.time-gap .topic-avatar { + margin-top: -5px; +} diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 022b0af045..9e0d6e2164 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -14,8 +14,8 @@ .edits {margin-right: 5px;} #topic-title { - margin-bottom: 20px; - margin: 0 60px 10px 20px; + //margin-bottom: 20px; + margin: 0 60px 10px 0; h1 { font-size: 1.5em; line-height: 1.25em; @@ -31,7 +31,7 @@ .private-message-glyph { display: none; } } -.private-message-glyph { color: scale-color($primary, $lightness: 75%); } +.private-message-glyph { color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); } .private_message #topic-title .private-message-glyph { display: inline; } @@ -61,7 +61,7 @@ } #topic-progress-expanded { - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; background: $secondary; box-shadow: 0 0px 2px rgba(0,0,0, .2); @@ -69,7 +69,6 @@ position: absolute; bottom: 34px; width: 133px; - padding: 5px; button.full { width: 100%; diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss index d639f20dbd..00797993b0 100644 --- a/app/assets/stylesheets/mobile/upload.scss +++ b/app/assets/stylesheets/mobile/upload.scss @@ -7,7 +7,7 @@ line-height: 18px; } .description { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index 272ee387b8..13b7ebad09 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -67,7 +67,7 @@ display: none; } - #pagedown-editor { + .pagedown-editor { width: 100%; } @@ -112,7 +112,7 @@ display: inline-block; } .instructions { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-top: 5px; margin-bottom: 10px; font-size: 80%; @@ -166,27 +166,31 @@ overflow: hidden; text-overflow: ellipsis; } - th.seen { + th { + padding: 0.5em; text-align: right; - } - td.avatar { - width: 60px; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } td { + padding: 0.5em; + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); img { margin-right: 10px; } - span.last-seen-at { + span.text { float: right; color: $primary; } } + .user-small { + width: 245px; + } } .user-content { padding: 10px 8px; background-color: $secondary; - border: 1px solid scale-color-diff(); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); margin-bottom: 10px; box-sizing: border-box; margin-top: 20px; @@ -205,21 +209,20 @@ th { text-align: left; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 5px; } td { padding: 5px; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } } } .about { - background-color: dark-light-diff($primary, $secondary, 0%, -75%); background-size: cover; - background-position: center center; + background: dark-light-diff($primary, $secondary, 0%, -75%) center center; width: 100%; margin-bottom: 10px; overflow: hidden; @@ -258,7 +261,7 @@ .details { padding: 15px 15px 4px 15px; - background-color: rgba($primary, .9); + background-color: dark-light-choose(rgba($primary, .9), rgba($secondary, .9)); h1 { font-size: 2.143em; @@ -303,7 +306,7 @@ width: 100%; position: relative; float: left; - color: dark-light-diff($secondary, $primary, 75%, 0%); + color: dark-light-choose(scale-color($secondary, $lightness: 75%), blend-primary-secondary(90%)); h1 {font-weight: bold;} @@ -359,14 +362,14 @@ } .secondary { display: none; } - .profile-image { - height: 0; - } + .profile-image { + height: 0; + } .details { padding: 12px 15px 2px 15px; margin-top: 0; - background: rgba($primary, 1); + background: dark-light-choose(rgba($primary, 1), blend-primary-secondary(5%)); .bio { display: none; } .primary { @@ -420,7 +423,7 @@ .item { padding: 20px 0 15px 0; background-color: $secondary; - border-bottom: 1px solid scale-color-diff(); + border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); } .type { color: $primary; @@ -442,10 +445,10 @@ margin-right: 4px; } .title { - font-size: 1em; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + display: block; } .name { font-size: 1em; @@ -465,7 +468,7 @@ } .notification { &.unread { - background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); + background-color: dark-light-choose(scale-color($tertiary, $lightness: 85%), srgb-scale($tertiary, $secondary, 15%)); } li { display: inline-block; } @@ -483,10 +486,23 @@ } // common/base/header.scss .fa, .icon { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); font-size: 1.714em; } } + .group-member-info { + .name { + display: inline-block; + margin-top: 5px; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + vertical-align: inherit; + } + .title { + display: inline-block; + margin-top: 5px; + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + } } .staff-counters { @@ -561,7 +577,7 @@ float: auto; } p { - color: scale-color($primary, $lightness: 50%); + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-top: 5px; margin-bottom: 10px; font-size: 80%; diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss index cf73b4d7d8..df21cf6c8a 100644 --- a/app/assets/stylesheets/vendor/bootstrap.scss +++ b/app/assets/stylesheets/vendor/bootstrap.scss @@ -14,6 +14,7 @@ @import "common/foundation/mixins"; +//noinspection CssOverwrittenProperties a:focus { outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; diff --git a/app/assets/stylesheets/vendor/font_awesome/_bordered-pulled.scss b/app/assets/stylesheets/vendor/font_awesome/_bordered-pulled.scss index 9d3fdf3a0b..d4b85a02f2 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_bordered-pulled.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_bordered-pulled.scss @@ -7,6 +7,15 @@ border-radius: .1em; } +.#{$fa-css-prefix}-pull-left { float: left; } +.#{$fa-css-prefix}-pull-right { float: right; } + +.#{$fa-css-prefix} { + &.#{$fa-css-prefix}-pull-left { margin-right: .3em; } + &.#{$fa-css-prefix}-pull-right { margin-left: .3em; } +} + +/* Deprecated as of 4.4.0 */ .pull-right { float: right; } .pull-left { float: left; } diff --git a/app/assets/stylesheets/vendor/font_awesome/_core.scss b/app/assets/stylesheets/vendor/font_awesome/_core.scss index 5a2db9d561..7425ef85fc 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_core.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_core.scss @@ -3,11 +3,10 @@ .#{$fa-css-prefix} { display: inline-block; - font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration + font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); // ensures no half-pixel rendering in firefox } diff --git a/app/assets/stylesheets/vendor/font_awesome/_icons.scss b/app/assets/stylesheets/vendor/font_awesome/_icons.scss index fbcfe81237..62d97677c9 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_icons.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_icons.scss @@ -163,6 +163,7 @@ .#{$fa-css-prefix}-github:before { content: $fa-var-github; } .#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; } .#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; } +.#{$fa-css-prefix}-feed:before, .#{$fa-css-prefix}-rss:before { content: $fa-var-rss; } .#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; } .#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; } @@ -492,6 +493,8 @@ .#{$fa-css-prefix}-empire:before { content: $fa-var-empire; } .#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; } .#{$fa-css-prefix}-git:before { content: $fa-var-git; } +.#{$fa-css-prefix}-y-combinator-square:before, +.#{$fa-css-prefix}-yc-square:before, .#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; } .#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; } .#{$fa-css-prefix}-qq:before { content: $fa-var-qq; } @@ -502,7 +505,6 @@ .#{$fa-css-prefix}-send-o:before, .#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; } .#{$fa-css-prefix}-history:before { content: $fa-var-history; } -.#{$fa-css-prefix}-genderless:before, .#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; } .#{$fa-css-prefix}-header:before { content: $fa-var-header; } .#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; } @@ -573,6 +575,7 @@ .#{$fa-css-prefix}-venus:before { content: $fa-var-venus; } .#{$fa-css-prefix}-mars:before { content: $fa-var-mars; } .#{$fa-css-prefix}-mercury:before { content: $fa-var-mercury; } +.#{$fa-css-prefix}-intersex:before, .#{$fa-css-prefix}-transgender:before { content: $fa-var-transgender; } .#{$fa-css-prefix}-transgender-alt:before { content: $fa-var-transgender-alt; } .#{$fa-css-prefix}-venus-double:before { content: $fa-var-venus-double; } @@ -582,6 +585,7 @@ .#{$fa-css-prefix}-mars-stroke-v:before { content: $fa-var-mars-stroke-v; } .#{$fa-css-prefix}-mars-stroke-h:before { content: $fa-var-mars-stroke-h; } .#{$fa-css-prefix}-neuter:before { content: $fa-var-neuter; } +.#{$fa-css-prefix}-genderless:before { content: $fa-var-genderless; } .#{$fa-css-prefix}-facebook-official:before { content: $fa-var-facebook-official; } .#{$fa-css-prefix}-pinterest-p:before { content: $fa-var-pinterest-p; } .#{$fa-css-prefix}-whatsapp:before { content: $fa-var-whatsapp; } @@ -594,3 +598,80 @@ .#{$fa-css-prefix}-train:before { content: $fa-var-train; } .#{$fa-css-prefix}-subway:before { content: $fa-var-subway; } .#{$fa-css-prefix}-medium:before { content: $fa-var-medium; } +.#{$fa-css-prefix}-yc:before, +.#{$fa-css-prefix}-y-combinator:before { content: $fa-var-y-combinator; } +.#{$fa-css-prefix}-optin-monster:before { content: $fa-var-optin-monster; } +.#{$fa-css-prefix}-opencart:before { content: $fa-var-opencart; } +.#{$fa-css-prefix}-expeditedssl:before { content: $fa-var-expeditedssl; } +.#{$fa-css-prefix}-battery-4:before, +.#{$fa-css-prefix}-battery-full:before { content: $fa-var-battery-full; } +.#{$fa-css-prefix}-battery-3:before, +.#{$fa-css-prefix}-battery-three-quarters:before { content: $fa-var-battery-three-quarters; } +.#{$fa-css-prefix}-battery-2:before, +.#{$fa-css-prefix}-battery-half:before { content: $fa-var-battery-half; } +.#{$fa-css-prefix}-battery-1:before, +.#{$fa-css-prefix}-battery-quarter:before { content: $fa-var-battery-quarter; } +.#{$fa-css-prefix}-battery-0:before, +.#{$fa-css-prefix}-battery-empty:before { content: $fa-var-battery-empty; } +.#{$fa-css-prefix}-mouse-pointer:before { content: $fa-var-mouse-pointer; } +.#{$fa-css-prefix}-i-cursor:before { content: $fa-var-i-cursor; } +.#{$fa-css-prefix}-object-group:before { content: $fa-var-object-group; } +.#{$fa-css-prefix}-object-ungroup:before { content: $fa-var-object-ungroup; } +.#{$fa-css-prefix}-sticky-note:before { content: $fa-var-sticky-note; } +.#{$fa-css-prefix}-sticky-note-o:before { content: $fa-var-sticky-note-o; } +.#{$fa-css-prefix}-cc-jcb:before { content: $fa-var-cc-jcb; } +.#{$fa-css-prefix}-cc-diners-club:before { content: $fa-var-cc-diners-club; } +.#{$fa-css-prefix}-clone:before { content: $fa-var-clone; } +.#{$fa-css-prefix}-balance-scale:before { content: $fa-var-balance-scale; } +.#{$fa-css-prefix}-hourglass-o:before { content: $fa-var-hourglass-o; } +.#{$fa-css-prefix}-hourglass-1:before, +.#{$fa-css-prefix}-hourglass-start:before { content: $fa-var-hourglass-start; } +.#{$fa-css-prefix}-hourglass-2:before, +.#{$fa-css-prefix}-hourglass-half:before { content: $fa-var-hourglass-half; } +.#{$fa-css-prefix}-hourglass-3:before, +.#{$fa-css-prefix}-hourglass-end:before { content: $fa-var-hourglass-end; } +.#{$fa-css-prefix}-hourglass:before { content: $fa-var-hourglass; } +.#{$fa-css-prefix}-hand-grab-o:before, +.#{$fa-css-prefix}-hand-rock-o:before { content: $fa-var-hand-rock-o; } +.#{$fa-css-prefix}-hand-stop-o:before, +.#{$fa-css-prefix}-hand-paper-o:before { content: $fa-var-hand-paper-o; } +.#{$fa-css-prefix}-hand-scissors-o:before { content: $fa-var-hand-scissors-o; } +.#{$fa-css-prefix}-hand-lizard-o:before { content: $fa-var-hand-lizard-o; } +.#{$fa-css-prefix}-hand-spock-o:before { content: $fa-var-hand-spock-o; } +.#{$fa-css-prefix}-hand-pointer-o:before { content: $fa-var-hand-pointer-o; } +.#{$fa-css-prefix}-hand-peace-o:before { content: $fa-var-hand-peace-o; } +.#{$fa-css-prefix}-trademark:before { content: $fa-var-trademark; } +.#{$fa-css-prefix}-registered:before { content: $fa-var-registered; } +.#{$fa-css-prefix}-creative-commons:before { content: $fa-var-creative-commons; } +.#{$fa-css-prefix}-gg:before { content: $fa-var-gg; } +.#{$fa-css-prefix}-gg-circle:before { content: $fa-var-gg-circle; } +.#{$fa-css-prefix}-tripadvisor:before { content: $fa-var-tripadvisor; } +.#{$fa-css-prefix}-odnoklassniki:before { content: $fa-var-odnoklassniki; } +.#{$fa-css-prefix}-odnoklassniki-square:before { content: $fa-var-odnoklassniki-square; } +.#{$fa-css-prefix}-get-pocket:before { content: $fa-var-get-pocket; } +.#{$fa-css-prefix}-wikipedia-w:before { content: $fa-var-wikipedia-w; } +.#{$fa-css-prefix}-safari:before { content: $fa-var-safari; } +.#{$fa-css-prefix}-chrome:before { content: $fa-var-chrome; } +.#{$fa-css-prefix}-firefox:before { content: $fa-var-firefox; } +.#{$fa-css-prefix}-opera:before { content: $fa-var-opera; } +.#{$fa-css-prefix}-internet-explorer:before { content: $fa-var-internet-explorer; } +.#{$fa-css-prefix}-tv:before, +.#{$fa-css-prefix}-television:before { content: $fa-var-television; } +.#{$fa-css-prefix}-contao:before { content: $fa-var-contao; } +.#{$fa-css-prefix}-500px:before { content: $fa-var-500px; } +.#{$fa-css-prefix}-amazon:before { content: $fa-var-amazon; } +.#{$fa-css-prefix}-calendar-plus-o:before { content: $fa-var-calendar-plus-o; } +.#{$fa-css-prefix}-calendar-minus-o:before { content: $fa-var-calendar-minus-o; } +.#{$fa-css-prefix}-calendar-times-o:before { content: $fa-var-calendar-times-o; } +.#{$fa-css-prefix}-calendar-check-o:before { content: $fa-var-calendar-check-o; } +.#{$fa-css-prefix}-industry:before { content: $fa-var-industry; } +.#{$fa-css-prefix}-map-pin:before { content: $fa-var-map-pin; } +.#{$fa-css-prefix}-map-signs:before { content: $fa-var-map-signs; } +.#{$fa-css-prefix}-map-o:before { content: $fa-var-map-o; } +.#{$fa-css-prefix}-map:before { content: $fa-var-map; } +.#{$fa-css-prefix}-commenting:before { content: $fa-var-commenting; } +.#{$fa-css-prefix}-commenting-o:before { content: $fa-var-commenting-o; } +.#{$fa-css-prefix}-houzz:before { content: $fa-var-houzz; } +.#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; } +.#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; } +.#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; } diff --git a/app/assets/stylesheets/vendor/font_awesome/_mixins.scss b/app/assets/stylesheets/vendor/font_awesome/_mixins.scss index 6b7f160931..f96719b6a0 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_mixins.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_mixins.scss @@ -3,12 +3,11 @@ @mixin fa-icon() { display: inline-block; - font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration + font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); // ensures no half-pixel rendering in firefox } diff --git a/app/assets/stylesheets/vendor/font_awesome/_variables.scss b/app/assets/stylesheets/vendor/font_awesome/_variables.scss index 9b7210e23b..c10cd47f73 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_variables.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_variables.scss @@ -3,19 +3,22 @@ $fa-font-path: "../fonts" !default; $fa-font-size-base: 14px !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts" !default; // for referencing Bootstrap CDN font files directly +$fa-line-height-base: 1 !default; +//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly $fa-css-prefix: fa !default; -$fa-version: "4.3.0" !default; +$fa-version: "4.4.0" !default; $fa-border-color: #eee !default; $fa-inverse: #fff !default; $fa-li-width: (30em / 14) !default; +$fa-var-500px: "\f26e"; $fa-var-adjust: "\f042"; $fa-var-adn: "\f170"; $fa-var-align-center: "\f037"; $fa-var-align-justify: "\f039"; $fa-var-align-left: "\f036"; $fa-var-align-right: "\f038"; +$fa-var-amazon: "\f270"; $fa-var-ambulance: "\f0f9"; $fa-var-anchor: "\f13d"; $fa-var-android: "\f17b"; @@ -51,12 +54,23 @@ $fa-var-asterisk: "\f069"; $fa-var-at: "\f1fa"; $fa-var-automobile: "\f1b9"; $fa-var-backward: "\f04a"; +$fa-var-balance-scale: "\f24e"; $fa-var-ban: "\f05e"; $fa-var-bank: "\f19c"; $fa-var-bar-chart: "\f080"; $fa-var-bar-chart-o: "\f080"; $fa-var-barcode: "\f02a"; $fa-var-bars: "\f0c9"; +$fa-var-battery-0: "\f244"; +$fa-var-battery-1: "\f243"; +$fa-var-battery-2: "\f242"; +$fa-var-battery-3: "\f241"; +$fa-var-battery-4: "\f240"; +$fa-var-battery-empty: "\f244"; +$fa-var-battery-full: "\f240"; +$fa-var-battery-half: "\f242"; +$fa-var-battery-quarter: "\f243"; +$fa-var-battery-three-quarters: "\f241"; $fa-var-bed: "\f236"; $fa-var-beer: "\f0fc"; $fa-var-behance: "\f1b4"; @@ -71,6 +85,7 @@ $fa-var-birthday-cake: "\f1fd"; $fa-var-bitbucket: "\f171"; $fa-var-bitbucket-square: "\f172"; $fa-var-bitcoin: "\f15a"; +$fa-var-black-tie: "\f27e"; $fa-var-bold: "\f032"; $fa-var-bolt: "\f0e7"; $fa-var-bomb: "\f1e2"; @@ -89,7 +104,11 @@ $fa-var-buysellads: "\f20d"; $fa-var-cab: "\f1ba"; $fa-var-calculator: "\f1ec"; $fa-var-calendar: "\f073"; +$fa-var-calendar-check-o: "\f274"; +$fa-var-calendar-minus-o: "\f272"; $fa-var-calendar-o: "\f133"; +$fa-var-calendar-plus-o: "\f271"; +$fa-var-calendar-times-o: "\f273"; $fa-var-camera: "\f030"; $fa-var-camera-retro: "\f083"; $fa-var-car: "\f1b9"; @@ -105,7 +124,9 @@ $fa-var-cart-arrow-down: "\f218"; $fa-var-cart-plus: "\f217"; $fa-var-cc: "\f20a"; $fa-var-cc-amex: "\f1f3"; +$fa-var-cc-diners-club: "\f24c"; $fa-var-cc-discover: "\f1f2"; +$fa-var-cc-jcb: "\f24b"; $fa-var-cc-mastercard: "\f1f1"; $fa-var-cc-paypal: "\f1f4"; $fa-var-cc-stripe: "\f1f5"; @@ -127,12 +148,14 @@ $fa-var-chevron-left: "\f053"; $fa-var-chevron-right: "\f054"; $fa-var-chevron-up: "\f077"; $fa-var-child: "\f1ae"; +$fa-var-chrome: "\f268"; $fa-var-circle: "\f111"; $fa-var-circle-o: "\f10c"; $fa-var-circle-o-notch: "\f1ce"; $fa-var-circle-thin: "\f1db"; $fa-var-clipboard: "\f0ea"; $fa-var-clock-o: "\f017"; +$fa-var-clone: "\f24d"; $fa-var-close: "\f00d"; $fa-var-cloud: "\f0c2"; $fa-var-cloud-download: "\f0ed"; @@ -147,13 +170,17 @@ $fa-var-cogs: "\f085"; $fa-var-columns: "\f0db"; $fa-var-comment: "\f075"; $fa-var-comment-o: "\f0e5"; +$fa-var-commenting: "\f27a"; +$fa-var-commenting-o: "\f27b"; $fa-var-comments: "\f086"; $fa-var-comments-o: "\f0e6"; $fa-var-compass: "\f14e"; $fa-var-compress: "\f066"; $fa-var-connectdevelop: "\f20e"; +$fa-var-contao: "\f26d"; $fa-var-copy: "\f0c5"; $fa-var-copyright: "\f1f9"; +$fa-var-creative-commons: "\f25e"; $fa-var-credit-card: "\f09d"; $fa-var-crop: "\f125"; $fa-var-crosshairs: "\f05b"; @@ -193,6 +220,7 @@ $fa-var-exclamation: "\f12a"; $fa-var-exclamation-circle: "\f06a"; $fa-var-exclamation-triangle: "\f071"; $fa-var-expand: "\f065"; +$fa-var-expeditedssl: "\f23e"; $fa-var-external-link: "\f08e"; $fa-var-external-link-square: "\f14c"; $fa-var-eye: "\f06e"; @@ -205,6 +233,7 @@ $fa-var-facebook-square: "\f082"; $fa-var-fast-backward: "\f049"; $fa-var-fast-forward: "\f050"; $fa-var-fax: "\f1ac"; +$fa-var-feed: "\f09e"; $fa-var-female: "\f182"; $fa-var-fighter-jet: "\f0fb"; $fa-var-file: "\f15b"; @@ -230,6 +259,7 @@ $fa-var-film: "\f008"; $fa-var-filter: "\f0b0"; $fa-var-fire: "\f06d"; $fa-var-fire-extinguisher: "\f134"; +$fa-var-firefox: "\f269"; $fa-var-flag: "\f024"; $fa-var-flag-checkered: "\f11e"; $fa-var-flag-o: "\f11d"; @@ -242,6 +272,7 @@ $fa-var-folder-o: "\f114"; $fa-var-folder-open: "\f07c"; $fa-var-folder-open-o: "\f115"; $fa-var-font: "\f031"; +$fa-var-fonticons: "\f280"; $fa-var-forumbee: "\f211"; $fa-var-forward: "\f04e"; $fa-var-foursquare: "\f180"; @@ -253,7 +284,10 @@ $fa-var-gbp: "\f154"; $fa-var-ge: "\f1d1"; $fa-var-gear: "\f013"; $fa-var-gears: "\f085"; -$fa-var-genderless: "\f1db"; +$fa-var-genderless: "\f22d"; +$fa-var-get-pocket: "\f265"; +$fa-var-gg: "\f260"; +$fa-var-gg-circle: "\f261"; $fa-var-gift: "\f06b"; $fa-var-git: "\f1d3"; $fa-var-git-square: "\f1d2"; @@ -272,10 +306,19 @@ $fa-var-gratipay: "\f184"; $fa-var-group: "\f0c0"; $fa-var-h-square: "\f0fd"; $fa-var-hacker-news: "\f1d4"; +$fa-var-hand-grab-o: "\f255"; +$fa-var-hand-lizard-o: "\f258"; $fa-var-hand-o-down: "\f0a7"; $fa-var-hand-o-left: "\f0a5"; $fa-var-hand-o-right: "\f0a4"; $fa-var-hand-o-up: "\f0a6"; +$fa-var-hand-paper-o: "\f256"; +$fa-var-hand-peace-o: "\f25b"; +$fa-var-hand-pointer-o: "\f25a"; +$fa-var-hand-rock-o: "\f255"; +$fa-var-hand-scissors-o: "\f257"; +$fa-var-hand-spock-o: "\f259"; +$fa-var-hand-stop-o: "\f256"; $fa-var-hdd-o: "\f0a0"; $fa-var-header: "\f1dc"; $fa-var-headphones: "\f025"; @@ -286,16 +329,29 @@ $fa-var-history: "\f1da"; $fa-var-home: "\f015"; $fa-var-hospital-o: "\f0f8"; $fa-var-hotel: "\f236"; +$fa-var-hourglass: "\f254"; +$fa-var-hourglass-1: "\f251"; +$fa-var-hourglass-2: "\f252"; +$fa-var-hourglass-3: "\f253"; +$fa-var-hourglass-end: "\f253"; +$fa-var-hourglass-half: "\f252"; +$fa-var-hourglass-o: "\f250"; +$fa-var-hourglass-start: "\f251"; +$fa-var-houzz: "\f27c"; $fa-var-html5: "\f13b"; +$fa-var-i-cursor: "\f246"; $fa-var-ils: "\f20b"; $fa-var-image: "\f03e"; $fa-var-inbox: "\f01c"; $fa-var-indent: "\f03c"; +$fa-var-industry: "\f275"; $fa-var-info: "\f129"; $fa-var-info-circle: "\f05a"; $fa-var-inr: "\f156"; $fa-var-instagram: "\f16d"; $fa-var-institution: "\f19c"; +$fa-var-internet-explorer: "\f26b"; +$fa-var-intersex: "\f224"; $fa-var-ioxhost: "\f208"; $fa-var-italic: "\f033"; $fa-var-joomla: "\f1aa"; @@ -340,7 +396,11 @@ $fa-var-mail-forward: "\f064"; $fa-var-mail-reply: "\f112"; $fa-var-mail-reply-all: "\f122"; $fa-var-male: "\f183"; +$fa-var-map: "\f279"; $fa-var-map-marker: "\f041"; +$fa-var-map-o: "\f278"; +$fa-var-map-pin: "\f276"; +$fa-var-map-signs: "\f277"; $fa-var-mars: "\f222"; $fa-var-mars-double: "\f227"; $fa-var-mars-stroke: "\f229"; @@ -364,11 +424,19 @@ $fa-var-money: "\f0d6"; $fa-var-moon-o: "\f186"; $fa-var-mortar-board: "\f19d"; $fa-var-motorcycle: "\f21c"; +$fa-var-mouse-pointer: "\f245"; $fa-var-music: "\f001"; $fa-var-navicon: "\f0c9"; $fa-var-neuter: "\f22c"; $fa-var-newspaper-o: "\f1ea"; +$fa-var-object-group: "\f247"; +$fa-var-object-ungroup: "\f248"; +$fa-var-odnoklassniki: "\f263"; +$fa-var-odnoklassniki-square: "\f264"; +$fa-var-opencart: "\f23d"; $fa-var-openid: "\f19b"; +$fa-var-opera: "\f26a"; +$fa-var-optin-monster: "\f23c"; $fa-var-outdent: "\f03b"; $fa-var-pagelines: "\f18c"; $fa-var-paint-brush: "\f1fc"; @@ -418,6 +486,7 @@ $fa-var-recycle: "\f1b8"; $fa-var-reddit: "\f1a1"; $fa-var-reddit-square: "\f1a2"; $fa-var-refresh: "\f021"; +$fa-var-registered: "\f25d"; $fa-var-remove: "\f00d"; $fa-var-renren: "\f18b"; $fa-var-reorder: "\f0c9"; @@ -436,6 +505,7 @@ $fa-var-rss-square: "\f143"; $fa-var-rub: "\f158"; $fa-var-ruble: "\f158"; $fa-var-rupee: "\f156"; +$fa-var-safari: "\f267"; $fa-var-save: "\f0c7"; $fa-var-scissors: "\f0c4"; $fa-var-search: "\f002"; @@ -499,6 +569,8 @@ $fa-var-steam-square: "\f1b7"; $fa-var-step-backward: "\f048"; $fa-var-step-forward: "\f051"; $fa-var-stethoscope: "\f0f1"; +$fa-var-sticky-note: "\f249"; +$fa-var-sticky-note-o: "\f24a"; $fa-var-stop: "\f04d"; $fa-var-street-view: "\f21d"; $fa-var-strikethrough: "\f0cc"; @@ -517,6 +589,7 @@ $fa-var-tag: "\f02b"; $fa-var-tags: "\f02c"; $fa-var-tasks: "\f0ae"; $fa-var-taxi: "\f1ba"; +$fa-var-television: "\f26c"; $fa-var-tencent-weibo: "\f1d5"; $fa-var-terminal: "\f120"; $fa-var-text-height: "\f034"; @@ -540,6 +613,7 @@ $fa-var-toggle-off: "\f204"; $fa-var-toggle-on: "\f205"; $fa-var-toggle-right: "\f152"; $fa-var-toggle-up: "\f151"; +$fa-var-trademark: "\f25c"; $fa-var-train: "\f238"; $fa-var-transgender: "\f224"; $fa-var-transgender-alt: "\f225"; @@ -547,6 +621,7 @@ $fa-var-trash: "\f1f8"; $fa-var-trash-o: "\f014"; $fa-var-tree: "\f1bb"; $fa-var-trello: "\f181"; +$fa-var-tripadvisor: "\f262"; $fa-var-trophy: "\f091"; $fa-var-truck: "\f0d1"; $fa-var-try: "\f195"; @@ -554,6 +629,7 @@ $fa-var-tty: "\f1e4"; $fa-var-tumblr: "\f173"; $fa-var-tumblr-square: "\f174"; $fa-var-turkish-lira: "\f195"; +$fa-var-tv: "\f26c"; $fa-var-twitch: "\f1e8"; $fa-var-twitter: "\f099"; $fa-var-twitter-square: "\f081"; @@ -578,6 +654,7 @@ $fa-var-venus-double: "\f226"; $fa-var-venus-mars: "\f228"; $fa-var-viacoin: "\f237"; $fa-var-video-camera: "\f03d"; +$fa-var-vimeo: "\f27d"; $fa-var-vimeo-square: "\f194"; $fa-var-vine: "\f1ca"; $fa-var-vk: "\f189"; @@ -591,13 +668,18 @@ $fa-var-weixin: "\f1d7"; $fa-var-whatsapp: "\f232"; $fa-var-wheelchair: "\f193"; $fa-var-wifi: "\f1eb"; +$fa-var-wikipedia-w: "\f266"; $fa-var-windows: "\f17a"; $fa-var-won: "\f159"; $fa-var-wordpress: "\f19a"; $fa-var-wrench: "\f0ad"; $fa-var-xing: "\f168"; $fa-var-xing-square: "\f169"; +$fa-var-y-combinator: "\f23b"; +$fa-var-y-combinator-square: "\f1d4"; $fa-var-yahoo: "\f19e"; +$fa-var-yc: "\f23b"; +$fa-var-yc-square: "\f1d4"; $fa-var-yelp: "\f1e9"; $fa-var-yen: "\f157"; $fa-var-youtube: "\f167"; diff --git a/app/assets/stylesheets/vendor/font_awesome/font-awesome.scss b/app/assets/stylesheets/vendor/font_awesome/font-awesome.scss index 93912b4540..8ffb05ed39 100644 --- a/app/assets/stylesheets/vendor/font_awesome/font-awesome.scss +++ b/app/assets/stylesheets/vendor/font_awesome/font-awesome.scss @@ -1,5 +1,5 @@ /*! - * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss new file mode 100644 index 0000000000..a12e8e5460 --- /dev/null +++ b/app/assets/stylesheets/vendor/pikaday.scss @@ -0,0 +1,215 @@ +/*! + * Pikaday + * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/ + */ + +.pika-single { + z-index: 9999; + display: block; + position: relative; + color: #333; + background: #fff; + border: 1px solid #ccc; + border-bottom-color: #bbb; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + + &.is-hidden { + display: none; + } + + &.is-bound { + position: absolute; + box-shadow: 0 5px 15px -5px rgba(0,0,0,.5); + } +} + +// clear child float (pika-lendar), using the famous micro clearfix hack +// http://nicolasgallagher.com/micro-clearfix-hack/ +.pika-single { + *zoom: 1; + + &:before, + &:after { + content: " "; + display: table; + } + + &:after { clear: both } +} + +.pika-lendar { + float: left; + width: 240px; + margin: 8px; +} + +.pika-title { + position: relative; + text-align: center; + + select { + cursor: pointer; + position: absolute; + z-index: 9998; + margin: 0; + left: 0; + top: 5px; + filter: alpha(opacity=0); + opacity: 0; + } +} + +.pika-label { + display: inline-block; + *display: inline; + position: relative; + z-index: 9999; + overflow: hidden; + margin: 0; + padding: 5px 3px; + font-size: 14px; + line-height: 20px; + font-weight: bold; + background-color: #fff; +} + +.pika-prev, +.pika-next { + display: block; + cursor: pointer; + position: relative; + outline: none; + border: 0; + padding: 0; + width: 20px; + height: 30px; + text-indent: 20px; // hide text using text-indent trick, using width value (it's enough) + white-space: nowrap; + overflow: hidden; + background: transparent no-repeat center center; + background-size: 75% 75%; + opacity: .5; + *position: absolute; + *top: 0; + + &:hover { + opacity: 1; + } + + &.is-disabled { + cursor: default; + opacity: .2; + } +} + +.pika-prev, +.is-rtl .pika-next { + float: left; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg=='); + *left: 0; +} + +.pika-next, +.is-rtl .pika-prev { + float: right; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII='); + *right: 0; +} + +.pika-select { + display: inline-block; + *display: inline; +} + +.pika-table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; + border: 0; + + th, + td { + width: 14.285714285714286%; + padding: 0; + } + + th { + color: #999; + font-size: 12px; + line-height: 25px; + font-weight: bold; + text-align: center; + } + + abbr { + border-bottom: none; + cursor: help; + } +} + +.pika-button { + cursor: pointer; + display: block; + -moz-box-sizing: border-box; + box-sizing: border-box; + outline: none; + border: 0; + margin: 0; + width: 100%; + padding: 5px; + color: #666; + font-size: 12px; + line-height: 15px; + text-align: right; + background: #f5f5f5; + + .is-today & { + color: #33aaff; + font-weight: bold; + } + + .is-selected & { + color: #fff; + font-weight: bold; + background: #33aaff; + box-shadow: inset 0 1px 3px #178fe5; + border-radius: 3px; + } + + .is-disabled & { + pointer-events: none; + cursor: default; + color: #999; + opacity: .3; + } + + &:hover { + color: #fff; + background: #ff8000; + box-shadow: none; + border-radius: 3px; + } +} + +.pika-week { + font-size: 11px; + color: #999; +} + +.is-inrange .pika-button { + background: #D5E9F7; +} + +.is-startrange .pika-button { + color: #fff; + background: #6CB31D; + box-shadow: none; + border-radius: 3px; +} + +.is-endrange .pika-button { + color: #fff; + background: #33aaff; + box-shadow: none; + border-radius: 3px; +} diff --git a/app/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss index aa3d61372a..87080ec2f8 100644 --- a/app/assets/stylesheets/vendor/select2.scss +++ b/app/assets/stylesheets/vendor/select2.scss @@ -200,6 +200,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@ white-space: nowrap; } +//noinspection CssOverwrittenProperties .select2-search input { width: 100%; height: auto !important; @@ -228,6 +229,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@ margin-top: 4px; } +//noinspection CssOverwrittenProperties .select2-search input.select2-active { background: #fff asset-url('select2-spinner.gif') no-repeat 100%; background: asset-url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); @@ -389,16 +391,14 @@ disabled look for disabled choices in the results dropdown /* disabled styles */ .select2-container.select2-container-disabled .select2-choice { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #ddd; - cursor: default; + background: #f4f4f4 none; + border: 1px solid #ddd; + cursor: default; } .select2-container.select2-container-disabled .select2-choice .select2-arrow { - background-color: #f4f4f4; - background-image: none; - border-left: 0; + background: #f4f4f4 none; + border-left: 0; } .select2-container.select2-container-disabled .select2-choice abbr { @@ -540,17 +540,15 @@ html[dir="rtl"] .select2-search-choice-close { /* disabled styles */ .select2-container-multi.select2-container-disabled .select2-choices { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #ddd; - cursor: default; + background: #f4f4f4 none; + border: 1px solid #ddd; + cursor: default; } .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { - padding: 3px 5px 3px 5px; - border: 1px solid #ddd; - background-image: none; - background-color: #f4f4f4; + padding: 3px 5px 3px 5px; + border: 1px solid #ddd; + background: #f4f4f4 none; } .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { display: none; @@ -594,16 +592,15 @@ html[dir="rtl"] .select2-search-choice-close { /* Retina-ize icons */ @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx) { - .select2-search input, - .select2-search-choice-close, - .select2-container .select2-choice abbr, - .select2-container .select2-choice .select2-arrow b { - background-image: asset-url('select2x2.png') !important; - background-repeat: no-repeat !important; - background-size: 60px 40px !important; - } + .select2-search input, + .select2-search-choice-close, + .select2-container .select2-choice abbr, + .select2-container .select2-choice .select2-arrow b { + background: asset-url('select2x2.png') !important no-repeat !important; + background-size: 60px 40px !important; + } - .select2-search input { - background-position: 100% -21px !important; - } + .select2-search input { + background-position: 100% -21px !important; + } } diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index d1a0b3d033..ccd6cdae72 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,8 +1,20 @@ +require_dependency 'rate_limiter' + class AboutController < ApplicationController skip_before_filter :check_xhr, only: [:show] + before_filter :ensure_logged_in, only: [:live_post_counts] def index @about = About.new render_serialized(@about, AboutSerializer) end + + def live_post_counts + RateLimiter.new(current_user, "live_post_counts", 1, 10.minutes).performed! unless current_user.staff? + category_topic_ids = Category.pluck(:topic_id).compact! + public_topics = Topic.listable_topics.visible.secured(Guardian.new(nil)).where.not(id: category_topic_ids) + stats = { public_topic_count: public_topics.count } + stats[:public_post_count] = public_topics.sum(:posts_count) - stats[:public_topic_count] + render json: stats + end end diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index 83587ac3bb..9ebe489fa7 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -25,7 +25,8 @@ class Admin::BackupsController < Admin::AdminController def create opts = { publish_to_message_bus: true, - with_uploads: params.fetch(:with_uploads) == "true" + with_uploads: params.fetch(:with_uploads) == "true", + client_id: params[:client_id], } BackupRestore.backup!(current_user.id, opts) rescue BackupRestore::OperationRunningError @@ -70,8 +71,12 @@ class Admin::BackupsController < Admin::AdminController end def restore - filename = params.fetch(:id) - BackupRestore.restore!(current_user.id, filename, true) + opts = { + filename: params.fetch(:id), + client_id: params.fetch(:client_id), + publish_to_message_bus: true, + } + BackupRestore.restore!(current_user.id, opts) rescue BackupRestore::OperationRunningError render json: failed_json.merge(message: I18n.t("backup.operation_already_running")) else diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb new file mode 100644 index 0000000000..2d90d46f2e --- /dev/null +++ b/app/controllers/admin/embeddable_hosts_controller.rb @@ -0,0 +1,34 @@ +class Admin::EmbeddableHostsController < Admin::AdminController + + before_filter :ensure_logged_in, :ensure_staff + + def create + save_host(EmbeddableHost.new) + end + + def update + host = EmbeddableHost.where(id: params[:id]).first + save_host(host) + end + + def destroy + host = EmbeddableHost.where(id: params[:id]).first + host.destroy + render json: success_json + end + + protected + + def save_host(host) + host.host = params[:embeddable_host][:host] + host.category_id = params[:embeddable_host][:category_id] + host.category_id = SiteSetting.uncategorized_category_id if host.category_id.blank? + + if host.save + render_serialized(host, EmbeddableHostSerializer, root: 'embeddable_host', rest_serializer: true) + else + render_json_error(host) + end + end + +end diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb new file mode 100644 index 0000000000..623c2a25a2 --- /dev/null +++ b/app/controllers/admin/embedding_controller.rb @@ -0,0 +1,29 @@ +require_dependency 'embedding' + +class Admin::EmbeddingController < Admin::AdminController + + before_filter :ensure_logged_in, :ensure_staff, :fetch_embedding + + def show + render_serialized(@embedding, EmbeddingSerializer, root: 'embedding', rest_serializer: true) + end + + def update + Embedding.settings.each do |s| + @embedding.send("#{s}=", params[:embedding][s]) + end + + if @embedding.save + fetch_embedding + render_serialized(@embedding, EmbeddingSerializer, root: 'embedding', rest_serializer: true) + else + render_json_error(@embedding) + end + end + + protected + + def fetch_embedding + @embedding = Embedding.find + end +end diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 42ed206bfd..767657f1e1 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -37,6 +37,8 @@ class Admin::GroupsController < Admin::AdminController def save_group(group) group.alias_level = params[:alias_level].to_i if params[:alias_level].present? group.visible = params[:visible] == "true" + grant_trust_level = params[:grant_trust_level].to_i + group.grant_trust_level = (grant_trust_level > 0 && grant_trust_level <= 4) ? grant_trust_level : nil group.automatic_membership_email_domains = params[:automatic_membership_email_domains] unless group.automatic group.automatic_membership_retroactive = params[:automatic_membership_retroactive] == "true" unless group.automatic @@ -78,8 +80,10 @@ class Admin::GroupsController < Admin::AdminController users = User.where(username: params[:usernames].split(",")) elsif params[:user_ids].present? users = User.find(params[:user_ids].split(",")) + elsif params[:user_emails].present? + users = User.where(email: params[:user_emails].split(",")) else - raise Discourse::InvalidParameters.new('user_ids or usernames must be present') + raise Discourse::InvalidParameters.new('user_ids or usernames or user_emails must be present') end users.each do |user| diff --git a/app/controllers/admin/permalinks_controller.rb b/app/controllers/admin/permalinks_controller.rb new file mode 100644 index 0000000000..875110e87a --- /dev/null +++ b/app/controllers/admin/permalinks_controller.rb @@ -0,0 +1,35 @@ +class Admin::PermalinksController < Admin::AdminController + + before_filter :fetch_permalink, only: [:destroy] + + def index + url = params[:filter] + permalinks = Permalink.filter_by(url) + render_serialized(permalinks, PermalinkSerializer) + end + + def create + params.require(:url) + params.require(:permalink_type) + params.require(:permalink_type_value) + + permalink = Permalink.new(:url => params[:url], params[:permalink_type] => params[:permalink_type_value]) + if permalink.save + render_serialized(permalink, PermalinkSerializer) + else + render_json_error(permalink) + end + end + + def destroy + @permalink.destroy + render json: success_json + end + + private + + def fetch_permalink + @permalink = Permalink.find(params[:id]) + end + +end diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index cd9b7c8541..e4416b1309 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -13,7 +13,12 @@ class Admin::ReportsController < Admin::AdminController end_date = start_date + 1.month end_date = Time.parse(params[:end_date]) if params[:end_date].present? - report = Report.find(report_type, {start_date: start_date, end_date: end_date}) + category_id = if params.has_key?(:category_id) + params[:category_id].blank? ? SiteSetting.uncategorized_category_id : params[:category_id].to_i + end + + report = Report.find(report_type, start_date: start_date, end_date: end_date, category_id: category_id) + raise Discourse::NotFound if report.blank? render_json_dump(report: report) diff --git a/app/controllers/admin/site_customizations_controller.rb b/app/controllers/admin/site_customizations_controller.rb index dc104fd743..afd3c162e5 100644 --- a/app/controllers/admin/site_customizations_controller.rb +++ b/app/controllers/admin/site_customizations_controller.rb @@ -2,6 +2,8 @@ class Admin::SiteCustomizationsController < Admin::AdminController before_filter :enable_customization + skip_before_filter :check_xhr, only: [:show] + def index @site_customizations = SiteCustomization.order(:name) @@ -30,7 +32,7 @@ class Admin::SiteCustomizationsController < Admin::AdminController respond_to do |format| if @site_customization.update_attributes(site_customization_params) - format.json { head :no_content } + format.json { render json: @site_customization, status: :created} else log_record.destroy if log_record format.json { render json: @site_customization.errors, status: :unprocessable_entity } @@ -48,6 +50,26 @@ class Admin::SiteCustomizationsController < Admin::AdminController end end + def show + @site_customization = SiteCustomization.find(params[:id]) + + respond_to do |format| + format.json do + check_xhr + render json: SiteCustomizationSerializer.new(@site_customization) + end + + format.any(:html, :text) do + raise RenderEmpty.new if request.xhr? + + response.headers['Content-Disposition'] = "attachment; filename=#{@site_customization.name.parameterize}.dcstyle.json" + response.sending_file = true + render json: SiteCustomizationSerializer.new(@site_customization) + end + end + + end + private def site_customization_params @@ -56,7 +78,7 @@ class Admin::SiteCustomizationsController < Admin::AdminController :mobile_stylesheet, :mobile_header, :mobile_top, :mobile_footer, :head_tag, :body_tag, :position, :enabled, :key, - :stylesheet_baked) + :stylesheet_baked, :embedded_css) end def log_site_customization_change(old_record, new_params) diff --git a/app/controllers/admin/site_text_controller.rb b/app/controllers/admin/site_text_controller.rb deleted file mode 100644 index c92a0bd40d..0000000000 --- a/app/controllers/admin/site_text_controller.rb +++ /dev/null @@ -1,21 +0,0 @@ -class Admin::SiteTextController < Admin::AdminController - - def show - site_text = SiteText.find_or_new(params[:id].to_s) - render_serialized(site_text, SiteTextSerializer) - end - - def update - site_text = SiteText.find_or_new(params[:id].to_s) - - # Updating to nothing is the same as removing it - if params[:value].present? - site_text.value = params[:value] - site_text.save! - else - site_text.destroy - end - - render nothing: true - end -end diff --git a/app/controllers/admin/site_text_types_controller.rb b/app/controllers/admin/site_text_types_controller.rb index 9f2efef6ba..f13e1ce704 100644 --- a/app/controllers/admin/site_text_types_controller.rb +++ b/app/controllers/admin/site_text_types_controller.rb @@ -1,7 +1,7 @@ class Admin::SiteTextTypesController < Admin::AdminController def index - render_serialized(SiteText.text_types, SiteTextTypeSerializer) + render_serialized(SiteText.text_types, SiteTextTypeSerializer, root: 'site_text_types') end end diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb new file mode 100644 index 0000000000..416d990186 --- /dev/null +++ b/app/controllers/admin/site_texts_controller.rb @@ -0,0 +1,21 @@ +class Admin::SiteTextsController < Admin::AdminController + + def show + site_text = SiteText.find_or_new(params[:id].to_s) + render_serialized(site_text, SiteTextSerializer, root: 'site_text') + end + + def update + site_text = SiteText.find_or_new(params[:id].to_s) + + # Updating to nothing is the same as removing it + if params[:site_text][:value].present? + site_text.value = params[:site_text][:value] + site_text.save! + else + site_text.destroy + end + + render_serialized(site_text, SiteTextSerializer, root: 'site_text') + end +end diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb index e5e8c9c3a9..fceecfa7d1 100644 --- a/app/controllers/admin/user_fields_controller.rb +++ b/app/controllers/admin/user_fields_controller.rb @@ -1,40 +1,58 @@ class Admin::UserFieldsController < Admin::AdminController def self.columns - [:name, :field_type, :editable, :description, :required, :show_on_profile] + [:name, :field_type, :editable, :description, :required, :show_on_profile, :position] end def create field = UserField.new(params.require(:user_field).permit(*Admin::UserFieldsController.columns)) + + field.position = (UserField.maximum(:position) || 0) + 1 field.required = params[:required] == "true" + update_options(field) + json_result(field, serializer: UserFieldSerializer) do field.save end end def index - render_serialized(UserField.all, UserFieldSerializer, root: 'user_fields') + user_fields = UserField.all.includes(:user_field_options).order(:position) + render_serialized(user_fields, UserFieldSerializer, root: 'user_fields') end def update - field_params = params.require(:user_field) - + field_params = params[:user_field] field = UserField.where(id: params.require(:id)).first Admin::UserFieldsController.columns.each do |col| - field.send("#{col}=", field_params[col] || false) + unless field_params[col].nil? + field.send("#{col}=", field_params[col]) + end end + update_options(field) - json_result(field, serializer: UserFieldSerializer) do - field.save + if field.save + render_serialized(field, UserFieldSerializer, root: 'user_field') + else + render_json_error(field) end end def destroy field = UserField.where(id: params.require(:id)).first field.destroy if field.present? - render nothing: true + render json: success_json end + protected + + def update_options(field) + options = params[:user_field][:options] + if options.present? + UserFieldOption.where(user_field_id: field.id).delete_all + field.user_field_options_attributes = options.map {|o| {value: o} }.uniq + end + end end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index b0758e3d10..c096cf078f 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -53,6 +53,7 @@ class Admin::UsersController < Admin::AdminController @user.suspended_till = params[:duration].to_i.days.from_now @user.suspended_at = DateTime.now @user.save! + @user.revoke_api_key StaffActionLogger.new(current_user).log_user_suspend(@user, params[:reason]) MessageBus.publish "/logout", @user.id, user_ids: [@user.id] render nothing: true diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7b3534046a..d9fe0a4976 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -144,7 +144,9 @@ class ApplicationController < ActionController::Base def set_current_user_for_logs if current_user Logster.add_to_env(request.env,"username",current_user.username) + response.headers["X-Discourse-Username"] = current_user.username end + response.headers["X-Discourse-Route"] = "#{controller_name}/#{action_name}" end def set_locale @@ -153,6 +155,8 @@ class ApplicationController < ActionController::Base else SiteSetting.default_locale end + + I18n.fallbacks.ensure_loaded! end def store_preloaded(key, json) @@ -267,7 +271,8 @@ class ApplicationController < ActionController::Base find_opts[:active] = true unless opts[:include_inactive] User.find_by(find_opts) elsif params[:external_id] - SingleSignOnRecord.find_by(external_id: params[:external_id]).try(:user) + external_id = params[:external_id].gsub(/\.json$/, '') + SingleSignOnRecord.find_by(external_id: external_id).try(:user) end raise Discourse::NotFound if user.blank? @@ -304,7 +309,11 @@ class ApplicationController < ActionController::Base def preload_current_user_data store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, scope: guardian, root: false))) - serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report([current_user.id]), each_serializer: TopicTrackingStateSerializer) + report = TopicTrackingState.report(current_user.id) + if report.length >= SiteSetting.max_tracked_new_unread.to_i + TopicUser.cap_unread_later(current_user.id) + end + serializer = ActiveModel::ArraySerializer.new(report, each_serializer: TopicTrackingStateSerializer) store_preloaded("topicTrackingStates", MultiJson.dump(serializer)) end @@ -408,17 +417,22 @@ class ApplicationController < ActionController::Base raise Discourse::InvalidAccess.new unless current_user && current_user.staff? end + def destination_url + request.original_url unless request.original_url =~ /uploads/ + end + def redirect_to_login_if_required return if current_user || (request.format.json? && api_key_valid?) - # save original URL in a cookie - cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/ - # redirect user to the SSO page if we need to log in AND SSO is enabled if SiteSetting.login_required? if SiteSetting.enable_sso? + # save original URL in a session so we can redirect after login + session[:destination_url] = destination_url redirect_to path('/session/sso') else + # save original URL in a cookie (javascript redirects after login in this case) + cookies[:destination_url] = destination_url redirect_to :login end end @@ -431,7 +445,7 @@ class ApplicationController < ActionController::Base def build_not_found_page(status=404, layout=false) category_topic_ids = Category.pluck(:topic_id).compact - @container_class = "container not-found-container" + @container_class = "wrap not-found-container" @top_viewed = Topic.where.not(id: category_topic_ids).top_viewed(10) @recent = Topic.where.not(id: category_topic_ids).recent(10) @slug = params[:slug].class == String ? params[:slug] : '' diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 8199472107..b63ec503db 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -16,6 +16,7 @@ class CategoriesController < ApplicationController options = {} options[:latest_posts] = params[:latest_posts] || SiteSetting.category_featured_topics options[:parent_category_id] = params[:parent_category_id] + options[:is_homepage] = current_homepage == "categories".freeze @list = CategoryList.new(guardian, options) @list.draft_key = Draft::NEW_TOPIC @@ -24,7 +25,7 @@ class CategoriesController < ApplicationController discourse_expires_in 1.minute - unless current_homepage == 'categories' + unless current_homepage == "categories" @title = I18n.t('js.filters.categories.title') end @@ -36,7 +37,7 @@ class CategoriesController < ApplicationController end def move - guardian.ensure_can_create!(Category) + guardian.ensure_can_create_category! params.require("category_id") params.require("position") @@ -49,6 +50,24 @@ class CategoriesController < ApplicationController end end + def reorder + guardian.ensure_can_create_category! + + params.require(:mapping) + change_requests = MultiJson.load(params[:mapping]) + by_category = Hash[change_requests.map { |cat, pos| [Category.find(cat.to_i), pos] }] + + unless guardian.is_admin? + raise Discourse::InvalidAccess unless by_category.keys.all? { |c| guardian.can_see_category? c } + end + + by_category.each do |cat, pos| + cat.position = pos + cat.save if cat.position_changed? + end + render json: success_json + end + def show if Category.topic_create_allowed(guardian).where(id: @category.id).exists? @category.permission = CategoryGroup.permission_types[:full] @@ -139,6 +158,7 @@ class CategoriesController < ApplicationController :position, :email_in, :email_in_allow_strangers, + :suppress_from_homepage, :parent_category_id, :auto_close_hours, :auto_close_based_on_last_post, @@ -146,6 +166,8 @@ class CategoriesController < ApplicationController :background_url, :allow_badges, :slug, + :topic_template, + :custom_fields => [params[:custom_fields].try(:keys)], :permissions => [*p.try(:keys)]) end end diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index 249a18f7a7..843a95092b 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -1,13 +1,20 @@ class EmbedController < ApplicationController skip_before_filter :check_xhr, :preload_json, :verify_authenticity_token - before_filter :ensure_embeddable + before_filter :ensure_embeddable, except: [ :info ] + before_filter :ensure_api_request, only: [ :info ] layout 'embed' def comments - embed_url = params.require(:embed_url) - topic_id = TopicEmbed.topic_id_for_embed(embed_url) + embed_url = params[:embed_url] + + topic_id = nil + if embed_url.present? + topic_id = TopicEmbed.topic_id_for_embed(embed_url) + else + topic_id = params[:topic_id].to_i + end if topic_id @topic_view = TopicView.new(topic_id, @@ -21,7 +28,8 @@ class EmbedController < ApplicationController if @topic_view && @topic_view.posts.size == SiteSetting.embed_post_limit @posts_left = @topic_view.topic.posts_count - SiteSetting.embed_post_limit - 1 end - else + + elsif embed_url.present? Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url) render 'loading' end @@ -29,8 +37,16 @@ class EmbedController < ApplicationController discourse_expires_in 1.minute end - def count + def info + embed_url = params.require(:embed_url) + @topic_embed = TopicEmbed.where(embed_url: embed_url).first + raise Discourse::NotFound if @topic_embed.nil? + + render_serialized(@topic_embed, TopicEmbedSerializer, root: false) + end + + def count embed_urls = params[:embed_url] by_url = {} @@ -50,11 +66,14 @@ class EmbedController < ApplicationController private + def ensure_api_request + raise Discourse::InvalidAccess.new('api key not set') if !is_api? + end + def ensure_embeddable if !(Rails.env.development? && current_user.try(:admin?)) - raise Discourse::InvalidAccess.new('embeddable host not set') if SiteSetting.normalized_embeddable_host.blank? - raise Discourse::InvalidAccess.new('invalid referer host') if URI(request.referer || '').host != SiteSetting.normalized_embeddable_host + raise Discourse::InvalidAccess.new('invalid referer host') unless EmbeddableHost.host_allowed?(request.referer) end response.headers['X-Frame-Options'] = "ALLOWALL" diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb index 74e341168c..f632b93bee 100644 --- a/app/controllers/export_csv_controller.rb +++ b/app/controllers/export_csv_controller.rb @@ -3,11 +3,8 @@ class ExportCsvController < ApplicationController skip_before_filter :preload_json, :check_xhr, only: [:show] def export_entity - params.require(:entity) - params.require(:entity_type) - guardian.ensure_can_export_entity!(params[:entity_type]) - - Jobs.enqueue(:export_csv_file, entity: params[:entity], user_id: current_user.id) + guardian.ensure_can_export_entity!(export_params[:entity_type]) + Jobs.enqueue(:export_csv_file, entity: export_params[:entity], user_id: current_user.id, args: export_params[:args]) render json: success_json end @@ -27,4 +24,13 @@ class ExportCsvController < ApplicationController end end + private + + def export_params + @_export_params ||= begin + params.require(:entity) + params.require(:entity_type) + params.permit(:entity, :entity_type, args: [:name, :start_date, :end_date, :category_id]) + end + end end diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 3a7f6437f9..1012248748 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -4,7 +4,7 @@ class InvitesController < ApplicationController skip_before_filter :check_xhr, :preload_json skip_before_filter :redirect_to_login_if_required - before_filter :ensure_logged_in, only: [:destroy, :create, :resend_invite, :check_csv_chunk, :upload_csv_chunk] + before_filter :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :resend_invite, :check_csv_chunk, :upload_csv_chunk] before_filter :ensure_new_registrations_allowed, only: [:show, :redeem_disposable_invite] def show @@ -48,6 +48,25 @@ class InvitesController < ApplicationController end end + def create_invite_link + params.require(:email) + group_ids = Group.lookup_group_ids(params) + topic = Topic.find_by(id: params[:topic_id]) + guardian.ensure_can_invite_to_forum!(group_ids) + + invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first + if invite_exists + guardian.ensure_can_send_multiple_invites!(current_user) + end + + # generate invite link + if invite_link = Invite.generate_invite_link(params[:email], current_user, topic, group_ids) + render_json_dump(invite_link) + else + render json: failed_json, status: 422 + end + end + def create_disposable_invite guardian.ensure_can_create_disposable_invite!(current_user) params.permit(:username, :email, :quantity, :group_names) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 927519cb49..d894ee1f37 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -5,36 +5,34 @@ class ListController < ApplicationController skip_before_filter :check_xhr - @@categories = [ + before_filter :set_category, only: [ # filtered topics lists - Discourse.filters.map { |f| "category_#{f}".to_sym }, - Discourse.filters.map { |f| "category_none_#{f}".to_sym }, - Discourse.filters.map { |f| "parent_category_category_#{f}".to_sym }, - Discourse.filters.map { |f| "parent_category_category_none_#{f}".to_sym }, + Discourse.filters.map { |f| :"category_#{f}" }, + Discourse.filters.map { |f| :"category_none_#{f}" }, + Discourse.filters.map { |f| :"parent_category_category_#{f}" }, + Discourse.filters.map { |f| :"parent_category_category_none_#{f}" }, # top summaries :category_top, :category_none_top, :parent_category_category_top, # top pages (ie. with a period) - TopTopic.periods.map { |p| "category_top_#{p}".to_sym }, - TopTopic.periods.map { |p| "category_none_top_#{p}".to_sym }, - TopTopic.periods.map { |p| "parent_category_category_top_#{p}".to_sym }, + TopTopic.periods.map { |p| :"category_top_#{p}" }, + TopTopic.periods.map { |p| :"category_none_top_#{p}" }, + TopTopic.periods.map { |p| :"parent_category_category_top_#{p}" }, # category feeds :category_feed, ].flatten - before_filter :set_category, only: @@categories - before_filter :ensure_logged_in, except: [ :topics_by, # anonymous filters Discourse.anonymous_filters, - Discourse.anonymous_filters.map { |f| "#{f}_feed".to_sym }, + Discourse.anonymous_filters.map { |f| "#{f}_feed" }, # anonymous categorized filters - Discourse.anonymous_filters.map { |f| "category_#{f}".to_sym }, - Discourse.anonymous_filters.map { |f| "category_none_#{f}".to_sym }, - Discourse.anonymous_filters.map { |f| "parent_category_category_#{f}".to_sym }, - Discourse.anonymous_filters.map { |f| "parent_category_category_none_#{f}".to_sym }, + Discourse.anonymous_filters.map { |f| :"category_#{f}" }, + Discourse.anonymous_filters.map { |f| :"category_none_#{f}" }, + Discourse.anonymous_filters.map { |f| :"parent_category_category_#{f}" }, + Discourse.anonymous_filters.map { |f| :"parent_category_category_none_#{f}" }, # category feeds :category_feed, # top summaries @@ -43,14 +41,14 @@ class ListController < ApplicationController :category_none_top, :parent_category_category_top, # top pages (ie. with a period) - TopTopic.periods.map { |p| "top_#{p}".to_sym }, - TopTopic.periods.map { |p| "category_top_#{p}".to_sym }, - TopTopic.periods.map { |p| "category_none_top_#{p}".to_sym }, - TopTopic.periods.map { |p| "parent_category_category_top_#{p}".to_sym }, + TopTopic.periods.map { |p| :"top_#{p}" }, + TopTopic.periods.map { |p| :"category_top_#{p}" }, + TopTopic.periods.map { |p| :"category_none_top_#{p}" }, + TopTopic.periods.map { |p| :"parent_category_category_top_#{p}" }, ].flatten # Create our filters - Discourse.filters.each_with_index do |filter, idx| + Discourse.filters.each do |filter| define_method(filter) do |options = nil| list_opts = build_topic_list_options list_opts.merge!(options) if options @@ -60,6 +58,10 @@ class ListController < ApplicationController list_opts[:no_definitions] = true end + if filter.to_s == current_homepage + list_opts.merge!(exclude_category_ids: get_excluded_category_ids(list_opts[:category])) + end + list = TopicQuery.new(user, list_opts).public_send("list_#{filter}") list.more_topics_url = construct_url_with(:next, list_opts) list.prev_topics_url = construct_url_with(:prev, list_opts) @@ -69,7 +71,7 @@ class ListController < ApplicationController # Note the first is the default and we don't add a title if (filter.to_s != current_homepage) && use_crawler_layout? - filter_title = I18n.t("js.filters.#{filter.to_s}.title") + filter_title = I18n.t("js.filters.#{filter.to_s}.title", count: 0) if list_opts[:category] @title = I18n.t('js.filters.with_category', filter: filter_title, category: Category.find(list_opts[:category]).name) else @@ -83,34 +85,20 @@ class ListController < ApplicationController define_method("category_#{filter}") do canonical_url "#{Discourse.base_url}#{@category.url}" - self.send(filter, { category: @category.id }) + self.send(filter, category: @category.id) end define_method("category_none_#{filter}") do - self.send(filter, { category: @category.id, no_subcategories: true }) + self.send(filter, category: @category.id, no_subcategories: true) end define_method("parent_category_category_#{filter}") do canonical_url "#{Discourse.base_url}#{@category.url}" - self.send(filter, { category: @category.id }) + self.send(filter, category: @category.id) end define_method("parent_category_category_none_#{filter}") do - self.send(filter, { category: @category.id }) - end - end - - Discourse.feed_filters.each do |filter| - define_method("#{filter}_feed") do - discourse_expires_in 1.minute - - @title = "#{SiteSetting.title} - #{I18n.t("rss_description.#{filter}")}" - @link = "#{Discourse.base_url}/#{filter}" - @description = I18n.t("rss_description.#{filter}") - @atom_link = "#{Discourse.base_url}/#{filter}.rss" - @topic_list = TopicQuery.new(nil, order: 'created').public_send("list_#{filter}") - - render 'list', formats: [:rss] + self.send(filter, category: @category.id) end end @@ -127,14 +115,26 @@ class ListController < ApplicationController end end + def latest_feed + discourse_expires_in 1.minute + + @title = "#{SiteSetting.title} - #{I18n.t("rss_description.latest")}" + @link = "#{Discourse.base_url}/latest" + @atom_link = "#{Discourse.base_url}/latest.rss" + @description = I18n.t("rss_description.latest") + @topic_list = TopicQuery.new(nil, order: 'created').list_latest + + render 'list', formats: [:rss] + end + def category_feed guardian.ensure_can_see!(@category) discourse_expires_in 1.minute @title = @category.name @link = "#{Discourse.base_url}#{@category.url}" - @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}" @atom_link = "#{Discourse.base_url}#{@category.url}.rss" + @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}" @topic_list = TopicQuery.new.list_new_in_category(@category) render 'list', formats: [:rss] @@ -147,15 +147,15 @@ class ListController < ApplicationController end def category_top - top({ category: @category.id }) + top(category: @category.id) end def category_none_top - top({ category: @category.id, no_subcategories: true }) + top(category: @category.id, no_subcategories: true) end def parent_category_category_top - top({ category: @category.id }) + top(category: @category.id) end TopTopic.periods.each do |period| @@ -163,6 +163,11 @@ class ListController < ApplicationController top_options = build_topic_list_options top_options.merge!(options) if options top_options[:per_page] = SiteSetting.topics_per_period_in_top_page + + if "top".freeze == current_homepage + top_options.merge!(exclude_category_ids: get_excluded_category_ids(top_options[:category])) + end + user = list_target_user list = TopicQuery.new(user, top_options).list_top_for(period) list.for_period = period @@ -177,15 +182,15 @@ class ListController < ApplicationController end define_method("category_top_#{period}") do - self.send("top_#{period}", { category: @category.id }) + self.send("top_#{period}", category: @category.id) end define_method("category_none_top_#{period}") do - self.send("top_#{period}", { category: @category.id, no_subcategories: true }) + self.send("top_#{period}", category: @category.id, no_subcategories: true) end define_method("parent_category_category_top_#{period}") do - self.send("top_#{period}", { category: @category.id }) + self.send("top_#{period}", category: @category.id) end end @@ -204,16 +209,15 @@ class ListController < ApplicationController end end - private def page_params(opts = nil) opts ||= {} - route_params = {format: 'json'} - route_params[:category] = @category.slug_for_url if @category + route_params = { format: 'json' } + route_params[:category] = @category.slug_for_url if @category route_params[:parent_category] = @category.parent_category.slug_for_url if @category && @category.parent_category - route_params[:order] = opts[:order] if opts[:order].present? - route_params[:ascending] = opts[:ascending] if opts[:ascending].present? + route_params[:order] = opts[:order] if opts[:order].present? + route_params[:ascending] = opts[:ascending] if opts[:ascending].present? route_params end @@ -230,16 +234,15 @@ class ListController < ApplicationController @category = Category.query_category(slug_or_id, parent_category_id) raise Discourse::NotFound if !@category - @description_meta = @category.description + @description_meta = @category.description_text guardian.ensure_can_see!(@category) end def build_topic_list_options - # exclude_category = 1. from params / 2. parsed from top menu / 3. nil options = { page: params[:page], topic_ids: param_to_integer_list(:topic_ids), - exclude_category: (params[:exclude_category] || select_menu_item.try(:filter)), + exclude_category_ids: params[:exclude_category_ids], category: params[:category], order: params[:order], ascending: params[:ascending], @@ -248,7 +251,8 @@ class ListController < ApplicationController status: params[:status], filter: params[:filter], state: params[:state], - search: params[:search] + search: params[:search], + q: params[:q] } options[:no_subcategories] = true if params[:no_subcategories] == 'true' options[:slow_platform] = true if slow_platform? @@ -256,17 +260,6 @@ class ListController < ApplicationController options end - def select_menu_item - menu_item = SiteSetting.top_menu_items.select do |mu| - (mu.has_specific_category? && mu.specific_category == @category.try(:slug)) || - action_name == mu.name || - (action_name.include?("top") && mu.name == "top") - end.first - - menu_item = nil if menu_item.try(:has_specific_category?) && menu_item.specific_category == @category.try(:slug) - menu_item - end - def list_target_user if params[:user_id] && guardian.is_staff? User.find(params[:user_id].to_i) @@ -289,25 +282,16 @@ class ListController < ApplicationController url.sub('.json?','?') end - def generate_top_lists(options) - top = TopLists.new - - options[:per_page] = SiteSetting.topics_per_period_in_top_summary - topic_query = TopicQuery.new(current_user, options) - - periods = [ListController.best_period_for(current_user.try(:previous_visit_at), options[:category])] - - periods.each { |period| top.send("#{period}=", topic_query.list_top_for(period)) } - - top + def get_excluded_category_ids(current_category=nil) + exclude_category_ids = Category.where(suppress_from_homepage: true) + exclude_category_ids = exclude_category_ids.where.not(id: current_category) if current_category + exclude_category_ids.pluck(:id) end def self.best_period_for(previous_visit_at, category_id=nil) best_periods_for(previous_visit_at).each do |period| top_topics = TopTopic.where("#{period}_score > 0") - if category_id - top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) - end + top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) if category_id return period if top_topics.count >= SiteSetting.topics_per_period_in_top_page end # default period is yearly @@ -317,8 +301,8 @@ class ListController < ApplicationController def self.best_periods_for(date) date ||= 1.year.ago periods = [] - periods << :daily if date > 8.days.ago - periods << :weekly if date > 35.days.ago + periods << :daily if date > 8.days.ago + periods << :weekly if date > 35.days.ago periods << :monthly if date > 180.days.ago periods << :yearly periods diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 6a42a5bc67..9831ee88c3 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -7,7 +7,11 @@ class NotificationsController < ApplicationController def index user = current_user if params[:recent].present? - notifications = Notification.recent_report(current_user, 10) + + limit = (params[:limit] || 15).to_i + limit = 50 if limit > 50 + + notifications = Notification.recent_report(current_user, limit) if notifications.present? # ordering can be off due to PMs diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb index 4211c85fb5..f78256da04 100644 --- a/app/controllers/permalinks_controller.rb +++ b/app/controllers/permalinks_controller.rb @@ -2,7 +2,7 @@ class PermalinksController < ApplicationController skip_before_filter :check_xhr, :preload_json def show - url = request.fullpath[1..-1] + url = request.fullpath permalink = Permalink.find_by_url(url) diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index f595ada867..b7c321ed95 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -9,7 +9,7 @@ class PostsController < ApplicationController # Need to be logged in for all actions here before_filter :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest] - skip_before_filter :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link] + skip_before_filter :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link, :latest] def markdown_id markdown Post.find(params[:id].to_i) @@ -37,21 +37,33 @@ class PostsController < ApplicationController .where('posts.id <= ?', last_post_id) .where('posts.id > ?', last_post_id - 50) .includes(topic: :category) - .includes(:user) + .includes(user: :primary_group) + .includes(:reply_to_user) .limit(50) # Remove posts the user doesn't have permission to see # This isn't leaking any information we weren't already through the post ID numbers posts = posts.reject { |post| !guardian.can_see?(post) } - counts = PostAction.counts_for(posts, current_user) - render_json_dump(serialize_data(posts, - PostSerializer, - scope: guardian, - root: 'latest_posts', - add_raw: true, - all_post_actions: counts) - ) + respond_to do |format| + format.rss do + @posts = posts + @title = "#{SiteSetting.title} - #{I18n.t("rss_description.posts")}" + @link = Discourse.base_url + @description = I18n.t("rss_description.posts") + render 'posts/latest', formats: [:rss] + end + format.json do + render_json_dump(serialize_data(posts, + PostSerializer, + scope: guardian, + root: 'latest_posts', + add_raw: true, + add_title: true, + all_post_actions: counts) + ) + end + end end def cooked @@ -78,7 +90,18 @@ class PostsController < ApplicationController end def create + + if !is_api? && current_user.blocked? + + # error has parity with what user would get if they posted when blocked + # and it went through post creator + render json: {errors: [I18n.t("topic_not_found")]}, status: 422 + return + end + @manager_params = create_params + @manager_params[:first_post_checks] = !is_api? + manager = NewPostManager.new(current_user, @manager_params) if is_api? @@ -121,12 +144,15 @@ class PostsController < ApplicationController changes[:category_id] = params[:post][:category_id] if params[:post][:category_id] end - revisor = PostRevisor.new(post) - if revisor.revise!(current_user, changes) - TopicLink.extract_from(post) - QuotedPost.extract_from(post) + # We don't need to validate edits to small action posts by staff + opts = {} + if post.post_type == Post.types[:small_action] && current_user.staff? + opts[:skip_validations] = true end + revisor = PostRevisor.new(post) + revisor.revise!(current_user, changes, opts) + return render_json_error(post) if post.errors.present? return render_json_error(post.topic) if post.topic.errors.present? @@ -160,6 +186,7 @@ class PostsController < ApplicationController def destroy post = find_post_from_params + RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff? if too_late_to(:delete_post, post) render json: {errors: [I18n.t('too_late_to_edit')]}, status: 422 @@ -182,6 +209,7 @@ class PostsController < ApplicationController def recover post = find_post_from_params + RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff? guardian.ensure_can_recover_post!(post) destroyer = PostDestroyer.new(current_user, post) destroyer.recover @@ -337,7 +365,7 @@ class PostsController < ApplicationController # If a param is present it uses that result structure. def backwards_compatible_json(json_obj, success) json_obj.symbolize_keys! - if params[:nested_post].blank? && json_obj[:errors].blank? + if params[:nested_post].blank? && json_obj[:errors].blank? && json_obj[:action] != :enqueued json_obj = json_obj[:post] end @@ -387,7 +415,6 @@ class PostsController < ApplicationController # Awful hack, but you can't seem to remove the `default_scope` when joining # So instead I grab the topics separately topic_ids = posts.dup.pluck(:topic_id) - secured_category_ids = guardian.secure_category_ids topics = Topic.where(id: topic_ids).with_deleted.where.not(archetype: 'private_message') topics = topics.secured(guardian) @@ -406,7 +433,9 @@ class PostsController < ApplicationController :category, :target_usernames, :reply_to_post_number, - :auto_track + :auto_track, + :typing_duration_msecs, + :composer_open_duration_msecs ] # param munging for WordPress @@ -436,6 +465,10 @@ class PostsController < ApplicationController result[:is_warning] = false end + if current_user.staff? && SiteSetting.enable_whispers? && params[:whisper] == "true" + result[:post_type] = Post.types[:whisper] + end + PostRevisor.tracked_topic_fields.each_key do |f| params.permit(f => []) result[f] = params[f] if params.has_key?(f) diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb index bfa1391213..d13de97081 100644 --- a/app/controllers/queued_posts_controller.rb +++ b/app/controllers/queued_posts_controller.rb @@ -8,7 +8,7 @@ class QueuedPostsController < ApplicationController state = QueuedPost.states[(params[:state] || 'new').to_sym] state ||= QueuedPost.states[:new] - @queued_posts = QueuedPost.visible.where(state: state).includes(:topic, :user) + @queued_posts = QueuedPost.visible.where(state: state).includes(:topic, :user).order(:created_at) render_serialized(@queued_posts, QueuedPostSerializer, root: :queued_posts, diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index f78087a4f9..0b857278f0 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -2,21 +2,75 @@ require_dependency 'search' class SearchController < ApplicationController + skip_before_filter :check_xhr, only: :show + def self.valid_context_types %w{user topic category private_messages} end + def show + search_args = { + type_filter: 'topic', + guardian: guardian, + include_blurbs: true, + blurb_length: 300 + } + + context, type = lookup_search_context + if context + search_args[:search_context] = context + search_args[:type_filter] = type if type + end + + search = Search.new(params[:q], search_args) + result = search.execute + + serializer = serialize_data(result, GroupedSearchResultSerializer, result: result) + + respond_to do |format| + format.html do + store_preloaded("search", MultiJson.dump(serializer)) + end + format.json do + render_json_dump(serializer) + end + end + + end + def query params.require(:term) - search_args = {guardian: guardian} - search_args[:type_filter] = params[:type_filter] if params[:type_filter].present? - if params[:include_blurbs].present? - search_args[:include_blurbs] = params[:include_blurbs] == "true" + search_args = { guardian: guardian } + + search_args[:type_filter] = params[:type_filter] if params[:type_filter].present? + search_args[:include_blurbs] = params[:include_blurbs] == "true" if params[:include_blurbs].present? + search_args[:search_for_id] = true if params[:search_for_id].present? + + context,type = lookup_search_context + if context + search_args[:search_context] = context + search_args[:type_filter] = type if type end - search_args[:search_for_id] = true if params[:search_for_id].present? + + search = Search.new(params[:term], search_args.symbolize_keys) + result = search.execute + render_serialized(result, GroupedSearchResultSerializer, result: result) + end + + protected + + def lookup_search_context + + return if params[:skip_context] == "true" search_context = params[:search_context] + unless search_context + if (context = params[:context]) && (id = params[:context_id]) + search_context = {type: context, id: id} + end + end + if search_context.present? raise Discourse::InvalidParameters.new(:search_context) unless SearchController.valid_context_types.include?(search_context[:type]) raise Discourse::InvalidParameters.new(:search_context) if search_context[:id].blank? @@ -24,23 +78,21 @@ class SearchController < ApplicationController # A user is found by username context_obj = nil if ['user','private_messages'].include? search_context[:type] - context_obj = User.find_by(username_lower: params[:search_context][:id].downcase) + context_obj = User.find_by(username_lower: search_context[:id].downcase) else klass = search_context[:type].classify.constantize - context_obj = klass.find_by(id: params[:search_context][:id]) + context_obj = klass.find_by(id: search_context[:id]) end + type_filter = nil if search_context[:type] == 'private_messages' - search_args[:type_filter] = 'private_messages' + type_filter = 'private_messages' end guardian.ensure_can_see!(context_obj) - search_args[:search_context] = context_obj - end - search = Search.new(params[:term], search_args.symbolize_keys) - result = search.execute - render_serialized(result, GroupedSearchResultSerializer, :result => result) + [context_obj, type_filter] + end end end diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 298ff2f826..7269f56c2a 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -11,8 +11,16 @@ class SessionController < ApplicationController end def sso - if SiteSetting.enable_sso - redirect_to DiscourseSingleSignOn.generate_url(params[:return_path] || path('/')) + return_path = if params[:return_path] + params[:return_path] + elsif session[:destination_url] + URI::parse(session[:destination_url]).path + else + path('/') + end + + if SiteSetting.enable_sso? + redirect_to DiscourseSingleSignOn.generate_url(return_path) else render nothing: true, status: 404 end diff --git a/app/controllers/similar_topics_controller.rb b/app/controllers/similar_topics_controller.rb new file mode 100644 index 0000000000..1f0a84d84f --- /dev/null +++ b/app/controllers/similar_topics_controller.rb @@ -0,0 +1,40 @@ +require_dependency 'similar_topic_serializer' +require_dependency 'search/grouped_search_results' + +class SimilarTopicsController < ApplicationController + + class SimilarTopic + def initialize(topic) + @topic = topic + end + + attr_reader :topic + + def blurb + Search::GroupedSearchResults.blurb_for(@topic.try(:blurb)) + end + end + + def index + params.require(:title) + params.require(:raw) + title, raw = params[:title], params[:raw] + invalid_length = [:title, :raw].any? { |key| check_invalid_length(key, params[key]) } + + # Only suggest similar topics if the site has a minimum amount of topics present + # and params are long enough. + return render json: [] if invalid_length || !Topic.count_exceeds_minimum? + + topics = Topic.similar_to(title, raw, current_user).to_a + topics.map! {|t| SimilarTopic.new(t) } + render_serialized(topics, SimilarTopicSerializer, root: :similar_topics, rest_serializer: true) + end + + protected + + def check_invalid_length(key, attr) + str = (key == :raw) ? "body" : key.to_s + attr.length < SiteSetting.send("min_#{str}_similar_length") + end + +end diff --git a/app/controllers/site_customizations_controller.rb b/app/controllers/site_customizations_controller.rb index e457d7d785..34a314720f 100644 --- a/app/controllers/site_customizations_controller.rb +++ b/app/controllers/site_customizations_controller.rb @@ -2,7 +2,6 @@ class SiteCustomizationsController < ApplicationController skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required def show - no_cookies cache_time = request.env["HTTP_IF_MODIFIED_SINCE"] @@ -30,7 +29,7 @@ class SiteCustomizationsController < ApplicationController response.headers["Last-Modified"] = stylesheet_time.httpdate expires_in 1.year, public: true - render text: SiteCustomization.stylesheet_contents(params[:key], params[:target] == "mobile" ? :mobile : :desktop), + render text: SiteCustomization.stylesheet_contents(params[:key], params[:target]), content_type: "text/css" end end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index d62882b50a..0247fe328b 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -1,7 +1,10 @@ +require_dependency 'distributed_memoizer' +require_dependency 'file_helper' + class StaticController < ApplicationController skip_before_filter :check_xhr, :redirect_to_login_if_required - skip_before_filter :verify_authenticity_token, only: [:enter] + skip_before_filter :verify_authenticity_token, only: [:cdn_asset, :enter, :favicon] def show return redirect_to(path '/') if current_user && params[:id] == 'login' @@ -72,6 +75,7 @@ class StaticController < ApplicationController uri.path !~ /\./ destination = uri.path + destination = "#{uri.path}?#{uri.query}" if uri.path =~ /new-topic/ end rescue URI::InvalidURIError # Do nothing if the URI is invalid @@ -81,7 +85,38 @@ class StaticController < ApplicationController redirect_to destination end - skip_before_filter :verify_authenticity_token, only: [:cdn_asset] + # We need to be able to draw our favicon on a canvas + # and pull it off the canvas into a data uri + # This can work by ensuring people set all the right CORS + # settings in the CDN asset, BUT its annoying and error prone + # instead we cache the favicon in redis and serve it out real quick with + # a huge expiry, we also cache these assets in nginx so it bypassed if needed + def favicon + + data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do + begin + file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png") + data = file.read + file.unlink + data + rescue => e + Rails.logger.warn("Invalid favicon_url #{SiteSetting.favicon_url}: #{e}\n#{e.backtrace}") + "" + end + end + + if data.bytesize == 0 + render text: UserAvatarsController::DOT, content_type: "image/gif" + else + expires_in 1.year, public: true + response.headers["Expires"] = 1.year.from_now.httpdate + response.headers["Content-Length"] = data.bytesize.to_s + response.headers["Last-Modified"] = Time.new('2000-01-01').httpdate + render text: data, content_type: "image/png" + end + + end + def cdn_asset path = File.expand_path(Rails.root + "public/assets/" + params[:path]) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index e7dfbab3b0..d139479de0 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -5,8 +5,6 @@ require_dependency 'topics_bulk_action' require_dependency 'discourse_event' class TopicsController < ApplicationController - include UrlHelper - before_filter :ensure_logged_in, only: [:timings, :destroy_timings, :update, @@ -26,11 +24,13 @@ class TopicsController < ApplicationController :bulk, :reset_new, :change_post_owners, - :bookmark] + :change_timestamps, + :bookmark, + :unsubscribe] before_filter :consider_user_for_promotion, only: :show - skip_before_filter :check_xhr, only: [:show, :feed] + skip_before_filter :check_xhr, only: [:show, :unsubscribe, :feed] def id_for_slug topic = Topic.find_by(slug: params[:slug].downcase) @@ -79,9 +79,14 @@ class TopicsController < ApplicationController @topic_view.draft = Draft.get(current_user, @topic_view.draft_key, @topic_view.draft_sequence) end + unless @topic_view.topic.visible + response.headers['X-Robots-Tag'] = 'noindex' + end + + canonical_url UrlHelper.absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}") + perform_show_response - canonical_url absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}") rescue Discourse::InvalidAccess => ex if current_user @@ -89,9 +94,34 @@ class TopicsController < ApplicationController Notification.remove_for(current_user.id, params[:topic_id]) end + if ex.obj && Topic === ex.obj && guardian.can_see_topic_if_not_deleted?(ex.obj) + rescue_discourse_actions(:not_found, 410) + return + end + raise ex end + def unsubscribe + @topic_view = TopicView.new(params[:topic_id], current_user) + + if slugs_do_not_match || (!request.format.json? && params[:slug].blank?) + return redirect_to @topic_view.topic.unsubscribe_url, status: 301 + end + + tu = TopicUser.find_by(user_id: current_user.id, topic_id: params[:topic_id]) + + if tu.notification_level > TopicUser.notification_levels[:regular] + tu.notification_level = TopicUser.notification_levels[:regular] + else + tu.notification_level = TopicUser.notification_levels[:muted] + end + + tu.save! + + perform_show_response + end + def wordpress params.require(:best) params.require(:topic_id) @@ -147,42 +177,32 @@ class TopicsController < ApplicationController success ? render_serialized(topic, BasicTopicSerializer) : render_json_error(topic) end - def similar_to - params.require(:title) - params.require(:raw) - title, raw = params[:title], params[:raw] - [:title, :raw].each { |key| check_length_of(key, params[key]) } - - # Only suggest similar topics if the site has a minimum amount of topics present. - return render json: [] unless Topic.count_exceeds_minimum? - - topics = Topic.similar_to(title, raw, current_user).to_a - render_serialized(topics, BasicTopicSerializer) - end - def feature_stats params.require(:category_id) category_id = params[:category_id].to_i - topics = Topic.listable_topics.visible + visible_topics = Topic.listable_topics.visible render json: { - pinned_in_category_count: topics.where(category_id: category_id).where(pinned_globally: false).where.not(pinned_at: nil).count, - pinned_globally_count: topics.where(pinned_globally: true).where.not(pinned_at: nil).count, - banner_count: topics.where(archetype: Archetype.banner).count, + pinned_in_category_count: visible_topics.where(category_id: category_id).where(pinned_globally: false).where.not(pinned_at: nil).count, + pinned_globally_count: visible_topics.where(pinned_globally: true).where.not(pinned_at: nil).count, + banner_count: Topic.listable_topics.where(archetype: Archetype.banner).count, } end def status params.require(:status) params.require(:enabled) - status, topic_id = params[:status], params[:topic_id].to_i - enabled = (params[:enabled] == 'true') + params.permit(:until) + + status = params[:status] + topic_id = params[:topic_id].to_i + enabled = params[:enabled] == 'true' check_for_status_presence(:status, status) @topic = Topic.find_by(id: topic_id) guardian.ensure_can_moderate!(@topic) - @topic.update_status(status, enabled, current_user) + @topic.update_status(status, enabled, current_user, until: params[:until]) render nothing: true end @@ -362,6 +382,22 @@ class TopicsController < ApplicationController end end + def change_timestamps + params.require(:topic_id) + params.require(:timestamp) + + guardian.ensure_can_change_post_owner! + + begin + PostTimestampChanger.new( topic_id: params[:topic_id].to_i, + timestamp: params[:timestamp].to_i ).change! + + render json: success_json + rescue ActiveRecord::RecordInvalid + render json: failed_json, status: 422 + end + end + def clear_pin topic = Topic.find_by(id: params[:topic_id].to_i) guardian.ensure_can_see!(topic) @@ -381,7 +417,8 @@ class TopicsController < ApplicationController current_user, params[:topic_id].to_i, params[:topic_time].to_i, - (params[:timings] || []).map{|post_number, t| [post_number.to_i, t.to_i]} + (params[:timings] || []).map{|post_number, t| [post_number.to_i, t.to_i]}, + {mobile: view_context.mobile_view?} ) render nothing: true end @@ -483,6 +520,7 @@ class TopicsController < ApplicationController format.html do @description_meta = @topic_view.topic.excerpt store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer)) + render :show end format.json do @@ -508,11 +546,6 @@ class TopicsController < ApplicationController topic.move_posts(current_user, post_ids_including_replies, args) end - def check_length_of(key, attr) - str = (key == :raw) ? "body" : key.to_s - invalid_param(key) if attr.length < SiteSetting.send("min_#{str}_similar_length") - end - def check_for_status_presence(key, attr) invalid_param(key) unless %w(pinned pinned_globally visible closed archived).include?(attr) end diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 5f8921a679..d1251784ff 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -1,54 +1,27 @@ class UploadsController < ApplicationController before_filter :ensure_logged_in, except: [:show] - skip_before_filter :preload_json, :check_xhr, only: [:show] + skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show] def create type = params.require(:type) - file = params[:file] || params[:files].first + file = params[:file] || params[:files].try(:first) url = params[:url] client_id = params[:client_id] - - Scheduler::Defer.later("Create Upload") do - begin - # API can provide a URL - if file.nil? && url.present? && is_api? - tempfile = FileHelper.download(url, SiteSetting.max_image_size_kb.kilobytes, "discourse-upload-#{type}") rescue nil - filename = File.basename(URI.parse(file).path) - else - tempfile = file.tempfile - filename = file.original_filename - content_type = file.content_type - end - - # when we're dealing with an avatar, crop it to its maximum size - if type == "avatar" && FileHelper.is_image?(filename) - max = Discourse.avatar_sizes.max - OptimizedImage.resize(tempfile.path, tempfile.path, max, max, allow_animation: SiteSetting.allow_animated_avatars) - end - - upload = Upload.create_for(current_user.id, tempfile, filename, tempfile.size, content_type: content_type) - - if upload.errors.empty? && current_user.admin? - retain_hours = params[:retain_hours].to_i - upload.update_columns(retain_hours: retain_hours) if retain_hours > 0 - end - - if upload.errors.empty? && FileHelper.is_image?(filename) - Jobs.enqueue(:create_thumbnails, upload_id: upload.id, type: type, user_id: params[:user_id]) - end - - data = upload.errors.empty? ? upload : { errors: upload.errors.values.flatten } - - MessageBus.publish("/uploads/#{type}", data.as_json, client_ids: [client_id]) - ensure - tempfile.try(:close!) rescue nil - end - end + synchronous = is_api? && params[:synchronous] # HACK FOR IE9 to prevent the "download dialog" response.headers["Content-Type"] = "text/plain" if request.user_agent =~ /MSIE 9/ - render json: success_json + if synchronous + data = create_upload(type, file, url) + render json: data.as_json + else + Scheduler::Defer.later("Create Upload") do + data = create_upload(type, file, url) + MessageBus.publish("/uploads/#{type}", data.as_json, client_ids: [client_id]) + end + render json: success_json + end end def show @@ -57,6 +30,7 @@ class UploadsController < ApplicationController RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db| return render_404 unless Discourse.store.internal? return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil? + return render_404 if SiteSetting.login_required? && db == "default" && current_user.nil? if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"]) opts = { filename: upload.original_filename } @@ -74,4 +48,48 @@ class UploadsController < ApplicationController render nothing: true, status: 404 end + def create_upload(type, file, url) + begin + # ensure we have a file + if file.nil? + # API can provide a URL + if url.present? && is_api? + tempfile = FileHelper.download(url, 10.megabytes, "discourse-upload-#{type}") rescue nil + filename = File.basename(URI.parse(url).path) + end + else + tempfile = file.tempfile + filename = file.original_filename + content_type = file.content_type + end + + return { errors: I18n.t("upload.file_missing") } if tempfile.nil? + + # allow users to upload large images that will be automatically reduced to allowed size + if SiteSetting.max_image_size_kb > 0 && FileHelper.is_image?(filename) && File.size(tempfile.path) > 0 + allow_animation = type == "avatar" ? SiteSetting.allow_animated_avatars : SiteSetting.allow_animated_thumbnails + attempt = 5 + while attempt > 0 && File.size(tempfile.path) > SiteSetting.max_image_size_kb.kilobytes + OptimizedImage.downsize(tempfile.path, tempfile.path, "80%", filename: filename, allow_animation: allow_animation) + attempt -= 1 + end + end + + upload = Upload.create_for(current_user.id, tempfile, filename, File.size(tempfile.path), content_type: content_type, image_type: type) + + if upload.errors.empty? && current_user.admin? + retain_hours = params[:retain_hours].to_i + upload.update_columns(retain_hours: retain_hours) if retain_hours > 0 + end + + if upload.errors.empty? && FileHelper.is_image?(filename) + Jobs.enqueue(:create_thumbnails, upload_id: upload.id, type: type, user_id: params[:user_id]) + end + + upload.errors.empty? ? upload : { errors: upload.errors.values.flatten } + ensure + tempfile.try(:close!) rescue nil + end + end + end diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb index e4d4079fec..c20f9c8d23 100644 --- a/app/controllers/user_actions_controller.rb +++ b/app/controllers/user_actions_controller.rb @@ -24,7 +24,7 @@ class UserActionsController < ApplicationController UserAction.stream(opts) end - render_serialized(stream, UserActionSerializer, root: "user_actions") + render_serialized(stream, UserActionSerializer, root: 'user_actions') end def show diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index ed8f31e4af..1ff19e3ccf 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -13,7 +13,10 @@ class UserAvatarsController < ApplicationController user.create_user_avatar(user_id: user.id) unless user.user_avatar user.user_avatar.update_gravatar! - render json: { upload_id: user.user_avatar.gravatar_upload_id } + render json: { + gravatar_upload_id: user.user_avatar.gravatar_upload_id, + gravatar_avatar_template: User.avatar_template(user.username, user.user_avatar.gravatar_upload_id) + } else raise Discourse::NotFound end @@ -105,7 +108,8 @@ class UserAvatarsController < ApplicationController upload, size, size, - allow_animation: SiteSetting.allow_animated_avatars + filename: upload.original_filename, + allow_animation: SiteSetting.allow_animated_avatars, ) end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index bb33159a43..b61ff36780 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -34,14 +34,18 @@ class Users::OmniauthCallbacksController < ApplicationController authenticator = self.class.find_authenticator(params[:provider]) - @data = authenticator.after_authenticate(auth) - @data.authenticator_name = authenticator.name + @auth_result = authenticator.after_authenticate(auth) - complete_response_data - - respond_to do |format| - format.html - format.json { render json: @data.to_client_hash } + if @auth_result.failed? + flash[:error] = @auth_result.failed_reason.html_safe + return render('failure') + else + @auth_result.authenticator_name = authenticator.name + complete_response_data + respond_to do |format| + format.html + format.json { render json: @auth_result.to_client_hash } + end end end @@ -69,35 +73,35 @@ class Users::OmniauthCallbacksController < ApplicationController protected def complete_response_data - if @data.user - user_found(@data.user) + if @auth_result.user + user_found(@auth_result.user) elsif SiteSetting.invite_only? - @data.requires_invite = true + @auth_result.requires_invite = true else - session[:authentication] = @data.session_data + session[:authentication] = @auth_result.session_data end end def user_found(user) # automatically activate any account if a provider marked the email valid - if !user.active && @data.email_valid + if !user.active && @auth_result.email_valid user.toggle(:active).save end if ScreenedIpAddress.should_block?(request.remote_ip) - @data.not_allowed_from_ip_address = true + @auth_result.not_allowed_from_ip_address = true elsif ScreenedIpAddress.block_admin_login?(user, request.remote_ip) - @data.admin_not_allowed_from_ip_address = true + @auth_result.admin_not_allowed_from_ip_address = true elsif Guardian.new(user).can_access_forum? && user.active # log on any account that is active with forum access log_on_user(user) Invite.invalidate_for_email(user.email) # invite link can't be used to log in anymore session[:authentication] = nil # don't carry around old auth info, perhaps move elsewhere - @data.authenticated = true + @auth_result.authenticated = true else if SiteSetting.must_approve_users? && !user.approved? - @data.awaiting_approval = true + @auth_result.awaiting_approval = true else - @data.awaiting_activation = true + @auth_result.awaiting_activation = true end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2deb0bd5d4..b5bb7c3e24 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -39,6 +39,12 @@ class UsersController < ApplicationController user_serializer.topic_post_count = {topic_id => Post.where(topic_id: topic_id, user_id: @user.id).count } end + # This is a hack to get around a Rails issue where values with periods aren't handled correctly + # when used as part of a route. + if params[:external_id] and params[:external_id].ends_with? '.json' + return render_json_dump(user_serializer) + end + respond_to do |format| format.html do @restrict_fields = guardian.restrict_user_fields?(@user) @@ -162,18 +168,29 @@ class UsersController < ApplicationController def invited inviter = fetch_user_from_params offset = params[:offset].to_i || 0 + filter_by = params[:filter] - invites = if guardian.can_see_invite_details?(inviter) - Invite.find_all_invites_from(inviter, offset) + invites = if guardian.can_see_invite_details?(inviter) && filter_by == "pending" + Invite.find_pending_invites_from(inviter, offset) else Invite.find_redeemed_invites_from(inviter, offset) end - invites = invites.filter_by(params[:filter]) + invites = invites.filter_by(params[:search]) render_json_dump invites: serialize_data(invites.to_a, InviteSerializer), can_see_invite_details: guardian.can_see_invite_details?(inviter) end + def invited_count + inviter = fetch_user_from_params + + pending_count = Invite.find_pending_invites_count(inviter) + redeemed_count = Invite.find_redeemed_invites_count(inviter) + + render json: {counts: { pending: pending_count, redeemed: redeemed_count, + total: (pending_count.to_i + redeemed_count.to_i) } } + end + def is_local_username users = params[:usernames] users = [params[:username]] if users.blank? @@ -225,15 +242,14 @@ class UsersController < ApplicationController return fail_with("login.password_too_long") end - if params[:password] && params[:password].length > User.max_password_length - render json: { success: false, message: I18n.t("login.password_too_long") } - return - end - if params[:email] && params[:email].length > 254 + 1 + 253 return fail_with("login.email_too_long") end + if SiteSetting.reserved_usernames.split("|").include? params[:username].downcase + return fail_with("login.reserved_username") + end + user = User.new(user_params) # Handle custom fields @@ -468,7 +484,7 @@ class UsersController < ApplicationController end else - flash[:error] = I18n.t('activation.already_done') + flash.now[:error] = I18n.t('activation.already_done') end render layout: 'no_ember' end @@ -499,29 +515,40 @@ class UsersController < ApplicationController results = UserSearch.new(term, topic_id: topic_id, topic_allowed_users: topic_allowed_users, searching_user: current_user).search - user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id] + user_fields = [:username, :upload_avatar_template] user_fields << :name if SiteSetting.enable_names? - to_render = { users: results.as_json(only: user_fields, methods: :avatar_template) } + to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) } if params[:include_groups] == "true" - to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} } + to_render[:groups] = Group.search_group(term, current_user).map { |m| { name: m.name, usernames: m.usernames.split(",") } } end render json: to_render end + AVATAR_TYPES_WITH_UPLOAD ||= %w{uploaded custom gravatar} + def pick_avatar user = fetch_user_from_params guardian.ensure_can_edit!(user) + type = params[:type] upload_id = params[:upload_id] user.uploaded_avatar_id = upload_id - # ensure we associate the custom avatar properly - if upload_id && user.user_avatar.custom_upload_id != upload_id - user.user_avatar.custom_upload_id = upload_id + if AVATAR_TYPES_WITH_UPLOAD.include?(type) + # make sure the upload exists + unless Upload.where(id: upload_id).exists? + return render_json_error I18n.t("avatar.missing") + end + + if type == "gravatar" + user.user_avatar.gravatar_upload_id = upload_id + else + user.user_avatar.custom_upload_id = upload_id + end end user.save! @@ -556,7 +583,7 @@ class UsersController < ApplicationController end def read_faq - if(user = current_user) + if user = current_user user.user_stat.read_faq = 1.second.ago user.user_stat.save end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 678a1dd33e..2dadd8db44 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -56,7 +56,7 @@ module ApplicationHelper end def html_classes - "#{mobile_view? ? 'mobile-view' : 'desktop-view'} #{mobile_device? ? 'mobile-device' : 'not-mobile-device'} #{rtl_class}" + "#{mobile_view? ? 'mobile-view' : 'desktop-view'} #{mobile_device? ? 'mobile-device' : 'not-mobile-device'} #{rtl_class} #{current_user ? '' : 'anon'}" end def rtl_class diff --git a/app/helpers/embed_helper.rb b/app/helpers/embed_helper.rb index c7cbe524fe..53eedd6259 100644 --- a/app/helpers/embed_helper.rb +++ b/app/helpers/embed_helper.rb @@ -16,12 +16,25 @@ module EmbedHelper def get_html(cooked) fragment = Nokogiri::HTML.fragment(cooked) + # convert lazyYT div to link fragment.css('div.lazyYT').each do |yt_div| youtube_id = yt_div["data-youtube-id"] youtube_link = "https://www.youtube.com/watch?v=#{youtube_id}" yt_div.replace "

      #{youtube_link}

      " end + + # convert Vimeo iframe to link + fragment.css('iframe').each do |iframe| + if iframe['src'] =~ /player.vimeo.com/ + vimeo_id = iframe['src'].split('/').last + iframe.replace "

      https://vimeo.com/#{vimeo_id}

      " + end + end + + # Strip lightbox metadata + fragment.css('.lightbox-wrapper .meta').remove + raw fragment end end diff --git a/app/jobs/base.rb b/app/jobs/base.rb index 8127d755be..a187dfb682 100644 --- a/app/jobs/base.rb +++ b/app/jobs/base.rb @@ -149,6 +149,7 @@ module Jobs begin RailsMultisite::ConnectionManagement.establish_connection(db: db) I18n.locale = SiteSetting.default_locale + I18n.fallbacks.ensure_loaded! begin execute(opts) rescue => e @@ -227,7 +228,8 @@ module Jobs end def self.enqueue_at(datetime, job_name, opts={}) - enqueue_in( [(datetime - Time.zone.now).to_i, 0].max, job_name, opts ) + secs = [(datetime - Time.zone.now).to_i, 0].max + enqueue_in(secs, job_name, opts) end def self.cancel_scheduled_job(job_name, params={}) diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb index 0b4488371a..738d0db4ea 100644 --- a/app/jobs/regular/automatic_group_membership.rb +++ b/app/jobs/regular/automatic_group_membership.rb @@ -13,8 +13,14 @@ module Jobs domains = group.automatic_membership_email_domains.gsub('.', '\.') - User.where("email ~* '@(#{domains})$'").find_each do |user| - group.add(user) rescue ActiveRecord::RecordNotUnique + User.where("email ~* '@(#{domains})$' and users.id not in ( + select user_id from group_users where group_users.group_id = ? + )", group_id).find_each do |user| + begin + group.add(user) + rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation + # we don't care about this + end end end diff --git a/app/jobs/regular/crawl_topic_link.rb b/app/jobs/regular/crawl_topic_link.rb index 7ad789cfed..e77fedfab6 100644 --- a/app/jobs/regular/crawl_topic_link.rb +++ b/app/jobs/regular/crawl_topic_link.rb @@ -119,7 +119,7 @@ module Jobs title.gsub!(/ +/, ' ') title.strip! if title.present? - crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..255]]) == 1) + crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..254]]) == 1) end end end diff --git a/app/jobs/regular/create_daily_backup.rb b/app/jobs/regular/create_backup.rb similarity index 71% rename from app/jobs/regular/create_daily_backup.rb rename to app/jobs/regular/create_backup.rb index 40024fc76d..5f1cf57602 100644 --- a/app/jobs/regular/create_daily_backup.rb +++ b/app/jobs/regular/create_backup.rb @@ -1,11 +1,10 @@ require "backup_restore/backup_restore" module Jobs - class CreateDailyBackup < Jobs::Base + class CreateBackup < Jobs::Base sidekiq_options retry: false def execute(args) - return unless SiteSetting.backup_daily? BackupRestore.backup!(Discourse.system_user.id, publish_to_message_bus: false) end end diff --git a/app/jobs/regular/create_thumbnails.rb b/app/jobs/regular/create_thumbnails.rb index 742d74877f..84285333d8 100644 --- a/app/jobs/regular/create_thumbnails.rb +++ b/app/jobs/regular/create_thumbnails.rb @@ -22,7 +22,13 @@ module Jobs def create_thumbnails_for_avatar(upload, user) Discourse.avatar_sizes.each do |size| - OptimizedImage.create_for(upload, size, size, allow_animation: SiteSetting.allow_animated_avatars) + OptimizedImage.create_for( + upload, + size, + size, + filename: upload.original_filename, + allow_animation: SiteSetting.allow_animated_avatars + ) end end diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index ec81200402..d3d2d3da89 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -8,19 +8,21 @@ module Jobs HEADER_ATTRS_FOR = {} HEADER_ATTRS_FOR['user_archive'] = ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at'] - HEADER_ATTRS_FOR['user_list'] = ['id','name','username','email','title','created_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'] + HEADER_ATTRS_FOR['user_list'] = ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'] HEADER_ATTRS_FOR['user_stats'] = ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received'] HEADER_ATTRS_FOR['user_sso'] = ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url'] HEADER_ATTRS_FOR['staff_action'] = ['staff_user','action','subject','created_at','details', 'context'] HEADER_ATTRS_FOR['screened_email'] = ['email','action','match_count','last_match_at','created_at','ip_address'] HEADER_ATTRS_FOR['screened_ip'] = ['ip_address','action','match_count','last_match_at','created_at'] HEADER_ATTRS_FOR['screened_url'] = ['domain','action','match_count','last_match_at','created_at'] + HEADER_ATTRS_FOR['report'] = ['date', 'value'] sidekiq_options retry: false attr_accessor :current_user def execute(args) @entity = args[:entity] + @extra = HashWithIndifferentAccess.new(args[:args]) if args[:args] @file_name = @entity @current_user = User.find_by(id: args[:user_id]) @@ -93,6 +95,16 @@ module Jobs end end + def report_export + @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String) + @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String) + @extra[:category_id] = @extra[:category_id].to_i if @extra[:category_id] + r = Report.find(@extra[:name], @extra) + r.data.map do |row| + [row[:x].to_s(:db), row[:y].to_s(:db)] + end + end + def get_header case @entity @@ -146,7 +158,7 @@ module Jobs category_name = "-" end is_pm = topic_data.archetype == "private_message" ? I18n.t("csv_export.boolean_yes") : I18n.t("csv_export.boolean_no") - url = "#{Discourse.base_url}/t/#{topic_data.slug}/#{topic_data.id}/#{user_archive['post_number']}" + url = "#{Discourse.base_uri}/t/#{topic_data.slug}/#{topic_data.id}/#{user_archive['post_number']}" topic_hash = {"post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category, "is_pm" => is_pm, "url" => url} user_archive.merge!(topic_hash) @@ -288,7 +300,7 @@ module Jobs def notify_user if @current_user if @file_name != "" && File.exists?("#{UserExport.base_directory}/#{@file_name}.gz") - SystemMessage.create_from_system_user(@current_user, :csv_export_succeeded, download_link: "#{Discourse.base_url}/export_csv/#{@file_name}.gz", file_name: "#{@file_name}.gz", file_size: number_to_human_size(File.size("#{UserExport.base_directory}/#{@file_name}.gz"))) + SystemMessage.create_from_system_user(@current_user, :csv_export_succeeded, download_link: "#{Discourse.base_uri}/export_csv/#{@file_name}.gz", file_name: "#{@file_name}.gz", file_size: number_to_human_size(File.size("#{UserExport.base_directory}/#{@file_name}.gz"))) else SystemMessage.create_from_system_user(@current_user, :csv_export_failed) end diff --git a/app/jobs/regular/feature_topic_users.rb b/app/jobs/regular/feature_topic_users.rb index 6eabc024e2..702fb4f6c3 100644 --- a/app/jobs/regular/feature_topic_users.rb +++ b/app/jobs/regular/feature_topic_users.rb @@ -8,16 +8,10 @@ module Jobs topic = Topic.find_by(id: topic_id) - # there are 3 cases here - # 1. topic was atomically nuked, this should be skipped - # 2. topic was deleted, this should be skipped - # 3. error an incorrect topic_id was sent - - unless topic.present? - max_id = Topic.with_deleted.maximum(:id).to_i - raise Discourse::InvalidParameters.new(:topic_id) if max_id < topic_id - return - end + # Topic may be hard deleted due to spam, no point complaining + # we would have to look at the topics table id sequence to find cases + # where this was called with an invalid id, no point really + return unless topic.present? topic.feature_topic_users(args) end diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb index 2b5671dfc9..efe7457e5c 100644 --- a/app/jobs/regular/pull_hotlinked_images.rb +++ b/app/jobs/regular/pull_hotlinked_images.rb @@ -4,8 +4,6 @@ require_dependency 'file_helper' module Jobs class PullHotlinkedImages < Jobs::Base - include UrlHelper - def initialize # maximum size of the file in bytes @max_size = SiteSetting.max_image_size_kb.kilobytes @@ -34,19 +32,19 @@ module Jobs # have we already downloaded that file? unless downloaded_urls.include?(src) begin - hotlinked = FileHelper.download(src, @max_size, "discourse-hotlinked") + hotlinked = FileHelper.download(src, @max_size, "discourse-hotlinked", true) rescue Discourse::InvalidParameters end if hotlinked - if hotlinked.size <= @max_size + if File.size(hotlinked.path) <= @max_size filename = File.basename(URI.parse(src).path) - upload = Upload.create_for(post.user_id, hotlinked, filename, hotlinked.size, { origin: src }) + upload = Upload.create_for(post.user_id, hotlinked, filename, File.size(hotlinked.path), { origin: src }) downloaded_urls[src] = upload.url else - Rails.logger.error("Failed to pull hotlinked image: #{src} - Image is bigger than #{@max_size}") + Rails.logger.info("Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}") end else - Rails.logger.error("There was an error while downloading '#{src}' locally.") + Rails.logger.error("There was an error while downloading '#{src}' locally for post: #{post_id}") end end # have we successfully downloaded that file? @@ -68,7 +66,7 @@ module Jobs raw.gsub!(src, "") end rescue => e - Rails.logger.error("Failed to pull hotlinked image: #{src}\n" + e.message + "\n" + e.backtrace.join("\n")) + Rails.logger.info("Failed to pull hotlinked image: #{src} post:#{post_id}\n" + e.message + "\n" + e.backtrace.join("\n")) ensure # close & delete the temp file hotlinked && hotlinked.close! diff --git a/app/jobs/regular/unpin_topic.rb b/app/jobs/regular/unpin_topic.rb new file mode 100644 index 0000000000..ff894ca6bc --- /dev/null +++ b/app/jobs/regular/unpin_topic.rb @@ -0,0 +1,16 @@ +module Jobs + + class UnpinTopic < Jobs::Base + + def execute(args) + topic_id = args[:topic_id] + + raise Discourse::InvalidParameters.new(:topic_id) unless topic_id.present? + + topic = Topic.find_by(id: topic_id) + topic.update_pinned(false) if topic.present? + end + + end + +end diff --git a/app/jobs/regular/update_top_redirection.rb b/app/jobs/regular/update_top_redirection.rb index b682fe924e..496f86f589 100644 --- a/app/jobs/regular/update_top_redirection.rb +++ b/app/jobs/regular/update_top_redirection.rb @@ -3,8 +3,7 @@ module Jobs class UpdateTopRedirection < Jobs::Base def execute(args) - user = User.find_by(id: args[:user_id]) - if user + if user = User.find_by(id: args[:user_id]) user.update_column(:last_redirected_to_top_at, args[:redirected_at]) end end diff --git a/app/jobs/scheduled/about_stats.rb b/app/jobs/scheduled/about_stats.rb new file mode 100644 index 0000000000..d745f8a0d6 --- /dev/null +++ b/app/jobs/scheduled/about_stats.rb @@ -0,0 +1,13 @@ +module Jobs + class AboutStats < Jobs::Scheduled + include Jobs::Stats + + every 30.minutes + + def execute(args) + stats = About.new.stats + set_cache(About, stats) + stats + end + end +end diff --git a/app/jobs/scheduled/daily_performance_report.rb b/app/jobs/scheduled/daily_performance_report.rb new file mode 100644 index 0000000000..343d3740b9 --- /dev/null +++ b/app/jobs/scheduled/daily_performance_report.rb @@ -0,0 +1,55 @@ +module Jobs + class DailyPerformanceReport < Jobs::Scheduled + every 1.day + per_host + + def execute(args) + if SiteSetting.daily_performance_report && + RailsMultisite::ConnectionManagement.current_db == "default" + result = `ruby #{Rails.root}/script/nginx_analyze.rb --limit 1440` + report_data = + if result.strip.empty? + "Report is only available in latest image, please run: +```text +cd /var/discourse +./launcher rebuild app +```" + else + "```text\n#{result}\n```" + end + + PostCreator.create(Discourse.system_user, + topic_id: performance_topic_id, + raw: report_data, + skip_validations: true) + + end + end + + def performance_topic_id + + if SiteSetting.performance_report_topic_id > 0 + topic = Topic.find_by(id: SiteSetting.performance_report_topic_id) + return topic.id if topic + end + + staff_category = Category.find_by(id: SiteSetting.staff_category_id) + raise StandardError, "Staff category was not found" unless staff_category + + post = PostCreator.create(Discourse.system_user, + raw: I18n.t('performance_report.initial_post_raw'), + category: staff_category.name, + title: I18n.t('performance_report.initial_topic_title'), + skip_validations: true) + + + unless post && post.topic_id + raise StandardError, "Could not create or retrieve performance report topic id" + end + + SiteSetting.performance_report_topic_id = post.topic_id + + end + + end +end diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index 694b975e45..3a04c1070e 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -1,16 +1,13 @@ module Jobs class DashboardStats < Jobs::Scheduled + include Jobs::Stats + every 30.minutes def execute(args) - stats_json = AdminDashboardData.fetch_stats.as_json - - # Add some extra time to the expiry so that the next job run has plenty of time to - # finish before previous cached value expires. - $redis.setex AdminDashboardData.stats_cache_key, (AdminDashboardData.recalculate_interval + 5).minutes, stats_json.to_json - - stats_json + stats = AdminDashboardData.fetch_stats + set_cache(AdminDashboardData, stats) + stats end - end end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index 9dd2a162b8..c565023e5b 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -11,6 +11,9 @@ module Jobs TopicFeaturedUsers.ensure_consistency! PostRevision.ensure_consistency! UserStat.update_view_counts(13.hours.ago) + Topic.ensure_consistency! + Badge.ensure_consistency! + CategoryUser.ensure_consistency! end end end diff --git a/app/jobs/scheduled/migrate_scheme.rb b/app/jobs/scheduled/migrate_scheme.rb new file mode 100644 index 0000000000..57271c1f58 --- /dev/null +++ b/app/jobs/scheduled/migrate_scheme.rb @@ -0,0 +1,48 @@ +module Jobs + + class MigrateScheme < Jobs::Scheduled + every 10.minutes + sidekiq_options retry: false + + MIGRATE_SCHEME_KEY ||= "migrate_to_new_scheme" + + def execute(args) + begin + return unless SiteSetting.migrate_to_new_scheme + return if $redis.exists(MIGRATE_SCHEME_KEY) + + # use a mutex to make sure this job is only run once + DistributedMutex.synchronize(MIGRATE_SCHEME_KEY) do + # clean up failed uploads + Upload.where("created_at < ?", 1.hour.ago) + .where("LENGTH(COALESCE(url, '')) = 0") + .destroy_all + + # migrate uploads to new scheme + problems = Upload.migrate_to_new_scheme + problems.each do |hash| + upload_id = hash[:upload].id + Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating upload id #{upload_id}", upload_id: upload_id)) + end + + # clean up failed optimized images + OptimizedImage.where("LENGTH(COALESCE(url, '')) = 0").destroy_all + # Clean up orphan optimized images + OptimizedImage.where("upload_id NOT IN (SELECT id FROM uploads)").destroy_all + + # migrate optimized_images to new scheme + problems = OptimizedImage.migrate_to_new_scheme + problems.each do |hash| + optimized_image_id = hash[:optimized_image].id + Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating optimized_image id #{optimized_image_id}", optimized_image_id: optimized_image_id)) + end + end + rescue => e + puts e.message + puts e.backtrace.join("\n") + end + end + + end + +end diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb new file mode 100644 index 0000000000..7eb3e3b8e8 --- /dev/null +++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb @@ -0,0 +1,34 @@ +module Jobs + class PendingQueuedPostReminder < Jobs::Scheduled + + every 1.hour + + def execute(args) + return true unless SiteSetting.notify_about_queued_posts_after > 0 && SiteSetting.contact_email + + if should_notify_ids.size > 0 && last_notified_id.to_i < should_notify_ids.max + message = PendingQueuedPostsMailer.notify(count: should_notify_ids.size) + Email::Sender.new(message, :pending_queued_posts_reminder).send + self.last_notified_id = should_notify_ids.max + end + + true + end + + def should_notify_ids + @_should_notify_ids ||= QueuedPost.new_posts.visible.where('created_at < ?', SiteSetting.notify_about_queued_posts_after.hours.ago).pluck(:id) + end + + def last_notified_id + (i = $redis.get(self.class.last_notified_key)) && i.to_i + end + + def last_notified_id=(arg) + $redis.set(self.class.last_notified_key, arg) + end + + def self.last_notified_key + "last_notified_queued_post_id" + end + end +end diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb index 189ae7bd70..625d67b8d8 100644 --- a/app/jobs/scheduled/periodical_updates.rb +++ b/app/jobs/scheduled/periodical_updates.rb @@ -8,7 +8,6 @@ module Jobs every 15.minutes def execute(args) - # Feature topics in categories CategoryFeaturedTopic.feature_topics @@ -22,7 +21,8 @@ module Jobs unless UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first problems = Post.rebake_old(250) problems.each do |hash| - Discourse.handle_job_exception(hash[:ex], error_context(args, "Rebaking post id #{hash[:post].id}", post_id: hash[:post].id)) + post_id = hash[:post].id + Discourse.handle_job_exception(hash[:ex], error_context(args, "Rebaking post id #{post_id}", post_id: post_id)) end end @@ -32,6 +32,16 @@ module Jobs user_id = hash[:profile].user_id Discourse.handle_job_exception(hash[:ex], error_context(args, "Rebaking user id #{user_id}", user_id: user_id)) end + + TopicUser.cap_unread_backlog! + + offset = (SiteSetting.max_tracked_new_unread * (2/5.0)).to_i + last_new_topic = Topic.order('created_at desc').offset(offset).select(:created_at).first + if last_new_topic + SiteSetting.min_new_topics_time = last_new_topic.created_at.to_i + end + + nil end end diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 8c0c8eb018..8c93910def 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -66,7 +66,7 @@ module Jobs private def rss - SimpleRSS.parse open(@feed_url) + SimpleRSS.parse open(@feed_url, allow_redirections: :all) end end @@ -86,11 +86,15 @@ module Jobs end def content - @article_rss_item.content || @article_rss_item.description + if @article_rss_item.content + @article_rss_item.content.scrub + else + @article_rss_item.description.scrub + end end def title - @article_rss_item.title + @article_rss_item.title.scrub end def user diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 608559dff6..68a1f98632 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -31,6 +31,9 @@ module Jobs end def handle_failure(mail_string, e) + + Rails.logger.warn("Email can not be processed: #{e}\n\n#{mail_string}") if SiteSetting.log_mail_processing_failures + template_args = {} case e when Email::Receiver::UserNotSufficientTrustLevelError diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb index 7408641e54..e3e7455584 100644 --- a/app/jobs/scheduled/schedule_backup.rb +++ b/app/jobs/scheduled/schedule_backup.rb @@ -5,8 +5,14 @@ module Jobs sidekiq_options retry: false def execute(args) - return unless SiteSetting.backup_daily? - Jobs.enqueue_in(rand(10.minutes), :create_daily_backup) + return unless SiteSetting.automatic_backups_enabled? + + if latest_backup = Backup.all[0] + date = File.ctime(latest_backup.path).to_date + return if (date + SiteSetting.backup_frequency.days) > Time.now.to_date + end + + Jobs.enqueue_in(rand(10.minutes), :create_backup) end end end diff --git a/app/jobs/stats.rb b/app/jobs/stats.rb new file mode 100644 index 0000000000..637091cc6a --- /dev/null +++ b/app/jobs/stats.rb @@ -0,0 +1,9 @@ +module Jobs + module Stats + def set_cache(klass, stats) + # Add some extra time to the expiry so that the next job run has plenty of time to + # finish before previous cached value expires. + $redis.setex klass.stats_cache_key, (klass.recalculate_stats_interval + 5).minutes, stats.to_json + end + end +end diff --git a/app/mailers/pending_queued_posts_mailer.rb b/app/mailers/pending_queued_posts_mailer.rb new file mode 100644 index 0000000000..fec7c3ba72 --- /dev/null +++ b/app/mailers/pending_queued_posts_mailer.rb @@ -0,0 +1,10 @@ +require_dependency 'email/message_builder' + +class PendingQueuedPostsMailer < ActionMailer::Base + include Email::BuildEmailHelper + + def notify(opts={}) + return unless SiteSetting.contact_email + build_email(SiteSetting.contact_email, template: 'queued_posts_reminder', count: opts[:count]) + end +end diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index da27294d7f..52e91f644d 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -41,11 +41,8 @@ class UserNotifications < ActionMailer::Base build_email( user.email, template: "user_notifications.account_created", email_token: opts[:email_token]) end - # On error, use english def short_date(dt) I18n.l(dt, format: :short) - rescue I18n::MissingTranslationData - I18n.l(dt, format: :short, locale: 'en') end def digest(user, opts={}) @@ -292,6 +289,7 @@ class UserNotifications < ActionMailer::Base context: context, username: username, add_unsubscribe_link: true, + unsubscribe_url: post.topic.unsubscribe_url, allow_reply_by_email: allow_reply_by_email, use_site_subject: use_site_subject, add_re_to_subject: add_re_to_subject, @@ -306,9 +304,7 @@ class UserNotifications < ActionMailer::Base } # If we have a display name, change the from address - if from_alias.present? - email_opts[:from_alias] = from_alias - end + email_opts[:from_alias] = from_alias if from_alias.present? TopicUser.change(user.id, post.topic_id, last_emailed_post_number: post.post_number) diff --git a/app/models/about.rb b/app/models/about.rb index dedf9a0ea7..1c96d032e2 100644 --- a/app/models/about.rb +++ b/app/models/about.rb @@ -1,9 +1,18 @@ class About include ActiveModel::Serialization + include StatsCacheable attr_accessor :moderators, :admins + def self.stats_cache_key + 'about-stats' + end + + def self.fetch_stats + About.new.stats + end + def version Discourse::VERSION::STRING end @@ -27,11 +36,13 @@ class About def moderators @moderators ||= User.where(moderator: true, admin: false) .where.not(id: Discourse::SYSTEM_USER_ID) + .order(:username_lower) end def admins @admins ||= User.where(admin: true) .where.not(id: Discourse::SYSTEM_USER_ID) + .order(:username_lower) end def stats diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 04c199b400..4253523763 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -1,58 +1,78 @@ require_dependency 'mem_info' class AdminDashboardData + include StatsCacheable - REPORTS = [ + GLOBAL_REPORTS ||= [ 'visits', 'signups', 'topics', 'posts', - 'flags', - 'users_by_trust_level', + 'time_to_first_response', + 'topics_with_no_response', 'likes', + 'flags', 'bookmarks', 'emails', + ] + + PAGE_VIEW_REPORTS ||= ['page_view_total_reqs'] + ApplicationRequest.req_types.keys.select { |r| r =~ /^page_view_/ && r !~ /mobile/ }.map { |r| r + "_reqs" } + + PRIVATE_MESSAGE_REPORTS ||= [ 'user_to_user_private_messages', 'system_private_messages', - 'moderator_warning_private_messages', 'notify_moderators_private_messages', 'notify_user_private_messages', - 'page_view_total_reqs' - ] + ApplicationRequest.req_types.keys.map{|r| r + "_reqs"} + 'moderator_warning_private_messages', + ] + + HTTP_REPORTS ||= ApplicationRequest.req_types.keys.select { |r| r =~ /^http_/ }.map { |r| r + "_reqs" }.sort + + USER_REPORTS ||= ['users_by_trust_level'] + + MOBILE_REPORTS ||= ['mobile_visits'] + ApplicationRequest.req_types.keys.select {|r| r =~ /mobile/}.map { |r| r + "_reqs" } + + def self.add_problem_check(*syms, &blk) + @problem_syms.push(*syms) if syms + @problem_blocks << blk if blk + end + class << self; attr_reader :problem_syms, :problem_blocks; end def problems - [ rails_env_check, - ruby_version_check, - host_names_check, - gc_checks, - sidekiq_check, - ram_check, - google_oauth2_config_check, - facebook_config_check, - twitter_config_check, - github_config_check, - s3_config_check, - image_magick_check, - failing_emails_check, - default_logo_check, - contact_email_check, - send_consumer_email_check, - title_check, - site_description_check, - site_contact_username_check, - notification_email_check - ].compact + problems = [] + AdminDashboardData.problem_syms.each do |sym| + problems << send(sym) + end + AdminDashboardData.problem_blocks.each do |blk| + problems << instance_exec(&blk) + end + problems.compact end + # used for testing + def self.reset_problem_checks + @problem_syms = [] + @problem_blocks = [] + + add_problem_check :rails_env_check, :ruby_version_check, :host_names_check, + :gc_checks, :ram_check, :google_oauth2_config_check, + :facebook_config_check, :twitter_config_check, + :github_config_check, :s3_config_check, :image_magick_check, + :failing_emails_check, :default_logo_check, :contact_email_check, + :send_consumer_email_check, :title_check, + :site_description_check, :site_contact_username_check, + :notification_email_check + + add_problem_check do + sidekiq_check || queue_size_check + end + end + reset_problem_checks def self.fetch_stats - AdminDashboardData.new - end - def self.fetch_cached_stats - # The DashboardStats job is responsible for generating and caching this. - stats = $redis.get(stats_cache_key) - stats ? JSON.parse(stats) : nil + AdminDashboardData.new.as_json end + def self.stats_cache_key 'dash-stats' end @@ -63,7 +83,12 @@ class AdminDashboardData def as_json(_options = nil) @json ||= { - reports: REPORTS.map { |type| Report.find(type).as_json }, + global_reports: AdminDashboardData.reports(GLOBAL_REPORTS), + page_view_reports: AdminDashboardData.reports(PAGE_VIEW_REPORTS), + private_message_reports: AdminDashboardData.reports(PRIVATE_MESSAGE_REPORTS), + http_reports: AdminDashboardData.reports(HTTP_REPORTS), + user_reports: AdminDashboardData.reports(USER_REPORTS), + mobile_reports: AdminDashboardData.reports(MOBILE_REPORTS), admins: User.admins.count, moderators: User.moderators.count, suspended: User.suspended.count, @@ -75,9 +100,8 @@ class AdminDashboardData } end - def self.recalculate_interval - # Could be configurable, multisite need to support it. - 30 # minutes + def self.reports(source) + source.map { |type| Report.find(type).as_json } end def rails_env_check @@ -97,6 +121,11 @@ class AdminDashboardData I18n.t('dashboard.sidekiq_warning') if Jobs.queued > 0 and (last_job_performed_at.nil? or last_job_performed_at < 2.minutes.ago) end + def queue_size_check + queue_size = Jobs.queued + I18n.t('dashboard.queue_size_warning', queue_size: queue_size) unless queue_size < 100_000 + end + def ram_check I18n.t('dashboard.memory_warning') if MemInfo.new.mem_total and MemInfo.new.mem_total < 1_000_000 end diff --git a/app/models/application_request.rb b/app/models/application_request.rb index 415540ac9f..8f146f10fd 100644 --- a/app/models/application_request.rb +++ b/app/models/application_request.rb @@ -7,7 +7,9 @@ class ApplicationRequest < ActiveRecord::Base http_5xx page_view_crawler page_view_logged_in - page_view_anon) + page_view_anon + page_view_logged_in_mobile + page_view_anon_mobile) cattr_accessor :autoflush, :autoflush_seconds, :last_flush # auto flush if backlog is larger than this @@ -20,7 +22,8 @@ class ApplicationRequest < ActiveRecord::Base def self.increment!(type, opts=nil) key = redis_key(type) val = $redis.incr(key).to_i - $redis.expire key, 3.days + # 3.days, see: https://github.com/rails/rails/issues/21296 + $redis.expire(key, 259200) autoflush = (opts && opts[:autoflush]) || self.autoflush if autoflush > 0 && val >= autoflush diff --git a/app/models/auto_track_duration_site_setting.rb b/app/models/auto_track_duration_site_setting.rb new file mode 100644 index 0000000000..b40ff6e0eb --- /dev/null +++ b/app/models/auto_track_duration_site_setting.rb @@ -0,0 +1,28 @@ +require_dependency 'enum_site_setting' + +class AutoTrackDurationSiteSetting < EnumSiteSetting + + def self.valid_value?(val) + val.to_i.to_s == val.to_s && + values.any? { |v| v[:value] == val.to_i } + end + + def self.values + @values ||= [ + { name: 'user.auto_track_options.never', value: -1 }, + { name: 'user.auto_track_options.immediately', value: 0 }, + { name: 'user.auto_track_options.after_30_seconds', value: 1000 * 30 }, + { name: 'user.auto_track_options.after_1_minute', value: 1000 * 60 }, + { name: 'user.auto_track_options.after_2_minutes', value: 1000 * 60 * 2 }, + { name: 'user.auto_track_options.after_3_minutes', value: 1000 * 60 * 3 }, + { name: 'user.auto_track_options.after_4_minutes', value: 1000 * 60 * 4 }, + { name: 'user.auto_track_options.after_5_minutes', value: 1000 * 60 * 5 }, + { name: 'user.auto_track_options.after_10_minutes', value: 1000 * 60 * 10 }, + ] + end + + def self.translate_names? + true + end + +end diff --git a/app/models/backup.rb b/app/models/backup.rb index c143eeb10c..40e5b1f71b 100644 --- a/app/models/backup.rb +++ b/app/models/backup.rb @@ -1,5 +1,4 @@ class Backup - include UrlHelper include ActiveModel::SerializerSupport attr_reader :filename @@ -72,7 +71,7 @@ class Backup def self.create_from_filename(filename) Backup.new(filename).tap do |b| b.path = File.join(Backup.base_directory, b.filename) - b.link = b.schemaless "#{Discourse.base_url}/admin/backups/#{b.filename}" + b.link = UrlHelper.schemaless "#{Discourse.base_url}/admin/backups/#{b.filename}" b.size = File.size(b.path) end end diff --git a/app/models/badge.rb b/app/models/badge.rb index 96c577f47d..818b4dfae3 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -20,10 +20,12 @@ class Badge < ActiveRecord::Base GoodShare = 22 GreatShare = 23 OneYearAnniversary = 24 - Promoter = 25 Campaigner = 26 Champion = 27 + PopularLink = 28 + HotLink = 29 + FamousLink = 30 # other consts AutobiographerMinBioLength = 10 @@ -244,6 +246,19 @@ SQL JOIN incoming_links i2 ON i2.id = views.i_id SQL end + + def self.linking_badge(count) + <<-SQL + SELECT tl.user_id, post_id, MIN(tl.created_at) granted_at + FROM topic_links tl + JOIN posts p ON p.id = post_id AND p.deleted_at IS NULL + JOIN topics t ON t.id = p.topic_id AND t.deleted_at IS NULL AND t.archetype <> 'private_message' + WHERE NOT tl.internal + AND tl.clicks >= #{count} + GROUP BY tl.user_id, tl.post_id + SQL + end + end belongs_to :badge_type @@ -310,6 +325,10 @@ SQL end end + def self.ensure_consistency! + Badge.find_each(&:reset_grant_count!) + end + protected def ensure_not_system unless id @@ -342,6 +361,7 @@ end # show_posts :boolean default(FALSE), not null # system :boolean default(FALSE), not null # image :string(255) +# long_description :text # # Indexes # diff --git a/app/models/category.rb b/app/models/category.rb index d431252b1d..7e550aef28 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -37,8 +37,10 @@ class Category < ActiveRecord::Base before_save :downcase_email before_save :downcase_name after_create :create_category_definition - after_create :publish_categories_list - after_destroy :publish_categories_list + + after_save :publish_category + after_destroy :publish_category_deletion + after_update :rename_category_definition, if: :name_changed? after_save :publish_discourse_stylesheet @@ -77,7 +79,7 @@ class Category < ActiveRecord::Base # permission is just used by serialization # we may consider wrapping this in another spot - attr_accessor :displayable_topics, :permission, :subcategory_ids, :notification_level + attr_accessor :displayable_topics, :permission, :subcategory_ids, :notification_level, :has_children def self.last_updated_at order('updated_at desc').limit(1).pluck(:updated_at).first.to_i @@ -233,8 +235,13 @@ SQL slug.present? ? self.slug : "#{self.id}-category" end - def publish_categories_list - MessageBus.publish('/categories', {categories: ActiveModel::ArraySerializer.new(Category.latest).as_json}) + def publish_category + group_ids = self.groups.pluck(:id) if self.read_restricted + MessageBus.publish('/categories', {categories: ActiveModel::ArraySerializer.new([self]).as_json}, group_ids: group_ids) + end + + def publish_category_deletion + MessageBus.publish('/categories', {deleted_categories: [self.id]}) end def parent_category_validator @@ -448,6 +455,8 @@ end # allow_badges :boolean default(TRUE), not null # name_lower :string(50) not null # auto_close_based_on_last_post :boolean default(FALSE) +# topic_template :text +# suppress_from_homepage :boolean default(FALSE) # # Indexes # diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb index 66c05573fa..c408bb4650 100644 --- a/app/models/category_featured_topic.rb +++ b/app/models/category_featured_topic.rb @@ -19,14 +19,21 @@ class CategoryFeaturedTopic < ActiveRecord::Base def self.feature_topics_for(c, existing=nil) return if c.blank? - query = TopicQuery.new(CategoryFeaturedTopic.fake_admin, + query_opts = { per_page: SiteSetting.category_featured_topics, except_topic_ids: [c.topic_id], visible: true, - no_definitions: true) + no_definitions: true + } + # Add topics, even if they're in secured categories: + query = TopicQuery.new(CategoryFeaturedTopic.fake_admin, query_opts) results = query.list_category_topic_ids(c).uniq + # Add some topics that are visible to everyone: + anon_query = TopicQuery.new(nil, query_opts.merge({except_topic_ids: [c.topic_id] + results})) + results += anon_query.list_category_topic_ids(c).uniq + return if results == existing CategoryFeaturedTopic.transaction do diff --git a/app/models/category_list.rb b/app/models/category_list.rb index b7868cdb0f..6f445feaa1 100644 --- a/app/models/category_list.rb +++ b/app/models/category_list.rb @@ -1,3 +1,5 @@ +require_dependency 'pinned_check' + class CategoryList include ActiveModel::Serialization @@ -17,6 +19,8 @@ class CategoryList prune_empty find_user_data + sort_unpinned + trim_results end private @@ -62,6 +66,8 @@ class CategoryList @categories = @categories.where('categories.parent_category_id = ?', @options[:parent_category_id].to_i) end + @categories = @categories.where(suppress_from_homepage: false) if @options[:is_homepage] + if SiteSetting.fixed_category_positions @categories = @categories.order('position ASC').order('id ASC') else @@ -72,10 +78,23 @@ class CategoryList end if latest_post_only? - @categories = @categories.includes(:latest_post => {:topic => :last_poster} ) + @categories = @categories.includes(latest_post: { topic: :last_poster }) end @categories = @categories.to_a + + category_user = {} + unless @guardian.anonymous? + category_user = Hash[*CategoryUser.where(user: @guardian.user).pluck(:category_id, :notification_level).flatten] + end + + allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id)) + @categories.each do |category| + category.notification_level = category_user[category.id] + category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id) + category.has_children = category.subcategories.present? + end + if @options[:parent_category_id].blank? subcategories = {} to_delete = Set.new @@ -151,4 +170,27 @@ class CategoryList @all_topics.each { |ft| ft.user_data = topic_lookup[ft.id] } end end + + def sort_unpinned + if @guardian.current_user && @all_topics.present? + # Put unpinned topics at the end of the list + @categories.each do |c| + next if c.displayable_topics.blank? || c.displayable_topics.size <= latest_posts_count + unpinned = [] + c.displayable_topics.each do |t| + unpinned << t if t.pinned_at && PinnedCheck.unpinned?(t, t.user_data) + end + unless unpinned.empty? + c.displayable_topics = (c.displayable_topics - unpinned) + unpinned + end + end + end + end + + def trim_results + @categories.each do |c| + next if c.displayable_topics.blank? + c.displayable_topics = c.displayable_topics[0,latest_posts_count] + end + end end diff --git a/app/models/category_style_setting.rb b/app/models/category_style_setting.rb deleted file mode 100644 index e62720ebc0..0000000000 --- a/app/models/category_style_setting.rb +++ /dev/null @@ -1,19 +0,0 @@ -# TODO all enums should probably move out of models -# TODO we should be able to do this kind of stuff without a backing class -require_dependency 'enum_site_setting' - -class CategoryStyleSetting < EnumSiteSetting - - VALUES = ["bar", "box", "bullet"] - - def self.valid_value?(val) - VALUES.include?(val) - end - - def self.values - VALUES.map do |l| - {name: l, value: l} - end - end - -end diff --git a/app/models/category_user.rb b/app/models/category_user.rb index d53fb804e2..cd7b719afd 100644 --- a/app/models/category_user.rb +++ b/app/models/category_user.rb @@ -15,18 +15,19 @@ class CategoryUser < ActiveRecord::Base TopicUser.notification_levels end - def self.auto_track_new_topic(topic) - apply_default_to_topic(topic, - TopicUser.notification_levels[:tracking], - TopicUser.notification_reasons[:auto_track_category] - ) - end + %w{watch track}.each do |s| + define_singleton_method("auto_#{s}_new_topic") do |topic, new_category=nil| + category_id = topic.category_id - def self.auto_watch_new_topic(topic) - apply_default_to_topic(topic, - TopicUser.notification_levels[:watching], - TopicUser.notification_reasons[:auto_watch_category] - ) + if new_category && topic.created_at > 5.days.ago + # we want to apply default of the new category + category_id = new_category.id + # remove defaults from previous category + remove_default_from_topic(topic.id, TopicUser.notification_levels[:"#{s}ing"], TopicUser.notification_reasons[:"auto_#{s}_category"]) + end + + apply_default_to_topic(topic.id, category_id, TopicUser.notification_levels[:"#{s}ing"], TopicUser.notification_reasons[:"auto_#{s}_category"]) + end end def self.batch_set(user, level, category_ids) @@ -56,7 +57,7 @@ class CategoryUser < ActiveRecord::Base end end - def self.apply_default_to_topic(topic, level, reason) + def self.apply_default_to_topic(topic_id, category_id, level, reason) # Can not afford to slow down creation of topics when a pile of users are watching new topics, reverting to SQL for max perf here sql = <<-SQL INSERT INTO topic_users(user_id, topic_id, notification_level, notifications_reason_id) @@ -68,14 +69,34 @@ class CategoryUser < ActiveRecord::Base SQL exec_sql(sql, - topic_id: topic.id, - category_id: topic.category_id, + topic_id: topic_id, + category_id: category_id, level: level, reason: reason ) end - private_class_method :apply_default_to_topic + def self.remove_default_from_topic(topic_id, level, reason) + sql = <<-SQL + DELETE FROM topic_users + WHERE topic_id = :topic_id + AND notifications_changed_at IS NULL + AND notification_level = :level + AND notifications_reason_id = :reason + SQL + + exec_sql(sql, + topic_id: topic_id, + level: level, + reason: reason + ) + end + + def self.ensure_consistency! + exec_sql("DELETE FROM category_users WHERE user_id NOT IN (SELECT id FROM users)") + end + + private_class_method :apply_default_to_topic, :remove_default_from_topic end # == Schema Information diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb index b97e6cf3fb..1e1f3869a1 100644 --- a/app/models/concerns/has_custom_fields.rb +++ b/app/models/concerns/has_custom_fields.rb @@ -45,6 +45,8 @@ module HasCustomFields has_many :_custom_fields, dependent: :destroy, :class_name => "#{name}CustomField" after_save :save_custom_fields + attr_accessor :preloaded_custom_fields + # To avoid n+1 queries, use this function to retrieve lots of custom fields in one go # and create a "sideloaded" version for easy querying by id. def self.custom_fields_for_ids(ids, whitelisted_fields) @@ -73,6 +75,39 @@ module HasCustomFields @custom_field_types[name] = type end + def self.preload_custom_fields(objects, fields) + if objects.present? + map = {} + + empty = {} + fields.each do |field| + empty[field] = nil + end + + objects.each do |obj| + map[obj.id] = obj + obj.preloaded_custom_fields = empty.dup + end + + fk = (name.underscore << "_id") + + "#{name}CustomField".constantize + .where("#{fk} in (?)", map.keys) + .where("name in (?)", fields) + .pluck(fk, :name, :value).each do |id, name, value| + + preloaded = map[id].preloaded_custom_fields + + if preloaded[name].nil? + preloaded.delete(name) + end + + HasCustomFields::Helpers.append_field(preloaded, name, value, @custom_field_types) + end + + end + end + end def reload(options = nil) @@ -80,12 +115,36 @@ module HasCustomFields super end + def custom_field_preloaded?(name) + @preloaded_custom_fields && @preloaded_custom_fields.key?(name) + end + def clear_custom_fields @custom_fields = nil @custom_fields_orig = nil end + class PreloadedProxy + def initialize(preloaded) + @preloaded = preloaded + end + + def [](key) + if @preloaded.key?(key) + @preloaded[key] + else + # for now you can not mix preload an non preload, it better just to fail + raise StandardError, "Attempting to access a non preloaded custom field, this is disallowed to prevent N+1 queries." + end + end + end + def custom_fields + + if @preloaded_custom_fields + return @preloaded_proxy ||= PreloadedProxy.new(@preloaded_custom_fields) + end + @custom_fields ||= refresh_custom_fields_from_db.dup end diff --git a/app/models/concerns/stats_cacheable.rb b/app/models/concerns/stats_cacheable.rb new file mode 100644 index 0000000000..d7364111f4 --- /dev/null +++ b/app/models/concerns/stats_cacheable.rb @@ -0,0 +1,24 @@ +module StatsCacheable + extend ActiveSupport::Concern + + module ClassMethods + def stats_cache_key + raise 'Stats cache key has not been set.' + end + + def fetch_stats + raise 'Not implemented.' + end + + # Could be configurable, multisite need to support it. + def recalculate_stats_interval + 30 # minutes + end + + def fetch_cached_stats + # The scheduled Stats job is responsible for generating and caching this. + stats = $redis.get(stats_cache_key) + stats ? JSON.parse(stats) : nil + end + end +end diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb index 688104950c..5276fe3b3e 100644 --- a/app/models/digest_email_site_setting.rb +++ b/app/models/digest_email_site_setting.rb @@ -3,16 +3,17 @@ require_dependency 'enum_site_setting' class DigestEmailSiteSetting < EnumSiteSetting def self.valid_value?(val) - val.blank? or values.any? { |v| v[:value] == val.to_s } + val.to_i.to_s == val.to_s && + values.any? { |v| v[:value] == val.to_i } end def self.values @values ||= [ - {name: 'never', value: '' }, - {name: 'daily', value: '1' }, - {name: 'every_three_days', value: '3' }, - {name: 'weekly', value: '7' }, - {name: 'every_two_weeks', value: '14' } + { name: 'never', value: 0 }, + { name: 'daily', value: 1 }, + { name: 'every_three_days', value: 3 }, + { name: 'weekly', value: 7 }, + { name: 'every_two_weeks', value: 14 } ] end diff --git a/app/models/digest_unsubscribe_key.rb b/app/models/digest_unsubscribe_key.rb index 5f48e181e7..34ed72fd10 100644 --- a/app/models/digest_unsubscribe_key.rb +++ b/app/models/digest_unsubscribe_key.rb @@ -17,3 +17,17 @@ class DigestUnsubscribeKey < ActiveRecord::Base self.key = SecureRandom.hex(32) end end + +# == Schema Information +# +# Table name: digest_unsubscribe_keys +# +# key :string(64) not null, primary key +# user_id :integer not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_digest_unsubscribe_keys_on_created_at (created_at) +# diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index 30f2da1b4b..6e21ca7bad 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -13,7 +13,7 @@ class DirectoryItem < ActiveRecord::Base end def self.period_types - @types ||= Enum.new(:all, :yearly, :monthly, :weekly, :daily) + @types ||= Enum.new(:all, :yearly, :monthly, :weekly, :daily, :quarterly) end def self.refresh! @@ -28,6 +28,7 @@ class DirectoryItem < ActiveRecord::Base since = case period_type when :daily then 1.day.ago when :weekly then 1.week.ago + when :quarterly then 3.weeks.ago when :monthly then 1.month.ago when :yearly then 1.year.ago else 1000.years.ago @@ -59,7 +60,7 @@ class DirectoryItem < ActiveRecord::Base AND COALESCE(t.visible, true) AND p.deleted_at IS NULL AND (NOT (COALESCE(p.hidden, false))) - AND COALESCE(p.post_type, :regular_post_type) != :moderator_action + AND COALESCE(p.post_type, :regular_post_type) = :regular_post_type AND u.id > 0 GROUP BY u.id", period_type: period_types[period_type], @@ -68,8 +69,29 @@ class DirectoryItem < ActiveRecord::Base was_liked_type: UserAction::WAS_LIKED, new_topic_type: UserAction::NEW_TOPIC, reply_type: UserAction::REPLY, - regular_post_type: Post.types[:regular], - moderator_action: Post.types[:moderator_action] + regular_post_type: Post.types[:regular] end end end + +# == Schema Information +# +# Table name: directory_items +# +# id :integer not null, primary key +# period_type :integer not null +# user_id :integer not null +# likes_received :integer not null +# likes_given :integer not null +# topics_entered :integer not null +# topic_count :integer not null +# post_count :integer not null +# created_at :datetime +# updated_at :datetime +# days_visited :integer default(0), not null +# posts_read :integer default(0), not null +# +# Indexes +# +# index_directory_items_on_period_type (period_type) +# diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index 63aaf74eab..894d545ada 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -114,12 +114,11 @@ class DiscourseSingleSignOn < SingleSignOn user.email = email end - if SiteSetting.sso_overrides_username && - user.username != username + if SiteSetting.sso_overrides_username && user.username != username && username.present? user.username = UserNameSuggester.suggest(username || name || email, user.username) end - if SiteSetting.sso_overrides_name && user.name != name + if SiteSetting.sso_overrides_name && user.name != name && name.present? user.name = name || User.suggest_name(username.blank? ? email : username) end @@ -127,28 +126,7 @@ class DiscourseSingleSignOn < SingleSignOn avatar_force_update || sso_record.external_avatar_url != avatar_url) - begin - tempfile = FileHelper.download(avatar_url, SiteSetting.max_image_size_kb.kilobytes, "sso-avatar", true) - - ext = FastImage.type(tempfile).to_s - tempfile.rewind - - upload = Upload.create_for(user.id, tempfile, "external-avatar." + ext, tempfile.size, { origin: avatar_url }) - user.uploaded_avatar_id = upload.id - - unless user.user_avatar - user.build_user_avatar - end - - if !user.user_avatar.contains_upload?(upload.id) - user.user_avatar.custom_upload_id = upload.id - end - rescue => e - # skip saving, we are not connected to the net - Rails.logger.warn "#{e}: Failed to download external avatar: #{avatar_url}, user id #{ user.id }" - ensure - tempfile.close! if tempfile && tempfile.respond_to?(:close!) - end + UserAvatar.import_url_for_user(avatar_url, user) end # change external attributes for sso record diff --git a/app/models/draft.rb b/app/models/draft.rb index 2a209fd0f1..2e90ba445f 100644 --- a/app/models/draft.rb +++ b/app/models/draft.rb @@ -7,7 +7,11 @@ class Draft < ActiveRecord::Base d = find_draft(user,key) if d return if d.sequence > sequence - d.update_columns(data: data, sequence: sequence) + exec_sql("UPDATE drafts + SET data = :data, + sequence = :sequence, + revisions = revisions + 1 + WHERE id = :id", id: d.id, sequence: sequence, data: data) else Draft.create!(user_id: user.id, draft_key: key, data: data, sequence: sequence) end @@ -60,6 +64,7 @@ end # created_at :datetime not null # updated_at :datetime not null # sequence :integer default(0), not null +# revisions :integer default(1), not null # # Indexes # diff --git a/app/models/email_token.rb b/app/models/email_token.rb index ce8c6b0241..a7eb036f90 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -60,7 +60,7 @@ class EmailToken < ActiveRecord::Base end end # redeem invite, if available - Invite.redeem_from_email(user.email) + return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present? user rescue ActiveRecord::RecordInvalid # If the user's email is already taken, just return nil (failure) diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb new file mode 100644 index 0000000000..822f8a8ea2 --- /dev/null +++ b/app/models/embeddable_host.rb @@ -0,0 +1,35 @@ +class EmbeddableHost < ActiveRecord::Base + validates_format_of :host, :with => /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\Z/i + belongs_to :category + + before_validation do + self.host.sub!(/^https?:\/\//, '') + self.host.sub!(/\/.*$/, '') + end + + def self.record_for_host(host) + uri = URI(host) rescue nil + return false unless uri.present? + + host = uri.host + return false unless host.present? + + where("lower(host) = ?", host).first + end + + def self.host_allowed?(host) + record_for_host(host).present? + end + +end + +# == Schema Information +# +# Table name: embeddable_hosts +# +# id :integer not null, primary key +# host :string(255) not null +# category_id :integer not null +# created_at :datetime +# updated_at :datetime +# diff --git a/app/models/embedding.rb b/app/models/embedding.rb new file mode 100644 index 0000000000..c6081b1896 --- /dev/null +++ b/app/models/embedding.rb @@ -0,0 +1,41 @@ +require 'has_errors' + +class Embedding < OpenStruct + include HasErrors + + def self.settings + %i(embed_by_username + embed_post_limit + embed_truncate + embed_whitelist_selector + embed_blacklist_selector + feed_polling_enabled + feed_polling_url + embed_username_key_from_feed) + end + + def base_url + Discourse.base_url + end + + def save + Embedding.settings.each do |s| + SiteSetting.send("#{s}=", send(s)) + end + true + rescue Discourse::InvalidParameters => p + errors.add :base, p.to_s + false + end + + def embeddable_hosts + EmbeddableHost.all.order(:host) + end + + def self.find + embedding_args = { id: 'default' } + + Embedding.settings.each {|s| embedding_args[s] = SiteSetting.send(s) } + Embedding.new(embedding_args) + end +end diff --git a/app/models/emoji.rb b/app/models/emoji.rb index d1dcab4ade..10313e4a45 100644 --- a/app/models/emoji.rb +++ b/app/models/emoji.rb @@ -47,7 +47,7 @@ class Emoji extension = File.extname(path) Emoji.new(path).tap do |e| e.name = File.basename(path, ".*") - e.url = "/#{base_url}/#{e.name}#{extension}" + e.url = "#{base_url}/#{e.name}#{extension}" end end @@ -110,12 +110,12 @@ class Emoji end def self.base_directory - "public/#{base_url}" + "public#{base_url}" end def self.base_url db = RailsMultisite::ConnectionManagement.current_db - "uploads/#{db}/_emoji" + "#{Discourse.base_uri}/uploads/#{db}/_emoji" end end diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb index e3cb2532a1..10866f8e8b 100644 --- a/app/models/global_setting.rb +++ b/app/models/global_setting.rb @@ -23,7 +23,10 @@ class GlobalSetting hash[s] = val end end - hash["host_names"] = [ hostname ] + hostnames = [ hostname ] + hostnames << backup_hostname if backup_hostname.present? + + hash["host_names"] = hostnames hash["database"] = db_name hash["prepared_statements"] = !!self.db_prepared_statements @@ -31,6 +34,25 @@ class GlobalSetting {"production" => hash} end + def self.redis_config + @config ||= + begin + c = {} + c[:host] = redis_host if redis_host + c[:port] = redis_port if redis_port + c[:password] = redis_password if redis_password.present? + c[:db] = redis_db if redis_db != 0 + c[:db] = 1 if Rails.env == "test" + if redis_sentinels.present? + c[:sentinels] = redis_sentinels.split(",").map do |address| + host,port = address.split(":") + {host: host, port: port} + end.to_a + end + c.freeze + end + end + class BaseProvider def self.coerce(setting) @@ -66,7 +88,7 @@ class GlobalSetting def read ERB.new(File.read(@file)).result().split("\n").each do |line| - if line =~ /^\s*([a-z_]+)\s*=\s*(\"([^\"]*)\"|\'([^\']*)\'|[^#]*)/ + if line =~ /^\s*([a-z_]+[a-z0-9_]*)\s*=\s*(\"([^\"]*)\"|\'([^\']*)\'|[^#]*)/ @data[$1.strip.to_sym] = ($4 || $3 || $2).strip end end diff --git a/app/models/group.rb b/app/models/group.rb index b36f5cee20..27959ac728 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -372,6 +372,9 @@ end # visible :boolean default(TRUE), not null # automatic_membership_email_domains :text # automatic_membership_retroactive :boolean default(FALSE) +# primary_group :boolean default(FALSE), not null +# title :string(255) +# grant_trust_level :integer # # Indexes # diff --git a/app/models/group_manager.rb b/app/models/group_manager.rb index a30d523f51..009f07446d 100644 --- a/app/models/group_manager.rb +++ b/app/models/group_manager.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # group_id :integer not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/group_user.rb b/app/models/group_user.rb index 38351f52b1..a39a470561 100644 --- a/app/models/group_user.rb +++ b/app/models/group_user.rb @@ -8,6 +8,8 @@ class GroupUser < ActiveRecord::Base after_save :set_primary_group after_destroy :remove_primary_group + after_save :grant_trust_level + protected def set_primary_group @@ -44,6 +46,15 @@ class GroupUser < ActiveRecord::Base title: group.title) end end + + def grant_trust_level + return if group.grant_trust_level.nil? + if user.trust_level < group.grant_trust_level + user.change_trust_level!(group.grant_trust_level) + user.trust_level_locked = true + user.save + end + end end # == Schema Information @@ -59,4 +70,5 @@ end # Indexes # # index_group_users_on_group_id_and_user_id (group_id,user_id) UNIQUE +# index_group_users_on_user_id_and_group_id (user_id,group_id) UNIQUE # diff --git a/app/models/invite.rb b/app/models/invite.rb index 51af251665..a2fdc3403d 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -71,10 +71,21 @@ class Invite < ActiveRecord::Base end end end + + def self.invite_by_email(email, invited_by, topic=nil, group_ids=nil) + create_invite_by_email(email, invited_by, topic, group_ids, true) + end + + # generate invite link + def self.generate_invite_link(email, invited_by, topic=nil, group_ids=nil) + invite = create_invite_by_email(email, invited_by, topic, group_ids, false) + return "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite + end + # Create an invite for a user, supplying an optional topic # # Return the previously existing invite if already exists. Returns nil if the invite can't be created. - def self.invite_by_email(email, invited_by, topic=nil, group_ids=nil) + def self.create_invite_by_email(email, invited_by, topic=nil, group_ids=nil, send_email=true) lower_email = Email.downcase(email) user = User.find_by(email: lower_email) @@ -115,7 +126,7 @@ class Invite < ActiveRecord::Base end end - Jobs.enqueue(:invite_email, invite_id: invite.id) + Jobs.enqueue(:invite_email, invite_id: invite.id) if send_email invite.reload invite @@ -151,19 +162,32 @@ class Invite < ActiveRecord::Base group_ids end - def self.find_all_invites_from(inviter, offset=0) + def self.find_all_invites_from(inviter, offset=0, limit=SiteSetting.invites_per_page) Invite.where(invited_by_id: inviter.id) + .where('invites.email IS NOT NULL') .includes(:user => :user_stat) .order('CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END', 'user_stats.time_read DESC', 'invites.redeemed_at DESC') - .limit(SiteSetting.invites_per_page) + .limit(limit) .offset(offset) .references('user_stats') end + def self.find_pending_invites_from(inviter, offset=0) + find_all_invites_from(inviter, offset).where('invites.user_id IS NULL').order('invites.created_at DESC') + end + def self.find_redeemed_invites_from(inviter, offset=0) - find_all_invites_from(inviter, offset).where('invites.user_id IS NOT NULL') + find_all_invites_from(inviter, offset).where('invites.user_id IS NOT NULL').order('invites.redeemed_at DESC') + end + + def self.find_pending_invites_count(inviter) + find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').count + end + + def self.find_redeemed_invites_count(inviter) + find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').count end def self.filter_by(email_or_username) diff --git a/app/models/muted_user.rb b/app/models/muted_user.rb index a60b30202b..59f8089c6f 100644 --- a/app/models/muted_user.rb +++ b/app/models/muted_user.rb @@ -2,3 +2,19 @@ class MutedUser < ActiveRecord::Base belongs_to :user belongs_to :muted_user, class_name: 'User' end + +# == Schema Information +# +# Table name: muted_users +# +# id :integer not null, primary key +# user_id :integer not null +# muted_user_id :integer not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_muted_users_on_muted_user_id_and_user_id (muted_user_id,user_id) UNIQUE +# index_muted_users_on_user_id_and_muted_user_id (user_id,muted_user_id) UNIQUE +# diff --git a/app/models/new_topic_duration_site_setting.rb b/app/models/new_topic_duration_site_setting.rb new file mode 100644 index 0000000000..ccc091a8b6 --- /dev/null +++ b/app/models/new_topic_duration_site_setting.rb @@ -0,0 +1,25 @@ +require_dependency 'enum_site_setting' + +class NewTopicDurationSiteSetting < EnumSiteSetting + + def self.valid_value?(val) + val.to_i.to_s == val.to_s && + values.any? { |v| v[:value] == val.to_i } + end + + def self.values + @values ||= [ + { name: 'user.new_topic_duration.not_viewed', value: -1 }, + { name: 'user.new_topic_duration.after_1_day', value: 60 * 24 }, + { name: 'user.new_topic_duration.after_2_days', value: 60 * 24 * 2 }, + { name: 'user.new_topic_duration.after_1_week', value: 60 * 24 * 7 }, + { name: 'user.new_topic_duration.after_2_weeks', value: 60 * 24 * 7 * 2 }, + { name: 'user.new_topic_duration.last_here', value: -2 }, + ] + end + + def self.translate_names? + true + end + +end diff --git a/app/models/notification.rb b/app/models/notification.rb index 3c0565907f..61da20b0cf 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -8,10 +8,9 @@ class Notification < ActiveRecord::Base validates_presence_of :notification_type scope :unread, lambda { where(read: false) } - scope :recent, lambda {|n=nil| n ||= 10; order('notifications.created_at desc').limit(n) } - scope :visible , lambda { where('notifications.topic_id IS NULL OR notifications.topic_id IN ( - SELECT id FROM topics - WHERE deleted_at IS NULL)') } + scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) } + scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id') + .where('topics.id IS NULL OR topics.deleted_at IS NULL') } after_save :refresh_notification_count after_destroy :refresh_notification_count @@ -31,7 +30,7 @@ class Notification < ActiveRecord::Base @types ||= Enum.new( :mentioned, :replied, :quoted, :edited, :liked, :private_message, :invited_to_private_message, :invitee_accepted, :posted, :moved_post, - :linked, :granted_badge, :invited_to_topic + :linked, :granted_badge, :invited_to_topic, :custom ) end @@ -78,8 +77,12 @@ class Notification < ActiveRecord::Base # Be wary of calling this frequently. O(n) JSON parsing can suck. def data_hash @data_hash ||= begin + return nil if data.blank? - JSON.parse(data).with_indifferent_access + parsed = JSON.parse(data) + return nil if parsed.blank? + + parsed.with_indifferent_access end end @@ -161,6 +164,8 @@ end # # Indexes # -# index_notifications_on_post_action_id (post_action_id) -# index_notifications_on_user_id_and_created_at (user_id,created_at) +# idx_notifications_speedup_unread_count (user_id,notification_type) +# index_notifications_on_post_action_id (post_action_id) +# index_notifications_on_user_id_and_created_at (user_id,created_at) +# index_notifications_on_user_id_and_topic_id_and_post_number (user_id,topic_id,post_number) # diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index d29560ab12..c7ba61b10b 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -1,4 +1,8 @@ require "digest/sha1" +require_dependency "file_helper" +require_dependency "url_helper" +require_dependency "db_helper" +require_dependency "file_store/local_store" class OptimizedImage < ActiveRecord::Base belongs_to :upload @@ -8,6 +12,7 @@ class OptimizedImage < ActiveRecord::Base def self.create_for(upload, width, height, opts={}) return unless width > 0 && height > 0 + return if upload.try(:sha1).blank? DistributedMutex.synchronize("optimized_image_#{upload.id}_#{width}_#{height}") do # do we already have that thumbnail? @@ -25,7 +30,7 @@ class OptimizedImage < ActiveRecord::Base # create the thumbnail otherwise original_path = Discourse.store.path_for(upload) if original_path.blank? - external_copy = Discourse.store.download(upload) + external_copy = Discourse.store.download(upload) rescue nil original_path = external_copy.try(:path) end @@ -94,6 +99,7 @@ class OptimizedImage < ActiveRecord::Base def self.resize_instructions(from, to, dimensions, opts={}) # NOTE: ORDER is important! %W{ + convert #{from}[0] -gravity center -background transparent @@ -108,17 +114,18 @@ class OptimizedImage < ActiveRecord::Base def self.resize_instructions_animated(from, to, dimensions, opts={}) %W{ + gifsicle #{from} - -coalesce - -gravity center - -thumbnail #{dimensions}^ - -extent #{dimensions} - #{to} + --colors=256 + --resize-fit #{dimensions} + --optimize=3 + --output #{to} } end def self.downsize_instructions(from, to, dimensions, opts={}) %W{ + convert #{from}[0] -gravity center -background transparent @@ -128,38 +135,32 @@ class OptimizedImage < ActiveRecord::Base end def self.downsize_instructions_animated(from, to, dimensions, opts={}) - %W{ - #{from} - -coalesce - -gravity center - -background transparent - -resize #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"} - #{to} - } + resize_instructions_animated(from, to, dimensions, opts) end def self.resize(from, to, width, height, opts={}) - optimize("resize", from, to, width, height, opts) + optimize("resize", from, to, "#{width}x#{height}", opts) end def self.downsize(from, to, max_width, max_height, opts={}) - optimize("downsize", from, to, max_width, max_height, opts) + optimize("downsize", from, to, "#{max_width}x#{max_height}", opts) end - def self.optimize(operation, from, to, width, height, opts={}) - dim = dimensions(width, height) + def self.downsize(from, to, dimensions, opts={}) + optimize("downsize", from, to, dimensions, opts) + end + + def self.optimize(operation, from, to, dimensions, opts={}) method_name = "#{operation}_instructions" - method_name += "_animated" if !!opts[:allow_animation] && from =~ /\.GIF$/i - instructions = self.send(method_name.to_sym, from, to, dim, opts) + if !!opts[:allow_animation] && (from =~ /\.GIF$/i || opts[:filename] =~ /\.GIF$/i) + method_name += "_animated" + end + instructions = self.send(method_name.to_sym, from, to, dimensions, opts) convert_with(instructions, to) end - def self.dimensions(width, height) - "#{width}x#{height}" - end - def self.convert_with(instructions, to) - `convert #{instructions.join(" ")} &> /dev/null` + `#{instructions.join(" ")} &> /dev/null` return false if $?.exitstatus != 0 ImageOptim.new.optimize_image!(to) @@ -169,6 +170,64 @@ class OptimizedImage < ActiveRecord::Base false end + def self.migrate_to_new_scheme(limit=50) + problems = [] + + if SiteSetting.migrate_to_new_scheme + max_file_size_kb = SiteSetting.max_image_size_kb.kilobytes + local_store = FileStore::LocalStore.new + + OptimizedImage.includes(:upload) + .where("url NOT LIKE '%/optimized/_X/%'") + .limit(limit) + .order(id: :desc) + .each do |optimized_image| + begin + # keep track of the url + previous_url = optimized_image.url.dup + # where is the file currently stored? + external = previous_url =~ /^\/\// + # download if external + if external + url = SiteSetting.scheme + ":" + previous_url + file = FileHelper.download(url, max_file_size_kb, "discourse", true) rescue nil + path = file.path + else + path = local_store.path_for(optimized_image) + file = File.open(path) + end + # compute SHA if missing + if optimized_image.sha1.blank? + optimized_image.sha1 = Digest::SHA1.file(path).hexdigest + end + # optimize if image + ImageOptim.new.optimize_image!(path) + # store to new location & update the filesize + File.open(path) do |f| + optimized_image.url = Discourse.store.store_optimized_image(f, optimized_image) + optimized_image.save + end + # remap the URLs + DbHelper.remap(UrlHelper.absolute(previous_url), optimized_image.url) unless external + DbHelper.remap(previous_url, optimized_image.url) + # remove the old file (when local) + unless external + FileUtils.rm(path, force: true) rescue nil + end + rescue => e + problems << { optimized_image: optimized_image, ex: e } + # just ditch the optimized image if there was any errors + optimized_image.destroy + ensure + file.try(:unlink) rescue nil + file.try(:close) rescue nil + end + end + end + + problems + end + end # == Schema Information diff --git a/app/models/permalink.rb b/app/models/permalink.rb index a216814fcd..086df29440 100644 --- a/app/models/permalink.rb +++ b/app/models/permalink.rb @@ -5,11 +5,72 @@ class Permalink < ActiveRecord::Base before_validation :normalize_url - def normalize_url - if self.url - self.url = self.url.strip - self.url = self.url[1..-1] if url[0,1] == '/' + class Normalizer + attr_reader :source + + def initialize(source) + @source = source + if source.present? + @rules = source.split("|").map do |rule| + parse_rule(rule) + end.compact + end end + + def parse_rule(rule) + return unless rule =~ /\/.*\// + + escaping = false + regex = "" + sub = "" + c = 0 + + rule.chars.each do |l| + c += 1 if !escaping && l == "/" + escaping = l == "\\" + + if c > 1 + sub << l + else + regex << l + end + end + + if regex.length > 1 + [Regexp.new(regex[1..-1]), sub[1..-1] || ""] rescue nil + end + + end + + def normalize(url) + return url unless @rules + @rules.each do |(regex,sub)| + url = url.sub(regex,sub) + end + + url + end + + end + + def self.normalize_url(url) + if url + url = url.strip + url = url[1..-1] if url[0,1] == '/' + end + + normalizations = SiteSetting.permalink_normalizations + + @normalizer = Normalizer.new(normalizations) unless @normalizer && @normalizer.source == normalizations + @normalizer.normalize(url) + end + + def self.find_by_url(url) + find_by(url: normalize_url(url)) + end + + def normalize_url + self.url = Permalink.normalize_url(url) if url end def target_url @@ -19,6 +80,16 @@ class Permalink < ActiveRecord::Base return category.url if category nil end + + def self.filter_by(url=nil) + permalinks = Permalink + .includes(:topic, :post, :category) + .order('permalinks.created_at desc') + + permalinks.where!('url ILIKE :url OR external_url ILIKE :url', url: "%#{url}%") if url.present? + permalinks.limit!(100) + permalinks.to_a + end end # == Schema Information diff --git a/app/models/post.rb b/app/models/post.rb index 0dbe2c6c3b..c486e327d9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -37,6 +37,7 @@ class Post < ActiveRecord::Base has_many :uploads, through: :post_uploads has_one :post_search_data + has_one :post_stat has_many :post_details @@ -73,7 +74,7 @@ class Post < ActiveRecord::Base end def self.types - @types ||= Enum.new(:regular, :moderator_action) + @types ||= Enum.new(:regular, :moderator_action, :small_action, :whisper) end def self.cook_methods @@ -89,21 +90,31 @@ class Post < ActiveRecord::Base end def limit_posts_per_day - if user.first_day_user? && post_number > 1 + if user.first_day_user? && post_number && post_number > 1 RateLimiter.new(user, "first-day-replies-per-day", SiteSetting.max_replies_in_first_day, 1.day.to_i) end end def publish_change_to_clients!(type) - # special failsafe for posts missing topics - # consistency checks should fix, but message + # special failsafe for posts missing topics consistency checks should fix, but message # is safe to skip - MessageBus.publish("/topic/#{topic_id}", { - id: id, - post_number: post_number, - updated_at: Time.now, - type: type - }, group_ids: topic.secure_group_ids) if topic + return unless topic + + channel = "/topic/#{topic_id}" + msg = { + id: id, + post_number: post_number, + updated_at: Time.now, + type: type + } + + # Whispers should not be published to everyone + if post_type == Post.types[:whisper] + user_ids = User.where('admin or moderator or id = ?', user_id).pluck(:id) + MessageBus.publish(channel, msg, user_ids: user_ids) + else + MessageBus.publish(channel, msg, group_ids: topic.secure_group_ids) + end end def trash!(trashed_by=nil) @@ -179,10 +190,12 @@ class Post < ActiveRecord::Base new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked) - if new_cooked != cooked && new_cooked.blank? - Rails.logger.warn("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}") - elsif new_cooked.blank? - Rails.logger.warn("Blank post detected post: #{self.url}\nraw: #{self.raw}") + if post_type == Post.types[:regular] + if new_cooked != cooked && new_cooked.blank? + Rails.logger.warn("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}") + elsif new_cooked.blank? + Rails.logger.warn("Blank post detected post: #{self.url}\nraw: #{self.raw}") + end end new_cooked @@ -337,7 +350,11 @@ class Post < ActiveRecord::Base end def url - Post.url(topic.slug, topic.id, post_number) + if topic + Post.url(topic.slug, topic.id, post_number) + else + "/404" + end end def self.url(slug, topic_id, post_number) @@ -400,7 +417,7 @@ class Post < ActiveRecord::Base return if user_id == new_user.id edit_reason = I18n.t('change_owner.post_revision_text', - old_user: self.user.username_lower, + old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'), new_user: new_user.username_lower ) @@ -491,17 +508,19 @@ class Post < ActiveRecord::Base args[:image_sizes] = image_sizes if image_sizes.present? args[:invalidate_oneboxes] = true if invalidate_oneboxes.present? Jobs.enqueue(:process_post, args) + DiscourseEvent.trigger(:after_trigger_post_process, self) end - def self.public_posts_count_per_day(start_date, end_date) - public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count + def self.public_posts_count_per_day(start_date, end_date, category_id=nil) + result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date) + result = result.where('topics.category_id = ?', category_id) if category_id + result.group('date(posts.created_at)').order('date(posts.created_at)').count end def self.private_messages_count_per_day(since_days_ago, topic_subtype) private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count end - def reply_history(max_replies=100) post_ids = Post.exec_sql("WITH RECURSIVE breadcrumb(id, reply_to_post_number) AS ( SELECT p.id, p.reply_to_post_number FROM posts AS p @@ -626,6 +645,7 @@ end # via_email :boolean default(FALSE), not null # raw_email :text # public_version :integer default(1), not null +# action_code :string(255) # # Indexes # diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 5fc1330126..abbe3c5df2 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -39,11 +39,13 @@ class PostAction < ActiveRecord::Base nil end - def self.flag_count_by_date(start_date, end_date) - where('created_at >= ? and created_at <= ?', start_date, end_date) - .where(post_action_type_id: PostActionType.flag_types.values) - .group('date(created_at)').order('date(created_at)') - .count + def self.flag_count_by_date(start_date, end_date, category_id=nil) + result = where('post_actions.created_at >= ? AND post_actions.created_at <= ?', start_date, end_date) + result = result.where(post_action_type_id: PostActionType.flag_types.values) + result = result.joins(post: :topic).where("topics.category_id = ?", category_id) if category_id + result.group('date(post_actions.created_at)') + .order('date(post_actions.created_at)') + .count end def self.update_flagged_posts_count @@ -122,12 +124,15 @@ SQL user_actions end - def self.count_per_day_for_type(post_action_type, since_days_ago=30) - unscoped.where(post_action_type_id: post_action_type) - .where('created_at >= ?', since_days_ago.days.ago) - .group('date(created_at)') - .order('date(created_at)') - .count + def self.count_per_day_for_type(post_action_type, opts=nil) + opts ||= {} + opts[:since_days_ago] ||= 30 + result = unscoped.where(post_action_type_id: post_action_type) + result = result.where('post_actions.created_at >= ?', opts[:since_days_ago].days.ago) + result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id]) if opts[:category_id] + result.group('date(post_actions.created_at)') + .order('date(post_actions.created_at)') + .count end def self.agree_flags!(post, moderator, delete_post=false) @@ -200,7 +205,7 @@ SQL end def staff_already_replied?(topic) - topic.posts.where("user_id IN (SELECT id FROM users WHERE moderator OR admin) OR post_type = :post_type", post_type: Post.types[:moderator_action]).exists? + topic.posts.where("user_id IN (SELECT id FROM users WHERE moderator OR admin) OR (post_type != :regular_post_type)", regular_post_type: Post.types[:regular]).exists? end def self.create_message_for_post_action(user, post, post_action_type_id, opts) @@ -233,7 +238,7 @@ SQL end end - PostCreator.new(user, opts).create.id + PostCreator.new(user, opts).create.try(:id) end def self.act(user, post, post_action_type_id, opts = {}) @@ -275,9 +280,12 @@ SQL end # agree with other flags - PostAction.agree_flags!(post, user) if staff_took_action - # update counters - post_action.try(:update_counters) + if staff_took_action + PostAction.agree_flags!(post, user) + + # update counters + post_action.try(:update_counters) + end post_action rescue ActiveRecord::RecordNotUnique @@ -457,7 +465,7 @@ SQL # the threshold has been reached, we will close the topic waiting for intervention message = I18n.t("temporarily_closed_due_to_flags") - topic.update_status("closed", true, Discourse.system_user, message) + topic.update_status("closed", true, Discourse.system_user, message: message) end def self.auto_hide_if_needed(acting_user, post, post_action_type) @@ -543,7 +551,8 @@ end # # Indexes # -# idx_unique_actions (user_id,post_action_type_id,post_id,targets_topic) UNIQUE -# idx_unique_flags (user_id,post_id,targets_topic) UNIQUE -# index_post_actions_on_post_id (post_id) +# idx_unique_actions (user_id,post_action_type_id,post_id,targets_topic) UNIQUE +# idx_unique_flags (user_id,post_id,targets_topic) UNIQUE +# index_post_actions_on_post_id (post_id) +# index_post_actions_on_user_id_and_post_action_type_id (user_id,post_action_type_id) # diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index b60502b98f..4e2bf369e8 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -45,11 +45,12 @@ class PostAnalyzer return [] if @raw.blank? return @raw_mentions if @raw_mentions.present? - # strip quotes and code blocks + # strip quotes, code blocks and oneboxes cooked_stripped = cooked_document cooked_stripped.css("aside.quote").remove cooked_stripped.css("pre").remove cooked_stripped.css("code").remove + cooked_stripped.css(".onebox").remove results = cooked_stripped.to_html.scan(PrettyText.mention_matcher) @raw_mentions = results.uniq.map { |un| un.first.downcase.gsub!(/^@/, '') } diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb index 39df0288ed..713d0affbc 100644 --- a/app/models/post_custom_field.rb +++ b/app/models/post_custom_field.rb @@ -15,5 +15,6 @@ end # # Indexes # +# index_post_custom_fields_on_name_and_value (name) # index_post_custom_fields_on_post_id_and_name (post_id,name) # diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 77111f6151..272eb1c3f4 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -123,11 +123,15 @@ class PostMover end def create_moderator_post_in_original_topic + move_type_str = PostMover.move_types[@move_type].to_s + original_topic.add_moderator_post( user, - I18n.t("move_posts.#{PostMover.move_types[@move_type]}_moderator_post", + I18n.t("move_posts.#{move_type_str}_moderator_post", count: post_ids.count, - topic_link: "[#{destination_topic.title}](#{destination_topic.url})"), + topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})"), + post_type: Post.types[:small_action], + action_code: "split_topic", post_number: @first_post_number_moved ) end diff --git a/app/models/post_stat.rb b/app/models/post_stat.rb new file mode 100644 index 0000000000..ec293b6663 --- /dev/null +++ b/app/models/post_stat.rb @@ -0,0 +1,20 @@ +class PostStat < ActiveRecord::Base + belongs_to :post +end + +# == Schema Information +# +# Table name: post_stats +# +# id :integer not null, primary key +# post_id :integer +# drafts_saved :integer +# typing_duration_msecs :integer +# composer_open_duration_msecs :integer +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_post_stats_on_post_id (post_id) +# diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb index f1a577f1ea..8f68209020 100644 --- a/app/models/post_timing.rb +++ b/app/models/post_timing.rb @@ -29,6 +29,25 @@ class PostTiming < ActiveRecord::Base TopicUser.ensure_consistency!(topic_id) end + def self.record_new_timing(args) + begin + exec_sql("INSERT INTO post_timings (topic_id, user_id, post_number, msecs) + SELECT :topic_id, :user_id, :post_number, :msecs + WHERE NOT EXISTS(SELECT 1 FROM post_timings + WHERE topic_id = :topic_id + AND user_id = :user_id + AND post_number = :post_number)", + args) + rescue PG::UniqueViolation + # concurrency is hard, we are not running serialized so this can possibly + # still happen, if it happens we just don't care, its an invalid record anyway + return + end + + Post.where(['topic_id = :topic_id and post_number = :post_number', args]).update_all 'reads = reads + 1' + UserStat.where(user_id: args[:user_id]).update_all 'posts_read_count = posts_read_count + 1' + end + # Increases a timer if a row exists, otherwise create it def self.record_timing(args) rows = exec_sql_row_count("UPDATE post_timings @@ -38,25 +57,7 @@ class PostTiming < ActiveRecord::Base AND post_number = :post_number", args) - if rows == 0 - - begin - exec_sql("INSERT INTO post_timings (topic_id, user_id, post_number, msecs) - SELECT :topic_id, :user_id, :post_number, :msecs - WHERE NOT EXISTS(SELECT 1 FROM post_timings - WHERE topic_id = :topic_id - AND user_id = :user_id - AND post_number = :post_number)", - args) - rescue PG::UniqueViolation - # concurrency is hard, we are not running serialized so this can possibly - # still happen, if it happens we just don't care, its an invalid record anyway - return - end - - Post.where(['topic_id = :topic_id and post_number = :post_number', args]).update_all 'reads = reads + 1' - UserStat.where(user_id: args[:user_id]).update_all 'posts_read_count = posts_read_count + 1' - end + record_new_timing(args) if rows == 0 end @@ -67,22 +68,58 @@ class PostTiming < ActiveRecord::Base end end + MAX_READ_TIME_PER_BATCH = 60*1000.0 - def self.process_timings(current_user, topic_id, topic_time, timings) + def self.process_timings(current_user, topic_id, topic_time, timings, opts={}) current_user.user_stat.update_time_read! - account_age_msecs = ((Time.now - current_user.created_at) * 1000.0) + max_time_per_post = ((Time.now - current_user.created_at) * 1000.0) + max_time_per_post = MAX_READ_TIME_PER_BATCH if max_time_per_post > MAX_READ_TIME_PER_BATCH highest_seen = 1 - timings.each do |post_number, time| - if post_number >= 0 && time < account_age_msecs - PostTiming.record_timing(topic_id: topic_id, - post_number: post_number, - user_id: current_user.id, - msecs: time) + + join_table = [] + + i = timings.length + while i > 0 + i -= 1 + timings[i][1] = max_time_per_post if timings[i][1] > max_time_per_post + timings.delete_at(i) if timings[i][0] < 1 + end + + timings.each_with_index do |(post_number, time), index| + + join_table << "SELECT #{topic_id.to_i} topic_id, #{post_number.to_i} post_number, + #{current_user.id.to_i} user_id, #{time.to_i} msecs, #{index} idx" + highest_seen = post_number.to_i > highest_seen ? post_number.to_i : highest_seen + end + + if join_table.length > 0 + sql = < max_time_per_post + + TopicUser.update_last_read(current_user, topic_id, highest_seen, topic_time, opts) if total_changed > 0 current_user.reload diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 39c51a3544..fa1f411208 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -64,8 +64,17 @@ class QueuedPost < ActiveRecord::Base QueuedPost.transaction do change_to!(:approved, approved_by) + if user.blocked? + user.update_columns(blocked: false) + end + creator = PostCreator.new(user, create_options.merge(skip_validations: true)) created_post = creator.create + + unless created_post && creator.errors.blank? + raise StandardError, "Failed to create post #{raw[0..100]} #{creator.errors.full_messages.inspect}" + end + end DiscourseEvent.trigger(:approved_post, self) @@ -99,3 +108,27 @@ class QueuedPost < ActiveRecord::Base end end + +# == Schema Information +# +# Table name: queued_posts +# +# id :integer not null, primary key +# queue :string(255) not null +# state :integer not null +# user_id :integer not null +# raw :text not null +# post_options :json not null +# topic_id :integer +# approved_by_id :integer +# approved_at :datetime +# rejected_by_id :integer +# rejected_at :datetime +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# by_queue_status (queue,state,created_at) +# by_queue_status_topic (topic_id,queue,state,created_at) +# diff --git a/app/models/report.rb b/app/models/report.rb index 37df62e23f..204bc3e9bc 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -2,7 +2,7 @@ require_dependency 'topic_subtype' class Report - attr_accessor :type, :data, :total, :prev30Days, :start_date, :end_date + attr_accessor :type, :data, :total, :prev30Days, :start_date, :end_date, :category_id def self.default_days 30 @@ -10,14 +10,11 @@ class Report def initialize(type) @type = type - @data = nil - @total = nil - @prev30Days = nil @start_date ||= 1.month.ago.beginning_of_day @end_date ||= Time.zone.now.end_of_day end - def as_json(options = nil) + def as_json(options=nil) { type: type, title: I18n.t("reports.#{type}.title"), @@ -27,16 +24,22 @@ class Report total: total, start_date: start_date, end_date: end_date, + category_id: category_id, prev30Days: self.prev30Days } end + def Report.add_report(name, &block) + singleton_class.instance_eval { define_method("report_#{name}", &block) } + end + def self.find(type, opts=nil) opts ||= {} # Load the report report = Report.new(type) report.start_date = opts[:start_date] if opts[:start_date] report.end_date = opts[:end_date] if opts[:end_date] + report.category_id = opts[:category_id] if opts[:category_id] report_method = :"report_#{type}" if respond_to?(report_method) @@ -46,6 +49,7 @@ class Report else return nil end + report end @@ -53,29 +57,41 @@ class Report data = if filter == :page_view_total ApplicationRequest.where(req_type: [ - ApplicationRequest.req_types.map{|k,v| v if k =~ /page_view/}.compact + ApplicationRequest.req_types.reject{|k,v| k =~ /mobile/}.map{|k,v| v if k =~ /page_view/}.compact ]) else ApplicationRequest.where(req_type: ApplicationRequest.req_types[filter]) end - filtered_results = data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date) + filtered_results = data + filtered_results = data.filtered_results.where(category_id: report.category_id) if report.category_id report.data = [] - filtered_results.order(date: :asc) + filtered_results.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date) + .order(date: :asc) .group(:date) .sum(:count) .each do |date, count| - report.data << {x: date, y: count} + report.data << { x: date, y: count } end report.total = data.sum(:count) - report.prev30Days = filtered_results.sum(:count) + report.prev30Days = filtered_results.where('date >= ? AND date <= ?', + (report.start_date - 31.days).to_date, + (report.end_date - 31.days).to_date ) + .sum(:count) end def self.report_visits(report) basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date + add_counts report, UserVisit, 'visited_at' + end + + def self.report_mobile_visits(report) + basic_report_about report, UserVisit, :mobile_by_day, report.start_date, report.end_date + report.total = UserVisit.where(mobile: true).count + report.prev30Days = UserVisit.where(mobile: true).where("visited_at >= ? and visited_at < ?", report.start_date - 30.days, report.start_date).count end def self.report_signups(report) @@ -83,13 +99,35 @@ class Report end def self.report_topics(report) - basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date - add_counts report, Topic.listable_topics, 'topics.created_at' + basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, report.category_id + countable = Topic.listable_topics + countable = countable.where(category_id: report.category_id) if report.category_id + add_counts report, countable, 'topics.created_at' end def self.report_posts(report) - basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date - add_counts report, Post.public_posts, 'posts.created_at' + basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, report.category_id + countable = Post.public_posts + countable = countable.joins(:topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'posts.created_at' + end + + def self.report_time_to_first_response(report) + report.data = [] + Topic.time_to_first_response_per_day(report.start_date, report.end_date, {category_id: report.category_id}).each do |r| + report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) } + end + report.total = Topic.time_to_first_response_total(category_id: report.category_id) + report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id) + end + + def self.report_topics_with_no_response(report) + report.data = [] + Topic.with_no_response_per_day(report.start_date, report.end_date, report.category_id).each do |r| + report.data << { x: Date.parse(r["date"]), y: r["count"].to_i } + end + report.total = Topic.with_no_response_total(category_id: report.category_id) + report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id) end def self.report_emails(report) @@ -104,7 +142,7 @@ class Report def self.basic_report_about(report, subject_class, report_method, *args) report.data = [] subject_class.send(report_method, *args).each do |date, count| - report.data << {x: date, y: count} + report.data << { x: date, y: count } end end @@ -116,14 +154,16 @@ class Report def self.report_users_by_trust_level(report) report.data = [] User.real.group('trust_level').count.each do |level, count| - report.data << {x: level.to_i, y: count} + report.data << { x: level.to_i, y: count } end end # Post action counts: def self.report_flags(report) - basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date - add_counts report, PostAction.where(post_action_type_id: PostActionType.flag_types.values), 'post_actions.created_at' + basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date, report.category_id + countable = PostAction.where(post_action_type_id: PostActionType.flag_types.values) + countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'post_actions.created_at' end def self.report_likes(report) @@ -136,10 +176,12 @@ class Report def self.post_action_report(report, post_action_type) report.data = [] - PostAction.count_per_day_for_type(post_action_type).each do |date, count| + PostAction.count_per_day_for_type(post_action_type, category_id: report.category_id).each do |date, count| report.data << { x: date, y: count } end - add_counts report, PostAction.unscoped.where(post_action_type_id: post_action_type), 'post_actions.created_at' + countable = PostAction.unscoped.where(post_action_type_id: post_action_type) + countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'post_actions.created_at' end # Private messages counts: diff --git a/app/models/site.rb b/app/models/site.rb index 4d3c159051..c6a3313f17 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -30,7 +30,7 @@ class Site end def groups - @groups ||= Group.order(:name).map { |g| {:id => g.id, :name => g.name}} + @groups ||= Group.order(:name).map { |g| { id: g.id, name: g.name } } end def user_fields @@ -41,7 +41,7 @@ class Site @categories ||= begin categories = Category .secured(@guardian) - .includes(:topic_only_relative_url) + .includes(:topic_only_relative_url, :subcategories) .order(:position) unless SiteSetting.allow_uncategorized_topics @@ -62,14 +62,19 @@ class Site categories.each do |category| category.notification_level = category_user[category.id] category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id) + category.has_children = category.subcategories.present? by_id[category.id] = category end - categories.reject! {|c| c.parent_category_id && !by_id[c.parent_category_id]} + categories.reject! { |c| c.parent_category_id && !by_id[c.parent_category_id] } categories end end + def suppressed_from_homepage_category_ids + categories.select { |c| c.suppress_from_homepage == true }.map(&:id) + end + def archetypes Archetype.list.reject { |t| t.id == Archetype.private_message } end @@ -80,7 +85,9 @@ class Site return { periods: TopTopic.periods.map(&:to_s), filters: Discourse.filters.map(&:to_s), - user_fields: UserField.all + user_fields: UserField.all.map do |userfield| + UserFieldSerializer.new(userfield, root: false, scope: guardian) + end }.to_json end diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb index 790f15ca41..45397f6ab5 100644 --- a/app/models/site_customization.rb +++ b/app/models/site_customization.rb @@ -6,6 +6,10 @@ class SiteCustomization < ActiveRecord::Base ENABLED_KEY = '7e202ef2-56d7-47d5-98d8-a9c8d15e57dd' @cache = DistributedCache.new('site_customization') + def self.css_fields + %w(stylesheet mobile_stylesheet embedded_css) + end + before_create do self.enabled ||= false self.key ||= SecureRandom.uuid @@ -13,14 +17,14 @@ class SiteCustomization < ActiveRecord::Base end def compile_stylesheet(scss) - DiscourseSassCompiler.compile(scss, 'custom') + DiscourseSassCompiler.compile("@import \"theme_variables\";\n" << scss, 'custom') rescue => e puts e.backtrace.join("\n") unless Sass::SyntaxError === e raise e end before_save do - ['stylesheet', 'mobile_stylesheet'].each do |stylesheet_attr| + SiteCustomization.css_fields.each do |stylesheet_attr| if self.send("#{stylesheet_attr}_changed?") begin self.send("#{stylesheet_attr}_baked=", compile_stylesheet(self.send(stylesheet_attr))) @@ -31,9 +35,16 @@ class SiteCustomization < ActiveRecord::Base end end + def any_stylesheet_changed? + SiteCustomization.css_fields.each do |fieldname| + return true if self.send("#{fieldname}_changed?") + end + false + end + after_save do remove_from_cache! - if stylesheet_changed? || mobile_stylesheet_changed? + if any_stylesheet_changed? MessageBus.publish "/file-change/#{key}", SecureRandom.hex MessageBus.publish "/file-change/#{SiteCustomization::ENABLED_KEY}", SecureRandom.hex end @@ -50,10 +61,24 @@ class SiteCustomization < ActiveRecord::Base ENABLED_KEY.dup << RailsMultisite::ConnectionManagement.current_db end + def self.field_for_target(target=nil) + target ||= :desktop + + case target.to_sym + when :mobile then :mobile_stylesheet + when :desktop then :stylesheet + when :embedded then :embedded_css + end + end + + def self.baked_for_target(target=nil) + "#{field_for_target(target)}_baked".to_sym + end + def self.enabled_stylesheet_contents(target=:desktop) @cache["enabled_stylesheet_#{target}"] ||= where(enabled: true) .order(:name) - .pluck(target == :desktop ? :stylesheet_baked : :mobile_stylesheet_baked) + .pluck(baked_for_target(target)) .compact .join("\n") end @@ -63,7 +88,7 @@ class SiteCustomization < ActiveRecord::Base enabled_stylesheet_contents(target) else where(key: key) - .pluck(target == :mobile ? :mobile_stylesheet_baked : :stylesheet_baked) + .pluck(baked_for_target(target)) .first end end @@ -127,7 +152,7 @@ class SiteCustomization < ActiveRecord::Base end def stylesheet_link_tag(target=:desktop) - content = target == :mobile ? mobile_stylesheet : stylesheet + content = self.send(SiteCustomization.field_for_target(target)) SiteCustomization.stylesheet_link_tag(key, target, content) end @@ -167,6 +192,8 @@ end # body_tag :text # top :text # mobile_top :text +# embedded_css :text +# embedded_css_baked :text # # Indexes # diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 5b272c0d91..ad84ea6810 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -68,11 +68,6 @@ class SiteSetting < ActiveRecord::Base @anonymous_menu_items ||= Set.new Discourse.anonymous_filters.map(&:to_s) end - def self.normalized_embeddable_host - return embeddable_host if embeddable_host.blank? - embeddable_host.sub(/^https?\:\/\//, '') - end - def self.anonymous_homepage top_menu_items.map { |item| item.name } .select { |item| anonymous_menu_items.include?(item) } @@ -93,15 +88,21 @@ class SiteSetting < ActiveRecord::Base use_https? ? "https" : "http" end - def self.has_enough_topics_to_redirect_to_top - TopTopic.periods.each do |period| - topics_per_period = TopTopic.where("#{period}_score > 0") - .limit(SiteSetting.topics_per_period_in_top_page) - .count - return true if topics_per_period >= SiteSetting.topics_per_period_in_top_page + def self.default_categories_selected + [ + SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_tracking.split("|"), + SiteSetting.default_categories_muted.split("|"), + ].flatten.to_set + end + + def self.min_redirected_to_top_period + TopTopic.sorted_periods.each do |p| + period = p[0] + return period if TopTopic.topics_per_period(period) >= SiteSetting.topics_per_period_in_top_page end - # nothing - false + # not enough topics + nil end end diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb index 76526dd52a..a5397ef159 100644 --- a/app/models/stylesheet_cache.rb +++ b/app/models/stylesheet_cache.rb @@ -28,3 +28,19 @@ class StylesheetCache < ActiveRecord::Base end end + +# == Schema Information +# +# Table name: stylesheet_cache +# +# id :integer not null, primary key +# target :string(255) not null +# digest :string(255) not null +# content :text not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_stylesheet_cache_on_target_and_digest (target,digest) UNIQUE +# diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index ca7290a673..4181c39bc0 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -1,7 +1,15 @@ +require_dependency "distributed_memoizer" + class TopTopic < ActiveRecord::Base belongs_to :topic + def self.topics_per_period(period) + DistributedMemoizer.memoize("#{Discourse.current_hostname}_topics_per_period_#{period}", 1.day) do + TopTopic.where("#{period}_score > 0").count + end.to_i + end + # The top topics we want to refresh often def self.refresh_daily! transaction do @@ -32,7 +40,11 @@ class TopTopic < ActiveRecord::Base def self.periods - @@periods ||= [:all, :yearly, :monthly, :weekly, :daily].freeze + @@periods ||= [:all, :yearly, :quarterly, :monthly, :weekly, :daily].freeze + end + + def self.sorted_periods + ascending_periods ||= Enum.new(:daily, :weekly, :monthly, :quarterly, :yearly, :all) end def self.sort_orders @@ -181,10 +193,11 @@ class TopTopic < ActiveRecord::Base def self.start_of(period) case period - when :yearly then 1.year.ago - when :monthly then 1.month.ago - when :weekly then 1.week.ago - when :daily then 1.day.ago + when :yearly then 1.year.ago + when :monthly then 1.month.ago + when :quarterly then 3.months.ago + when :weekly then 1.week.ago + when :daily then 1.day.ago end end @@ -207,38 +220,56 @@ end # # Table name: top_topics # -# id :integer not null, primary key -# topic_id :integer -# yearly_posts_count :integer default(0), not null -# yearly_views_count :integer default(0), not null -# yearly_likes_count :integer default(0), not null -# monthly_posts_count :integer default(0), not null -# monthly_views_count :integer default(0), not null -# monthly_likes_count :integer default(0), not null -# weekly_posts_count :integer default(0), not null -# weekly_views_count :integer default(0), not null -# weekly_likes_count :integer default(0), not null -# daily_posts_count :integer default(0), not null -# daily_views_count :integer default(0), not null -# daily_likes_count :integer default(0), not null -# yearly_score :float default(0.0) -# monthly_score :float default(0.0) -# weekly_score :float default(0.0) -# daily_score :float default(0.0) +# id :integer not null, primary key +# topic_id :integer +# yearly_posts_count :integer default(0), not null +# yearly_views_count :integer default(0), not null +# yearly_likes_count :integer default(0), not null +# monthly_posts_count :integer default(0), not null +# monthly_views_count :integer default(0), not null +# monthly_likes_count :integer default(0), not null +# weekly_posts_count :integer default(0), not null +# weekly_views_count :integer default(0), not null +# weekly_likes_count :integer default(0), not null +# daily_posts_count :integer default(0), not null +# daily_views_count :integer default(0), not null +# daily_likes_count :integer default(0), not null +# daily_score :float default(0.0) +# weekly_score :float default(0.0) +# monthly_score :float default(0.0) +# yearly_score :float default(0.0) +# all_score :float default(0.0) +# daily_op_likes_count :integer default(0), not null +# weekly_op_likes_count :integer default(0), not null +# monthly_op_likes_count :integer default(0), not null +# yearly_op_likes_count :integer default(0), not null +# quarterly_posts_count :integer default(0), not null +# quarterly_views_count :integer default(0), not null +# quarterly_likes_count :integer default(0), not null +# quarterly_score :float default(0.0) +# quarterly_op_likes_count :integer default(0), not null # # Indexes # -# index_top_topics_on_daily_likes_count (daily_likes_count) -# index_top_topics_on_daily_posts_count (daily_posts_count) -# index_top_topics_on_daily_views_count (daily_views_count) -# index_top_topics_on_monthly_likes_count (monthly_likes_count) -# index_top_topics_on_monthly_posts_count (monthly_posts_count) -# index_top_topics_on_monthly_views_count (monthly_views_count) -# index_top_topics_on_topic_id (topic_id) UNIQUE -# index_top_topics_on_weekly_likes_count (weekly_likes_count) -# index_top_topics_on_weekly_posts_count (weekly_posts_count) -# index_top_topics_on_weekly_views_count (weekly_views_count) -# index_top_topics_on_yearly_likes_count (yearly_likes_count) -# index_top_topics_on_yearly_posts_count (yearly_posts_count) -# index_top_topics_on_yearly_views_count (yearly_views_count) +# index_top_topics_on_daily_likes_count (daily_likes_count) +# index_top_topics_on_daily_op_likes_count (daily_op_likes_count) +# index_top_topics_on_daily_posts_count (daily_posts_count) +# index_top_topics_on_daily_views_count (daily_views_count) +# index_top_topics_on_monthly_likes_count (monthly_likes_count) +# index_top_topics_on_monthly_op_likes_count (monthly_op_likes_count) +# index_top_topics_on_monthly_posts_count (monthly_posts_count) +# index_top_topics_on_monthly_views_count (monthly_views_count) +# index_top_topics_on_quarterly_likes_count (quarterly_likes_count) +# index_top_topics_on_quarterly_op_likes_count (quarterly_op_likes_count) +# index_top_topics_on_quarterly_posts_count (quarterly_posts_count) +# index_top_topics_on_quarterly_views_count (quarterly_views_count) +# index_top_topics_on_topic_id (topic_id) UNIQUE +# index_top_topics_on_weekly_likes_count (weekly_likes_count) +# index_top_topics_on_weekly_op_likes_count (weekly_op_likes_count) +# index_top_topics_on_weekly_posts_count (weekly_posts_count) +# index_top_topics_on_weekly_views_count (weekly_views_count) +# index_top_topics_on_yearly_likes_count (yearly_likes_count) +# index_top_topics_on_yearly_op_likes_count (yearly_op_likes_count) +# index_top_topics_on_yearly_posts_count (yearly_posts_count) +# index_top_topics_on_yearly_views_count (yearly_views_count) # diff --git a/app/models/topic.rb b/app/models/topic.rb index 1d0f6e4573..0cf7dad300 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -107,6 +107,7 @@ class Topic < ActiveRecord::Base # When we want to temporarily attach some data to a forum topic (usually before serialization) attr_accessor :user_data + attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code attr_accessor :participants attr_accessor :topic_list @@ -217,6 +218,13 @@ class Topic < ActiveRecord::Base end end + def self.visible_post_types(viewed_by=nil) + types = Post.types + result = [types[:regular], types[:moderator_action], types[:small_action]] + result << types[:whisper] if viewed_by.try(:staff?) + result + end + def self.top_viewed(max = 10) Topic.listable_topics.visible.secured.order('views desc').limit(max) end @@ -357,8 +365,10 @@ class Topic < ActiveRecord::Base custom_fields[key.to_s] end - def self.listable_count_per_day(start_date, end_date) - listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date).group('date(created_at)').order('date(created_at)').count + def self.listable_count_per_day(start_date, end_date, category_id=nil) + result = listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date) + result = result.where(category_id: category_id) if category_id + result.group('date(created_at)').order('date(created_at)').count end def private_message? @@ -393,7 +403,7 @@ class Topic < ActiveRecord::Base return [] unless candidate_ids.present? - similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity", title: title, raw: raw])) + similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity, p.cooked as blurb", title: title, raw: raw])) .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1") .limit(SiteSetting.max_similar_results) .where("topics.id IN (?)", candidate_ids) @@ -403,8 +413,8 @@ class Topic < ActiveRecord::Base similar end - def update_status(status, enabled, user, message=nil) - TopicStatusUpdate.new(self, user).update!(status, enabled, message) + def update_status(status, enabled, user, opts={}) + TopicStatusUpdate.new(self, user).update!(status, enabled, opts) end # Atomically creates the next post number @@ -479,22 +489,25 @@ class Topic < ActiveRecord::Base Category.where(id: new_category.id).update_all("topic_count = topic_count + 1") CategoryFeaturedTopic.feature_topics_for(old_category) unless @import_mode CategoryFeaturedTopic.feature_topics_for(new_category) unless @import_mode || old_category.id == new_category.id - CategoryUser.auto_watch_new_topic(self) - CategoryUser.auto_track_new_topic(self) + CategoryUser.auto_watch_new_topic(self, new_category) + CategoryUser.auto_track_new_topic(self, new_category) end true end - def add_moderator_post(user, text, opts={}) + def add_moderator_post(user, text, opts=nil) + opts ||= {} new_post = nil Topic.transaction do creator = PostCreator.new(user, raw: text, - post_type: Post.types[:moderator_action], + post_type: opts[:post_type] || Post.types[:moderator_action], + action_code: opts[:action_code], no_bump: opts[:bump].blank?, skip_notifications: opts[:skip_notifications], - topic_id: self.id) + topic_id: self.id, + skip_validations: true) new_post = creator.create increment!(:moderator_posts_count) end @@ -662,7 +675,8 @@ class Topic < ActiveRecord::Base { html: post.cooked, - key: self.id + key: self.id, + url: self.url } end @@ -709,6 +723,10 @@ class Topic < ActiveRecord::Base url end + def unsubscribe_url + "#{url}/unsubscribe" + end + def clear_pin_for(user) return unless user.present? TopicUser.change(user.id, id, cleared_pinned_at: Time.now) @@ -719,9 +737,17 @@ class Topic < ActiveRecord::Base TopicUser.change(user.id, id, cleared_pinned_at: nil) end - def update_pinned(status, global=false) - update_column(:pinned_at, status ? Time.now : nil) - update_column(:pinned_globally, global) + def update_pinned(status, global=false, pinned_until=nil) + pinned_until = Time.parse(pinned_until) rescue nil + + update_columns( + pinned_at: status ? Time.now : nil, + pinned_globally: global, + pinned_until: pinned_until + ) + + Jobs.cancel_scheduled_job(:unpin_topic, topic_id: self.id) + Jobs.enqueue_at(pinned_until, :unpin_topic, topic_id: self.id) if pinned_until end def draft_key @@ -738,6 +764,11 @@ class Topic < ActiveRecord::Base end end + def self.ensure_consistency! + # unpin topics that might have been missed + Topic.where("pinned_until < now()").update_all(pinned_at: nil, pinned_globally: false, pinned_until: nil) + end + def self.auto_close Topic.where("NOT closed AND auto_close_at < ? AND auto_close_user_id IS NOT NULL", 1.minute.ago).each do |t| t.auto_close @@ -842,7 +873,100 @@ class Topic < ActiveRecord::Base end def expandable_first_post? - SiteSetting.embeddable_host.present? && SiteSetting.embed_truncate? && has_topic_embed? + SiteSetting.embed_truncate? && has_topic_embed? + end + + TIME_TO_FIRST_RESPONSE_SQL ||= <<-SQL + SELECT AVG(t.hours)::float AS "hours", t.created_at AS "date" + FROM ( + SELECT t.id, t.created_at::date AS created_at, EXTRACT(EPOCH FROM MIN(p.created_at) - t.created_at)::float / 3600.0 AS "hours" + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id + /*where*/ + GROUP BY t.id + ) t + GROUP BY t.created_at + ORDER BY t.created_at + SQL + + TIME_TO_FIRST_RESPONSE_TOTAL_SQL ||= <<-SQL + SELECT AVG(t.hours)::float AS "hours" + FROM ( + SELECT t.id, EXTRACT(EPOCH FROM MIN(p.created_at) - t.created_at)::float / 3600.0 AS "hours" + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id + /*where*/ + GROUP BY t.id + ) t + SQL + + def self.time_to_first_response(sql, opts=nil) + opts ||= {} + builder = SqlBuilder.new(sql) + builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date] + builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date] + builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id] + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.where("p.deleted_at IS NULL") + builder.where("p.post_number > 1") + builder.where("p.user_id != t.user_id") + builder.where("p.user_id in (:user_ids)", {user_ids: opts[:user_ids]}) if opts[:user_ids] + builder.where("EXTRACT(EPOCH FROM p.created_at - t.created_at) > 0") + builder.exec + end + + def self.time_to_first_response_per_day(start_date, end_date, opts={}) + time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge({start_date: start_date, end_date: end_date})) + end + + def self.time_to_first_response_total(opts=nil) + total = time_to_first_response(TIME_TO_FIRST_RESPONSE_TOTAL_SQL, opts) + total.first["hours"].to_f.round(2) + end + + WITH_NO_RESPONSE_SQL ||= <<-SQL + SELECT COUNT(*) as count, tt.created_at AS "date" + FROM ( + SELECT t.id, t.created_at::date AS created_at, MIN(p.post_number) first_reply + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id AND p.user_id != t.user_id AND p.deleted_at IS NULL + /*where*/ + GROUP BY t.id + ) tt + WHERE tt.first_reply IS NULL + GROUP BY tt.created_at + ORDER BY tt.created_at + SQL + + def self.with_no_response_per_day(start_date, end_date, category_id=nil) + builder = SqlBuilder.new(WITH_NO_RESPONSE_SQL) + builder.where("t.created_at >= :start_date", start_date: start_date) if start_date + builder.where("t.created_at < :end_date", end_date: end_date) if end_date + builder.where("t.category_id = :category_id", category_id: category_id) if category_id + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.exec + end + + WITH_NO_RESPONSE_TOTAL_SQL ||= <<-SQL + SELECT COUNT(*) as count + FROM ( + SELECT t.id, MIN(p.post_number) first_reply + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id AND p.user_id != t.user_id AND p.deleted_at IS NULL + /*where*/ + GROUP BY t.id + ) tt + WHERE tt.first_reply IS NULL + SQL + + def self.with_no_response_total(opts={}) + builder = SqlBuilder.new(WITH_NO_RESPONSE_TOTAL_SQL) + builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id] + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.exec.first["count"].to_i end private @@ -919,11 +1043,15 @@ end # pinned_globally :boolean default(FALSE), not null # auto_close_based_on_last_post :boolean default(FALSE) # auto_close_hours :float +# pinned_until :datetime # # Indexes # -# idx_topics_front_page (deleted_at,visible,archetype,category_id,id) -# idx_topics_user_id_deleted_at (user_id) -# index_topics_on_bumped_at (bumped_at) -# index_topics_on_id_and_deleted_at (id,deleted_at) +# idx_topics_front_page (deleted_at,visible,archetype,category_id,id) +# idx_topics_user_id_deleted_at (user_id) +# index_topics_on_bumped_at (bumped_at) +# index_topics_on_created_at_and_visible (created_at,visible) +# index_topics_on_id_and_deleted_at (id,deleted_at) +# index_topics_on_pinned_at (pinned_at) +# index_topics_on_pinned_globally (pinned_globally) # diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index fa80087035..8d8485232f 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -4,6 +4,7 @@ class TopicEmbed < ActiveRecord::Base belongs_to :topic belongs_to :post validates_presence_of :embed_url + validates_uniqueness_of :embed_url def self.normalize_url(url) url.downcase.sub(/\/$/, '').sub(/\-+/, '-').strip @@ -32,12 +33,14 @@ class TopicEmbed < ActiveRecord::Base # If there is no embed, create a topic, post and the embed. if embed.blank? Topic.transaction do + eh = EmbeddableHost.record_for_host(url) + creator = PostCreator.new(user, title: title, raw: absolutize_urls(url, contents), skip_validations: true, cook_method: Post.cook_methods[:raw_html], - category: SiteSetting.embed_category) + category: eh.try(:category_id)) post = creator.create if post.present? TopicEmbed.create!(topic_id: post.topic_id, @@ -166,7 +169,7 @@ end # id :integer not null, primary key # topic_id :integer not null # post_id :integer not null -# embed_url :string(255) not null +# embed_url :string(1000) not null # content_sha1 :string(40) # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb index d00aaeda14..ee461cbe65 100644 --- a/app/models/topic_featured_users.rb +++ b/app/models/topic_featured_users.rb @@ -38,6 +38,7 @@ WITH cte as ( JOIN posts p ON p.topic_id = t.id WHERE p.deleted_at IS NULL AND NOT p.hidden AND + p.post_type <> #{Post.types[:whisper]} AND p.user_id <> t.user_id AND p.user_id <> t.last_post_user_id #{filter} @@ -81,6 +82,7 @@ SQL private def update_participant_count - topic.update_columns(participant_count: topic.posts.count('distinct user_id')) + count = topic.posts.where('NOT hidden AND post_type <> ?', Post.types[:whisper]).count('distinct user_id') + topic.update_columns(participant_count: count) end end diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index d92cebf155..3ed474d7c0 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -231,7 +231,8 @@ end # # Indexes # -# index_topic_links_on_post_id (post_id) -# index_topic_links_on_topic_id (topic_id) -# unique_post_links (topic_id,post_id,url) UNIQUE +# index_topic_links_on_link_post_id_and_reflection (link_post_id,reflection) +# index_topic_links_on_post_id (post_id) +# index_topic_links_on_topic_id (topic_id) +# unique_post_links (topic_id,post_id,url) UNIQUE # diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb index 1a255a56d6..4a51ca5200 100644 --- a/app/models/topic_link_click.rb +++ b/app/models/topic_link_click.rb @@ -2,10 +2,6 @@ require_dependency 'discourse' require 'ipaddr' require 'url_helper' -class TopicLinkClickHelper - include UrlHelper -end - class TopicLinkClick < ActiveRecord::Base belongs_to :topic_link, counter_cache: :clicks belongs_to :user @@ -20,7 +16,6 @@ class TopicLinkClick < ActiveRecord::Base url = args[:url] return nil if url.blank? - helper = TopicLinkClickHelper.new uri = URI.parse(url) rescue nil urls = Set.new @@ -28,12 +23,21 @@ class TopicLinkClick < ActiveRecord::Base if url =~ /^http/ urls << url.sub(/^https/, 'http') urls << url.sub(/^http:/, 'https:') - urls << helper.schemaless(url) + urls << UrlHelper.schemaless(url) end - urls << helper.absolute_without_cdn(url) + urls << UrlHelper.absolute_without_cdn(url) urls << uri.path if uri.try(:host) == Discourse.current_hostname urls << url.sub(/\?.*$/, '') if url.include?('?') + # add a cdn link + if uri && Discourse.asset_host.present? + cdn_uri = URI.parse(Discourse.asset_host) rescue nil + if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path) + is_cdn_link = true + urls << uri.path[(cdn_uri.path.length)..-1] + end + end + link = TopicLink.select([:id, :user_id]) # test for all possible URLs @@ -59,7 +63,9 @@ class TopicLinkClick < ActiveRecord::Base return nil unless uri # Only redirect to whitelisted hostnames - return WHITELISTED_REDIRECT_HOSTNAMES.include?(uri.hostname) ? url : nil + return url if WHITELISTED_REDIRECT_HOSTNAMES.include?(uri.hostname) || is_cdn_link + + return nil end return url if args[:user_id] && link.user_id == args[:user_id] diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb index 0fb296171b..cce332a6d0 100644 --- a/app/models/topic_list.rb +++ b/app/models/topic_list.rb @@ -3,6 +3,9 @@ require_dependency 'avatar_lookup' class TopicList include ActiveModel::Serialization + cattr_accessor :preloaded_custom_fields + self.preloaded_custom_fields = [] + attr_accessor :more_topics_url, :prev_topics_url, :draft, @@ -30,8 +33,10 @@ class TopicList # Lazy initialization def topics - return @topics if @topics.present? + @topics ||= load_topics + end + def load_topics @topics = @topics_input # Attach some data for serialization to each topic @@ -76,6 +81,10 @@ class TopicList ft.topic_list = self end + if TopicList.preloaded_custom_fields.present? + Topic.preload_custom_fields(@topics, TopicList.preloaded_custom_fields) + end + @topics end diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index 4f23d7c3de..64dcc256e8 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -1,21 +1,20 @@ TopicStatusUpdate = Struct.new(:topic, :user) do - def update!(status, enabled, message=nil) + def update!(status, enabled, opts={}) status = Status.new(status, enabled) Topic.transaction do - change(status) + change(status, opts) highest_post_number = topic.highest_post_number - - create_moderator_post_for(status, message) + create_moderator_post_for(status, opts[:message]) update_read_state_for(status, highest_post_number) end end private - def change(status) + def change(status, opts={}) if status.pinned? || status.pinned_globally? - topic.update_pinned(status.enabled?, status.pinned_globally?) + topic.update_pinned(status.enabled?, status.pinned_globally?, opts[:until]) elsif status.autoclosed? topic.update_column('closed', status.enabled?) else @@ -49,8 +48,6 @@ TopicStatusUpdate = Struct.new(:topic, :user) do locale_key = status.locale_key locale_key << "_lastpost" if topic.auto_close_based_on_last_post message_for_autoclosed(locale_key) - else - I18n.t(status.locale_key) end end @@ -69,7 +66,9 @@ TopicStatusUpdate = Struct.new(:topic, :user) do end def options_for(status) - { bump: status.reopening_topic? } + { bump: status.reopening_topic?, + post_type: Post.types[:small_action], + action_code: status.action_code } end Status = Struct.new(:name, :enabled) do @@ -85,8 +84,12 @@ TopicStatusUpdate = Struct.new(:topic, :user) do !enabled? end + def action_code + "#{name}.#{enabled? ? 'enabled' : 'disabled'}" + end + def locale_key - "topic_statuses.#{name}_#{enabled? ? 'enabled' : 'disabled'}" + "topic_statuses.#{action_code.gsub('.', '_')}" end def reopening_topic? diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb index 0bf3fa7096..a38b6ec6d8 100644 --- a/app/models/topic_tracking_state.rb +++ b/app/models/topic_tracking_state.rb @@ -73,6 +73,7 @@ class TopicTrackingState highest_post_number: post.post_number, created_at: post.created_at, topic_id: post.topic_id, + category_id: post.topic.category_id, notification_level: tu.notification_level } } @@ -106,15 +107,16 @@ class TopicTrackingState WHEN COALESCE(u.new_topic_duration_minutes, :default_duration) = :always THEN u.created_at WHEN COALESCE(u.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(u.previous_visit_at,u.created_at) ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(u.new_topic_duration_minutes, :default_duration)) - END, us.new_since)", + END, us.new_since, :min_date)", now: DateTime.now, last_visit: User::NewTopicDuration::LAST_VISIT, always: User::NewTopicDuration::ALWAYS, - default_duration: SiteSetting.new_topic_duration_minutes + default_duration: SiteSetting.default_other_new_topic_duration_minutes, + min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime ).where_values[0] end - def self.report(user_ids, topic_id = nil) + def self.report(user_id, topic_id = nil) # Sam: this is a hairy report, in particular I need custom joins and fancy conditions # Dropping to sql_builder so I can make sense of it. @@ -125,52 +127,78 @@ class TopicTrackingState # This code needs to be VERY efficient as it is triggered via the message bus and may steal # cycles from usual requests # - - unread = TopicQuery.unread_filter(Topic).where_values.join(" AND ") - new = TopicQuery.new_filter(Topic, "xxx").where_values.join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause) + # + sql = report_raw_sql(topic_id: topic_id) sql = < 'private_message' AND ((#{unread}) OR (#{new})) AND (topics.visible OR u.admin OR u.moderator) AND topics.deleted_at IS NULL AND - ( category_id IS NULL OR NOT c.read_restricted OR u.admin OR category_id IN ( + ( NOT c.read_restricted OR u.admin OR category_id IN ( SELECT c2.id FROM categories c2 JOIN category_groups cg ON cg.category_id = c2.id - JOIN group_users gu ON gu.user_id = u.id AND cg.group_id = gu.group_id + JOIN group_users gu ON gu.user_id = :user_id AND cg.group_id = gu.group_id WHERE c2.read_restricted ) ) AND NOT EXISTS( SELECT 1 FROM category_users cu WHERE last_read_post_number IS NULL AND - cu.user_id = u.id AND + cu.user_id = :user_id AND cu.category_id = topics.category_id AND cu.notification_level = #{CategoryUser.notification_levels[:muted]}) SQL - if topic_id + if opts && opts[:topic_id] sql << " AND topics.id = :topic_id" end - sql << " ORDER BY topics.bumped_at DESC ) SELECT * FROM x LIMIT 500" - - SqlBuilder.new(sql) - .map_exec(TopicTrackingState, user_ids: user_ids, topic_id: topic_id) - + sql << " ORDER BY topics.bumped_at DESC" end end diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 2611039f31..730a131e2e 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -7,8 +7,9 @@ class TopicUser < ActiveRecord::Base scope :tracking, lambda { |topic_id| where(topic_id: topic_id) - .where("COALESCE(topic_users.notification_level, :regular) >= :tracking", - regular: TopicUser.notification_levels[:regular], tracking: TopicUser.notification_levels[:tracking]) + .where("COALESCE(topic_users.notification_level, :regular) >= :tracking", + regular: TopicUser.notification_levels[:regular], + tracking: TopicUser.notification_levels[:tracking]) } # Class methods @@ -58,13 +59,9 @@ class TopicUser < ActiveRecord::Base def create_lookup(topic_users) topic_users = topic_users.to_a - result = {} return result if topic_users.blank? - - topic_users.each do |ftu| - result[ftu.topic_id] = ftu - end + topic_users.each { |ftu| result[ftu.topic_id] = ftu } result end @@ -100,9 +97,9 @@ class TopicUser < ActiveRecord::Base if rows == 0 now = DateTime.now auto_track_after = User.select(:auto_track_topics_after_msecs).find_by(id: user_id).auto_track_topics_after_msecs - auto_track_after ||= SiteSetting.auto_track_topics_after + auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs - if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed] || 0) + if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0) attrs[:notification_level] ||= notification_levels[:tracking] end @@ -113,11 +110,9 @@ class TopicUser < ActiveRecord::Base end if attrs[:notification_level] - MessageBus.publish("/topic/#{topic_id}", - {notification_level_change: attrs[:notification_level]}, user_ids: [user_id]) + MessageBus.publish("/topic/#{topic_id}", { notification_level_change: attrs[:notification_level] }, user_ids: [user_id]) end - rescue ActiveRecord::RecordNotUnique # In case of a race condition to insert, do nothing end @@ -127,7 +122,7 @@ class TopicUser < ActiveRecord::Base user_id = user.is_a?(User) ? user.id : topic now = DateTime.now - rows = TopicUser.where({topic_id: topic_id, user_id: user_id}).update_all({last_visited_at: now}) + rows = TopicUser.where(topic_id: topic_id, user_id: user_id).update_all(last_visited_at: now) if rows == 0 TopicUser.create(topic_id: topic_id, user_id: user_id, last_visited_at: now, first_visited_at: now) else @@ -137,7 +132,7 @@ class TopicUser < ActiveRecord::Base # Update the last read and the last seen post count, but only if it doesn't exist. # This would be a lot easier if psql supported some kind of upsert - def update_last_read(user, topic_id, post_number, msecs) + def update_last_read(user, topic_id, post_number, msecs, opts={}) return if post_number.blank? msecs = 0 if msecs.to_i < 0 @@ -148,7 +143,7 @@ class TopicUser < ActiveRecord::Base now: DateTime.now, msecs: msecs, tracking: notification_levels[:tracking], - threshold: SiteSetting.auto_track_topics_after + threshold: SiteSetting.default_other_auto_track_topics_after_msecs } # In case anyone seens "highest_seen_post_number" and gets confused, like I do. @@ -192,22 +187,23 @@ class TopicUser < ActiveRecord::Base if before_last_read < post_number # The user read at least one new post TopicTrackingState.publish_read(topic_id, post_number, user.id, after) - user.update_posts_read!(post_number - before_last_read) + user.update_posts_read!(post_number - before_last_read, mobile: opts[:mobile]) end if before != after - MessageBus.publish("/topic/#{topic_id}", {notification_level_change: after}, user_ids: [user.id]) + MessageBus.publish("/topic/#{topic_id}", { notification_level_change: after }, user_ids: [user.id]) end end if rows.length == 0 # The user read at least one post in a topic that they haven't viewed before. args[:new_status] = notification_levels[:regular] - if (user.auto_track_topics_after_msecs || SiteSetting.auto_track_topics_after) == 0 + if (user.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs) == 0 args[:new_status] = notification_levels[:tracking] end TopicTrackingState.publish_read(topic_id, post_number, user.id, args[:new_status]) - user.update_posts_read!(post_number) + + user.update_posts_read!(post_number, mobile: opts[:mobile]) exec_sql("INSERT INTO topic_users (user_id, topic_id, last_read_post_number, highest_seen_post_number, last_visited_at, first_visited_at, notification_level) SELECT :user_id, :topic_id, :post_number, ft.highest_post_number, :now, :now, :new_status @@ -219,7 +215,7 @@ class TopicUser < ActiveRecord::Base WHERE ftu.user_id = :user_id and ftu.topic_id = :topic_id)", args) - MessageBus.publish("/topic/#{topic_id}", {notification_level_change: args[:new_status]}, user_ids: [user.id]) + MessageBus.publish("/topic/#{topic_id}", { notification_level_change: args[:new_status] }, user_ids: [user.id]) end end @@ -232,6 +228,7 @@ class TopicUser < ActiveRecord::Base def self.update_post_action_cache(opts={}) user_id = opts[:user_id] + post_id = opts[:post_id] topic_id = opts[:topic_id] action_type = opts[:post_action_type] @@ -277,9 +274,53 @@ SQL builder.where("tu2.topic_id = :topic_id", topic_id: topic_id) end + if post_id + builder.where("tu2.topic_id IN (SELECT topic_id FROM posts WHERE id = :post_id)", post_id: post_id) + builder.where("tu2.user_id IN (SELECT user_id FROM post_actions + WHERE post_id = :post_id AND + post_action_type_id = :action_type_id)") + end + builder.exec(action_type_id: PostActionType.types[action_type]) end + # cap number of unread topics at count, bumping up highest_seen / last_read if needed + def self.cap_unread!(user_id, count) + sql = < e + problems << { upload: upload, ex: e } + ensure + file.try(:unlink) rescue nil + file.try(:close) rescue nil + end + end + end + + problems + end + end # == Schema Information diff --git a/app/models/user.rb b/app/models/user.rb index ca45d6b6f4..fdca6f1677 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,17 +12,17 @@ require_dependency 'promotion' class User < ActiveRecord::Base include Roleable - include UrlHelper include HasCustomFields has_many :posts has_many :notifications, dependent: :destroy has_many :topic_users, dependent: :destroy + has_many :category_users, dependent: :destroy has_many :topics has_many :user_open_ids, dependent: :destroy has_many :user_actions, dependent: :destroy has_many :post_actions, dependent: :destroy - has_many :user_badges, -> {where('user_badges.badge_id IN (SELECT id FROM badges where enabled)')}, dependent: :destroy + has_many :user_badges, -> { where('user_badges.badge_id IN (SELECT id FROM badges WHERE enabled)') }, dependent: :destroy has_many :badges, through: :user_badges has_many :email_logs, dependent: :delete_all has_many :post_timings @@ -76,14 +76,15 @@ class User < ActiveRecord::Base validates :ip_address, allowed_ip_address: {on: :create, message: :signup_not_allowed} after_initialize :add_trust_level - after_initialize :set_default_email_digest - after_initialize :set_default_external_links_in_new_tab + + before_create :set_default_user_preferences after_create :create_email_token after_create :create_user_stat after_create :create_user_profile after_create :ensure_in_trust_level_group after_create :automatic_group_membership + after_create :set_default_categories_preferences before_save :update_username_lower before_save :ensure_password_is_hashed @@ -149,7 +150,7 @@ class User < ActiveRecord::Base def self.username_available?(username) lower = username.downcase - User.where(username_lower: lower).blank? + User.where(username_lower: lower).blank? && !SiteSetting.reserved_usernames.split("|").include?(username) end def effective_locale @@ -172,9 +173,8 @@ class User < ActiveRecord::Base end def self.suggest_name(email) - return "" unless email - name = email.split(/[@\+]/)[0] - name = name.gsub(".", " ") + return "" if email.blank? + name = email.split(/[@\+]/)[0].gsub(".", " ") name.titleize end @@ -300,16 +300,23 @@ class User < ActiveRecord::Base User.where("id = ? and seen_notification_id < ?", id, notification_id) .update_all ["seen_notification_id = ?", notification_id] - # mark all badge notifications read - Notification.where('user_id = ? AND NOT read AND notification_type = ?', id, Notification.types[:granted_badge]) + # mark all "badge granted" and "invite accepted" notifications read + Notification.where('user_id = ? AND NOT read AND notification_type IN (?)', id, [Notification.types[:granted_badge], Notification.types[:invitee_accepted]]) .update_all ["read = ?", true] end def publish_notifications_state + # publish last notification json with the message so we + # can apply an update + notification = notifications.visible.order('notifications.id desc').first + json = NotificationSerializer.new(notification).as_json if notification + MessageBus.publish("/notification/#{id}", {unread_notifications: unread_notifications, unread_private_messages: unread_private_messages, - total_unread_notifications: total_unread_notifications}, + total_unread_notifications: total_unread_notifications, + last_notification: json + }, user_ids: [id] # only publish the notification to this user ) end @@ -369,6 +376,11 @@ class User < ActiveRecord::Base last_seen_at.present? end + def create_visit_record!(date, opts={}) + user_stat.update_column(:days_visited, user_stat.days_visited + 1) + user_visits.create!(visited_at: date, posts_read: opts[:posts_read] || 0, mobile: opts[:mobile] || false) + end + def visit_record_for(date) user_visits.find_by(visited_at: date) end @@ -377,17 +389,21 @@ class User < ActiveRecord::Base create_visit_record!(date) unless visit_record_for(date) end - def update_posts_read!(num_posts, now=Time.zone.now, _retry=false) + def update_posts_read!(num_posts, opts={}) + now = opts[:at] || Time.zone.now + _retry = opts[:retry] || false + if user_visit = visit_record_for(now.to_date) user_visit.posts_read += num_posts + user_visit.mobile = true if opts[:mobile] user_visit.save user_visit else begin - create_visit_record!(now.to_date, num_posts) + create_visit_record!(now.to_date, posts_read: num_posts, mobile: opts.fetch(:mobile, false)) rescue ActiveRecord::RecordNotUnique if !_retry - update_posts_read!(num_posts, now, _retry=true) + update_posts_read!(num_posts, opts.merge( retry: true )) else raise end @@ -427,22 +443,52 @@ class User < ActiveRecord::Base end def avatar_template_url - schemaless absolute avatar_template + UrlHelper.schemaless UrlHelper.absolute avatar_template end - def self.avatar_template(username,uploaded_avatar_id) - return letter_avatar_template(username) if !uploaded_avatar_id + def self.default_template(username) + if SiteSetting.default_avatars.present? + split_avatars = SiteSetting.default_avatars.split("\n") + if split_avatars.present? + hash = username.each_char.reduce(0) do |result, char| + [((result << 5) - result) + char.ord].pack('L').unpack('l').first + end + + split_avatars[hash.abs % split_avatars.size] + end + else + system_avatar_template(username) + end + end + + def self.avatar_template(username, uploaded_avatar_id) username ||= "" + return default_template(username) if !uploaded_avatar_id hostname = RailsMultisite::ConnectionManagement.current_hostname UserAvatar.local_avatar_template(hostname, username.downcase, uploaded_avatar_id) end - def self.letter_avatar_template(username) - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + def self.system_avatar_template(username) + # TODO it may be worth caching this in a distributed cache, should be benched + if SiteSetting.external_system_avatars_enabled + url = SiteSetting.external_system_avatars_url.dup + url.gsub! "{color}", letter_avatar_color(username.downcase) + url.gsub! "{username}", username + url.gsub! "{first_letter}", username[0].downcase + url + else + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + end + end + + def self.letter_avatar_color(username) + username ||= "" + color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length] + color.map { |c| c.to_s(16).rjust(2, '0') }.join end def avatar_template - self.class.avatar_template(username,uploaded_avatar_id) + self.class.avatar_template(username, uploaded_avatar_id) end # The following count methods are somewhat slow - definitely don't use them in a loop. @@ -556,15 +602,17 @@ class User < ActiveRecord::Base end def treat_as_new_topic_start_date - duration = new_topic_duration_minutes || SiteSetting.new_topic_duration_minutes - [case duration + duration = new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes.to_i + times = [case duration when User::NewTopicDuration::ALWAYS created_at when User::NewTopicDuration::LAST_VISIT previous_visit_at || user_stat.new_since else duration.minutes.ago - end, user_stat.new_since].max + end, user_stat.new_since, Time.at(SiteSetting.min_new_topics_time).to_datetime] + + times.max end def readable_name @@ -650,26 +698,32 @@ class User < ActiveRecord::Base end def should_be_redirected_to_top - redirected_to_top_reason.present? + redirected_to_top.present? end - def redirected_to_top_reason + def redirected_to_top # redirect is enabled return unless SiteSetting.redirect_users_to_top_page # top must be in the top_menu - return unless SiteSetting.top_menu =~ /top/i - # there should be enough topics - return unless SiteSetting.has_enough_topics_to_redirect_to_top + return unless SiteSetting.top_menu =~ /(^|\|)top(\||$)/i + # not enough topics + return unless period = SiteSetting.min_redirected_to_top_period if !seen_before? || (trust_level == 0 && !redirected_to_top_yet?) update_last_redirected_to_top! - return I18n.t('redirected_to_top_reasons.new_user') + return { + reason: I18n.t('redirected_to_top_reasons.new_user'), + period: period + } elsif last_seen_at < 1.month.ago update_last_redirected_to_top! - return I18n.t('redirected_to_top_reasons.not_seen_in_a_month') + return { + reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'), + period: period + } end - # no reason + # don't redirect to top nil end @@ -830,11 +884,6 @@ class User < ActiveRecord::Base email_tokens.create(email: email) end - def create_visit_record!(date, posts_read=0) - user_stat.update_column(:days_visited, user_stat.days_visited + 1) - user_visits.create!(visited_at: date, posts_read: posts_read) - end - def ensure_password_is_hashed if @raw_password self.salt = SecureRandom.hex(16) @@ -884,26 +933,42 @@ class User < ActiveRecord::Base end end - def set_default_email_digest - if has_attribute?(:email_digests) && self.email_digests.nil? - if SiteSetting.default_digest_email_frequency.blank? - self.email_digests = false - else - self.email_digests = true - self.digest_after_days ||= SiteSetting.default_digest_email_frequency.to_i if has_attribute?(:digest_after_days) - end - end + def set_default_user_preferences + set_default_email_digest_frequency + set_default_email_private_messages + set_default_email_direct + set_default_email_mailing_list_mode + set_default_email_always + + set_default_other_new_topic_duration_minutes + set_default_other_auto_track_topics_after_msecs + set_default_other_external_links_in_new_tab + set_default_other_enable_quoting + set_default_other_dynamic_favicon + set_default_other_disable_jump_reply + set_default_other_edit_history_public + + # needed, otherwise the callback chain is broken... + true end - def set_default_external_links_in_new_tab - if has_attribute?(:external_links_in_new_tab) && self.external_links_in_new_tab.nil? - self.external_links_in_new_tab = !SiteSetting.default_external_links_in_new_tab.blank? + def set_default_categories_preferences + values = [] + + %w{watching tracking muted}.each do |s| + category_ids = SiteSetting.send("default_categories_#{s}").split("|") + category_ids.each do |category_id| + values << "(#{self.id}, #{category_id}, #{CategoryUser.notification_levels[s.to_sym]})" + end + end + + if values.present? + exec_sql("INSERT INTO category_users (user_id, category_id, notification_level) VALUES #{values.join(",")}") end end # Delete unactivated accounts (without verified email) that are over a week old def self.purge_unactivated - to_destroy = User.where(active: false) .joins('INNER JOIN user_stats AS us ON us.user_id = users.id') .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago) @@ -933,6 +998,39 @@ class User < ActiveRecord::Base end end + def set_default_email_digest_frequency + if has_attribute?(:email_digests) + if SiteSetting.default_email_digest_frequency.to_i <= 0 + self.email_digests = false + else + self.email_digests = true + self.digest_after_days ||= SiteSetting.default_email_digest_frequency.to_i if has_attribute?(:digest_after_days) + end + end + end + + def set_default_email_mailing_list_mode + self.mailing_list_mode = SiteSetting.default_email_mailing_list_mode if has_attribute?(:mailing_list_mode) + end + + %w{private_messages direct always}.each do |s| + define_method("set_default_email_#{s}") do + self.send("email_#{s}=", SiteSetting.send("default_email_#{s}")) if has_attribute?("email_#{s}") + end + end + + %w{new_topic_duration_minutes auto_track_topics_after_msecs}.each do |s| + define_method("set_default_other_#{s}") do + self.send("#{s}=", SiteSetting.send("default_other_#{s}").to_i) if has_attribute?(s) + end + end + + %w{external_links_in_new_tab enable_quoting dynamic_favicon disable_jump_reply edit_history_public}.each do |s| + define_method("set_default_other_#{s}") do + self.send("#{s}=", SiteSetting.send("default_other_#{s}")) if has_attribute?(s) + end + end + end # == Schema Information @@ -946,7 +1044,7 @@ end # name :string(255) # seen_notification_id :integer default(0), not null # last_posted_at :datetime -# email :string(256) not null +# email :string(513) not null # password_hash :string(64) # salt :string(32) # active :boolean default(FALSE), not null @@ -991,6 +1089,8 @@ end # # Indexes # +# idx_users_admin (id) +# idx_users_moderator (id) # index_users_on_auth_token (auth_token) # index_users_on_last_posted_at (last_posted_at) # index_users_on_last_seen_at (last_seen_at) diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 0d4c661d10..fa87a744b4 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -79,12 +79,21 @@ SQL def self.private_messages_stats(user_id, guardian) return unless guardian.can_see_private_messages?(user_id) # list the stats for: all/mine/unread (topic-based) - private_messages = Topic.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user_id})") - .joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user_id})") - .private_messages - all = private_messages.count - mine = private_messages.where(user_id: user_id).count - unread = private_messages.where("tu.last_read_post_number IS NULL OR tu.last_read_post_number < topics.highest_post_number").count + + sql = < e + # skip saving, we are not connected to the net + Rails.logger.warn "#{e}: Failed to download external avatar: #{avatar_url}, user id #{ user.id }" + ensure + tempfile.close! if tempfile && tempfile.respond_to?(:close!) + end + end # == Schema Information diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb index 5c6894d4d9..f78ed824bb 100644 --- a/app/models/user_badge.rb +++ b/app/models/user_badge.rb @@ -12,10 +12,12 @@ class UserBadge < ActiveRecord::Base after_create do Badge.increment_counter 'grant_count', self.badge_id + DiscourseEvent.trigger(:user_badge_granted, self.badge_id, self.user_id) end after_destroy do Badge.decrement_counter 'grant_count', self.badge_id + DiscourseEvent.trigger(:user_badge_removed, self.badge_id, self.user_id) end end diff --git a/app/models/user_email_observer.rb b/app/models/user_email_observer.rb index 3f24c6c568..0da32b73f0 100644 --- a/app/models/user_email_observer.rb +++ b/app/models/user_email_observer.rb @@ -39,7 +39,7 @@ class UserEmailObserver < ActiveRecord::Observer private def enqueue(type) - return unless notification.user.email_direct? + return unless (notification.user.email_direct? && notification.user.active?) Jobs.enqueue_in(delay, :user_email, @@ -49,7 +49,7 @@ class UserEmailObserver < ActiveRecord::Observer end def enqueue_private(type) - return unless notification.user.email_private_messages? + return unless (notification.user.email_private_messages? && notification.user.active?) Jobs.enqueue_in(delay, :user_email, diff --git a/app/models/user_field.rb b/app/models/user_field.rb index 648163326a..c39644a609 100644 --- a/app/models/user_field.rb +++ b/app/models/user_field.rb @@ -1,5 +1,7 @@ class UserField < ActiveRecord::Base validates_presence_of :name, :description, :field_type + has_many :user_field_options, dependent: :destroy + accepts_nested_attributes_for :user_field_options def self.max_length 2048 @@ -19,4 +21,5 @@ end # description :string(255) not null # required :boolean default(TRUE), not null # show_on_profile :boolean default(FALSE), not null +# position :integer default(0) # diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb new file mode 100644 index 0000000000..2b3036fa40 --- /dev/null +++ b/app/models/user_field_option.rb @@ -0,0 +1,13 @@ +class UserFieldOption < ActiveRecord::Base +end + +# == Schema Information +# +# Table name: user_field_options +# +# id :integer not null, primary key +# user_field_id :integer not null +# value :string(255) not null +# created_at :datetime +# updated_at :datetime +# diff --git a/app/models/user_history.rb b/app/models/user_history.rb index 94f48adecd..77867f7d46 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -143,6 +143,7 @@ end # topic_id :integer # admin_only :boolean default(FALSE) # post_id :integer +# custom_type :string(255) # # Indexes # diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb index b54c66e604..551361586e 100644 --- a/app/models/user_visit.rb +++ b/app/models/user_visit.rb @@ -1,8 +1,16 @@ class UserVisit < ActiveRecord::Base - # A count of visits in the last month by day + def self.counts_by_day_query(start_date, end_date) + where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date).group(:visited_at).order(:visited_at) + end + + # A count of visits in a date range by day def self.by_day(start_date, end_date) - where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date).group(:visited_at).order(:visited_at).count + counts_by_day_query(start_date, end_date).count + end + + def self.mobile_by_day(start_date, end_date) + counts_by_day_query(start_date, end_date).where(mobile: true).count end def self.ensure_consistency! @@ -27,8 +35,10 @@ end # user_id :integer not null # visited_at :date not null # posts_read :integer default(0) +# mobile :boolean default(FALSE) # # Indexes # # index_user_visits_on_user_id_and_visited_at (user_id,visited_at) UNIQUE +# index_user_visits_on_visited_at_and_mobile (visited_at,mobile) # diff --git a/app/models/username_validator.rb b/app/models/username_validator.rb index 3b350d289e..ac9adcc95e 100644 --- a/app/models/username_validator.rb +++ b/app/models/username_validator.rb @@ -30,6 +30,9 @@ class UsernameValidator username_length_max? username_char_valid? username_first_char_valid? + username_last_char_valid? + username_no_double_special? + username_does_not_end_with_confusing_suffix? errors.empty? end @@ -58,15 +61,36 @@ class UsernameValidator def username_char_valid? return unless errors.empty? - if username =~ /[^A-Za-z0-9_]/ + if username =~ /[^A-Za-z0-9_\.\-]/ self.errors << I18n.t(:'user.username.characters') end end def username_first_char_valid? return unless errors.empty? - if username[0] =~ /[^A-Za-z0-9]/ + if username[0] =~ /[^A-Za-z0-9_]/ self.errors << I18n.t(:'user.username.must_begin_with_alphanumeric') end end + + def username_last_char_valid? + return unless errors.empty? + if username[-1] =~ /[^A-Za-z0-9_]/ + self.errors << I18n.t(:'user.username.must_end_with_alphanumeric') + end + end + + def username_no_double_special? + return unless errors.empty? + if username =~ /[\-_\.]{2,}/ + self.errors << I18n.t(:'user.username.must_not_contain_two_special_chars_in_seq') + end + end + + def username_does_not_end_with_confusing_suffix? + return unless errors.empty? + if username =~ /\.(json|gif|jpeg|png|htm|js|json|xml|woff|tif|html)/i + self.errors << I18n.t(:'user.username.must_not_contain_confusing_suffix') + end + end end diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb index df8eebc177..7111c6ac47 100644 --- a/app/serializers/about_serializer.rb +++ b/app/serializers/about_serializer.rb @@ -8,4 +8,8 @@ class AboutSerializer < ApplicationSerializer :locale, :version, :https + + def stats + object.class.fetch_cached_stats || Jobs::AboutStats.new.execute({}) + end end diff --git a/app/serializers/admin_plugin_serializer.rb b/app/serializers/admin_plugin_serializer.rb index 09fdcc5276..6a00ded374 100644 --- a/app/serializers/admin_plugin_serializer.rb +++ b/app/serializers/admin_plugin_serializer.rb @@ -3,7 +3,9 @@ class AdminPluginSerializer < ApplicationSerializer :name, :version, :url, - :admin_route + :admin_route, + :enabled, + :enabled_setting def id object.metadata.name @@ -21,6 +23,18 @@ class AdminPluginSerializer < ApplicationSerializer object.metadata.url end + def enabled + object.enabled? + end + + def enabled_setting + object.enabled_site_setting + end + + def include_enabled_setting? + enabled_setting.present? + end + def include_url? url.present? end diff --git a/app/serializers/admin_post_serializer.rb b/app/serializers/admin_post_serializer.rb index 38a31992dc..a06328d832 100644 --- a/app/serializers/admin_post_serializer.rb +++ b/app/serializers/admin_post_serializer.rb @@ -3,7 +3,7 @@ class AdminPostSerializer < ApplicationSerializer attributes :id, :created_at, :post_number, - :name, :username, :avatar_template, :uploaded_avatar_id, + :name, :username, :avatar_template, :topic_id, :topic_slug, :topic_title, :category_id, :excerpt, @@ -29,10 +29,6 @@ class AdminPostSerializer < ApplicationSerializer object.user.avatar_template end - def uploaded_avatar_id - object.user.uploaded_avatar_id - end - def topic_slug topic.slug end @@ -46,7 +42,7 @@ class AdminPostSerializer < ApplicationSerializer end def moderator_action - object.post_type == Post.types[:moderator_action] + object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action] end def deleted_by diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb index 57f4b4e9f2..0fa30b658e 100644 --- a/app/serializers/admin_user_serializer.rb +++ b/app/serializers/admin_user_serializer.rb @@ -2,7 +2,8 @@ require_dependency 'admin_user_list_serializer' class AdminUserSerializer < AdminUserListSerializer - attributes :associated_accounts, + attributes :name, + :associated_accounts, :can_send_activation_email, :can_activate, :can_deactivate, diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb index 75ef6488a4..f62968a59f 100644 --- a/app/serializers/basic_category_serializer.rb +++ b/app/serializers/basic_category_serializer.rb @@ -7,6 +7,7 @@ class BasicCategorySerializer < ApplicationSerializer :slug, :topic_count, :post_count, + :position, :description, :description_text, :topic_url, @@ -16,7 +17,9 @@ class BasicCategorySerializer < ApplicationSerializer :notification_level, :logo_url, :background_url, - :can_edit + :can_edit, + :topic_template, + :has_children def include_parent_category_id? parent_category_id diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb index 9f6ad6b7a2..38644aff4d 100644 --- a/app/serializers/basic_group_serializer.rb +++ b/app/serializers/basic_group_serializer.rb @@ -8,5 +8,6 @@ class BasicGroupSerializer < ApplicationSerializer :automatic_membership_email_domains, :automatic_membership_retroactive, :primary_group, - :title + :title, + :grant_trust_level end diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb index 04b91ecad4..8969d19a06 100644 --- a/app/serializers/basic_post_serializer.rb +++ b/app/serializers/basic_post_serializer.rb @@ -4,7 +4,6 @@ class BasicPostSerializer < ApplicationSerializer :name, :username, :avatar_template, - :uploaded_avatar_id, :created_at, :cooked, :cooked_hidden @@ -21,13 +20,10 @@ class BasicPostSerializer < ApplicationSerializer object.user.try(:avatar_template) end - def uploaded_avatar_id - object.user.try(:uploaded_avatar_id) - end - def cooked_hidden object.hidden && !scope.is_staff? end + def include_cooked_hidden? cooked_hidden end diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb index 8911291f36..8880c8dbd7 100644 --- a/app/serializers/basic_user_serializer.rb +++ b/app/serializers/basic_user_serializer.rb @@ -1,5 +1,5 @@ class BasicUserSerializer < ApplicationSerializer - attributes :id, :username, :uploaded_avatar_id, :avatar_template + attributes :id, :username, :avatar_template def include_name? SiteSetting.enable_names? @@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer if Hash === object User.avatar_template(user[:username], user[:uploaded_avatar_id]) else - object.avatar_template + user.try(:avatar_template) end end diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb index 8242a57ff7..6138f1d1bd 100644 --- a/app/serializers/category_serializer.rb +++ b/app/serializers/category_serializer.rb @@ -8,9 +8,12 @@ class CategorySerializer < BasicCategorySerializer :position, :email_in, :email_in_allow_strangers, + :suppress_from_homepage, :can_delete, :cannot_delete_reason, - :allow_badges + :is_special, + :allow_badges, + :custom_fields def group_permissions @group_permissions ||= begin @@ -35,6 +38,15 @@ class CategorySerializer < BasicCategorySerializer true end + def include_is_special? + [SiteSetting.lounge_category_id, SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id] + .include? object.id + end + + def is_special + true + end + def include_can_delete? scope && scope.can_delete?(object) end @@ -55,4 +67,8 @@ class CategorySerializer < BasicCategorySerializer scope && scope.can_edit?(object) end + def include_suppress_from_homepage? + scope && scope.can_edit?(object) + end + end diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index cc689e42b1..c576025cd5 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -23,21 +23,26 @@ class CurrentUserSerializer < BasicUserSerializer :no_password, :can_delete_account, :should_be_redirected_to_top, - :redirected_to_top_reason, + :redirected_to_top, :disable_jump_reply, :custom_fields, :muted_category_ids, :dismissed_banner_key, :is_anonymous, :post_queue_new_count, - :show_queued_posts + :show_queued_posts, + :read_faq def include_site_flagged_posts_count? object.staff? end + def read_faq + object.user_stat.read_faq? + end + def topic_count - object.topics.count + object.user_stat.topic_count end def reply_count @@ -76,8 +81,8 @@ class CurrentUserSerializer < BasicUserSerializer true end - def include_redirected_to_top_reason? - object.redirected_to_top_reason.present? + def include_redirected_to_top? + object.redirected_to_top.present? end def custom_fields diff --git a/app/serializers/embeddable_host_serializer.rb b/app/serializers/embeddable_host_serializer.rb new file mode 100644 index 0000000000..f5de82a0cf --- /dev/null +++ b/app/serializers/embeddable_host_serializer.rb @@ -0,0 +1,16 @@ +class EmbeddableHostSerializer < ApplicationSerializer + attributes :id, :host, :category_id + + def id + object.id + end + + def host + object.host + end + + def category_id + object.category_id + end +end + diff --git a/app/serializers/embedding_serializer.rb b/app/serializers/embedding_serializer.rb new file mode 100644 index 0000000000..dda224edc0 --- /dev/null +++ b/app/serializers/embedding_serializer.rb @@ -0,0 +1,14 @@ +class EmbeddingSerializer < ApplicationSerializer + attributes :id, :fields, :base_url + attributes *Embedding.settings + + has_many :embeddable_hosts, serializer: EmbeddableHostSerializer, embed: :ids + + def fields + Embedding.settings + end + + def read_attribute_for_serialization(attr) + object.respond_to?(attr) ? object.send(attr) : send(attr) + end +end diff --git a/app/serializers/flagged_topic_serializer.rb b/app/serializers/flagged_topic_serializer.rb index 2e5e08b086..bf6bcf4df0 100644 --- a/app/serializers/flagged_topic_serializer.rb +++ b/app/serializers/flagged_topic_serializer.rb @@ -1,6 +1,7 @@ class FlaggedTopicSerializer < ActiveModel::Serializer attributes :id, :title, + :fancy_title, :slug, :archived, :closed, diff --git a/app/serializers/group_user_serializer.rb b/app/serializers/group_user_serializer.rb index a42afab194..e72dc2bb8e 100644 --- a/app/serializers/group_user_serializer.rb +++ b/app/serializers/group_user_serializer.rb @@ -1,4 +1,3 @@ class GroupUserSerializer < BasicUserSerializer - attributes :name, :last_seen_at + attributes :name, :title, :last_posted_at, :last_seen_at end - diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index 5620bccf00..94963913e2 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -77,6 +77,10 @@ class ListableTopicSerializer < BasicTopicSerializer !!object.user_data end + def excerpt + object.excerpt + end + alias :include_last_read_post_number? :has_user_data def unread diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb new file mode 100644 index 0000000000..98f2062f79 --- /dev/null +++ b/app/serializers/permalink_serializer.rb @@ -0,0 +1,31 @@ +class PermalinkSerializer < ApplicationSerializer + attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :post_number, :post_topic_title, :category_id, :category_name, :category_url, :external_url + + def topic_title + object.try(:topic).try(:title) + end + + def topic_url + object.try(:topic).try(:url) + end + + def post_url + object.try(:post).try(:url) + end + + def post_number + object.try(:post).try(:post_number) + end + + def post_topic_title + object.try(:post).try(:topic).try(:title) + end + + def category_name + object.try(:category).try(:name) + end + + def category_url + object.try(:category).try(:url) + end +end diff --git a/app/serializers/post_action_user_serializer.rb b/app/serializers/post_action_user_serializer.rb index b69a273482..72dbd8e4d8 100644 --- a/app/serializers/post_action_user_serializer.rb +++ b/app/serializers/post_action_user_serializer.rb @@ -9,10 +9,6 @@ class PostActionUserSerializer < BasicUserSerializer object.user.username end - def uploaded_avatar_id - object.user.uploaded_avatar_id - end - def avatar_template object.user.avatar_template end diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb index bbe0339365..a10f9dbf63 100644 --- a/app/serializers/post_serializer.rb +++ b/app/serializers/post_serializer.rb @@ -5,6 +5,7 @@ class PostSerializer < BasicPostSerializer :topic_view, :parent_post, :add_raw, + :add_title, :single_post_link_counts, :draft_sequence, :post_actions, @@ -18,7 +19,6 @@ class PostSerializer < BasicPostSerializer attributes :post_number, :post_type, :updated_at, - :like_count, :reply_count, :reply_to_post_number, :quote_count, @@ -29,6 +29,9 @@ class PostSerializer < BasicPostSerializer :yours, :topic_id, :topic_slug, + :topic_title, + :topic_html_title, + :category_id, :display_username, :primary_group_name, :version, @@ -58,7 +61,8 @@ class PostSerializer < BasicPostSerializer :wiki, :user_custom_fields, :static_doc, - :via_email + :via_email, + :action_code def initialize(object, opts) super(object, opts) @@ -73,6 +77,30 @@ class PostSerializer < BasicPostSerializer object.try(:topic).try(:slug) end + def include_topic_title? + @add_title + end + + def include_topic_html_title? + @add_title + end + + def include_category_id? + @add_title + end + + def topic_title + object.topic.title + end + + def topic_html_title + object.topic.fancy_title + end + + def category_id + object.topic.category_id + end + def moderator? !!(object.try(:user).try(:moderator?)) end @@ -149,8 +177,7 @@ class PostSerializer < BasicPostSerializer def reply_to_user { username: object.reply_to_user.username, - avatar_template: object.reply_to_user.avatar_template, - uploaded_avatar_id: object.reply_to_user.uploaded_avatar_id + avatar_template: object.reply_to_user.avatar_template } end @@ -181,37 +208,38 @@ class PostSerializer < BasicPostSerializer count_col = "#{sym}_count".to_sym count = object.send(count_col) if object.respond_to?(count_col) - count ||= 0 - action_summary = { - id: id, - count: count, - hidden: (sym == :vote), - can_act: scope.post_can_act?(object, sym, taken_actions: actions) - } + summary = { id: id, count: count } + summary[:hidden] = true if sym == :vote + summary[:can_act] = true if scope.post_can_act?(object, sym, taken_actions: actions) if sym == :notify_user && scope.current_user.present? && scope.current_user == object.user - action_summary[:can_act] = false # Don't send a pm to yourself about your own post, silly + summary.delete(:can_act) end # The following only applies if you're logged in - if action_summary[:can_act] && scope.current_user.present? - action_summary[:can_defer_flags] = scope.is_staff? && - PostActionType.flag_types.values.include?(id) && - active_flags.present? && active_flags.has_key?(id) && - active_flags[id].count > 0 + if summary[:can_act] && scope.current_user.present? + summary[:can_defer_flags] = true if scope.is_staff? && + PostActionType.flag_types.values.include?(id) && + active_flags.present? && active_flags.has_key?(id) && + active_flags[id].count > 0 end if actions.present? && actions.has_key?(id) - action_summary[:acted] = true - action_summary[:can_undo] = scope.can_delete?(actions[id]) + summary[:acted] = true + summary[:can_undo] = true if scope.can_delete?(actions[id]) end # only show public data unless scope.is_staff? || PostActionType.public_types.values.include?(id) - action_summary[:count] = action_summary[:acted] ? 1 : 0 + summary[:count] = summary[:acted] ? 1 : 0 end - result << action_summary + summary.delete(:count) if summary[:count] == 0 + + # Only include it if the user can do it or it has a count + if summary[:can_act] || summary[:count] + result << summary + end end result @@ -281,6 +309,10 @@ class PostSerializer < BasicPostSerializer scope.is_staff? ? object.version : object.public_version end + def include_action_code? + object.action_code.present? + end + private def post_actions diff --git a/app/serializers/post_wordpress_serializer.rb b/app/serializers/post_wordpress_serializer.rb index 51c5613ea9..a7bee3708e 100644 --- a/app/serializers/post_wordpress_serializer.rb +++ b/app/serializers/post_wordpress_serializer.rb @@ -2,11 +2,9 @@ class PostWordpressSerializer < BasicPostSerializer attributes :post_number - include UrlHelper - def avatar_template if object.user - absolute object.user.avatar_template + UrlHelper.absolute object.user.avatar_template else nil end diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb index 86b36bbda1..43892fa292 100644 --- a/app/serializers/queued_post_serializer.rb +++ b/app/serializers/queued_post_serializer.rb @@ -13,7 +13,7 @@ class QueuedPostSerializer < ApplicationSerializer :category_id, :can_delete_user - has_one :user, serializer: BasicUserSerializer + has_one :user, serializer: AdminUserListSerializer has_one :topic, serializer: BasicTopicSerializer def category_id diff --git a/app/serializers/search_post_serializer.rb b/app/serializers/search_post_serializer.rb index 27fc4cdae7..614ba8b790 100644 --- a/app/serializers/search_post_serializer.rb +++ b/app/serializers/search_post_serializer.rb @@ -2,6 +2,8 @@ class SearchPostSerializer < PostSerializer has_one :topic, serializer: TopicListItemSerializer + attributes :like_count + attributes :blurb def blurb options[:result].blurb(object) diff --git a/app/serializers/similar_topic_serializer.rb b/app/serializers/similar_topic_serializer.rb new file mode 100644 index 0000000000..9e6e067e90 --- /dev/null +++ b/app/serializers/similar_topic_serializer.rb @@ -0,0 +1,21 @@ +class SimilarTopicSerializer < ApplicationSerializer + + has_one :topic, serializer: TopicListItemSerializer, embed: :ids + attributes :id, :blurb, :created_at, :url + + def id + object.topic.id + end + + def blurb + object.blurb + end + + def url + object.topic.url + end + + def created_at + object.topic.created_at + end +end diff --git a/app/serializers/site_customization_serializer.rb b/app/serializers/site_customization_serializer.rb new file mode 100644 index 0000000000..6a3e70ff21 --- /dev/null +++ b/app/serializers/site_customization_serializer.rb @@ -0,0 +1,7 @@ +class SiteCustomizationSerializer < ApplicationSerializer + + attributes :id, :name, :key, :enabled, :created_at, :updated_at, + :stylesheet, :header, :footer, :top, + :mobile_stylesheet, :mobile_header, :mobile_footer, :mobile_top, + :head_tag, :body_tag, :embedded_css +end diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb index 38c30737b2..dec52ed2f2 100644 --- a/app/serializers/site_serializer.rb +++ b/app/serializers/site_serializer.rb @@ -11,7 +11,8 @@ class SiteSerializer < ApplicationSerializer :uncategorized_category_id, # this is hidden so putting it here :is_readonly, :disabled_plugins, - :user_field_max_length + :user_field_max_length, + :suppressed_from_homepage_category_ids has_many :categories, serializer: BasicCategorySerializer, embed: :objects has_many :post_action_types, embed: :objects diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb index 31caab4b99..fb8e792031 100644 --- a/app/serializers/site_text_serializer.rb +++ b/app/serializers/site_text_serializer.rb @@ -1,12 +1,17 @@ class SiteTextSerializer < ApplicationSerializer - attributes :text_type, + attributes :id, + :text_type, :title, :description, :value, :format, :allow_blank? + def id + text_type + end + def title object.site_text_type.title end diff --git a/app/serializers/site_text_type_serializer.rb b/app/serializers/site_text_type_serializer.rb index 02ee847e45..9c6f5f4164 100644 --- a/app/serializers/site_text_type_serializer.rb +++ b/app/serializers/site_text_type_serializer.rb @@ -1,6 +1,10 @@ class SiteTextTypeSerializer < ApplicationSerializer - attributes :text_type, :title + attributes :id, :text_type, :title + + def id + text_type + end def text_type object.text_type diff --git a/app/serializers/topic_embed_serializer.rb b/app/serializers/topic_embed_serializer.rb new file mode 100644 index 0000000000..ac06bf1f3b --- /dev/null +++ b/app/serializers/topic_embed_serializer.rb @@ -0,0 +1,15 @@ +class TopicEmbedSerializer < ApplicationSerializer + attributes \ + :topic_id, + :post_id, + :topic_slug, + :comment_count + + def topic_slug + object.topic.slug + end + + def comment_count + object.topic.posts_count - 1 + end +end diff --git a/app/serializers/topic_post_count_serializer.rb b/app/serializers/topic_post_count_serializer.rb index 586f9f2d79..c780d12031 100644 --- a/app/serializers/topic_post_count_serializer.rb +++ b/app/serializers/topic_post_count_serializer.rb @@ -14,8 +14,4 @@ class TopicPostCountSerializer < BasicUserSerializer object[:post_count] end - def uploaded_avatar_id - object[:user].uploaded_avatar_id - end - end diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index c2d98f077b..9cda8e1c01 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -32,7 +32,8 @@ class TopicViewSerializer < ApplicationSerializer :category_id, :word_count, :deleted_at, - :pending_posts_count + :pending_posts_count, + :user_id attributes :draft, :draft_key, @@ -42,6 +43,7 @@ class TopicViewSerializer < ApplicationSerializer :pinned_globally, :pinned, # Is topic pinned and viewer hasn't cleared the pin? :pinned_at, # Ignores clear pin + :pinned_until, :details, :highest_post_number, :last_read_post_number, @@ -176,6 +178,10 @@ class TopicViewSerializer < ApplicationSerializer object.topic.pinned_at end + def pinned_until + object.topic.pinned_until + end + def actions_summary result = [] return [] unless post = object.posts.try(:first) diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index ccf02e031c..d9609ff9b4 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -22,17 +22,16 @@ class UserActionSerializer < ApplicationSerializer :title, :deleted, :hidden, - :moderator_action, + :post_type, + :action_code, :edit_reason, :category_id, - :uploaded_avatar_id, :closed, - :archived, - :acting_uploaded_avatar_id + :archived def excerpt cooked = object.cooked || PrettyText.cook(object.raw) - PrettyText.excerpt(cooked, 300) if cooked + PrettyText.excerpt(cooked, 300, keep_emojis: true) if cooked end def avatar_template @@ -67,10 +66,6 @@ class UserActionSerializer < ApplicationSerializer object.title.present? end - def moderator_action - object.post_type == Post.types[:moderator_action] - end - def include_reply_to_post_number? object.action_type == UserAction::REPLY end diff --git a/app/serializers/user_field_serializer.rb b/app/serializers/user_field_serializer.rb index 8638b2c04d..7c06898061 100644 --- a/app/serializers/user_field_serializer.rb +++ b/app/serializers/user_field_serializer.rb @@ -5,5 +5,15 @@ class UserFieldSerializer < ApplicationSerializer :field_type, :editable, :required, - :show_on_profile + :show_on_profile, + :position, + :options + + def options + object.user_field_options.pluck(:value) + end + + def include_options? + options.present? + end end diff --git a/app/serializers/user_name_serializer.rb b/app/serializers/user_name_serializer.rb index ac7beaa8d2..3d7fc0d1f8 100644 --- a/app/serializers/user_name_serializer.rb +++ b/app/serializers/user_name_serializer.rb @@ -1,20 +1,3 @@ -class UserNameSerializer < ApplicationSerializer - attributes :id, :username, :name, :title, :uploaded_avatar_id, :avatar_template - - def include_name? - SiteSetting.enable_names? - end - - def avatar_template - if Hash === object - User.avatar_template(user[:username], user[:uploaded_avatar_id]) - else - object.avatar_template - end - end - - def user - object[:user] || object - end - +class UserNameSerializer < BasicUserSerializer + attributes :name, :title end diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 737b1f39ec..334b20e2d2 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -40,6 +40,7 @@ class UserSerializer < BasicUserSerializer :bio_cooked, :created_at, :website, + :website_name, :profile_background, :card_background, :location, @@ -59,7 +60,6 @@ class UserSerializer < BasicUserSerializer :suspended_till, :uploaded_avatar_id, :badge_count, - :notification_count, :has_title_badges, :edit_history_public, :custom_fields, @@ -92,10 +92,13 @@ class UserSerializer < BasicUserSerializer :tracked_category_ids, :watched_category_ids, :private_messages_stats, - :notification_count, :disable_jump_reply, + :system_avatar_upload_id, + :system_avatar_template, :gravatar_avatar_upload_id, + :gravatar_avatar_template, :custom_avatar_upload_id, + :custom_avatar_template, :has_title_badges, :card_image_badge, :card_image_badge_id, @@ -133,6 +136,26 @@ class UserSerializer < BasicUserSerializer object.user_profile.website end + def website_name + website_host = URI(website.to_s).host rescue nil + discourse_host = Discourse.current_hostname + return if website_host.nil? + if website_host == discourse_host + # example.com == example.com + website_host + URI(website.to_s).path + elsif (website_host.split('.').length == discourse_host.split('.').length) && discourse_host.split('.').length > 2 + # www.example.com == forum.example.com + website_host.split('.')[1..-1].join('.') == discourse_host.split('.')[1..-1].join('.') ? website_host + URI(website.to_s).path : website_host + else + # example.com == forum.example.com + discourse_host.ends_with?("." << website_host) ? website_host + URI(website.to_s).path : website_host + end + end + + def include_website_name + website.present? + end + def card_image_badge_id object.user_profile.card_image_badge.try(:id) end @@ -196,7 +219,7 @@ class UserSerializer < BasicUserSerializer end def bio_excerpt - object.user_profile.bio_excerpt(350 ,keep_newlines: true) + object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emojis: true }) end def include_suspend_reason? @@ -228,11 +251,11 @@ class UserSerializer < BasicUserSerializer ### def auto_track_topics_after_msecs - object.auto_track_topics_after_msecs || SiteSetting.auto_track_topics_after + object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs end def new_topic_duration_minutes - object.new_topic_duration_minutes || SiteSetting.new_topic_duration_minutes + object.new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes end def muted_category_ids @@ -251,7 +274,7 @@ class UserSerializer < BasicUserSerializer MutedUser.where(user_id: object.id).joins(:muted_user).pluck(:username) end - def include_private_message_stats? + def include_private_messages_stats? can_edit && !(omit_stats == true) end @@ -259,20 +282,34 @@ class UserSerializer < BasicUserSerializer UserAction.private_messages_stats(object.id, scope) end + def system_avatar_upload_id + # should be left blank + end + + def system_avatar_template + User.system_avatar_template(object.username) + end + def gravatar_avatar_upload_id object.user_avatar.try(:gravatar_upload_id) end + def gravatar_avatar_template + return unless gravatar_upload_id = object.user_avatar.try(:gravatar_upload_id) + User.avatar_template(object.username, gravatar_upload_id) + end + def custom_avatar_upload_id object.user_avatar.try(:custom_upload_id) end - def has_title_badges - object.badges.where(allow_title: true).count > 0 + def custom_avatar_template + return unless custom_upload_id = object.user_avatar.try(:custom_upload_id) + User.avatar_template(object.username, custom_upload_id) end - def notification_count - Notification.where(user_id: object.id).count + def has_title_badges + object.badges.where(allow_title: true).count > 0 end def include_edit_history_public? @@ -308,4 +345,5 @@ class UserSerializer < BasicUserSerializer def pending_count 0 end + end diff --git a/app/serializers/user_wordpress_serializer.rb b/app/serializers/user_wordpress_serializer.rb index 7e121b82f7..015ff94a29 100644 --- a/app/serializers/user_wordpress_serializer.rb +++ b/app/serializers/user_wordpress_serializer.rb @@ -1,12 +1,10 @@ class UserWordpressSerializer < BasicUserSerializer - include UrlHelper - def avatar_template if Hash === object - absolute User.avatar_template(user[:username], user[:uploaded_avatar_id]) + UrlHelper.absolute User.avatar_template(user[:username], user[:uploaded_avatar_id]) else - absolute object.avatar_template + UrlHelper.absolute object.avatar_template end end diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index f90754c22c..64853e9155 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -24,7 +24,7 @@ class PostAlerter end create_notification(user, Notification.types[:private_message], post) end - elsif post.post_type != Post.types[:moderator_action] + elsif post.post_type == Post.types[:regular] # If it's not a private message and it's not an automatic post caused by a moderator action, notify the users notify_post_users(post) end @@ -107,7 +107,9 @@ class PostAlerter # Don't notify the same user about the same notification on the same post existing_notification = user.notifications .order("notifications.id desc") - .find_by(topic_id: post.topic_id, post_number: post.post_number) + .find_by(topic_id: post.topic_id, + post_number: post.post_number, + notification_type: type) if existing_notification && existing_notification.notification_type == type return unless existing_notification.notification_type == Notification.types[:edited] && diff --git a/app/services/post_owner_changer.rb b/app/services/post_owner_changer.rb index 2776ebfa58..c7aa0b7511 100644 --- a/app/services/post_owner_changer.rb +++ b/app/services/post_owner_changer.rb @@ -2,7 +2,7 @@ class PostOwnerChanger def initialize(params) @post_ids = params[:post_ids] - @topic = Topic.find_by(id: params[:topic_id].to_i) + @topic = Topic.with_deleted.find_by(id: params[:topic_id].to_i) @new_owner = params[:new_owner] @acting_user = params[:acting_user] @@ -12,8 +12,13 @@ class PostOwnerChanger def change_owner! ActiveRecord::Base.transaction do @post_ids.each do |post_id| - post = Post.find(post_id) + post = Post.with_deleted.find(post_id) @topic.user = @new_owner if post.is_first_post? + + if post.user == nil + @topic.recover! if post.is_first_post? + end + post.topic = @topic post.set_owner(@new_owner, @acting_user) end diff --git a/app/services/post_timestamp_changer.rb b/app/services/post_timestamp_changer.rb new file mode 100644 index 0000000000..65b056128f --- /dev/null +++ b/app/services/post_timestamp_changer.rb @@ -0,0 +1,43 @@ +class PostTimestampChanger + def initialize(params) + @topic = Topic.with_deleted.find(params[:topic_id]) + @posts = @topic.posts + @timestamp = Time.at(params[:timestamp]) + @time_difference = calculate_time_difference + end + + def change! + ActiveRecord::Base.transaction do + update_topic + + @posts.each do |post| + if post.is_first_post? + update_post(post, @timestamp) + else + update_post(post, Time.at(post.created_at.to_f + @time_difference)) + end + end + end + + # Burst the cache for stats + [AdminDashboardData, About].each { |klass| $redis.del klass.stats_cache_key } + end + + private + + def calculate_time_difference + @timestamp - @topic.created_at + end + + def update_topic + @topic.update_attributes( + created_at: @timestamp, + updated_at: @timestamp, + bumped_at: @timestamp + ) + end + + def update_post(post, timestamp) + post.update_attributes(created_at: timestamp, updated_at: timestamp) + end +end diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 0e420e5f4a..cd681eea92 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -42,10 +42,13 @@ class StaffActionLogger topic = deleted_post.topic || Topic.with_deleted.find(deleted_post.topic_id) + username = deleted_post.user.try(:username) || "unknown" + name = deleted_post.user.try(:name) || "unknown" + details = [ "id: #{deleted_post.id}", "created_at: #{deleted_post.created_at}", - "user: #{deleted_post.user.username} (#{deleted_post.user.name})", + "user: #{username} (#{name})", "topic: #{topic.title}", "post_number: #{deleted_post.post_number}", "raw: #{deleted_post.raw}" diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb index d96c8ca981..f5ba7a3703 100644 --- a/app/services/user_activator.rb +++ b/app/services/user_activator.rb @@ -23,7 +23,8 @@ class UserActivator end def factory - if SiteSetting.must_approve_users? + invite = Invite.find_by(email: Email.downcase(@user.email)) + if SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?) ApprovalActivator elsif !user.active? EmailActivator @@ -42,10 +43,13 @@ end class EmailActivator < UserActivator def activate + email_token = user.email_tokens.unconfirmed.active.first + email_token = user.email_tokens.create(email: user.email) if email_token.nil? + Jobs.enqueue(:user_email, type: :signup, user_id: user.id, - email_token: user.email_tokens.first.token + email_token: email_token.token ) I18n.t("login.activate_email", email: user.email) end diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb index 2b70d181ca..edf842f9f6 100644 --- a/app/services/user_destroyer.rb +++ b/app/services/user_destroyer.rb @@ -20,6 +20,7 @@ class UserDestroyer User.transaction do + Draft.where(user_id: user.id).delete_all QueuedPost.where(user_id: user.id).delete_all if opts[:delete_posts] diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb index 2fdcd3154d..a179dbc0c8 100644 --- a/app/views/application/_header.html.erb +++ b/app/views/application/_header.html.erb @@ -1,5 +1,5 @@
      -
      +
      @@ -13,7 +13,7 @@
      <% unless current_user %>
      - " class='btn btn-primary btn-small'><%= I18n.t('log_in') %> + " class='btn btn-primary btn-small login-button'> <%= I18n.t('log_in') %>
      <% end %>
      diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb index 98332fec1f..0f67c8f1c4 100644 --- a/app/views/common/_discourse_javascript.html.erb +++ b/app/views/common/_discourse_javascript.html.erb @@ -24,6 +24,12 @@ <% end %> window.onerror(e && e.message, null,null,null,e); }); + +<% if Rails.env.development? || Rails.env.test? %> + //Ember.ENV.RAISE_ON_DEPRECATION = true + //Ember.LOG_STACKTRACE_ON_DEPRECATION = true +<% end %> +
      diff --git a/app/views/users/omniauth_callbacks/failure.html.erb b/app/views/users/omniauth_callbacks/failure.html.erb index 697043807c..c83169acb3 100644 --- a/app/views/users/omniauth_callbacks/failure.html.erb +++ b/app/views/users/omniauth_callbacks/failure.html.erb @@ -1,11 +1,20 @@ -
      - <%if flash[:error]%> -
      - <%=flash[:error]%> + + + <%= render partial: "layouts/head" %> + <%= render partial: "common/special_font_face" %> + <%= render partial: "common/discourse_stylesheet" %> + + +
      + <%if flash[:error].present? %> +
      + <%=flash[:error]%> +
      + <%else%> +
      + <%= t 'login.omniauth_error_unknown' %> +
      + <%end%>
      - <%else%> -
      - <% t 'login.omniauth_error_unknown' %> -
      - <%end%> -
      \ No newline at end of file + + diff --git a/config/cloud/cloud66/deploy_hooks.yml b/config/cloud/cloud66/deploy_hooks.yml index dee74d8d67..6d971570bc 100644 --- a/config/cloud/cloud66/deploy_hooks.yml +++ b/config/cloud/cloud66/deploy_hooks.yml @@ -20,12 +20,6 @@ production: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Copy redis settings - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Copy production.rb file - source: /config/cloud/cloud66/files/production.rb destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb @@ -103,12 +97,6 @@ staging: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Rename redis.yml.sample file - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Rename production.rb.sample file - source: /config/cloud/cloud66/files/production.rb destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb @@ -168,8 +156,6 @@ development: first_thing: # 1. Permissions on postgres box - source: /config/cloud/cloud66/scripts/permissions.sh - destination: /tmp/scripts/permissions.sh - target: postgresql apply_during: build_only execute: true sudo: true @@ -186,12 +172,6 @@ development: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Rename redis.yml.sample file - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Move thin config to server - source: /config/cloud/cloud66/files/thin.yml destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml @@ -241,4 +221,4 @@ development: target: rails apply_during: build_only execute: true - sudo: true \ No newline at end of file + sudo: true diff --git a/config/cloud/cloud66/files/production.rb b/config/cloud/cloud66/files/production.rb index b7f03a0977..db662574be 100644 --- a/config/cloud/cloud66/files/production.rb +++ b/config/cloud/cloud66/files/production.rb @@ -23,11 +23,6 @@ Discourse::Application.configure do # Specifies the header that your server uses for sending files config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # you may use other configuration here for mail eg: sendgrid config.action_mailer.delivery_method = :smtp diff --git a/config/cloud/cloud66/files/redis.yml b/config/cloud/cloud66/files/redis.yml deleted file mode 100644 index 25ba0da879..0000000000 --- a/config/cloud/cloud66/files/redis.yml +++ /dev/null @@ -1,22 +0,0 @@ -defaults: &defaults - uri: <%= uri = URI.parse( ENV['REDIS_ADDRESS'].nil? ? ENV['REDIS_PROVIDER_URL'] || "redis://localhost:6379" : "redis://#{ENV['REDIS_ADDRESS']}:6379") %> - host: <%= uri.host %> - port: <%= uri.port %> - password: <%= uri.password %> - db: 0 - -development: - <<: *defaults - -profile: - <<: *defaults - -test: - <<: *defaults - db: 1 - -staging: - <<: *defaults - -production: - <<: *defaults diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf index d489606533..3b2ae347d9 100644 --- a/config/discourse_defaults.conf +++ b/config/discourse_defaults.conf @@ -46,6 +46,9 @@ db_prepared_statements = true # hostname running the forum hostname = "www.example.com" +# backup hostname mainly for cdn use +backup_hostname = + # address of smtp server used to send emails smtp_address = @@ -92,6 +95,10 @@ redis_db = 0 # redis password redis_password = +# redis sentinels eg +# redis_sentinels = 10.0.0.1:26381,10.0.0.2:26381 +redis_sentinels = + # enable Cross-origin Resource Sharing (CORS) directly at the application level enable_cors = false cors_origin = '' diff --git a/config/environments/production.rb b/config/environments/production.rb index 30263174ad..013e37f597 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -24,10 +24,6 @@ Discourse::Application.configure do config.log_level = :info - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - if GlobalSetting.smtp_address settings = { address: GlobalSetting.smtp_address, diff --git a/config/environments/profile.rb b/config/environments/profile.rb index 43531b0d5c..1784a23528 100644 --- a/config/environments/profile.rb +++ b/config/environments/profile.rb @@ -27,10 +27,6 @@ Discourse::Application.configure do # Specifies the header that your server uses for sending files config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - # we recommend you use mailcatcher https://github.com/sj26/mailcatcher config.action_mailer.smtp_settings = { address: "localhost", port: 1025 } diff --git a/config/initializers/04-message_bus.rb b/config/initializers/04-message_bus.rb index 7ada7b9ffa..00bf806d41 100644 --- a/config/initializers/04-message_bus.rb +++ b/config/initializers/04-message_bus.rb @@ -17,7 +17,12 @@ end MessageBus.group_ids_lookup do |env| user = CurrentUser.lookup_from_env(env) - user.groups.select('groups.id').map{|g| g.id} if user + if user && user.admin? + # special rule, admin is allowed access to all groups + Group.pluck(:id) + elsif user + user.groups.pluck('groups.id') + end end MessageBus.on_connect do |site_id| @@ -29,7 +34,7 @@ MessageBus.on_disconnect do |site_id| end # Point at our redis -MessageBus.redis_config = YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env].symbolize_keys +MessageBus.redis_config = GlobalSetting.redis_config MessageBus.long_polling_enabled = SiteSetting.enable_long_polling MessageBus.long_polling_interval = SiteSetting.long_polling_interval @@ -45,3 +50,8 @@ end MessageBus.cache_assets = !Rails.env.development? MessageBus.enable_diagnostics + +if Rails.env == "test" + # disable keepalive in testing + MessageBus.keepalive_interval = -1 +end diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb index 5f7e017cb5..3726cb173b 100644 --- a/config/initializers/06-mini_profiler.rb +++ b/config/initializers/06-mini_profiler.rb @@ -37,7 +37,8 @@ if defined?(Rack::MiniProfiler) /^\/uploads/, /^\/javascripts\//, /^\/images\//, - /^\/stylesheets\// + /^\/stylesheets\//, + /^\/favicon\/proxied/ ] # For our app, let's just show mini profiler always, polling is chatty so nuke that @@ -93,3 +94,13 @@ if defined?(Rack::MiniProfiler) # Rack::MiniProfiler.profile_method ActionView::PathResolver, 'find_templates' end + + +if ENV["PRINT_EXCEPTIONS"] + trace = TracePoint.new(:raise) do |tp| + puts tp.raised_exception + puts tp.raised_exception.backtrace.join("\n") + puts + end + trace.enable +end diff --git a/config/initializers/10-discourse_iife.rb b/config/initializers/10-discourse_iife.rb index 4df28e58c9..122c2922b0 100644 --- a/config/initializers/10-discourse_iife.rb +++ b/config/initializers/10-discourse_iife.rb @@ -1,7 +1,7 @@ require 'discourse_iife' Rails.application.assets.register_preprocessor('application/javascript', DiscourseIIFE) -unless Rails.env.production? +unless Rails.env.production? || ENV["DISABLE_EVAL"] require 'source_url' Rails.application.assets.register_postprocessor('application/javascript', SourceURL) end diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb new file mode 100644 index 0000000000..43b7299572 --- /dev/null +++ b/config/initializers/i18n.rb @@ -0,0 +1,37 @@ +# order: after 02-freedom_patches.rb + +# Include pluralization module +require 'i18n/backend/pluralization' +I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization) + +# Include fallbacks module +require 'i18n/backend/fallbacks' +I18n.backend.class.send(:include, I18n::Backend::Fallbacks) + +# Configure custom fallback order +class FallbackLocaleList < Hash + def [](locale) + # user locale, site locale, english + # TODO - this can be extended to be per-language for a better user experience + # (e.g. fallback zh_TW to zh_CN / vice versa) + [locale, SiteSetting.default_locale.to_sym, :en].uniq.compact + end + + def ensure_loaded! + self[I18n.locale].each { |l| I18n.ensure_loaded! l } + end +end + +class NoFallbackLocaleList < FallbackLocaleList + def [](locale) + [locale] + end +end + + +if Rails.env.development? + I18n.fallbacks = NoFallbackLocaleList.new +else + I18n.fallbacks = FallbackLocaleList.new + I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) } +end diff --git a/config/initializers/logster.rb b/config/initializers/logster.rb index da61432018..2daf7200fe 100644 --- a/config/initializers/logster.rb +++ b/config/initializers/logster.rb @@ -20,6 +20,9 @@ if Rails.env.production? # /(?m).*?Line: (?:\D|0).*?Column: (?:\D|0)/, + # also empty JS errors + /^Script error\..*Line: 0/m, + # CSRF errors are not providing enough data # suppress unconditionally for now /^Can't verify CSRF token authenticity$/, @@ -50,3 +53,5 @@ Logster.config.current_context = lambda{|env,&blk| # TODO logster should be able to do this automatically Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs" + +Logster.config.application_version = Discourse.git_version diff --git a/config/initializers/pluralization.rb b/config/initializers/pluralization.rb deleted file mode 100644 index 0a567d4451..0000000000 --- a/config/initializers/pluralization.rb +++ /dev/null @@ -1,2 +0,0 @@ -require "i18n/backend/pluralization" -I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 2d634e49e8..bfac8028f1 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -6,9 +6,11 @@ end Sidekiq.configure_server do |config| config.redis = Discourse.sidekiq_redis_config - # add our pausable middleware + config.server_middleware do |chain| chain.add Sidekiq::Pausable + # ensure statistic middleware is included in case of a fork + chain.add Sidekiq::Statistic::Middleware end end @@ -45,6 +47,9 @@ Sidekiq.logger.level = Logger::WARN class SidekiqLogsterReporter < Sidekiq::ExceptionHandler::Logger def call(ex, context = {}) + + return if Jobs::HandledExceptionWrapper === ex + # Pass context to Logster fake_env = {} context.each do |key, value| diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index b0c09ba491..63764408b9 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -8,9 +8,12 @@ ar: js: number: + format: + separator: "." + delimiter: "," human: storage_units: - format: '%n %u' + format: '%n% u' units: byte: zero: بايت @@ -23,12 +26,17 @@ ar: kb: كيلو بايت mb: ميجا tb: تيرا + short: + thousands: "ألف{{number}}" + millions: "مليون{{number}}" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMM D, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -115,14 +123,14 @@ ar: two: "ساعتان" few: "%{count} ساعات" many: "%{count} ساعة" - other: "%{count} ساعة" + other: "%{count} ساعات" x_days: zero: "0 يوم" one: "يوم واحد" two: "يومان" few: "%{count} أيام" many: "%{count} يومًا" - other: "%{count} يوم" + other: "%{count} أيام" date_year: "MMM D, 'YY" medium_with_ago: x_minutes: @@ -146,6 +154,28 @@ ar: few: "%{count} يوم مضى" many: "%{count} يوم مضى" other: "%{count} يوم مضى" + later: + x_days: + zero: "%{count} يوم مضى" + one: "1 يوم مضى" + two: "يومان مضى {count}%" + few: "أيام مضت {count}%" + many: "أيام مضت {count}%" + other: "أيام مضت {count}%" + x_months: + zero: "بعد أقل من شهر." + one: "بعد شهر." + two: "بعد شهرين." + few: "بعد %{count} أشهر" + many: "بعد %{count} شهر." + other: "بعد %{count} شهر." + x_years: + zero: "بعد أقل من سنة." + one: "بعد سنة واحدة." + two: "بعد سنتين." + few: "بعد %{count} سنوات." + many: "بعد %{count} سنوات." + other: "بعد %{count} سنة." share: topic: 'ضع رابطاً في هذا الموضوع.' post: 'الموضوع رقم %{postNumber}' @@ -154,6 +184,26 @@ ar: facebook: 'شارك هذا الرابط عن طريق فيس بوك' google+: 'شارك هذا الرابط عن طريق جوجل+' email: 'شارك هذا الرابط عن طريق البريد الالكتروني' + action_codes: + split_topic: "تقسيم هذا الموضوع %{when}" + autoclosed: + enabled: 'أغلق %{when}' + disabled: 'مفتوح %{when}' + closed: + enabled: 'مغلق %{when}' + disabled: 'مفتوح %{when}' + archived: + enabled: 'مؤرشف %{when}' + disabled: 'غير مؤرشف %{when}' + pinned: + enabled: 'مثبت %{when}' + disabled: 'غير مثبت %{when}' + pinned_globally: + enabled: 'مثبت عالمياً %{when}' + disabled: 'غير مثبت %{when}' + visible: + enabled: 'مدرج %{when}' + disabled: 'غير مدرج %{when}' topic_admin_menu: "عمليات المدير" emails_are_disabled: "جميع الرسائل الالكترونية تم تعطيلها من قبل المدير , لن يتم ارسال اي بريد الكتروني " edit: 'عدّل العنوان و التصنيف على هذا الموضوع' @@ -167,10 +217,17 @@ ar: age: "العمر" joined: "إنضم" admin_title: "المدير" - flags_title: "الأعلام" + flags_title: "بلاغات" show_more: "أعرض المزيد" - show_help: "مساعدة" + show_help: "خيارات" links: "روابط" + links_lowercase: + zero: "رابط" + one: "رابط" + two: "رابط" + few: "رابط" + many: "روابط" + other: "روابط" faq: "التعليمات" guidelines: "توجيهات " privacy_policy: "سياسة الخصوصية " @@ -190,6 +247,7 @@ ar: every_two_weeks: "كل اسبوعين" every_three_days: "كل ثلاثة أيام" max_of_count: "اقصى {{count}}" + alternation: "أو" character_count: zero: "0 حرف" one: "حرف واحد" @@ -258,14 +316,18 @@ ar: saved: "تم الحفظ!" upload: "رفع" uploading: "يتم الرفع..." + uploading_filename: "تحديث {{filename}}..." uploaded: "اكتمل الرفع!" enable: "تمكين" disable: "تعطيل" undo: "تراجع" revert: "عكس" failed: "فشل" + switch_to_anon: "وضع التخفي" + switch_from_anon: "خروج مجهول" banner: close: "تعطيل البانر" + edit: "تحرير هذا البانر" choose_topic: none_found: "لم يتم العثور على مواضيع." title: @@ -275,14 +337,32 @@ ar: topic: "الموضوع" approve: 'الموافقة' reject: 'الرفض' + delete_user: 'حذف المستخدم' title: "تحتاج موافقة" none: "لا يوجد مشاركات لمراجعتها" edit: "تعديل" cancel: "إلغاء" + view_pending: "عرض المشاركات المعلقة" + has_pending_posts: + zero: " هذا الموضوع لا توجد به مشاركات بانتظار الموافقة" + one: "هذا الموضوع له 1 مشاركة بانتظار الموافقة" + two: "هذا الموضوع له مشاركتان بانتظار الموافقة" + few: "هذا الموضوع له قليل من المشاركات بانتظار الموافقة" + many: "هذا الموضوع له كثير من المشاركات بانتظار الموافقة" + other: "هذا الموضوع له {{count}} مشاركات بانتظار الموافقة" confirm: "حفظ التعديلات" + delete_prompt: "هل أنت متأكد أنك تريد حذف %{username}؟ هذا سيحذف جميع مشاركاتك ويحظر بريدك الإلكتروني و عنوانك الـIP ." approval: title: "المشاركات تحتاج موافقة" description: "لقد استلمنا مشاركتك لكنها تحتاج موافقة المشرف قبل ظهورها. الرجاء الانتظار" + pending_posts: + zero: "ﻻ يوجد مشاركات معلقة." + one: "لديك مشاركة معلقة." + two: "لديك مشاركتين معلقتين." + few: "لديك {{count}} مشاركات معلقة." + many: "لديك {{count}} مشاركة معلقة." + other: "لديك {{count}} مشاركة معلقة." + ok: "موافق" user_action: user_posted_topic: "a href='{{userUrl}}'>{{user}} مشاركاتهذا الموضوع" you_posted_topic: "ك مشاركاتهذا الموضوع" @@ -302,6 +382,7 @@ ar: title: "الأعضاء" likes_given: "الإعجابات المعطاة" likes_received: "الإعجابات المستلمة" + topics_entered: "مدخل" topics_entered_long: "المواضيع المدخلة" time_read: "وقت القراءة" topic_count: "المواضيع" @@ -321,7 +402,7 @@ ar: many: "%{count} عضوًا" other: "%{count} عضو" groups: - visible: "المجموعة مخفية عن جميع المستخدمين" + visible: "المجموعة مرئية عن جميع المستخدمين" title: zero: "مجموعات" one: "مجموعات" @@ -332,18 +413,22 @@ ar: members: "أعضاء " posts: "مشاركات" alias_levels: - title: "من يستطيع أن يشارك في هذه المجموعة ؟" + title: "الذين يمكنهم استخدام هذه المجموعة كاسم مستعار ؟" nobody: "لا أحد" only_admins: "المسؤولين فقط" mods_and_admins: "فقط المدراء والمشرفون" members_mods_and_admins: "فقط اعضاء المجموعة والمشرفون والمدراء" everyone: "الكل" + trust_levels: + title: "مستوى الثقة يمنح تلقائيا للأعضاء عندما يضيفون:" + none: "لا شيء" user_action_groups: '1': "الإعجابات المعطاة" '2': "الإعجابات المستلمة" '3': "المفضلة" '4': "مواضيع" '5': "الردود" + '6': "ردود" '7': "إشارات" '9': "إقتباسات" '10': "تألقت" @@ -356,6 +441,14 @@ ar: all_subcategories: "جميع" no_subcategory: "لا شيء" category: "تصنيف" + reorder: + title: "إعادة ترتيب الفئات" + title_long: "إعادة تنظيم قائمة الفئة" + fix_order: "تثبيت الأماكن" + fix_order_tooltip: "ليس كل الفئات لديها رقم مكان فريد، ربما يسبب نتيجة غير متوقعة." + save: "حفظ الترتيب" + apply_all: "تطبيق" + position: "مكان" posts: "مشاركات" topics: "مواضيع" latest: "آخر" @@ -380,7 +473,7 @@ ar: other: "%{count} مشاركة جديدة في ال%{unit} الماضي" ip_lookup: title: 'جدول العناوين ' - hostname: Hostname + hostname: اسم المضيف location: الموقع location_not_found: (غيرمعرف) organisation: المنظمات @@ -393,25 +486,40 @@ ar: topics_entered: " مواضيع شوهدت" post_count: "# مشاركات" confirm_delete_other_accounts: "هل أنت متأكد أنك تريد حذف هذا الحساب ؟" + user_fields: + none: "(إختر خيار )" user: said: "{{username}}:" - profile: "الملف الشخصي" + profile: "الصفحة الشخصية" mute: "كتم" edit: "تعديل التفضيلات" download_archive: "تحميل مواضيعي" new_private_message: "رسالة جديدة" - private_message: "الرسالة" + private_message: "رسالة" private_messages: "الرسائل" activity_stream: "النشاط" preferences: " التفضيلات" + expand_profile: "توسيع" bookmarks: "المفضلة" bio: "معلومات عنّي" invited_by: "مدعو بواسطة" trust_level: "مستوى الثقة" - notifications: "اشعارات" + notifications: "الاشعارات" + desktop_notifications: + label: "إشعارات سطح المكتب" + not_supported: "عذراً , الإشعارات غير مدعومة على هذا المتصفح " + perm_default: "تفعيل الإشعارات" + perm_denied_btn: "الصلاحيات ممنوعة " + perm_denied_expl: "لقد قمت بإيقاف صلاحية الإشعارات في متصفحك . إستخدم متصفحك لتفعيل التنبيهات و ثم أعد ضغط الزر .\n( سطح المكتب : الأيقونة في أقصى اليسار في شريط العنوان . للهواتف الذكية : في معلومات الموقع Site Info)" + disable: "إيقاف الإشعارات " + currently_enabled: "( مفعل مسبقاً )" + enable: "تفعيل الإشعارات" + currently_disabled: "( مفعل مسبقاً )" + each_browser_note: "ملاحظة : يجب انت تقوم بتغيير هذا الإعداد عند كل مرة تستخدم فيها متصفح جديد ." dismiss_notifications: "جعل الجميع مقروء" dismiss_notifications_tooltip: "جعل جميع اشعارات غيرمقروء الى مقروء" disable_jump_reply: "لاتذهب الى مشاركة جديدة بعد الرد" + dynamic_favicon: "أعرض عدد الموضوع الجديد / الحديث في أيقونة المتصفح." edit_history_public: "جعل المستخدمين الاخرين يطلعون على تعديلاتي" external_links_in_new_tab: "إفتح كل الروابط الخارجية في صفحة جديدة" enable_quoting: "إسمح بإقتباس التعليقات لنصوص البارزة الملقى عليها ضوء" @@ -420,14 +528,15 @@ ar: admin: "{{user}} مدير" moderator_tooltip: "هذا المستخدم لديه صلاحية التعديل" admin_tooltip: "هذا المستخدم مدير" + blocked_tooltip: "هذا المستخدم محظور" suspended_notice: "هذا المستخدم موقوف حتى تاريخ {{date}}" suspended_reason: "سبب" github_profile: "Github" mailing_list_mode: "استقبال بريد الكتروني لكل مشاركة جديدة (بإسثناء لو قمت بكتم الموضوع او التصنيف)" watched_categories: "متابع" - watched_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة" + watched_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك بجميع المشاركات والمواضيع و بعدد المشاركات الجديدة التي ستظهر بجانب الموضوع. " tracked_categories: "Tracked" - tracked_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة" + tracked_categories_instructions: "ستتبع بشكل تلقائي جميع المواضيع الجديدة في هذه التصنيفات. عدد المشاركات الجديدة سيظهر بجانب الموضوع." muted_categories: "كتم" muted_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة" delete_account: "حذف الحساب" @@ -457,6 +566,7 @@ ar: set_password: " إعادة تعين الرمز السري" change_about: title: "تعديل معلومات عنّي" + error: "حدث خطأ عند تغيير القيمة." change_username: title: "تغيير اسم المستخدم" confirm: "إذا قمت بتغيير الاسم المستعار، فإن جميع المشاركات التي قمت بالمشاركة بها سيتم الغائها. هل أنت متأكد بقيامك على هذه الخطوة؟" @@ -471,6 +581,7 @@ ar: change_avatar: title: "غير صورتك الشخصية" gravatar: "Gravatar, based on" + gravatar_title: "غير صورتك الشخصية على موقع Gravatar's." refresh_gravatar_title: "حدّث Gravatar" letter_based: "الصورة الافتراضية " uploaded_avatar: "تخصيص صورة" @@ -478,7 +589,7 @@ ar: upload_title: "رفع صورتك " upload_picture: "رفع الصورة" image_is_not_a_square: "تنبيه: تم اقتصاص جزء من الصورة ، لأنها ليست مربعة الشكل." - cache_notice: "تم تغيير صورة العرض بنجاح، لكن قد تتأخر الصورة في الظهور لديك بسبب cacheing الموجود في متصفحك" + cache_notice: "قمت بتغيير صورة العرض بنجاح , لكن قد تتأخر في الظهور لديك ." change_profile_background: title: "لون خلفية الحساب" instructions: "سيتم وضع خلفية الحساب في المنتصف بعرض 850px" @@ -538,54 +649,42 @@ ar: every_two_weeks: "كل أسبوعين" email_direct: "تلقي رسالة إلكترونية عند اقتباس مشاركة لك أو الرد على عليها أو في حالة ذكر اسمك @username" email_private_messages: "إرسال إشعار بالبريد الإلكتروني عندما يرسل لك شخصاً رسالة خاصة" - email_always: "لاتفعل ارسال رسائل بريدية اذا كنت متفاعل مع الموقع" + email_always: "نبهني بوجود رسائل جديدة حتى لو كنت متصل على الموقع ." other_settings: "اخرى" categories_settings: "اقسام" new_topic_duration: label: " \nإعتبر الوضوع جديد حين" not_viewed: "لم تقم بالاطلاع عليها حتى الآن" last_here: "تم انشائها منذ آخر زيارة لك" - after_n_days: - zero: "تم انشائها خلال الـ 0 يوم الأخير" - one: "تم انشائها خلال اليوم الأخير" - two: "تم انشائها خلال اليومين الأخيرين" - few: "تم انشائها خلال الـ {{count}} أيام الأخيرة" - many: "تم انشائها خلال الـ {{count}} يوم الأخيرة" - other: "تم انشائها خلال الـ {{count}} يوم الأخيرة" - after_n_weeks: - zero: "تم انشائها خلال الـ 0 أسبوع الأخيرة" - one: "تم انشائها خلال الأسبوع الأخير" - two: "تم انشائها خلال الأسبوعين الأخيرين" - few: "تم انشائها خلال الـ {{count}} أسابيع الأخيرة" - many: "تم انشائها خلال الـ {{count}} أسبوع الأخيرة" - other: "تم انشائها خلال الـ {{count}} أسبوع الأخيرة" + after_1_day: "أنشأت في اليوم الماضي" + after_2_days: "أنشأت في اليومين الماضيين" + after_1_week: "أنشأت في الأسبوع الماضي" + after_2_weeks: "أنشأت في الأسبوعين الماضيين" auto_track_topics: "متابعة المواضيع التي أدخلها بشكل تلقائي" auto_track_options: never: "ابداً" immediately: "حالاً" - after_n_seconds: - zero: "بعد 0 ثانية" - one: "بعد ثانية" - two: "بعد ثانيتين" - few: "بعد {{count}} ثوان" - many: "بعد {{count}} ثانية" - other: "بعد {{count}} ثانية" - after_n_minutes: - zero: "بعد 0 دقيقة" - one: "بعد دقيقة" - two: "بعد دقيقتين" - few: "بعد {{count}} دقائق" - many: "بعد {{count}} دقيقة" - other: "بعد {{count}} دقيقة" + after_30_seconds: "بعد 30 ثانية" + after_1_minute: "بعد 1 دقيقة" + after_2_minutes: "بعد 2 دقائق" + after_3_minutes: "بعد 3 دقائق" + after_4_minutes: "بعد 4 دقائق" + after_5_minutes: "بعد 5 دقائق" + after_10_minutes: "بعد 10 دقائق" invited: search: "نوع البحث عن الدعوات" title: "دعوة" user: "المستخدمين المدعويين" - none: ".لم تقم بدعوة أي شخص إلى هنا حتى الأن" + sent: "تم الإرسال" + none: "لا توجد دعوات معلقة لعرضها." truncated: "اظهار اوائل {{count}} المدعويين" redeemed: "دعوات مستخدمة" + redeemed_tab: "محررة" + redeemed_tab_with_count: "({{count}}) محررة" redeemed_at: "مستخدمة" pending: "دعوات قيد الإنتضار" + pending_tab: "قيد الانتظار" + pending_tab_with_count: "معلق ({{count}})" topics_entered: " مواضيع شوهدت" posts_read_count: "مشاركات شوهدت" expired: "الدعوة انتهت صلاحيتها " @@ -597,6 +696,8 @@ ar: days_visited: "أيام الزيارة" account_age_days: "عمر العضوية بالأيام" create: "ارسال دعوة" + generate_link: "انسخ رابط الدعوة" + generated_link_message: '

      رابط الدعوة منح بنجاح!

      رابط الدعوة صالح فقط لعنوان البريد الإلكتروني هذا: %{invitedEmail}

      ' bulk_invite: none: "لم تقم بدعوة اي احد حتى الان. تستطيع ارسال دعوة , أو ارسال عدة دعوات عن طريقuploading a bulk invite file." text: "الدعوة من ملف" @@ -618,6 +719,7 @@ ar: title: "ايبي مسجل" avatar: title: "صورة الملف الشخصي" + header_title: "الملف والرسائل والعناوين والتفضيلات." title: title: "عنوان" filters: @@ -650,7 +752,11 @@ ar: logout: "تم تسجيل خروجك" refresh: "تحديث" read_only_mode: + enabled: "وضع القراءة فقط مفعل. يمكنك إكمال تصفح الموقع لكن التفاعلات قد لا تعمل." login_disabled: "تسجيل الدخول معطل لأن الموقع في خالة القراءة فقط" + too_few_topics_and_posts_notice: "دعونا الحصول على هذه المناقشة بدأت! يوجد حاليا%{currentTopics} / %{requiredTopics} المواضيع و %{currentPosts} / %{requiredPosts} المشاركات. الزوار الجدد بحاجة إلى بعض الأحاديث لقراءة والرد على." + too_few_topics_notice: "دعونا الحصول على هذه المناقشة التي! وهناك حاليا %{currentTopics} / %{requiredTopics} المواضيع. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها." + too_few_posts_notice: "دعونا الحصول على هذه المناقشة التي بدأت! يوجد حاليا %{currentPosts} / %{requiredPosts} مشاركات. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها." learn_more: "تعلم المزيد..." year: 'سنة' year_desc: 'المواضيع المكتوبة خلال 365 يوم الماضية' @@ -664,6 +770,28 @@ ar: unmute: إلغاء الكتم last_post: أخر مشاركة last_reply_lowercase: آخر رد + replies_lowercase: + zero: رد + one: رد + two: ردود + few: ردود + many: ردود + other: ردود + signup_cta: + sign_up: "إشترك" + hide_session: "ذكرني غدا" + hide_forever: "لا، شكراً" + hidden_for_session: "حسنا، أنا اسأل لك غدا. يمكنك دائماً استخدام '\"تسجيل الدخول\"' لإنشاء حساب، أيضا." + intro: "مهلا هناك! : heart_eyes: يبدو أنك تتمتع المناقشة، ولكن لم تقم بالتسجيل للحصول على حساب." + value_prop: "عندما تقوم بإنشاء حساب، نستطيع تتبع بالضبط ما كنت قد قرأت، حيث كنت دائماً تأتي حق العودة حيث تركته. يمكنك أيضا الحصول على الاشعارات، هنا وعبر البريد الإلكتروني، كلما تقدم وظائف جديدة. ويمكنك مثل مشاركات لتبادل الحب.:heartbeat:" + methods: + sso: "التسجيل أمر سهل: كل ما تحتاجه حساب في الموقع الرئيسي." + only_email: "التسجيل أمر سهل: كل ما تحتاجه هو بريد إلكتروني وكلمة مرور." + only_other: "استخدم الخاص بك %{provider} لتسجيل حساب ." + one_and_email: "استخدم الخاص بك %{provider} الحساب, أو البريد الإلكتروني وكلمة المرور، للتسجيل." + multiple_no_email: "التسجيل أمر سهل: استخدام أي موقع لتواصل الاجتماعي %{count} لتسجيل الدخول." + multiple: "التسجيل أمر سهل: استخدام أي موقع لتواصل الاجتماعي لتسجيل الدخول %{count} ، أو البريد الإلكتروني وكلمة المرور." + unknown: "خطأ في الحصول على دعم أساليب تسجيل الدخول" summary: enabled_description: "أنت تنظر الى ملخص لهذا الموضوع , مشاركات مثيرة للإهتمام بحسب رأي المجتمع" description: "هناك {{count}} ردود" @@ -707,6 +835,7 @@ ar: email_placeholder: "البريد الإلكتروني أو إسم المستخدم" caps_lock_warning: "Caps Lock is on" error: "مشكل غير معروف" + rate_limit: "الرجاء اﻹنتظارقبل محاولة تسجيل الدخول مجدداً." blank_username_or_password: "أدخل اسم المستخدم أو البريد الإلكتروني و كلمة المرور." reset_password: ' إعادة تعيين الرمز السري' logging_in: "...تسجيل الدخول " @@ -744,7 +873,10 @@ ar: emoji_one: "تعبيرات" composer: emoji: "تعبيرات: ابتسامة" + options: "خيارات" + whisper: "همس" add_warning: "هذا تحذير رسمي" + toggle_whisper: "تبديل الهمس" posting_not_on_topic: "أي موضوع تود الرد عليه؟" saving_draft_tip: "جار الحفظ..." saved_draft_tip: "تم الحفظ" @@ -757,6 +889,7 @@ ar: title_too_long: "العنوان يجب أن لا يكون أكثر من {{max}} حرف" post_missing: "لا يمكن للمشاركة أن تكون خالية" post_length: "التعليق يجب أن يكون أكثر {{min}} حرف" + try_like: 'هل تجرب زر ؟' category_missing: "يجب عليك اختيارفئة" save_edit: "حفظ التحرير" reply_original: "التعليق على الموضوع الاصلي" @@ -764,11 +897,13 @@ ar: reply: "الرد" cancel: "إلغاء" create_topic: "إنشاء موضوع" + create_pm: "رسالة" title: "او اضغط على Ctrl+Enter" users_placeholder: "اضافة مستخدم" title_placeholder: "ما هو الموضوع المراد مناقشته في جملة واحدة ؟" edit_reason_placeholder: "لمذا تريد التعديل ؟" show_edit_reason: "(اضف سبب التعديل)" + reply_placeholder: "أكتب هنا. استخدم Markdown, BBCode, أو HTML للتشكيل. اسحب أو الصق الصور." view_new_post: "الاطلاع على أحدث مشاركاتك" saving: "يتم الحفظ..." saved: "تم الحفظ" @@ -796,7 +931,7 @@ ar: list_item: "قائمة العناصر" heading_title: "اخفاء" heading_text: "اخفاء" - hr_title: "قانون افقي" + hr_title: "Horizontal Rule" undo_title: "تراجع" redo_title: "تقدم" help: "مساعدة في الـ Maekdown" @@ -812,9 +947,11 @@ ar: units: "(# of hours)" examples: 'أدخل الساعة (24)' notifications: + title: "الإشعار عندما يتم ذكر @name , أو الردود على مواضيعك أو مشاركاتك أو الرسالة الخاصة ...إلخ" none: "لا يمكن عرض الإشعارات في الوقت الحالي." more: "إظهار إشعارات قديمة" total_flagged: "مجموع المشاركات المعلّم عليها" + mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}}" replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " @@ -822,10 +959,32 @@ ar: liked: "

      {{username}} {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " + invited_to_topic: "

      {{username}} {{description}}

      " invitee_accepted: "

      {{username}} accepted your invitation

      " moved_post: "

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

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

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

      " + alt: + mentioned: "مؤشرة بواسطة" + quoted: "مقتبسة بواسطة" + replied: "مجاب" + posted: "مشاركة بواسطة" + edited: "تم تعديل مشاركتك بواسطة" + liked: "تم الإعجاب بمشاركتك" + private_message: "رسالة خاصة من" + invited_to_private_message: "تمت الدعوة لرسالة خاصة من " + invited_to_topic: "تمت الدعوة لموضوع من " + invitee_accepted: "قبلت الدعوة بواسطة" + moved_post: "مشاركتك نقلت بواسطة" + linked: "رابط لمشاركتك" + granted_badge: "تم منح الشارة" + popup: + mentioned: '{{username}} أشار لك في "{{topic}}" - {{site_title}}' + quoted: '{{username}} نقل لك في "{{topic}}" - {{site_title}}' + replied: '{{username}} رد لك في "{{topic}}" - {{site_title}}' + posted: '{{username}} شارك في "{{topic}}" - {{site_title}}' + private_message: '{{username}} أرسل لك رسالة خاصة في "{{topic}}" - {{site_title}}' + linked: '{{username}} رتبط بمشاركتك من "{{topic}}" - {{site_title}}' upload_selector: title: "اضف صورة" title_with_attachments: "اضف صورة او ملف" @@ -833,15 +992,32 @@ ar: from_the_web: "عن طريق الويب" remote_tip: "رابط لصورة" remote_tip_with_attachments: "رابط لصورة أو ملف ({{authorized_extensions}})" - local_tip: "اضغط لاختيار صورة من جهازك" + local_tip: "إختر صور من جهازك ." local_tip_with_attachments: "اضغط لاختيار صورة أو ملف من جهازك ({{authorized_extensions}})" hint: "(تستطيع أيضا أن تسحب و تفلت ملف أو صورة في المحرر لرفعه)" - hint_for_supported_browsers: "(تستطيع أيضا أن تسحب وتفلت صورة أو تلصقها في المحرر لرفعها)" + hint_for_supported_browsers: "يمكنك أيضا سحبوإفلات أو لصق الصور إلى المحرر" uploading: "يتم الرفع" + select_file: "تحديد ملف" image_link: "رابط ستشير له الصورة" search: + sort_by: "ترتيب حسب" + relevance: "أهمية" + latest_post: "آخر مشاركات" + most_viewed: "الأكثر مشاهدة" + most_liked: "الأكثر إعجابا" + select_all: "أختر الكل" + clear_all: "إلغ إختيار الكل" + result_count: + zero: "{{count}} لا نتائج \"{{term}}\"" + one: "{{count}} نتيجة \"{{term}}\"" + two: "{{count}} 2 نتائج \"{{term}}\"" + few: "{{count}} النتائج \"{{term}}\"" + many: "{{count}} النتائج \"{{term}}\"" + other: "{{count}} النتائج \"{{term}}\"" title: "البحث في المواضيع أو الردود أو الأعضاء أو التصنيفات" no_results: "لم يتم العثور على نتائج للبحث" + no_more_results: "لا يوجد نتائج إضافية ." + search_help: بحث عن المساعدة searching: "جاري البحث ..." post_format: "#{{post_number}} بواسطة {{username}}" context: @@ -849,7 +1025,8 @@ ar: category: "البحث في التصنيف \"{{category}}\"" topic: "بحث في هذا الموضوع" private_messages: "البحث في الرسائل الخاصة" - site_map: "الذهاب إلى قائمة مواضيع أو تصنيف آخر" + hamburger_menu: "أذهب لقائمة موضوع أخر أو فئة" + new_item: "جديد" go_back: 'الرجوع' not_logged_in_user: 'صفحة المستخدم مع ملخص عن نشاطه و إعداداته' current_user: 'الذهاب إلى صفحتك الشخصية' @@ -902,6 +1079,9 @@ ar: bookmarks: "لايوجد المزيد من المواضيع في المفضلة" search: "لايوجد نتائج بحث أخرى يمكن عرضها" topic: + unsubscribe: + stop_notifications: "ستستقبل الأن إشعارات أقل لـ{{title}}" + change_notification_state: "حالة إشعارك الحالي هي " filter_to: "{{post_count}} مشاركات/مشاركة في الموضوع" create: 'موضوع جديد' create_long: 'كتابة موضوع جديد' @@ -968,6 +1148,7 @@ ar: toggle_information: "إظهار/إخفاء تفاصيل الموضوع" read_more_in_category: "ترغب في قراءة المزيد؟ استعرض مواضيع أخرى في {{catLink}} أو {{latestLink}}." read_more: "ترغب في قراءة المزيد؟ {{catLink}} أو {{latestLink}}." + read_more_MF: "هناك { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" browse_all_categories: استعرض جميع التصنيفات view_latest_topics: شاهد آخر المواضيع suggest_create_topic: ما رأيك لو تكتب موضوع جديد؟ @@ -984,6 +1165,7 @@ ar: go_top: "أعلى" go_bottom: "أسفل" go: "اذهب" + jump_bottom: "الذهاب لأخر مشاركة" jump_bottom_with_number: "الذهاب إلى الرد %{post_number}" total: مجموع المشاركات current: المشاركة الحالية @@ -999,29 +1181,29 @@ ar: '2_4': 'سيصلك إشعارات لأنك أضفت مشاركة لهذا الموضوع.' '2_2': 'سيصلك إشعارات لأنك اخترت متابعة الموضوع' '2': 'سيصلك اشعار بسبب انك قراءة هذا الموضوع.' - '1_2': '.سيتم إشعارك إذا ذكر أحد ما اسمك أو رد على مشاركاتك' - '1': '.سيتم إشعارك إذا ذكر أحد ما اسمك أو رد على مشاركاتك' + '1_2': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك' + '1': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك' '0_7': 'لن يصلك أي إشعار يخص هذا التصنيف بناء على طلبك.' '0_2': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.' '0': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.' watching_pm: title: "تحت المتابعة" - description: "سيتم إشعارك بأية رد على هذه الرسالة الخاصة. عدد الرسائل الغير مقروءة و الجديدة ستظهر بجانب موضوع الرسالة." + description: "سيتم إشعارك بأية رد على هذه الرسالة، وبعدد الردود الجديدة التي ستظهر ." watching: title: "تحت المتابعة" - description: "سيتم إشعارك بأية رد على هذه الرسالة الخاصة. عدد الرسائل الغير مقروءة و الجديدة ستظهر بجانب الرسالة." + description: "سيتم إشعارك بأية رد على هذا الموضوع، وبعدد الردود الجديدة التي ستظهر." tracking_pm: title: "متتبعة" - description: "عدد المشاركات الغير مقروءة و الجديدة سيظهر بجانب هذه الرسالة الخاصة. سيصلك إشعار إذا ذكرك أحد ما أو رد على مشاركتك." + description: "سيتم عرض عدد الردود الجديدة لهذه الرسالة. سيتم إعلامك إذا ذكر أحد اسمك@ أو ردود لك." tracking: title: "تحت المتابعة" - description: "عدد المشاركات الغير مقروءة و الجديدة سيظهر بجانب هذا الموضوع. سيصلك إشعار إذا ذكرك أحد ما أو رد على مشاركتك." + description: "سيتم عرض عدد الردود جديدة لهذا الموضوع. سيتم إعلامك إذا ذكر أحد name@ أو ردود لك." regular: title: "منتظم" - description: ".سيتم إشعارك إذا ذكر أحد ما اسمك أو رد على مشاركاتك" + description: ".سيتم إشعارك إذا ذكر أحد ما @اسمك أو رد لك" regular_pm: title: "منتظم" - description: "سيتم إشعارك إذا ذكر اسمك أحد ما أو رد على مشاركتك في الرسالة الخاصة." + description: "سيتم تنبيهك إذا قام احدٌ بالاشارة إلى حسابك @name أو الرد عليك." muted_pm: title: "كتم" description: "لن يتم إشعارك بأي جديد يخص هذه الرسالة الخاصة." @@ -1063,38 +1245,110 @@ ar: success_message: 'تم الإبلاغ عن الموضوع' feature_topic: title: "ترشيح هذا الموضوع" + pin: "جعل هذا الموضوع يظهر في أعلى فئة {{categoryLink}} حتى " + confirm_pin: "لديك مسبقاً {{count}} مواضيع معلقة. قد تكون كثرة المواضيع المعلقة عبئاً على لمستخدمين الجدد والزوار. هل أنت متأكد أنك تريد تعليق موضوع آخر في هذه الفئة؟" + unpin: "ازالة هذا الموضوع من أعلى هذه الفئة {{categoryLink}}." + unpin_until: "ازالة هذا الموضوع من أعلى فئة {{categoryLink}} أو إنتظر حتى %{until} " + pin_note: "المستخدمون يستطعون إزالة تثبيت الموضوع بشكل خاص بهم." + pin_validation: "التاريخ مطلوب لتثبيت هذا الموضوع." + already_pinned: + zero: "ﻻيوجد مواضيع مثبتة في {{categoryLink}}." + one: "المواضيع المثيتة حالياً في {{categoryLink}} : \n1." + other: "المواضيع المثبتة حالياً في {{categoryLink}} : \n{{count}}." + pin_globally: " جعل هذا الموضوع يظهر في أعلى جميع القوائم الموضوع." + confirm_pin_globally: "لديك بالفعل {{count}} الموضوعات معقود على الصعيد العالمي. قد تكون عدة مواضيع معلقة عبئا للمستخدمين الجدد والمجهولين. هل أنت متأكد أنك تريد يعلقون موضوع آخر على الصعيد العالمي؟" + unpin_globally: "إزالة هذا الموضوع من أعلى لجميع القوائم الموضوع." + unpin_globally_until: "أزل هذا الموضوع من أعلى قوائم الموضوعاتاو إنتظر حتى : %{until}." + global_pin_note: "يمكن للمستخدمين بفصل موضوع على حدة لأنفسهم. " + already_pinned_globally: + zero: "لا توجد مواضيع معقود على الصعيد العالمي." + one: "موضوعات معلقة حاليا على الصعيد العالمي: 1." + other: "موضوعات معلقة حاليا على الصعيد العالمي: {{count}}." + make_banner: "أجعل هذا الموضوع يظهر في الإشعار في أعلى كل الصفحة." + remove_banner: "إزالة الإشعار الذي يظهر في اعلى الصفحات" + banner_note: "المستخدمون يستطعون إبعاد الشعار بأغلاقه. موضوع واحد فقط يبقى كشعار لأي وقت معطى." + already_banner: + zero: "لا يوجد إشعار للموضوع" + one: "هناك شعار موضوع حاليا" inviting: "دعوة..." automatically_add_to_groups_optional: "هذه الدعوة تتضمن صلاحيات الدخول على المجموعات : (اختياري , مدير فقط )" automatically_add_to_groups_required: "هذه الدعوة تتضمن صلاحيات الدخول على هذه المجموعات: (يتطلب , مدير" invite_private: + title: 'رسالة دعوة' email_or_username: "دعوات عن طريق اسم المستخدم او البريد الالكتروني" email_or_username_placeholder: "البريد الإلكتروني أو إسم المستخدم" action: "دعوة" + success: "لقد دعونا ذلك المستخدم للمشاركة في هذه الرسالة." error: "للأسف, حدثت مشكلة في دعوة المستخدم" group_name: "اسم المجموعة" invite_reply: title: 'دعوة' + username_placeholder: "اسم المستخدم" + action: 'ارسال دعوة' + help: 'دعوة المستخدمين لهذا الموضوع عن طرق البريد الإلكتروني أو الأشعارات' to_forum: "سيتم ارسال رسالة بريد الكتروني ﻷصدقائك للمشاركة في هذا الموضوع , لابتطلب تسجيل الدخول" + sso_enabled: "أدخل أسم الشخص الذي ترغب بدعوته لهذا الموضوع" + to_topic_blank: "أدخل أسم الشخص أو عنوان بريده الإلكتروني لدعوته لهذا الموضوع" + to_topic_email: "لقد ادخلت عنوان البريد إلإلكتروني. سنقوم بإرسال دعوة تسمح لصديقك بالرد حالاً على هذا الموضوع." + to_topic_username: "لقد ادخلت اسم المستحدم. سنقوم بإرسال إشعار يحتوي على رابط دعوة إلى الموضوع." + to_username: "ضع اسم المستخدم للشخص الذي تريد دعوته. سنقوم بإرسال إشعار يحتوي على رابط دعوة إلى الموضوع." email_placeholder: 'name@example.com' + success_email: "قمنا بإرسال دعوة بالبريد لـ {{emailOrUsername}} . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك." + success_username: "دعونا عضو للمشاركة في هذا الموضوع." + error: "نأسف لا يمكنك دعوة هذا المُستَخدم , ربما لأنه مُسَجِل لدينا مسبقاً (الدعوات محدودة)" login_reply: 'سجل دخولك لرد' filters: + n_posts: + zero: "لا يوجد مشاركات." + one: "مشاركة واحدة." + two: "مشاركتان." + few: "مشاركات قليلة." + many: "مشاركات كثيرة." + other: "{{count}} مشاركات." cancel: "حذف التخصيص" split_topic: title: "موضوع جديد" action: "موضوع جديد" topic_name: "اسم الموضوع" error: "هناك مشكلة في نقل المشاركات الى الموضوع الجديد" + instructions: + zero: "أنت على وشك انشاء موضوع جديد, ولم يتم اختيار أي مشاركة لتعبئته." + one: "أنت على وشك انشاء موضوع جديد وتعبئته بمشاركة اخترتها." + two: "أنت على وشك انشاء موضوع جديد وتعبئته بـمشاركاتين اخترتها." + few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ {{count}} مشاركات اخترتها." + many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ {{count}} مشاركة اخترتها." + other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ {{count}} مشاركة اخترتها." merge_topic: title: "الانتقال الى موضوع موجود" action: "الانتقال الى موضوع موجود" error: "هناك خطأ في نقل هذه المشاركات الى هذا الموضوع" + instructions: + zero: "لم يتم اختيار أي مشاركة لنقلها !" + one: "الرجاء اختيار الموضوع الذي تود نقل المشاركة إليه." + two: "الرجاء اختيار الموضوع الذي تود نقل المشاركتين إليه." + few: "الرجاء اختيار الموضوع الذي تود نقل الـ{{count}} مشاركات إليه." + many: "الرجاء اختيار الموضوع الذي تود نقل الـ{{count}} مشاركة إليه." + other: "الرجاء اختيار الموضوع الذي تود نقل الـ{{count}} مشاركة إليه." change_owner: title: "تغيير صاحب المشاركة" action: "تغيير العضوية " error: "هناك خطأ في نغيير العضوية" label: "عضوية جديدة للمشاركات" placeholder: "اسم مستخدم للعضوية الجديدة" + instructions: + zero: "لم يتم تحديد أي مشاركة!" + one: "الرجاء اختيار المالك الجديد لمشاركة نُشرت بواسطة {{old_user}}." + two: "الرجاء اختيار المالك الجديد لمشاركتين نُشرت بواسطة {{old_user}}." + few: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركات نُشرت بواسطة {{old_user}}." + many: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركة نُشرت بواسطة {{old_user}}." + other: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركة نُشرت بواسطة {{old_user}}." instructions_warn: "ملاحطة لن يتم نقل الاشعارت القديمة للمشاركة للمسخدم الجديد
      تحذير: اي بيانات تتعلق بالمشاركة هذه لن يتم نقلها للمستخدم الجديد. استعملها بحذر." + change_timestamp: + title: "تغيير الطابع الزمني" + action: "تغيير الطابع الزمني" + invalid_timestamp: "الطابع الزمني لا يمكن أن يكون في المستقبل." + error: "هناك خطأ في نغيير الطابع الزمني للموضوع." + instructions: "رجاء أختر الطابع الزمني الجديد للموضوع. المشاركات في الموضوع ستكون محدثة لنفس الوقت المختلف." multi_select: select: 'تحديد' selected: 'محدد ({{count}})' @@ -1103,9 +1357,18 @@ ar: cancel: الغاء التحديد select_all: تحديد الكل deselect_all: حذف الكل + description: + zero: لم يتم اختيار أي مشاركة. + one: اخترت مشاركة واحدة. + two: اخترت مشاركتين. + few: اخترت {{count}} مشاراكات. + many: اخترت {{count}} مشاراكات. + other: اخترت {{count}} مشاركة. post: - reply_topic: "الرد على {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "الاقتباس" + edit: "تعديل {{link}} {{replyAvatar}} {{username}} ." edit_reason: "سبب:" post_number: "مشاركات {{number}}" last_edited_on: "آخر تعديل للمشاركة في " @@ -1114,9 +1377,48 @@ ar: follow_quote: "الذهاب إلى المشاركة المقتبسة" show_full: "عرض كامل المشاركة" show_hidden: 'عرض المحتوى المخفي.' + deleted_by_author: + zero: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال أقل من ساعة مالم يُشار اليها)" + one: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال ساعة مالم يُشار اليها)" + two: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال ساعتين مالم يُشار اليها)" + few: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال %{count} ساعات مالم يُشار اليها)" + many: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال %{count} ساعة مالم يُشار اليها)" + other: "(مشاركة كُتبت بواسطة كاتب, سوف تحذف تلقائياً خلال %{count} ساعة مالم يُشار اليها)" expand_collapse: "عرض/إخفاء" + gap: + zero: "لا يوجد ردود مخفية." + one: "مشاهدة رد مخفي." + two: "مشاهدة ردين مخفيين." + few: "مشاهدة {{count}} ردود مخفية." + many: "مشاهدة {{count}} رد مخفي." + other: "مشاهدة {{count}} رد مخفي." more_links: "{{count}} أكثر .." unread: "المشاركة غير مقروءة" + has_replies: + zero: "لا ردود" + one: "{{count}} رد" + two: "ردان" + few: "ردود قليلة" + many: "ردود كثيرة" + other: "{{count}} ردود." + has_likes: + zero: "لا إعجابات" + one: "{{count}} إعجاب" + two: "إعجابان" + few: "إعجابات قليلة" + many: "إعجابات كثيرة" + other: "{{count}} إعجابات" + has_likes_title: + zero: "لم يعجب أحد بهذه المشاركة" + one: "شخص واحد أعجب بهذه المشاركة" + two: "أعجب شخصان بهذه المشاركة" + few: "أعجب أشخاص قليلون بهذه المشاركة" + many: "أعجب أشخاص كثيرون بهذه المشاركة" + other: "{{count}} أشخاص أعجبوا بهذه المشاركة" + has_likes_title_you: + zero: "أنت أعجبت بهذه المشاركة" + one: "أنت وشخص أخر أعجبتم بهذه المشاركة" + other: "أنت و {{count}} أشخاص أخرون أعجبتم بهذه المشاركة ." errors: create: "المعذرة، حدثت مشكلة أثناء إنشاء المشاركة. الرجاء المحاولة مرة أخرى." edit: "المعذرة، حدث خطأ أثناء تحرير مشاركتك. الرجاء المحاولة في وقت لاحق." @@ -1134,6 +1436,7 @@ ar: no_value: "لا ، حافظ عليها" yes_value: "نعم متأكد." via_email: "وصلت هذه المشاركة من خلال الإيميل" + whisper: "هذه المشاركة همسة خاصة للمشرفين" wiki: about: "هذه المشاركة عبارة عن ويكي بمعنى أنها متاحة للمستخدمين العاديين لتحريرها ، " archetypes: @@ -1151,6 +1454,13 @@ ar: share: "مشاركة رابط في هذه المشاركة" more: "المزيد" delete_replies: + confirm: + zero: "ﻻ يوجد ردود لحذفها." + one: "هل تريد أيضاً حذف الرد المباشر لهذا الموضوع؟" + two: "هل تريد أيضاً حذف الردين المباشرين لهذا الموضوع؟" + few: "هل تريد أيضاً حذف {{count}} ردود مباشرة لهذه المشاركة؟" + many: "هل تريد أيضاً حذف {{count}} رداً مباشراً لهذه المشاركة؟" + other: "هل تريد أيضاً حذف {{count}} رداً مباشراً لهذه المشاركة؟" yes_value: "نعم، احذف هذه الردود أيضاً" no_value: "لا ، المشاركة فقط" admin: "عمليات المدير" @@ -1162,6 +1472,13 @@ ar: unhide: "إظهار" actions: flag: 'التبليغات' + defer_flags: + zero: "أجّل الإعلام" + one: "أجّل الإعلام" + two: "أجّل الإعلامات" + few: "أجّل الإعلامات" + many: "أجّل الإعلامات" + other: "أجّل الإعلامات" it_too: off_topic: "أبلغ عنها أيضا" spam: "أبلغ عنها أيضا" @@ -1180,9 +1497,12 @@ ar: people: off_topic: "{{icons}} بلغ أن هذا لاعلاقة له بالموضوع" spam: "{{icons}} بلغ انه هذا هو سبام" + spam_with_url: "{{icons}} بُلغ انه غير مرغوب به" inappropriate: "{{icons}} بلغ أنه غير لائق" notify_moderators: "{{icons}} تنبيه المشرف" notify_moderators_with_url: "{{icons}} نبه المشرف" + notify_user: "{{icons}} رسالة مُرسلة." + notify_user_with_url: "{{icons}} أرسلت message ." bookmark: "{{icons}} اضف في المفضلة" like: "{{icons}} استحسان" vote: "{{icons}} صوت لهذا" @@ -1191,13 +1511,136 @@ ar: spam: "تم الإبلاغ عن الموضوع على أنه سبام" inappropriate: "تم الإبلاغ عن الموضوع على أنه غير لائق" notify_moderators: "تم الإبلاغ عن الموضوع ليشاهده المشرف" + notify_user: "لقد قمت بأرسال رسالة لهذا المستخدم" bookmark: "قمت بتفضيل هذه المشاركة" like: "قمت بإستحسان هذا" vote: "قمت بالتصويت لهذه المشاركة" + by_you_and_others: + off_topic: + zero: "أنت بلّغت بأن هذا خارج عن الموضوع." + one: "أنت وآخر بلّغتما بأن هذا خارج عن الموضوع." + two: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + few: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + many: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + other: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + spam: + zero: "أنت أبلّغت بأن هذا غير مرغوب فيه." + one: "أنت وآخر أبلّغتما بأن هذا غير مرغوب فيه." + two: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + few: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + many: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + other: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + inappropriate: + zero: "أنت أشرت لهذا كغير ملائم." + one: "أنت و شخص آخر أشرتُما لهذا كغير ملائم." + two: "أنت و {{count}} آخران أشرتُم لهذا كغير ملائم." + few: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم." + many: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم." + other: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم." + notify_moderators: + zero: "أنت و 1 آخر علّمتم هذا للمراقبين" + one: "أنت و 1 آخر علّمتم هذا للمراقبين" + two: "أنت و {{count}} آخرون علّمتما هذا للمراقبين" + few: "أنت و {{count}} آخرون علّمتم هذا للمراقبين" + many: "أنت و {{count}} آخرون علّمتم هذا للمراقبين" + other: "أنت و {{count}} آخرون علّمتم هذا للمراقبين" + notify_user: + zero: "أنت أرسلت رسالة لهذا المستخدم." + one: "أنت و شخص آخر أرسلتما رسالة لهذا المستخدم." + two: "أنت و {{count}} آخران أرسلتم رسالة لهذا المستخدم." + few: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم." + many: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم." + other: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم." + bookmark: + zero: "أنت عَلَّمتَ هذه المشاركة." + one: "أنت و شخص آخر عَلَّمتُما هذه المشاركة." + two: "أنت و {{count}} آخران عَلَّمتُم هذه المشاركة." + few: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة." + many: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة." + other: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة." + like: + zero: "أنت فقط أعجبت بهذا ." + one: "أنت و {{شخص}} أخر أعجبتما بهذا ." + two: "أنت و {{شخصان}} أخران أعجبتوا بهذا ." + few: "أنت و أشخاص {{قليلة}} أخرى أعجبتوا بهذا ." + many: "أنت و أشخاص {{كثيرة}} أخرى أعجبتوا بهذا ." + other: "أنت و {{count}} أشخاص أخرون أعجبتوا بهذا ." + vote: + zero: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + one: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + two: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + few: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + many: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + other: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + by_others: + off_topic: + zero: "لم يتم الاشارة لهذا كخارج عن الموضوع." + one: "شخص أشار لهذا كخارج عن الموضوع." + two: "شخصان أشارا لهذا كخارج عن الموضوع." + few: "{{count}} أشخاص أشاروا لهذا كخارج عن الموضوع." + many: "{{count}} شخص أشار لهذا كخارج عن الموضوع." + other: "{{count}} شخص أشار لهذا كخارج عن الموضوع." + spam: + zero: "لم يتم الاشارة لهذا كغير مفيد," + one: "شخص أشار لهذا كغير مفيد." + two: "شخصان أشارا لهذا كغير مفيد." + few: "{{count}} أشخاص أشاروا لهذا كغير مفيد." + many: "{{count}} شخص أشار لهذا كغير مفيد." + other: "{{count}} شخص أشار لهذا كغير مفيد." + inappropriate: + zero: "لم تتم الإشارة لهذا كغير ملائم." + one: "شخص أشار لهذا كغير ملائم." + two: "شخصان أشارا لهذا كغير ملائم." + few: "{{count}} أشخاص أشاروا لهذا كغير ملائم." + many: "{{count}} شخص أشاروا لهذا كغير ملائم." + other: "{{count}} شخص أشاروا لهذا كغير ملائم." + notify_moderators: + zero: "1 عضو علّم هذا للمراقبين" + one: "1 عضو علّم هذا للمراقبين" + two: "{{count}} أعضاء علّمو هذا للمراقبين" + few: "{{count}} أعضاء علّمو هذا للمراقبين" + many: "{{count}} أعضاء علّمو هذا للمراقبين" + other: "{{count}} أعضاء علّمو هذا للمراقبين" + notify_user: + zero: "لم يتم إرسال رسالة لهذا المستخدم." + one: "شخص أرسل رسالة لهذا المستخدم." + two: "{{count}} أرسلا رسالة لهذا المستخدم." + few: "{{count}} أرسلوا رسالة لهذا المستخدم." + many: "{{count}} أرسلوا رسالة لهذا المستخدم." + other: "{{count}} أرسلوا رسالة لهذا المستخدم." + bookmark: + zero: "لم يفضل أحد هذه المشاركة." + one: " شخص واحد فضل هذه المشاركة." + two: " شخصان فضلا هذه المشاركة." + few: "أشخاص قليلون فضلوا هذه المشاركة." + many: "أشخاص كثيرون فضلوا هذه المشاركة." + other: "{{count}} أشخاص فضلوا هذه المشاركة." + like: + zero: "شخص واحد اعجب بهذا" + one: "{{count}} أشخاص أعجبو بهذا" + two: "{{count}} أشخاص أعجبو بهذا" + few: "{{count}} أشخاص أعجبو بهذا" + many: "{{count}} أشخاص أعجبو بهذا" + other: "{{count}} أشخاص أعجبو بهذا" + vote: + zero: "لم يتم التصويت لهذه المشاركة." + one: "شخص صوت لهذه المشاركة." + two: "شخصان صوتا لهذه المشاركة." + few: "{{count}} أشخاص صوتوا لهذه المشاركة." + many: "{{count}} شخص صوتوا لهذه المشاركة." + other: "{{count}} شخص صوتوا لهذه المشاركة." edits: one: 1 تعديل other: "{{count}} تعديل" zero: لايوجد تعديل + delete: + confirm: + zero: "هل أنت متأكد أنك لا تريد حذف تلك المشاركة؟" + one: "هل أنت متأكد أنك تريد حذف تلك المشاركة؟" + two: "هل أنت متأكد أنك تريد حذف تلك المشاركتين؟" + few: "هل أنت متأكد أنك تريد حذف تلك المشاركات القليلة؟" + many: "هل أنت متأكد أنك تريد حذف تلك المشاركات الكثيرة؟" + other: "هل أنت متأكد أنك تريد حذف كل تلك المشاركات؟" revisions: controls: first: "التعديل الاول" @@ -1206,6 +1649,7 @@ ar: last: "آخر تعديل" hide: "اخفاء التعديل" show: "اظهار التعديل" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Show the rendered output with additions and removals inline" @@ -1219,16 +1663,20 @@ ar: category: can: 'can…' none: '(غير مصنف)' + all: 'جميع التصنيفات' choose: 'اختيار category…' edit: 'تعديل' edit_long: "تعديل" view: 'اظهار المواضيع في الصنف' general: 'عام' settings: 'اعدادات' + topic_template: "إطار الموضوع" delete: 'حذف الصنف' create: 'قسم جديد' + create_long: 'أنشئ فئة جديدة' save: 'حفظ القسم' slug: 'عنوان التصنيف/Slug' + slug_placeholder: '(اختياري) خط تحت عنوان الموقع' creation_error: حدثت مشكلة اثناء انشاء القسم save_error: حدث خطأ أثناء حفظ التصنيف name: "اسم التصنيف" @@ -1248,6 +1696,7 @@ ar: change_in_category_topic: "تعديل الوصف" already_used: 'هذا اللون تم استخدامه سابقا في تصنيف آخر' security: "الأمن" + special_warning: "تحذير: هذه الفئة هي فئة قبل التصنيف وإعدادات الحماية لا يمكن تعديلها. إذا لم تكن تريد استخدام هذه الفئة، احذفها بدلا من تطويعها لأغراض أخرى." images: "الصور" auto_close_label: "الإغلاق التلقائي للمواضيع بعد:" auto_close_units: "ساعات" @@ -1255,6 +1704,7 @@ ar: email_in_allow_strangers: "قبول بريد إلكتروني من مستخدمين لا يملكون حسابات" email_in_disabled: "إضافة مواضيع جديدة من خلال البريد الإلكتروني موقف في الوقت الحالي من خلال إعدادات الموقع. لتفعيل إضافة مواضيع جديدة من خلال البريد الإلكتروني," email_in_disabled_click: 'قم بتفعيل خيار "email in" في الإعدادات' + suppress_from_homepage: "كتم هذه الفئة من الصفحة الرئيسية" allow_badges_label: "السماح بالحصول على الشارات في هذا التصنيف" edit_permissions: "تعديل الصلاحيات" add_permission: "اضف صلاحية" @@ -1267,13 +1717,13 @@ ar: notifications: watching: title: "مشاهده " - description: "ستتابع بشكل تلقائي جديد هذه التصنيفات. سيتم إشعارك بكل مشاركة او موضوع، بالإضافة لذلك سيتم عرض عدد المشاركات الغير مقروءة و الجديدة بجانب الموضوع." + description: "سوف تشاهد تلقائياً كل المواضيع الجديدة في هذه الفئات. سيتم نتبيهك لكل المشاركات والمواضيع الجديدة, وعدد الردود الجديدة على هذه المواضيع سيكون ظاهراً." tracking: title: "تتبع " - description: "ستتابع بشكل تلقائي جديد هذه التصنيفات. سيتم إشعارك بكل مشاركة او موضوع، بالإضافة لذلك سيتم عرض عدد المشاركات الغير مقروءة و الجديدة بجانب الموضوع." + description: "سوف تتابع تلقائياً كل المواضيع في هذه الفئات.وعدد الردود الجديدة على هذه المواضيعسكون ظاهراً." regular: title: "طبيعي" - description: ".سيتم إشعارك إذا ذكر أحد ما اسمك أو رد على مشاركاتك" + description: "سوف تُنبه اذا قام أحد بالاشارة لاسمك \"@name\" أو الرد عليك." muted: title: "كتم" description: "لن يتم إشعارك بأي جديد يخص هذا الموضوع ولن يظهرهذا الموضوع في تبويب المواضيع الغير مقروءة." @@ -1282,6 +1732,7 @@ ar: private_reminder: 'التبليغات ذات خصوصية، تظهر فقط للمشرفين' action: 'التبليغ عن مشاركة' take_action: "أجراء العمليه " + notify_action: 'رسالة' delete_spammer: "حذف مرسلي البريد المزعج" delete_confirm: "أنت على وشك حذف %{posts} المشاركات و%{topics} المواضيع من هذا المستخدم , حذف حساباتهم منهم من التسجيل وحجب الاي بي %{ip_address}, واضافة بريدهم الالكتروني %{email} لقائمة المحجوبين . هل أنت متأكد أن هذا المستخدم سبام ?" yes_delete_spammer: "نعم , حذف مرسلي البريد المزعج" @@ -1303,9 +1754,19 @@ ar: flagging_topic: title: "شكرا لمساعدتنا في ابقاء مجتمعنا نضيفا" action: "التبليغ عن الموضوع" + notify_action: "رسالة" topic_map: title: "ملخص الموضوع" + participants_title: "مشاركين مكررين" + links_title: "روابط شائعة." links_shown: "اظهار {{totalLinks}} روابط..." + clicks: + zero: "%{count} نقرة" + one: "%{count} نقرة" + two: "%{count} نقرتان" + few: "%{count} نقرات" + many: "%{count} نقرات" + other: "%{count} نقرات" topic_statuses: warning: help: "هذا تحذير رسمي" @@ -1313,6 +1774,10 @@ ar: help: "قمت بتفضيل هذا الموضوع" locked: help: "هذا الموضوع مغلق, لن يتم قبول اي رد " + archived: + help: "هذا الموضوع مؤرشف,لن تستطيع أن تعدل عليه" + locked_and_archived: + help: "هذا الموضوع مغلق و مؤرشف; لم يعد يقبل ردود جديدة أو لا يمكن تغيره." unpinned: title: "غير مثبت" help: "هذا الموضوع غير مثبت بالنسبة لك, سيتم عرضه بالترتيب العادي" @@ -1322,21 +1787,46 @@ ar: pinned: title: "مثبت" help: "هذا الموضوع مثبت لك, سوف يتم عرضه في اول القسم" - archived: - help: "هذا الموضوع مؤرشف,لن تستطيع أن تعدل عليه" invisible: help: "هذا الموضوع غير مصنف لن يظهر في قائمة التصانيف ولايمكن الدخول عليه الابرابط مباشر." posts: "مشاركات" posts_lowercase: "مشاركات" posts_long: "هناك {{number}} مشاركات في هذا الموضوع" + posts_likes_MF: | + هذا الموضوع له {count, plural, one {1 reply} other {# replies}} {ratio, select, + low {with a high like to post ratio} + med {with a very high like to post ratio} + high {with an extremely high like to post ratio} + other {}} original_post: "المشاركة الاصلية" views: "مشاهدات" + views_lowercase: + zero: "مشاهده" + one: "مشاهد" + two: "مشاهد" + few: "مشاهدات" + many: "مشاهدات" + other: "مشاهدات" replies: "ردود " views_long: "هذا الموضوع قد تمت مشاهدته {{number}} مرات" activity: "النشاط" likes: "اعجابات" + likes_lowercase: + zero: "أعجاب" + one: "أعجاب" + two: "اﻹعجابات" + few: "اﻹعجابات" + many: "اﻹعجابات" + other: "اﻹعجابات" likes_long: "هناك {{number}} اعجابات في هذا الموضوع" users: "مستخدمين" + users_lowercase: + zero: "مستخدم" + one: "مستخدم" + two: "مستخدم" + few: "مستخدمون" + many: "مستخدمون" + other: "مستخدمون" category_title: "قسم" history: "تاريخ" changed_by: "الكاتب {{author}}" @@ -1348,7 +1838,10 @@ ar: with_topics: "%{filter} مواضيع" with_category: "%{filter} %{category} مواضيع" latest: - title: "آخر" + title: + zero: "الأخير" + one: "الآخر (1)" + other: "الآخر ({{count}})" help: "مواضيع بآخر المشاركات" hot: title: "ساخن" @@ -1356,6 +1849,9 @@ ar: read: title: "قراءة" help: "مواضيع قمت بقراءتها بترتيب آخر قراءة" + search: + title: "بحث" + help: "بحث في كل المواضيع" categories: title: "اقسام" title_in: "قسم - {{categoryName}}" @@ -1394,11 +1890,25 @@ ar: top: title: "أعلى" help: "أكثر المواضيع نشاطا خلال سنة, شهر, اسبوع او يوم" - this_year: "هذه السنة" - this_month: "هذا الشهر" - this_week: "هذا الاسبوع" + all: + title: "كل الأوقات" + yearly: + title: "سنوي" + quarterly: + title: "فصليا" + monthly: + title: "شهري" + weekly: + title: "اسبوعي" + daily: + title: "يومي" + all_time: "جميع الأوقات" + this_year: "سنة" + this_quarter: "ربع" + this_month: "شهر" + this_week: "أسبوع" today: "اليوم" - other_periods: "الاطلاع على مواضيع زيادة" + other_periods: "مشاهدة الأفضل" browser_update: 'للأسف, متصفحك قديم لكي يفتح هذه الصفحة. Please قم بتحديث متصفحك.' permission_types: full: "انشاء / رد / مشاهدة" @@ -1411,10 +1921,15 @@ ar: moderator: 'مراقب' dashboard: title: "داشبورد" + last_updated: "أخر تحديث للوحة التحكم:" version: "الاصدار" + up_to_date: "لديك آخر اصدار!" critical_available: "يوجد تحديث هام." updates_available: "يوجد تحديثات." please_upgrade: "يرجى الترقية!" + no_check_performed: "لم يتم التحقق من التحديثات. اضمن أن sidekiq يعمل." + stale_data: "لم يتم التحقق من التحديثات مؤخراً. اضمن أن sidekiq يعمل." + version_check_pending: "يبدو أنك رُقيت مؤخرا. رائع!" installed_version: "مثبّت" latest_version: "آخر" problems_found: "يوجد بعض المشاكل عند تثبيت Discourse :" @@ -1425,8 +1940,17 @@ ar: admins: 'مدراء:' blocked: 'محظور:' suspended: 'موقوف:' + private_messages_short: "الرسائل" + private_messages_title: "الرسائل" + mobile_title: "متنقل" + space_free: "{{size}} إضافي" uploads: "عمليات الرفع" backups: "النسخ الاحتياطية" + traffic_short: "المرور" + traffic: "طلبات تطبيقات الويب" + page_views: "طلبات API " + page_views_short: "طلبات API " + show_traffic_report: "عرض تقرير مرور مفصل" reports: today: "اليوم" yesterday: "امس" @@ -1436,15 +1960,32 @@ ar: 7_days_ago: "منذ ٧ ايام" 30_days_ago: "منذ ٣٠ يوم" all: "الكل" + view_table: "جدول" + view_chart: "شريط الرسم البياني" + refresh_report: "تحديث التقرير " + start_date: "تاريخ البدء" + end_date: "تاريخ الإنتهاء" commits: latest_changes: "آخر تغيير: يرجى التحديث" by: "بواسطة" flags: + title: "التبليغات" old: "قديم" active: "نشط" + agree: "أوافق" + agree_title: "أكد هذا البلاغ لكونه صحيح وصالح" + agree_flag_modal_title: "أوافق مع ..." + agree_flag_hide_post: "اوافق (اخفاء المشاركة + ارسال ر.خ)" + agree_flag_hide_post_title: "أخفي هذه المشاركة وَ تلقائيا بإرسال رسالة للمستخدم وحثهم على تحريرها" + agree_flag_restore_post: "موافق (استعادة المشاركة)" + agree_flag_restore_post_title: "استعد هذه المشاركة." + agree_flag: "الموافقه على التبليغ" + agree_flag_title: "الموافقة مع التَعَلّيم وحفظ المشاركة دون تغيير." + defer_flag: "تأجيل" defer_flag_title: "إزالة البلاغ، لا يتطلب منك إجراء في الوقت الحالي." delete: "حذف" delete_title: "حذف المشاركة المرتبطة بهذا البلاغ" + delete_post_defer_flag: "حذف المشاركة مع تأجيل البلاغ" delete_post_defer_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع" delete_post_agree_flag: "حذف المشاركة مع الموافقة على البلاغ" delete_post_agree_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع" @@ -1464,11 +2005,51 @@ ar: deferred: "مؤجل" flagged_by: "مُبلّغ عنه بواسطة" resolved_by: "تم حلّه بواسطة" + took_action: "اجريت العمليات" system: "النظام" error: "حدث خطأ ما" + reply_message: "الرد" no_results: "لا يوجد بلاغات." + topic_flagged: "هذا topic قد عُلِّم." visit_topic: "زيارة الموضوع لاتخاذ قرار" was_edited: "تم تعديل المشاركة بعد أول بلاغ" + previous_flags_count: "هذه المشاركة قد سبق الإشارة إليها {{count}} مرات." + summary: + action_type_3: + zero: "خارج عن الموضوع" + one: "خارج عن الموضوع" + two: "خارج عن الموضوع x{{count}}" + few: "خارج عن الموضوع x{{count}}" + many: "خارج عن الموضوع x{{count}}" + other: "خارج عن الموضوع x{{count}}" + action_type_4: + zero: "غير ملائم" + one: "غير ملائم" + two: "غير ملائم x{{count}}" + few: "غير ملائم x{{count}}" + many: "غير ملائم x{{count}}" + other: "غير ملائم x{{count}}" + action_type_6: + zero: "مخصص" + one: "مخصص" + two: "مخصص x{{count}}" + few: "مخصص x{{count}}" + many: "مخصص x{{count}}" + other: "مخصص x{{count}}" + action_type_7: + zero: "مخصص" + one: "مخصص" + two: "مخصص x{{count}}" + few: "مخصص x{{count}}" + many: "مخصص x{{count}}" + other: "مخصص x{{count}}" + action_type_8: + zero: "رسائل مزعجة" + one: "رسائل مزعجة" + two: "رسائل مزعجة x{{count}}" + few: "رسائل مزعجة x{{count}}" + many: "رسائل مزعجة x{{count}}" + other: "رسائل مزعجة x{{count}}" groups: primary: "المجموعة الأساسية" no_primary: "(لايوجد مجموعة أساسية)" @@ -1487,8 +2068,12 @@ ar: name: "الاسم" add: "اضافة" add_members: "اضافة عضو" + custom: "مخصص" + automatic: "تلقائي" automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة." automatic_membership_retroactive: "اضافة الاعضاء الذين يمتكلون عنوان ايميل مطابق للعنوان الموجود في القائمة." + default_title: "عنوان افتراضي لكل أعضاء هذه المجموعة." + primary_group: "تلقيائاً ضعها كمجموعة أساسية." api: generate_master: "Generate Master API Key" none: "There are no active API keys right now" @@ -1509,7 +2094,11 @@ ar: name: "الاسم" none_installed: "لاتملك اي اضافة مثبته" version: "الاصدار" + enabled: "مفعل؟" + is_enabled: "Y" + not_enabled: "N" change_settings: "تغيير الاعدادت" + change_settings_short: "الاعدادات" howto: "كيف اثبت اضافة؟" backups: title: "نسخة احتياطية" @@ -1520,15 +2109,19 @@ ar: read_only: enable: title: "تفعيل وضع القراءة فقط" + label: "تفعيل وضع القراءة فقط." confirm: "هل أنت متأكد من تفعيل وضع القراءة فقط؟" disable: title: "تعطيل وضع القراءة فقط" + label: "تعطيل وضع القراءة فقط." logs: none: "No logs yet." columns: filename: "اسم الملف" size: "حجم" upload: + label: "رفع" + title: "رفع نسخة احتياطية لهذه الحالة." uploading: "يتم الرفع..." success: "'{{filename}}' تم رفعه بنجاح." error: "هناك مشكلة في رفع '{{filename}}': {{message}}" @@ -1536,26 +2129,32 @@ ar: is_running: "هناك عملية مازالت تعمل ..." failed: "الـ {{operation}} فشلت. الرجاء التحقق من logs." cancel: + label: "إلغاء" title: "الغاء العملية الحالية" confirm: "هل أنت متأكد من رغبتك في الغاء العملية الحالية ؟" backup: + label: "نسخة احتياطية" title: "انشاء نسخة احتياطية" confirm: "هل تريد انشاء نسخة احتياطية جديدة ؟" without_uploads: "نعم (لا تضمن الملفات)" download: + label: "تحميل" title: "تحميل النسخة الاحتياطية" destroy: title: "حذف النسخة الاحتياطية" confirm: "هل أنت متأكد من رغبتك في حذف النسخة الاحتياطية؟" restore: is_disabled: "Restore is disabled in the site settings." + label: "استعادة" title: "اعادة تخزين النسخة الاحتياطية" confirm: "هل أنت متأكد من رغبتك في اعادة تخزين النسخة الاحتياطية؟" rollback: + label: "اعادة السنخة السابقة" title: "Rollback the database to previous working state" confirm: "Are your sure you want to rollback the database to the previous working state?" export_csv: user_archive_confirm: "هل أنت متأكد من رغبتك في تحميل جميع مشاركاتك ؟" + success: "بدأ التصدير, سيتم إعلامك برسالة عند اكتمال العملية." failed: "فشل في التصدير, الرجاء التحقق من الـ logs" rate_limit_error: "المشاركات يمكن تحميلها لمرة واحدة في اليوم , الرجاء المحاولة غدا." button_text: "التصدير" @@ -1565,6 +2164,8 @@ ar: screened_email: "Export full screened email list in CSV format." screened_ip: "Export full screened IP list in CSV format." screened_url: "Export full screened URL list in CSV format." + export_json: + button_text: "تصدير" invite: button_text: "ارسال دعوات" button_title: "ارسال دعوات" @@ -1574,7 +2175,8 @@ ar: css: "CSS" header: "Header" top: "Top" - footer: "Footer" + footer: "تذييل " + embedded_css: "تضمين CSS" head_tag: text: "" title: "HTML that will be inserted before the tag" @@ -1582,16 +2184,18 @@ ar: text: "" title: "HTML that will be inserted before the tag" override_default: "Do not include standard style sheet" - enabled: "تفعيل؟" + enabled: "مفعل؟" preview: "معاينة" undo_preview: "ازالة المعاينة" rescue_preview: "الشكل الافتراضي" - explain_preview: "مشاهدة الموقع مع الثيم الجديد" - explain_undo_preview: "الرجوع الى الثيم السابق" - explain_rescue_preview: "مشاهدة الموقع مع الثيم الافتراضي" + explain_preview: "مشاهدة الموقع بهذا الشكل المخصص" + explain_undo_preview: "الرجوع الى الشكل السابق" + explain_rescue_preview: "مشاهدة الموقع بالشكل الافتراضي" save: "حفظ" new: "جديد" new_style: "ثيم جديد" + import: "استيراد" + import_title: "حدد ملف او انسخ نص" delete: "حذف" delete_confirm: "حذف هذا التخصيص؟" about: "Modify CSS stylesheets and HTML headers on the site. Add a customization to start." @@ -1619,7 +2223,7 @@ ar: name: 'ثانوي' description: 'اللون الاساسي للخلفية, والنص للايقونة' tertiary: - name: 'tertiary' + name: 'ثلاثي' description: 'الروابط، الأزرار، الإشعارات و أشياء أخرى.' quaternary: name: "رباعي" @@ -1663,15 +2267,33 @@ ar: send_test: "ارسل رسالة تجربة" sent_test: "اٌرسلت!" delivery_method: "طريقة التسليم" + preview_digest: "معاينة الخلاصة." + preview_digest_desc: "معاينة محتوى رسائل البريد الإلكتروني الملخص المرسلة للأعضاء الغير متاحين." refresh: "تحديث" format: "التنسيق" html: "html" text: "نص" last_seen_user: "آخر مستخدم تواجد:" + reply_key: "مفتاح الرد" + skipped_reason: "تجاوز السبب" logs: + none: "لا يوجد سجلات." filters: + title: "المنقي" user_placeholder: "اسم المستخدم" + address_placeholder: "name@example.com" + type_placeholder: "الخلاصة، إنشاء حساب..." + reply_key_placeholder: "مفتاح الرد" + skipped_reason_placeholder: "السبب" logs: + title: "سجلات" + action: "عملية" + created_at: "مكتوبة" + last_match_at: "اخر تطابق" + match_count: "تطابقات" + ip_address: "IP" + topic_id: "رقم معرّف الموضوع" + post_id: "رقم المشاركة" delete: 'حذف' edit: 'تعديل' save: 'حفظ' @@ -1680,7 +2302,10 @@ ar: do_nothing: "لا تفعل شيء" staff_actions: title: "عمليات المشرفين" - clear_filters: "إظهار الكل" + instructions: "إضغط على أسماء الإعضاء والإجراءات لتصفيه القائمة . إضغط على صورة العرض للإنتقال لصفحة العضو" + clear_filters: "إظهار كل شيء" + staff_user: "عضو إداري" + target_user: "عضو مستهدف" subject: "الموضوع" when: "متى" context: "السياق" @@ -1701,20 +2326,32 @@ ar: delete_site_customization: "حذف هذا التخصيص؟" suspend_user: "حظر المستخدم" unsuspend_user: "رفع الحظر " + grant_badge: "منح شارة" + revoke_badge: "حذف الشعار" check_email: "التحقق من البريد" delete_topic: "حذف الموضوع" delete_post: "حذف المشاركة" + impersonate: "إنتحال" anonymize_user: "مستخدم مجهول" + roll_up: "عناوين IP المتغيرة المحظورة" screened_emails: + title: "عناوين بريد إلكتروني محجوبة." description: "عندما تتم محاول انشاء حساب جديد, سيتم التحقق من قائمة البريد الالكتروني وسيتم حظر التسجيل لهذا البريد واتخاذ اي اجراء متبع" email: "قائمة البريد الالكتروني" actions: allow: "سماح" screened_urls: + title: "عناوين مواقع محجوبة" description: "الروابط الالكترونية الموجودة هنا تم استخدامها في مشاركات من قيل مستخدمين سبام " url: "رابط" domain: "عنوان" screened_ips: + title: "عناوين IP محجوبة" + description: 'عناوين IP التي شوهدت. أستخدم "اسمح" لإضافة عناوين IP للقائمة البيضاء.' + delete_confirm: "هل أنت متأكد أنك تريد إزالة القاعدة لـ %{ip_address} ؟" + roll_up_confirm: "هل أنت متأكد أنك تريد تغيير مصفي عناوين IP الشائعة إلى الشبكات الفرعية ؟" + rolled_up_some_subnets: "تم بنجاح حظر IP متغير يدخل إلى هذه الشبكات الفرعية : %{subnets}." + rolled_up_no_subnet: "ليس هنالك شيء ليتدحرج" actions: block: "حظر" do_nothing: "سماح" @@ -1724,23 +2361,93 @@ ar: ip_address: "عناوين الIP" add: "اضافة" filter: "بحث" + roll_up: + text: "متغير" + title: "أنشئ مدخلات فرعية جديدة إذا كانت هذه على الأقل مدخلات 'min_ban_entries_for_roll_up'." + logster: + title: "سجلات الخطأ." + impersonate: + title: "انتحال الشخصية" + help: "استخدم هذه الأداة لانتحال شخصية حساب مستخدم لأغراض التصحيح. سيتم تسجيل خروجك عندما تنتهي." + not_found: "ﻻيمكن إيجاد ذلك المستخدم." + invalid: "عذراً , لايمكنك تمثل شخصية ذلك العضو." users: title: 'مستخدمين' create: 'اضافة مدير' last_emailed: "آخر بريد الكتروني" not_found: "نعتذر، لا يوجد اسم المستخدم هذا في نظامنا." + id_not_found: "خطاء !! , إسم المستخدم غير موجود" active: "نشط" + show_emails: "عرض الرسائل" nav: new: "جديد" active: "نشط" + pending: "قيد الانتظار" + staff: 'الإدارة' + suspended: 'موقوف' + blocked: 'محظور' + suspect: 'مريب' + approved: "موافقة؟" + approved_selected: + zero: "وافق المستخدم" + one: "وافق المستخدم" + two: " وافق المستخدمين ({{count}})" + few: " وافق المستخدمين ({{count}})" + many: " وافق المستخدمين ({{count}})" + other: " وافق المستخدمين ({{count}})" + reject_selected: + zero: "رفض المستخدمين" + one: "رفض المستخدم" + two: "رفض المستخدمين ({{count}})" + few: "رفض المستخدمين ({{count}})" + many: "رفض المستخدمين ({{count}})" + other: "رفض المستخدمين ({{count}})" titles: active: 'مستخدمين نشطين' new: 'مستخدمين جدد ' + pending: 'أعضاء بانتظار المراجعة' + newuser: 'أعضاء في مستوى الثقة 0 (عضو جديد)' + basic: 'أعضاء في مستوى الثقة 1 (عضو أساسي)' + regular: 'أعضاء في مستوى الثقة 2 (منتسب)' + leader: 'أعضاء في مستوى الثقة 3 (منتظم)' + elder: 'أعضاء في مستوى الثقة 4 (قائد)' + staff: "طاقم" admins: 'مستخدمين مدراء' moderators: 'مراقبين' blocked: 'مستخدمين محظورين:' + suspended: 'أعضاء موقوفين' + suspect: 'أعضاء مريبين' + reject_successful: + zero: "رفض بنجاح 1 مستخدم" + one: "رفض بنجاح 1 مستخدم" + two: "رفض بنجاح %{count} مستخدمين." + few: "رفض بنجاح %{count} مستخدمين." + many: "رفض بنجاح %{count} مستخدمين." + other: "رفض بنجاح %{count} مستخدمين." + reject_failures: + zero: "فشل لرفض 1 مستخدم." + one: "فشل لرفض 1 مستخدم." + two: "فشل لرفض %{count} مستخدمين." + few: "فشل لرفض %{count} مستخدمين." + many: "فشل لرفض %{count} مستخدمين." + other: "فشل لرفض %{count} مستخدمين." + not_verified: "لم يتم التحقق" + check_email: + title: "اظهار عوان البريد الالكتروني لهذا العضو." + text: "إظهار" user: + suspend_failed: "حدث خطأ ما أوقف هذا المستخدم {{error}}." + unsuspend_failed: "حدث خطأ ما لم يوقف هذا المستخدم {{error}}." + suspend_duration: "كم هي مدة تعلّيق العضو ؟" + suspend_duration_units: "(أيام)" + suspend_reason_label: "لماذا هل أنت عالق؟ هذا النص سيكون ظاهراً للكل على صفحة تعريف هذا العضو, وسيكون ظاهراً للعضو عندما يحاول تسجل الدخول. احفظها قصيرة." + suspend_reason: "سبب" + suspended_by: "محظور من قبل" delete_all_posts: "حذف جميع المشاركات" + delete_all_posts_confirm: "هل أنت متأكد من أنك تريد حذف %{posts} مشاركات و %{topics} مواضيع ؟" + suspend: "علّق" + unsuspend: "إلقاء التعليق" + suspended: "معلّق؟" moderator: "مراقب؟" admin: "مدير؟" blocked: "محظور؟" @@ -1748,17 +2455,67 @@ ar: edit_title: "تعديل العنوان" save_title: "حفظ العنوان" refresh_browsers: "تحديث المتصفحات اجبارياً" + refresh_browsers_message: "الرسالة أُرسلت إلى كل الأعضاء!" + show_public_profile: "عرض الملف العام." + impersonate: 'انتحال شخصية' + ip_lookup: "جدول \"IP\"" + log_out: "تسجيل الخروج" + logged_out: "العضو قام بتسجيل الخروج من جميع الأجهزه" + revoke_admin: 'سحب الإدارة' + grant_admin: 'منحة إدارية' + revoke_moderation: 'سحب المراقبة' + grant_moderation: 'منحة مراقبة' unblock: 'إلغاء حظر' block: 'حظر' + reputation: شهرة permissions: صلاحيات activity: أنشطة like_count: الإعجابات المعطاة / المستلمة + last_100_days: 'في آخر 100 يوم' private_topics_count: موضوع خاص posts_read_count: المشاركات المقروءة post_count: المشاركات المنشأة topics_entered: المواضيع المشاهدة + flags_given_count: مبلغ عنه + flags_received_count: تم إستلام بلاغ + warnings_received_count: تحذيرات مستلمه + flags_given_received_count: 'تم التبليغ ' + approve: 'تصديق' + approved_by: "مصدق بواسطة" + approve_success: "تم تسجيل العضوية و إرسال رسالة الى بريد العضو بتعليمات التفعيل " + approve_bulk_success: "تم ! جميع الأعضاء المحددين تم توثيقهم وتنبيهم " time_read: "وقت القراءة" + anonymize: "مستخدم مجهول" + anonymize_confirm: "هل أنت متأكد أنك تريد هذا الحساب مجهول؟ هذا سيغير اسم المستخدم والبريد الإلكتروني، ويعيد تعين كل معلومات ملف التعريف." + anonymize_yes: "نعم، أخفي هذا الحساب." + anonymize_failed: "كانت هناك مشكلة من حساب مجهول المصدر" delete: "حذف المستخدم" + delete_forbidden_because_staff: "لا يمكن حذف مدراء والمشرفين." + delete_posts_forbidden_because_staff: "لا يمكن حذف جميع المشاركات للمدراء والمشرفين. " + delete_forbidden: + zero: "لا يمكن حذف الأعضاء إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو." + one: "لا يمكن للأعضاء الحذف إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو. (المشاركات الأقدم من يوم لا يمكن حذفها.)" + two: "لا يمكن حذف الأعضاء إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو. (المشاركات الأقدم من يومين لا يمكن حذفها.)" + few: "لا يمكن حذف الأعضاء إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو.\n(المشاركات الأقدم من أيام قليلة لا يمكن حذفها.)" + many: "لا يمكن حذف الأعضاء إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو. (المشاركات الأقدم من أيام %{كثيرة} لا يمكن حذفها.)" + other: "لا يمكن للأعضاء الحذف إذا كان لديهم مشاركات. احذف جميع المشاركات قبل المحاولة بحذف العضو. (المشاركات الأقدم من %{count} أيام لا يمكن حذفها.)" + cant_delete_all_posts: + zero: "لا تستطيع حذف جميع المشاركات. (The delete_user_max_post_age setting.)" + one: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يوم. (The delete_user_max_post_age setting.)" + two: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يومين. (The delete_user_max_post_age setting.)" + few: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام قليلة. (The delete_user_max_post_age setting.)" + many: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام %{كثيرة}. (The delete_user_max_post_age setting.)" + other: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)" + cant_delete_all_too_many_posts: + zero: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)" + one: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)" + two: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركتين.\n(delete_all_posts_max)" + few: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركات.\n(delete_all_posts_max)" + many: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)" + other: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)" + delete_confirm: "هل أنت متأكد من حذف هذا العضو ؟ الحذف نهائي بلا رجعه" + delete_and_block: "حذف و حظر this email and IP address" + delete_dont_block: "حذفه فقط" deleted: "تم حذف المستخدم." delete_failed: "حدث خطأ عند حذف المستخدم. يجب التاكد من انك حذفت جميع مشاركات المستخدم قبل محاولة حذف المستخدم." send_activation_email: "ارسل رسالة تفعيل" @@ -1774,7 +2531,24 @@ ar: suspended_explanation: "المستخدم الموقوف لايملك صلاحية تسجيل الدخول" block_explanation: "المستخدم الموقوف لايستطيع أن يشارك" trust_level_change_failed: "هناك مشكلة في تغيير مستوى ثقة المستخدم " + suspend_modal_title: "حظر المستخدم" + trust_level_2_users: "أعضاء مستوى الثقة 2." + trust_level_3_requirements: "متطلبات مستوى الثقة 3." + trust_level_locked_tip: "مستوى الثقة مغلق، والنظام لن يرقي أو سيخفض رتبة العضو." + trust_level_unlocked_tip: "مستوى الثقة غير مؤمن، والنظام قد ترقية أو تخفيض المستعمل " + lock_trust_level: "قفل مستوى الثقة" + unlock_trust_level: "فتح مستوى الثقة " tl3_requirements: + title: "المتطلبات لمستوى الثقة 3." + table_title: "في آخر 100 يوم" + value_heading: "تصويت" + requirement_heading: "متطلبات" + visits: "الزيارات" + days: "أيام" + topics_replied_to: "مواضيع للردود" + topics_viewed: "المواضيع شوهدت" + topics_viewed_all_time: "المواضيع المعروضة(جميع الأوقات)" + posts_read: "المنشورات المقروءة" posts_read_all_time: "المشاركات المقروءة (جميع الاوقات)" flagged_posts: "المشاركات المبلغ عنها " flagged_by_users: "المستخدمين الذين بلغوا" @@ -1786,26 +2560,351 @@ ar: does_not_qualify: "غير مستحق للمستوى" will_be_promoted: "سيتم الترقية عنه قريبا" will_be_demoted: "سيتم التخفيض قريبا" + on_grace_period: "حاليا في فترة مهلة ترقية، لن يتم تخفيض رتب." locked_will_not_be_promoted: "مستوى الثفة هذا لن يتم الترقية له نهائيا" locked_will_not_be_demoted: "مستوى الثفة هذا لن يتم الخفض له نهائيا" sso: - external_username: "اسم المستخدم" - external_name: "الاسم" + title: "الدخول الموحد" + external_id: "ID الخارجي" + external_username: "أسم المستخدم" + external_name: "الأسم" external_email: "البريد الإلكتروني" external_avatar_url: "رابط الملف الشخصي" + user_fields: + title: "حقول المستخدم" + help: "إضافة الحقول التي يمكن للمستخدمين ملئها ." + create: "أضف حقل مستخدم" + untitled: "بدون عنوان" + name: "اسم الحقل" + type: "نوع الحقل " + description: "حقل الوصف" + save: "حفظ" + edit: "تعديل" + delete: "حذف" + cancel: "إلغاء" + delete_confirm: "هل انت متأكد من انك تريد حذف هذا الحقل ؟" + options: "خيارات" + required: + title: "المطلوب للأشتراك ؟" + enabled: "مطلوب" + disabled: "غير مطلوب" + editable: + title: "التعديل بعد انشاء الحساب ؟" + enabled: "تعديل" + disabled: "غير قابل للتعديل" + show_on_profile: + title: "عرض في الملف الشحصي العام؟" + enabled: "عرض في الملف الشخصي" + disabled: "عدم الأظهار في الملف الشخصي" + field_types: + text: 'حقل النص' + confirm: 'تأكيد' + dropdown: "القائمة المنسدلة" + site_text: + none: "اختر نوع المحتوى المراد تعديله" + title: 'محتوى النص' site_settings: + show_overriden: 'تظهر فقط تجاوز' + title: 'اعدادات' + reset: 'إعادة تعيين' none: 'لا شيء' + no_results: "لا توجد نتائج." + clear_filter: "مسح" + add_url: "أضافة رابط" + add_host: "أضافة نطاق" + categories: + all_results: 'كل' + required: 'مطلوب' + basic: 'الإعداد الأساسي' + users: 'مستخدمون' + posting: 'مشاركة' + email: 'البريد الإلكتروني' + files: 'ملفات' + trust: 'المستويات الموثوقة' + security: 'أمن' + onebox: "رابط تفصيلي" + seo: 'SEO' + spam: 'سخام' + rate_limits: 'حدود المعدل' + developer: 'المطور' + embedding: "تضمين" + legal: "قانوني" + uncategorized: 'أخرى' + backups: "النسخ الإحتياطية" + login: "تسجيل الدخول" + plugins: "الإضافات " + user_preferences: "تفضيلات العضو" badges: + title: 'شعارات ' + new_badge: شعار جديد + new: 'جديد ' + name: 'إسم ' + badge: 'شعار ' + display_name: إسم العرض + description: الوصف + badge_type: نوع الشعار + badge_grouping: المجموعة + badge_groupings: + modal_title: 'تجميع الشعارات ' + granted_by: 'ممنوح بواسطة ' + granted_at: ممنوح في + reason_help: ( رابط إلى مشاركة أو موضوع ) save: حفظ delete: حذف + delete_confirm: هل أنت متأكد من أنك تريد حذف هذا الشعار ؟ + revoke: تعطيل reason: السبب + expand: توسيع &مساعدة; + revoke_confirm: هل أنت متأكد أنك تريد سحب هذه الشارة؟ + edit_badges: 'تعديل الشعارات ' + grant_badge: منح شارة + granted_badges: شارات ممنوحة. + grant: منحة + no_user_badges: "%{name} لم يمنح أي شارة." + no_badges: لا يوجد أي شارة يمكن منحها. + none_selected: "حدد شارة البدء" + allow_title: اسمح للشارة أن تستخدم كعنوان. + multiple_grant: 'يمكن منحه عدة مرات. ' + listable: اظهار الشارة على صفحة الشارات العامة + enabled: تفعيل الشعار + icon: أيقونة + image: صورة + icon_help: "إستخدم فئة الخط او رابط الى صورة" + query: علامة استفهام (SQL) + target_posts: إستعلام يستهدف المشاركات + auto_revoke: إلغاء الاستعلام اليومي + show_posts: عرض مشاركة الشارات الممنوحة على صفحة الشارات. + trigger: مطلق + trigger_type: + none: "تحديث يومي" + post_action: "عندما يعمل عضو على مشاركة." + post_revision: "عندما يقوم عضو بتعديل أو إنشاء مشاركة." + trust_level_change: "عندما يقوم شخص بتغير مستوى الثقة." + user_change: "عندما يتم تعديل عضو أو انشاءه." + preview: + link_text: "معاينة الشارات الممنوحة." + plan_text: "معاينة مع خطة الاستعلام." + modal_title: "معاينة علامة استفهام" + sql_error_header: "كان هناك خطأ ما في الاستعلام." + error_help: "انظر الرابط التالي للمساعدة بالاستفسارات الشارات." + bad_count_warning: + header: "تحذير !!" + text: "هناك عينات ممنوحة ضائعة. حدث هذا عندما أعادت شارة الإستعلام user IDs أو post IDs التي لم تكن موجودة. هذا ربما بسبب نتيجة غير متوقعة في وقت لاحق - رجائا أنقر مرتين للتأكد من إستعلامك-" + grant_count: + zero: "لا شارات لكي تعيّن." + one: "1 شارة لكي تعين." + other: "%{count} شارات بكي تعين." + sample: "أمثلة:" + grant: + with: %{أسم المستخدم} + with_post: %{أسم المستخدم} لهذه المشاركة %{link} + with_post_time: %{أسم المستخدم} لهذه المشاركة %{link} at %{time} + with_time: %{أسم المستخدم} في %{time} + emoji: + title: "الوجه التعبيري" + help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)" + add: "أضافة وجه تعبيري جديد ؟" + name: "الأسم" + image: "صورة" + delete_confirm: "هل أنت متأكد من انك تريد حذف هذا :%{name}: الوجه التعبيري ؟" + embedding: + get_started: "إذا أردت تضمين Discourse في موقع اخر، أبدأ بإضافة مضيف." + confirm_delete: "هل انت متأكد من انك تريد حذف هذا المضيف ؟" + sample: "استخدم كود HTML التالي لموقعك لإنشاء وتضمين موضوع discourse. استبدل REPLACE_ME مع canonical URL لصفحة قمت بتضمينها فيه." + title: "تضمين" + host: "أسمع بالمضيفين" + edit: "تعديل" + category: "مشاركة لفئة" + add_host: "أضف مضيف" + settings: "تضمين إعدادات" + feed_settings: "إعدادات التغذية " + feed_description: " توفير مغذي RSS/ATOM لموقعك سيطور قدرة Discourse على استيراد المحتوى الخاص بك." + crawling_settings: "إعدادات المتقدم ببطء." + crawling_description: "عندما ينشأ Discourse مواضيع لمشاركتك، إذا لم يتوفر مغذي RSS/ATOM سيحاول تحليل محتواك من HTML الخاص بك. أحيانا يمكن أن يكون تحديا استخراج محتواك، لذا نمنحك القدرة لتحديد قواعد CSS لجعل الاستخراج أسهل." + embed_by_username: "اسم العضو للموضوع المنشأ" + embed_post_limit: "أقصى عدد مشاركات مضمنة" + embed_username_key_from_feed: "مفتاح لسحب اسم عضو discourse من المغذي" + embed_truncate: "بتر المشاركات المضمنة" + embed_whitelist_selector: "منتقي CSS للعناصر التي تسمح في التضمينات." + embed_blacklist_selector: "منتقي CSS للعناصر التي حذفت من التضمينات." + feed_polling_enabled: "استورد المشاركات عبر RSS/ATOM" + feed_polling_url: "URL مغذي RSS/ATOM يتقدم ببطء." + save: "أحفظ الإعدادات المضمنة" + permalink: + title: "الرابط الثابت" + url: "رابط" + topic_id: "رقم الموضوع" + topic_title: "موضوع" + post_id: "رقم المشاركة" + post_title: "مشاركة" + category_id: "رقم الفئة" + category_title: "تصنيف" + external_url: "رابط خارجي" + delete_confirm: هل أنت متأكد من حذف هذا الرابط الثابت ؟ + form: + label: "جديد :" + add: "أضف" + filter: "بحث ( رابط داخلي أو خارجي )" + lightbox: + download: "تحميل" + search_help: + title: 'بحث عن المساعدة' + keyboard_shortcuts_help: + title: 'أختصارات لوحة المفاتيح' + jump_to: + title: 'اقفز إلى' + home: 'g, h الرئيسية' + latest: 'g, l الأخير' + new: 'g, n جديد' + unread: 'g, u لم يقرأ' + categories: 'g, c الفئات' + top: 'g, t الأعلى' + bookmarks: 'g, b الإشارات المرجعية' + profile: 'g, p ملف التعريف' + messages: 'g, m الرسائل' + navigation: + title: 'المتصفح' + jump: '# الذهاب الى الموضوع #' + back: 'uخلف' + up_down: 'k/j نقل المحدد ↑ ↓' + open: 'o أو أدخل فتح الموضوع المحدد' + next_prev: 'shift+j/shift+k القسم التالي/السابق' + application: + title: 'التطبيقات' + create: 'c انشاء موضوع جديد' + notifications: 'n فتح الإشعارات' + hamburger_menu: '= فتح قائمة hamburger' + user_profile_menu: 'pأفتح قائمة المستخدم' + show_incoming_updated_topics: '. عرض المواضيع المحدثة' + search: '/ البحث' + help: 'pأفتح قائمة المستخدم' + dismiss_new_posts: 'تجاهل جديد / المشاركات x, r' + dismiss_topics: 'x, t رفض المواضيع' + log_out: 'shift+z shift+z تسجيل خروج' + actions: + title: 'إجراءات' + bookmark_topic: 'f تبديل علامة مرجعية الموضوع' + pin_unpin_topic: 'ثبت/عدم التثبيت للموضوع shift+p ' + share_topic: 'مشاركة الموضوع shift+s' + share_post: 's مشاركة الموضوع' + reply_as_new_topic: 'الرد في موضوع مرتبط t' + reply_topic: 'رد على الموضوع shift+r' + reply_post: 'r الرد على الموضوع' + quote_post: 'q اقتباس المشاركة' + like: 'l الأعجاب بالموضوع' + flag: 'تعليم المشاركة !' + bookmark: 'b الإشارات المرجعية الخاصة بالموضوع' + edit: 'l تعديل الموضوع' + delete: 'd حذف الموضوع' + mark_muted: 'صمّت الموضوع m, m' + mark_regular: 'm, r موضوع منظم (الإفتراضي)' + mark_tracking: 'm, t تابع الموضوع' + mark_watching: 'm, w شاهد الموضوع' badges: + title: شارات + allow_title: "يمكن استخدامه كعنوان" + multiple_grant: "يمكن منحه عدة مرات. " + badge_count: + zero: "%{count} شاره" + one: "%{count} شاره" + two: "%{count} شاراتين" + few: "%{count} شارات" + many: "%{count} شارات" + other: "%{count} شارات" + more_badges: + zero: "+%{count} المزيد" + one: "+%{count} المزيد" + two: "+%{count} المزيد" + few: "+%{count} المزيد" + many: "+%{count} المزيد" + other: "+%{count} المزيد" + granted: + zero: "ﻻيوجد ممنوحات." + one: "ممنوح واحد." + two: "ممنوحان." + few: "%{count} ممنوحات." + many: "%{count} ممنوحات." + other: "%{count} ممنوحات." + select_badge_for_title: حدد شعار لإستخدامه كعنوان + none: "لا شئ" + badge_grouping: + getting_started: + name: البداية + community: + name: مجتمع + trust_level: + name: مستوى الثقة + other: + name: الجميع + posting: + name: نشر badge: + editor: + name: محرر + description: أول موضوع تم تحريره + basic_user: + name: أساسي + description: منح جميع وظائف المجتمع الأساسية. + member: + name: عضو + description: مُنح دعوات + regular: + name: منتظم + description: منح اعادة تصنيف, اعادة تسمية, اتباع الروابط + leader: + name: قائد + description: منح تحرير عام, تثبيت, اغلاق, ارشفة, تقسيم ودمج + welcome: + name: مرحباً + description: تلقيت إعجاب + autobiographer: + name: الكاتب سيرته بنفسه + description: تصفية عضو ملف التعريفمعلومات + anniversary: + name: ذكرى + description: عضو نشط لمدة عام، شارك مرة واحدة على الأقل + nice_post: + name: مشاركة رائعة + description: 'تلقيت 10 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة ' + good_post: + name: مشاركة جيدة + description: تلقيت 25 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة + great_post: + name: مشاركة ممتازة + description: تلقيت 50 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة + nice_topic: + name: 'موضوع رائع ' + description: تلقيت 10 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة + good_topic: + name: موضوع جيد + description: تلقيت 25 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة + great_topic: + name: موضوع ممتاز + description: 'تلقيت 50 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة ' + nice_share: + name: مشاركة رائعة + description: تم مشاركة رد مع أكثر من 25 زائر + good_share: + name: مشاركة جيدة + description: تم مشاركة رد مع أكثر من 300 زائر + great_share: + name: مشاركة ممتازة + description: تم مشاركة رد مع أكثر من 1000 زائر first_like: name: اول اعجاب + description: أعجب في رد first_flag: name: اول بلاغ description: مشاركة مبلغ عنها + promoter: + name: متعهد + description: دعوة مستخدم + campaigner: + name: ناشط + description: تم دعوة 3 أعضاء (مستوى الثقة 1) + champion: + name: بطل + description: تم دعوة 5 أعضاء (مستوى الثقة 2) first_share: name: اول مشاركة description: مشاركة تعليق @@ -1816,7 +2915,26 @@ ar: name: التعليق الأول description: إقتباسات read_guidelines: - name: 'توجيهات ' + name: اقرأ التعليمات description: اطلع على توجيهات المجتمع reader: name: قارئ + description: قراءة أكثر من 100 تعليق في الموضوع + popular_link: + name: رابط مشهور + description: شارك رابط خارجي بـ 50 نقرة على الأقل. + hot_link: + name: الرابط الساخن + description: شارك الرابط الخارجي بـ 300 نقرة على الأقل. + famous_link: + name: رابط مشهور + description: شارك الرابط الخارجي بـ 1000 نقرة على الأقل + google_search: | +

      ابحث في قوقل

      +

      + + + + + +

      diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 3108b32d5d..2083dcfee3 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -12,6 +12,10 @@ bs_BA: storage_units: format: '%n %u' units: + byte: + one: Bajt + few: Bajta + other: Bajta gb: GB kb: KB mb: MB @@ -29,10 +33,60 @@ bs_BA: long_date_with_year_with_linebreak: "MMM D, 'YY
      LT" tiny: half_a_minute: "< 1m" + less_than_x_seconds: + one: "< 1 sekunda" + few: "< %{count} sekundi" + other: "< %{count} sekundi" + x_seconds: + one: "1 sekunda" + few: "%{count} sekundi" + other: "%{count} sekundi" + less_than_x_minutes: + one: "<1 minuta" + few: "%{count} minuta" + other: "%{count} minuta" date_month: "MMM D" date_year: "MMM 'YY" medium: + x_minutes: + one: "1 minuta" + few: "Par minuta" + other: "%{count} minuta" + x_hours: + one: "1 sahat" + few: "Par sahati" + other: "%{count} sahati" + x_days: + one: "1 dan" + few: "Par dana" + other: "%{count} dana" date_year: "MMM D, 'YY" + medium_with_ago: + x_minutes: + one: "Prije 1 minutu" + few: "Prije par minuta" + other: "%{count} minuta prije" + x_hours: + one: "Prije 1 sahat " + few: "Prije par sahati" + other: "%{count} sahati prije" + x_days: + one: "prije 1 dan " + few: "Prije par dana " + other: "%{count} dana prije" + later: + x_days: + one: "Prije 1 dan" + few: "Prije par dana" + other: "%{count} dana prije" + x_months: + one: "Prije 1 mjesec" + few: "Prije par mjeseci" + other: "%{count} mjeseci prije" + x_years: + one: "Prije 1 godinu" + few: "Prije par godina" + other: "%{count} godine/a prije" share: topic: 'podjeli link ka ovoj temi' post: 'podjeli link ka ovom postu #%{postNumber}' @@ -56,6 +110,10 @@ bs_BA: flags_title: "Opomene" show_more: "pokaži još" links: "Linkovi" + links_lowercase: + one: "Link" + few: "Link" + other: "Linkovi" faq: "Upoznavanje Foruma" guidelines: "Guidelines" privacy_policy: "Privacy Policy" @@ -73,7 +131,13 @@ bs_BA: daily: "dnevno" weekly: "nedeljno" every_two_weeks: "svake dvije nedelje" + every_three_days: "Svako 3 dana" max_of_count: "maksimalno {{count}}" + alternation: "ili" + character_count: + one: "{{count}} karakter" + few: "{{count}} karaktera" + other: "{{count}} karaktera" suggested_topics: title: "Savetujemo Teme" about: @@ -85,16 +149,39 @@ bs_BA: stat: all_time: "Svih Vremena" last_7_days: "Zadnjih 7 Dana" + last_30_days: "Zadnjih 30 dana" like_count: "Broj Lajkova" topic_count: "Broj Tema" post_count: "Broj Postova" user_count: "Broj Članova" + active_user_count: "Aktivnih korisnika" + contact: "Kontaktirajte nas" + contact_info: "U slučaju da forum ne radi, molimo kontaktirajte nas na %{contact_info}." + bookmarked: + title: "Bookmark" + clear_bookmarks: "Očisti bookmark" + help: + bookmark: "Klikni da bookmarkuješ prvi post u temi" + unbookmark: "Klikni da ukloniš sve bookmarke iz ove teme" bookmarks: not_logged_in: "sorry, you must be logged in to bookmark posts" created: "you've bookmarked this post" not_bookmarked: "you've read this post; click to bookmark it" last_read: "this is the last post you've read; click to bookmark it" remove: "Remove Bookmark" + confirm_clear: "Jeste li sigurni da želite očistiti sve bookmarke iz ove kategorije?" + topic_count_latest: + one: "{{count}} nova ili tema sa editovanim postom." + few: "{{count}} novih ili tema sa editovanim postovima." + other: "{{count}} novih ili tema sa editovanim postovima." + topic_count_unread: + one: "{{count}} nepročitana tema." + few: "{{count}} nepročitanih tema." + other: "{{count}} nepročitanih tema." + topic_count_new: + one: "{{count}} nova tema." + few: "{{count}} novih tema." + other: "{{count}} novih tema." click_to_show: "Klikni da pokažeš." preview: "pregledaj" cancel: "otkaži" @@ -109,13 +196,39 @@ bs_BA: undo: "Undo" revert: "Revert" failed: "Failed" + switch_to_anon: "Anonimni mod" banner: close: "Dismiss this banner." + edit: "Uredite ovaj baner >>" choose_topic: none_found: "Nema pronađenih tema." title: search: "Search for a Topic by name, url or id:" placeholder: "type the topic title here" + queue: + topic: "Tema:" + approve: 'Odobri' + reject: 'Odbij' + delete_user: 'Izbriši korisnika' + title: "Potrebno odobrenje" + none: "Nema postova za pregled." + edit: "Uredi" + cancel: "Odustani" + view_pending: "Vidi postove na čekanju" + has_pending_posts: + one: "Ova tema ima 1 post koji čeka odobrenje" + few: "Ova tema ima {{count}} postova koji čekaju odobrenje" + other: "Ova tema ima {{count}} postova koji čekaju odobrenje" + confirm: "Sačuvaj promjene" + delete_prompt: "Jeste li sigurni da želite izbrisati %{username}? Ovo će izbrisati sve njihove postove i blokirati njihovu email i IP adresu." + approval: + title: "Post treba odobrenje" + description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo budite strpljivi." + pending_posts: + one: "Imate 1 post na čekanju." + few: "Imate {{count}} postova na čekanju." + other: "Imate {{count}} postova na čekanju." + ok: "OK" user_action: user_posted_topic: "{{user}} posted the topic" you_posted_topic: "You posted the topic" @@ -130,17 +243,30 @@ bs_BA: posted_by_you: "Posted by you" sent_by_user: "Sent by {{user}}" sent_by_you: "Sent by you" + directory: + title: "Korisnici" + topic_count: "Teme" + post_count: "Replike" + days_visited: "Posijete" + total_rows: + one: "%{count} korisnik" + few: "%{count} korisnika" + other: "%{count} korisnika" groups: - visible: "Group is visible to all users" + visible: "Grupa je vidljiva svim korisnicima" + title: + one: "grupa" + few: "grupe" + other: "grupe" members: "Članovi" posts: "Postovi" alias_levels: title: "Who can use this group as an alias?" nobody: "Niko" only_admins: "Samo admini" - mods_and_admins: "Only moderators and Admins" - members_mods_and_admins: "Only group members, moderators and admins" - everyone: "Everyone" + mods_and_admins: "Samo moderatori i Admini" + members_mods_and_admins: "Samo članovi grupe, moderatori i admini" + everyone: "Svatko" user_action_groups: '1': "Dati Lajkovi" '2': "Dobijeni Lajkovi" @@ -204,9 +330,7 @@ bs_BA: suspended_reason: "Reason: " mailing_list_mode: "Receive an email for every new post (unless you mute the topic or category)" watched_categories: "Watched" - watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic's listing." tracked_categories: "Tracked" - tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." muted_categories: "Muted" muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." delete_account: "Delete My Account" @@ -299,7 +423,6 @@ bs_BA: weekly: "nedeljno" email_direct: "Receive an email when someone quotes you, replies to your post, or mentions your @username" email_private_messages: "Receive an email when someone sends you a private message" - email_always: "Do not suppress email notifications when I am active on the site" other_settings: "Other" categories_settings: "Categories" new_topic_duration: @@ -313,7 +436,6 @@ bs_BA: search: "kucaj da potražiš pozivnice..." title: "Pozivnice" user: "Pozvan Korisnik" - none: "You haven't invited anyone here yet." truncated: "Showing the first {{count}} invites." redeemed: "Redeemed Invites" redeemed_at: "Redeemed" @@ -380,7 +502,6 @@ bs_BA: read_only_mode: enabled: "An administrator enabled read-only mode. You can continue to browse the site but interactions may not work." login_disabled: "Login is disabled while the site is in read only mode." - too_few_topics_notice: "Create at least 5 public topics and %{posts} public posts to get discussion started. New users cannot earn trust levels unless there's content for them to read. This message appears only to staff." learn_more: "learn more..." year: 'godina' year_desc: 'teme kreirane u zadnjih 365 dana' @@ -493,7 +614,6 @@ bs_BA: title_placeholder: "O čemu je ova diskusija u jednoj rečenici?" edit_reason_placeholder: "zašto pravite izmjenu?" show_edit_reason: "(dodaj razlog izmjene)" - reply_placeholder: "Kucaj ovde. Koristi Markdown ili BBCode za formatiranje. Povuci ili paste sliku za upload." view_new_post: "Pogledaj svoj novi post." saving: "Čuvam..." saved: "Sačuvano!" @@ -560,10 +680,7 @@ bs_BA: from_the_web: "Sa neta" remote_tip: "link do slike http://primjer.com/slika.jpg" remote_tip_with_attachments: "link to image or file http://primjer.com/file.ext (allowed extensions: {{authorized_extensions}})." - local_tip: "klikni da odabereš sliku sa svog uređaja" - local_tip_with_attachments: "klikni da odabereš sliku ili fajl sa svog uređaja (dozvoljene ekstenzije: {{authorized_extensions}})" hint: "(možete i mišom prenijeti vaše slike direktno iz vašeg foldera ovdje)" - hint_for_supported_browsers: "(možete i mišom prenijeti vaše slike direktno iz vašeg foldera ovdje a možete i copy/paste sliku)" uploading: "Uplodujem" image_link: "link do vaše slike će pokazivati" search: @@ -575,7 +692,6 @@ bs_BA: user: "Traži postove od @{{username}}" category: "Traži \"{{category}}\" kategoriju" topic: "Pretraži ovu temu" - site_map: "go to another topic list or category" go_back: 'go back' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: 'go to your user page' @@ -672,29 +788,17 @@ bs_BA: '2_4': 'Dobijat ćete notifikacije zato što ste ostavili odgovor na ovoj temi.' '2_2': 'Dobijat ćete notifikacije zato što pratite ovu temu.' '2': 'Dobijat ćete notifikacije zato što pročitao ovu temu.' - '1_2': 'Dobijat ćete notifikacije kada neko spomene @name ili odgovori na vaš post.' - '1': 'Dobijat ćete notifikacije samo kada neko spomene @name ili odgovori na vaš post.' '0_7': 'Ignorišete sve notifikacije u ovoj kategoriji.' '0_2': 'Ignorišete sve notifikacije u ovoj temi.' '0': 'Ignorišete sve notifikacije u ovoj temi.' watching_pm: title: "Motrenje" - description: "You will be notified of every new post in this private message. A count of unread and new posts will also appear next to the topic." watching: title: "Motrenje" - description: "Stizat će vam obavještenja za svaki novi post u ovoj temi. Takođe broj novih i nepročitanih postova će stajati pored teme." tracking_pm: title: "Praćenje" - description: "Broj novih i nepročitanih postova će stajati pored teme. Dobijat ćete obaviješteni ako neko spomene vaš @nadimak or ili ako odgovori na vaš post." tracking: title: "Praćenje" - description: "Broj novih i nepročitanih postova će stajati pored teme. Dobijat ćete obaviješteni samo ako neko spomene vaš @nadimak ili ako odgovori na vaš post." - regular: - title: "Regularno" - description: "Bit ćete obaviješteni ako neko spomene vaš @nadimak ili ako odgovori na vaš post." - regular_pm: - title: "Regularno" - description: "You will be notified only if someone mentions your @name or replies to your post in the private message." muted_pm: title: "Mutirano" description: "You will never be notified of anything about this private message." @@ -774,8 +878,6 @@ bs_BA: select_all: select all deselect_all: deselect all post: - reply: "Odgovori na {{link}} od {{replyAvatar}} {{username}}" - reply_topic: "Odgovori na {{link}}" quote_reply: "citiraj odgovor" edit: "Editing {{link}} by {{replyAvatar}} {{username}}" edit_reason: "Razlog: " @@ -940,13 +1042,10 @@ bs_BA: notifications: watching: title: "Motrenje" - description: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." tracking: title: "Praćenje" - description: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." regular: title: "Regularno" - description: "You will be notified only if someone mentions your @name or replies to your post." muted: title: "Mutirano" description: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." @@ -981,6 +1080,8 @@ bs_BA: help: "Ovo je zvanično upozorenje." locked: help: "Ova tema je zatvorena; zvanično ne prima nove postove" + archived: + help: "Ova tema je arhivirana; zaleđena je i ne može biti promjenjena" unpinned: title: "Unpinned" help: "This topic is unpinned; it will display in default order" @@ -990,8 +1091,6 @@ bs_BA: pinned: title: "Zakačena" help: "Ova tema je zakačena; biće na vrhu svoje kategorije" - archived: - help: "Ova tema je arhivirana; zaleđena je i ne može biti promjenjena" invisible: help: "Ovu temu sajt ne lista među najnovijim temama. Neće biti prisutna ni među listama tema unutar kategorija. Jedini način da se dođe do ove teme je direktan link" posts: "Odgovori" @@ -1019,7 +1118,6 @@ bs_BA: with_topics: "%{filter} teme" with_category: "%{filter} %{category} teme" latest: - title: "Najnovije" help: "teme sa nedavnim postovima" hot: title: "Popularne" @@ -1070,11 +1168,7 @@ bs_BA: title: "Popularne Sedmično" daily: title: "Popularne Dnevno" - this_year: "Ove godine" - this_month: "Ovog mjeseca" - this_week: "Ove nedelje" today: "Danas" - other_periods: "pogledaj još tema" browser_update: 'Nažalost, vaš internet browser je prestar za ovaj korišćenje ovog foruma. Idite na i obnovite vaš browser.' permission_types: full: "Kreiraj / Odgovori / Vidi" @@ -1329,7 +1423,6 @@ bs_BA: sent_test: "sent!" delivery_method: "Delivery Method" preview_digest: "Pregled Sajta" - preview_digest_desc: "This is a tool for previewing the content of the digest emails sent from your forum." refresh: "Refresh" format: "Format" html: "html" @@ -1695,7 +1788,6 @@ bs_BA: title: 'Aplikacija' create: 'c Započni novu temu' notifications: 'n Otvori notifikacije' - site_map_menu: '= Otvori meni sajta' user_profile_menu: 'p Otvori meni korisnika' show_incoming_updated_topics: '. Pročitaj promjenje teme' search: '/ Tragaj' @@ -1724,6 +1816,7 @@ bs_BA: allow_title: "allow badge as title?" multiple_grant: "awarded multiple times?" select_badge_for_title: Izaveri bedž za svoj naslov + none: "" badge_grouping: getting_started: name: Da započnete @@ -1757,6 +1850,9 @@ bs_BA: autobiographer: name: Autobiografičar description: Popunio biografiju na svom profilu + anniversary: + name: Godišnjica + description: Aktivan član godinu dana, pisao najmanje jednom nice_post: name: Dobar Post description: Dobio 10 lajkova na postu. Ovaj se bedž može dobiti više puta @@ -1790,6 +1886,8 @@ bs_BA: first_flag: name: Prva Opomena description: Opomenuo post + champion: + description: Pozvao 5 članova (trust level 2) first_share: name: Prvi Share description: Podijelio post diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 06f92da1f9..7699af6fb5 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -8,6 +8,9 @@ cs: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -17,15 +20,20 @@ cs: few: bajty other: bajtů gb: GB - kb: KB + kb: kB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -98,9 +106,22 @@ cs: one: "před 1 dnem" few: "před %{count} dny" other: "před %{count} dny" + later: + x_days: + one: "za 1 den" + few: "za %{count} dny" + other: "za %{count} dní" + x_months: + one: "za 1 měsíc" + few: "za %{count} měsíce" + other: "za %{count} měsíců" + x_years: + one: "za 1 rok" + few: "za %{count} roků" + other: "za %{count} let" share: topic: 'sdílet odkaz na toto téma' - post: 'příspěvek' + post: 'příspěvek #%{postNumber}' close: 'zavřít' twitter: 'sdílet odkaz na Twitteru' facebook: 'sdílet odkaz na Facebooku' @@ -121,7 +142,6 @@ cs: admin_title: "Administrace" flags_title: "Nahlášení" show_more: "zobrazit více" - show_help: "pomoc" links: "Odkazy" links_lowercase: one: "odkaz" @@ -146,6 +166,7 @@ cs: every_two_weeks: "jednou za 14 dní" every_three_days: "každé tři dny" max_of_count: "max z" + alternation: "nebo" character_count: one: "{{count}} znak" few: "{{count}} znaky" @@ -209,9 +230,9 @@ cs: revert: "Vrátit" failed: "Selhání" switch_to_anon: "Anonymní mód" - switch_from_anon: "Opustit anonymní mód" banner: close: "Odmítnout tento banner." + edit: "Editujte tento banner >>" choose_topic: none_found: "Žádná témata nenalezena." title: @@ -228,8 +249,9 @@ cs: cancel: "Zrušit" view_pending: "zobrazit příspěvky čekající na schválení" has_pending_posts: - one: "Toto téma má 1 příspěvek, který čeká na schválení." - many: "Toto téma má {{count}} příspěvků, které čekají na schválení." + one: "Toto téma má 1 příspěvek, který čeká na schválení." + few: "Toto téma má {{count}} příspěvky, které čekají na schválení." + other: "Toto téma má {{count}} příspěvků, které čekají na schválení." confirm: "Uložit změny" delete_prompt: "Jsi si jistý, že chceš smazat %{username}? Smažou se všechny jeho příspěvky, zablokuje se jeho email a IP adresa," approval: @@ -373,9 +395,9 @@ cs: github_profile: "Github" mailing_list_mode: "Upozornit emailem na každý nový příspěvek (kromě ztišených témat a kategorií)." watched_categories: "Hlídané" - watched_categories_instructions: "Nová témata v těchto kategoriích budou hlídaná. Na všechny nové příspěvky budete upozorněni." + watched_categories_instructions: "Budete automaticky sledovat všechna nová témata v těchto kategoriích. Na všechny nové příspěvky a témata budete upozorněni. Počet nových příspěvků se zobrazí vedle tématu." tracked_categories: "Sledované" - tracked_categories_instructions: "Všechna nová témata v této kategorii budou automaticky Hlídaná. Počet nepřečtených a nových příspěvků se zobrazí vedle tématu." + tracked_categories_instructions: "Všechna nová témata v této kategorii budou automaticky hlídaná. Počet nových příspěvků se zobrazí vedle tématu." muted_categories: "Ztišené" muted_categories_instructions: "Nebudete upozorněni na žádná nová témata v těchto kategoriích a ani se nebudou zobrazovat jako nepřečtené." delete_account: "Smazat můj účet" @@ -420,6 +442,7 @@ cs: change_avatar: title: "Změňte si svůj profilový obrázek" gravatar: "Založeno na Gravataru" + gravatar_title: "Změňte si avatar na webových stránkách Gravatar" refresh_gravatar_title: "Obnovit Gravatar" letter_based: "Systémem přidělený profilový obrázek" uploaded_avatar: "Vlastní obrázek" @@ -427,7 +450,6 @@ cs: upload_title: "Nahrát obrázek" upload_picture: "Nahrát obrázek" image_is_not_a_square: "Varování: Ořízli jsme váš avatar; šířka a délka nebyla stejná." - cache_notice: "Úspěšně jste změnili avatar, ale může chvíli trvat než se změna projeví." change_profile_background: title: "Pozadí profilu" instructions: "Pozadí profilu je zarovnáno doprostřed a má výchozí šířku 850px." @@ -487,42 +509,26 @@ cs: every_two_weeks: "každé dva týdny" email_direct: "Zašli mi email, pokud mě někde cituje, odpoví na můj příspěvek, zmíní mé @jméno nebo mě pozve do tématu." email_private_messages: "Zašli mi email, pokud mi někdo pošle zprávu." - email_always: "Posílat upozorňovací emaily, i když jsem zrovna na webu aktivní." other_settings: "Ostatní" categories_settings: "Kategorie" new_topic_duration: label: "Považovat témata za nová, pokud" not_viewed: "jsem je dosud neviděl." last_here: "byla vytvořena od mé poslední návštěvy." - after_n_days: - one: "byla vytvořena v posledním {{count}} dnu." - few: "byla vytvořena v posledních {{count}} dnech." - other: "byla vytvořena v posledních {{count}} dnech." - after_n_weeks: - one: "byla vytvořena v posledním {{count}} týdnu." - few: "byla vytvořena v posledních {{count}} týdnech." - other: "byla vytvořena v posledních {{count}} týdnech." auto_track_topics: "Automaticky sledovat témata, která navštívím" auto_track_options: never: "nikdy" immediately: "ihned" - after_n_seconds: - one: "po 1 sekundě." - few: "po {{count}} sekundách." - other: "po {{count}} sekundách." - after_n_minutes: - one: "po 1 minutě." - few: "po {{count}} minutách." - other: "po {{count}} minutách." invited: search: "pište pro hledání v pozvánkách..." title: "Pozvánky" user: "Pozvaný uživatel" - none: "Zatím jste nikoho nepozvali." truncated: "Showing the first {{count}} invites." redeemed: "Uplatněné pozvánky" + redeemed_tab: "Uplatněno" redeemed_at: "Uplatněno" pending: "Nevyřízené pozvánky" + pending_tab: "Čeká na schválení" topics_entered: "Zobrazil témat" posts_read_count: "Přečteno příspěvků" expired: "Poznávka je už prošlá." @@ -555,6 +561,7 @@ cs: title: "Registrační IP adresa" avatar: title: "Profilový obrázek" + header_title: "profil, zprávy, záložky a nastavení" title: title: "Titul" filters: @@ -649,6 +656,7 @@ cs: email_placeholder: "emailová adresa nebo uživatelské jméno" caps_lock_warning: "zapnutý Caps Lock" error: "Neznámá chyba" + rate_limit: "Počkejte před dalším pokusem se přihlásit." blank_username_or_password: "Vyplňte prosím email nebo uživatelské jméno, a heslo." reset_password: 'Resetovat heslo' logging_in: "Přihlašuji..." @@ -713,7 +721,6 @@ cs: title_placeholder: "O čem je ve zkratce tato diskuze?" edit_reason_placeholder: "proč byla nutná úprava?" show_edit_reason: "(přidat důvod úpravy)" - reply_placeholder: "Pište sem. Můžete použít Markdown, BBCode nebo HTML. Obrázky nahrajte přetáhnutím nebo vložením." view_new_post: "Zobrazit váš nový příspěvek." saving: "Ukládám..." saved: "Uloženo!" @@ -788,11 +795,9 @@ cs: from_the_web: "Z webu" remote_tip: "odkaz na obrázek" remote_tip_with_attachments: "odkaz na obrázek nebo osubor ({{authorized_extensions}})" - local_tip: "klikněte sem pro výběr obrázku z vašeho zařízení." - local_tip_with_attachments: "klikněte pro vybrání obrázku nebo souboru z vašeho zařízení ({{authorized_extensions}})" hint: "(můžete také rovnou soubor do editoru přetáhnout)" - hint_for_supported_browsers: "(můžete také rovnou obrázky do editoru přetáhnout)" uploading: "Nahrávám" + select_file: "Vyberte soubor" image_link: "adresa na kterou má váš obrázek odkazovat" search: title: "vyhledávat témata, příspěvky, uživatele nebo kategorie" @@ -804,7 +809,6 @@ cs: category: "Vyhledat v kategorii „{{category}}“" topic: "Vyhledat v tomto tématu" private_messages: "Hledat ve zprávách" - site_map: "přejít na jiný seznam témat nebo kategorii" go_back: 'jít zpět' not_logged_in_user: 'stránka uživatele s přehledem o aktuální činnosti a nastavení' current_user: 'jít na vaši uživatelskou stránku' @@ -941,22 +945,20 @@ cs: '0': 'Ignorujete všechna oznámení z tohoto tématu.' watching_pm: title: "Hlídání" - description: "Budete informováni o každém novém příspěvku v této zprávě. Vedle názvu tématu se objeví počet nepřečtených a nových příspěvků." + description: "Budete informováni o každém novém příspěvku v této zprávě. Vedle názvu tématu se objeví počet nepřečtených příspěvků." watching: title: "Hlídané" - description: "Budete informováni o každém novém příspěvku v tomto tématu. Vedle názvu tématu se objeví počet nepřečtených a nových příspěvků." + description: "Budete informováni o každém novém příspěvku v tomto tématu. Vedle názvu tématu se objeví počet nepřečtených příspěvků." tracking_pm: title: "Sledování" - description: "Počet nepřečtených a nových příspěvků se objeví vedle zprávy. Budete upozorněni, pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." + description: "U této zprávy se zobrazí počet nových příspěvků. Budete upozorněni, pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." tracking: title: "Sledované" - description: "U tématu se zobrazí počet nepřečtených a nových příspěvků. Budete uporozněni když vás někdo zmíní jako @jmeno nebo odpoví na váš příspěvek." + description: "U tohoto tématu se zobrazí počet nových příspěvků. Budete upozorněni, pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." regular: - title: "Klasicky" description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." regular_pm: - title: "Normální" - description: "Budete upozorněni, když vás někdo zmíní vaše @jmeno nebo odpoví na váš příspěvek pomocí zprávy." + description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." muted_pm: title: "Ztišení" description: "Nikdy nedostanete oznámení týkající se čehokoliv v této zprávě." @@ -998,7 +1000,6 @@ cs: success_message: 'Téma úspěšně nahlášeno.' feature_topic: title: "Povýšit téma" - pin: "Zobrazovat toto téma na vrcholu {{categoryLink}} kategorie." confirm_pin: "Již máte {{count}} připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma v této kategorii?" unpin: "Odstranit toto téma z vrcholu {{categoryLink}} kategorie." pin_note: "Uživatelé mohou odepnout téma sami pro sebe." @@ -1006,7 +1007,6 @@ cs: zero: "V {{categoryLink}} nejsou žádná připevněná témata." one: "V současnosti připevněná téma v {{categoryLink}}: 1." other: "V současnosti připevněná téma v {{categoryLink}}: {{count}}." - pin_globally: "Zobrazit toto téma na vrcholu všech seznamů témat, dokud do správce neodepne." confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?" unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy." global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe." @@ -1019,6 +1019,7 @@ cs: banner_note: "Uživatelé mohou odmítnout banner jeho zavřením. V jeden moment může být pouze jedno téma jako banner." already_banner: zero: "Žádné téma není jako banner." + one: "V současnosti je zde zakázané téma." inviting: "Odesílám pozvánku..." automatically_add_to_groups_optional: "Tato pozvánka obsahuje také přístup do této skupiny: (volitelné, pouze administrátor)" automatically_add_to_groups_required: "Tato pozvánka obsahuje také přístup do těchto skupin: (Vyžadováno, pouze administrátor)" @@ -1039,8 +1040,8 @@ cs: sso_enabled: "Zadej uživatelské jméno člověka, kterého chceš pozvat do tohoto tématu." to_topic_blank: "Zadej uživatelské jméno a email člověka, kterého chceš pozvat do tohoto tématu." to_topic_email: "Zadal jste emailovou adresu. Pošleme na ni pozvánku, s jejíž pomocí bude moci váš kamarád ihned odpovědět do tohoto tématu." - to_topic_username: "Zadali jste uživatelské jméno. Zašleme mu oznámení s pozváním do tohoto tématu." - to_username: "Vložte uživatelské jméno osoby kterou chcete pozvat. Zašleme jí upozornění s pozvánkou do tohoto tématu." + to_topic_username: "Zadali jste uživatelské jméno. Zašleme pozvánku s odkazem do tohoto tématu." + to_username: "Zadejte uživatelské jméno člověka, kterého chcete pozvat. Zašleme pozvánku s odkazem do tohoto tématu." email_placeholder: 'jmeno@priklad.cz' success_email: "Zaslali jsme pozvánku na {{emailOrUsername}}. Upozorníme vás až bude pozvánka použita. Své pozvánky můžete sledovat v tabulce pozvánek na svém uživatelském profilu." success_username: "Pozvali jsme zadaného uživatele, aby se zúčastnil tématu." @@ -1079,6 +1080,7 @@ cs: one: "Vyberte prosím nového autora příspěvku od {{old_user}}." few: "Vyberte prosím nového autora {{count}} příspěvků od {{old_user}}." other: "Vyberte prosím nového autora {{count}} příspěvků od {{old_user}}." + instructions_warn: "Poznámka: Žádná upozornění na tento příspěvek nebudou zpětně přenesena na nového uživatele.
      Varování: V současné chvíli, žádná data svázaná s příspěvkem nebudou přenesena na nového uživatele. Používejte opatrně." multi_select: select: 'vybrat' selected: 'vybráno ({{count}})' @@ -1092,8 +1094,6 @@ cs: few: Máte označeny {{count}} příspěvky. other: Máte označeno {{count}} příspěvků. post: - reply: "Odpovídáte na {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Odpověď na {{link}}" quote_reply: "odpověď s citací" edit: "Editujete {{link}} {{replyAvatar}} {{username}}" edit_reason: "Důvod: " @@ -1109,12 +1109,28 @@ cs: few: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" expand_collapse: "rozbalit/sbalit" + gap: + one: "zobrazit 1 skrytou odpověď" + few: "zobrazit {{count}} skryté odpovědi" + other: "zobrazit {{count}} skrytých odpovědí" more_links: "{{count}} dalších..." unread: "Příspěvek je nepřečtený." has_replies: - one: "Odpověď" - few: "Odpovědi" - other: "Odpovědí" + one: "{{count}} odpověď" + few: "{{count}} odpovědi" + other: "{{count}} odpovědí" + has_likes: + one: "{{count}} líbí se mi" + few: "{{count}} líbí se mi" + other: "{{count}} líbí se mi" + has_likes_title: + one: "1 člověku se líbí tento příspěvek" + few: "{{count}} lidem se líbí tento příspěvek" + other: "{{count}} lidem se líbí tento příspěvek" + has_likes_title_you: + zero: "tento příspěvek se mi líbí" + one: "vám a 1 další osobě se tento příspěvek líbí" + other: "vám a {{count}} dalším lidem se tento příspěvek líbí" errors: create: "Bohužel nastala chyba při vytváření příspěvku. Prosím zkuste to znovu." edit: "Bohužel nastala chyba při editaci příspěvku. Prosím zkuste to znovu." @@ -1287,6 +1303,7 @@ cs: last: "Poslední revize" hide: "Schovejte revizi" show: "Zobrazte revizi" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Vykreslený příspěvek se změnami zobrazenými v textu" @@ -1300,16 +1317,19 @@ cs: category: can: 'smí… ' none: '(bez kategorie)' + all: 'Všechny kategorie' choose: 'Vyberte kategorii…' edit: 'upravit' edit_long: "Upravit" view: 'Zobrazit témata v kategorii' general: 'Základní' settings: 'Nastavení' + topic_template: "Šablona tématu" delete: 'Smazat kategorii' create: 'Nová kategorie' save: 'Uložit kategorii' slug: 'Odkaz kategorie' + slug_placeholder: '(Dobrovolné) podtržená URL' creation_error: Během vytváření nové kategorie nastala chyba. save_error: Během ukládání kategorie nastala chyba. name: "Název kategorie" @@ -1348,13 +1368,13 @@ cs: notifications: watching: title: "Hlídání" - description: "Budete automaticky sledovat všechna nová témata v těchto kategoriích. Na všechny nové příspěvky budete upozorněni. Počet nepřečtených a nových příspěvků se zobrazí vedle tématu." + description: "Všechna nová témata v této kategorii budou automaticky Sledovaná. Na všechny nové příspěvky a témata budete upozorněni. Navíc ve výpisu uvidíte počet nepřečtených příspěvků." tracking: title: "Sledování" - description: "Všechna nová témata v této kategorii budou automaticky hlídaná. Počet nepřečtených a nových příspěvků se zobrazí vedle tématu." + description: "Všechna nová témata v této kategorii budou automaticky Hlídaná. Počet nových příspěvků se zobrazí vedle tématu." regular: title: "Normální" - description: "Budete informováni, pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." + description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek." muted: title: "Ztišený" description: "Nebudete upozorněni na žádná nová témata v těchto kategoriích a ani se nebudou zobrazovat jako nepřečtené." @@ -1401,6 +1421,8 @@ cs: help: "V tématu je vložena záložka" locked: help: "toto téma je uzavřené; další odpovědi nejsou přijímány" + archived: + help: "toto téma je archivováno; je zmraženo a nelze ho již měnit" unpinned: title: "Nepřipnuté" help: "Pro vás toto téma není připnuté; bude se zobrazovat v běžném pořadí" @@ -1410,8 +1432,6 @@ cs: pinned: title: "Připnuto" help: "Pro vás je toto téma připnuté; bude se zobrazovat na vrcholu seznamu ve své kategorii" - archived: - help: "toto téma je archivováno; je zmraženo a nelze ho již měnit" invisible: help: "Toto téma je neviditelné; nebude se zobrazovat v seznamu témat a lze ho navštívit pouze přes přímý odkaz" posts: "Příspěvků" @@ -1454,7 +1474,10 @@ cs: with_topics: "%{filter} témata" with_category: "%{filter} %{category} témata" latest: - title: "Nejnovější" + title: + zero: "Aktuální" + one: "Aktuální (1)" + other: "Aktuální ({{count}})" help: "nejaktuálnější témata" hot: title: "Populární" @@ -1474,6 +1497,7 @@ cs: zero: "Nepřečtená" one: "Nepřečtená (1)" other: "Nepřečtená ({{count}})" + help: "témata. která sledujete nebo hlídáte, s nepřečtenými příspěvky" lower_title_with_count: one: "1 nepřečtený" other: "{{count}} nepřečtených" @@ -1513,11 +1537,11 @@ cs: daily: title: "Denně" all_time: "Za celou dobu" - this_year: "Letos" - this_month: "Tenhle měsíc" - this_week: "Tenhle týden" + this_year: "Rok" + this_month: "Měsíc" + this_week: "Týden" today: "Dnes" - other_periods: "další nejlepší témata" + other_periods: "viz nahoře" browser_update: 'Bohužel, váš prohlížeč je příliš starý, aby na něm Discourse mohl fungovat. Prosím aktualizujte svůj prohlížeč.' permission_types: full: "Vytvářet / Odpovídat / Prohlížet" @@ -1551,6 +1575,7 @@ cs: suspended: 'Zakázáno:' private_messages_short: "Msgs" private_messages_title: "Zprávy" + mobile_title: "Mobilní verze" space_free: "{{size}} prázdné" uploads: "Nahrané soubory" backups: "zálohy" @@ -1687,7 +1712,11 @@ cs: name: "Název" none_installed: "Nemáte nainstalované žádné pluginy." version: "Verze" + enabled: "Zapnutý?" + is_enabled: "A" + not_enabled: "N" change_settings: "Změnit nastavení" + change_settings_short: "Nastavení" howto: "Jak nainstaluji pluginy?" backups: title: "Zálohy" @@ -1743,14 +1772,18 @@ cs: confirm: "Are your sure you want to rollback the database to the previous working state?" export_csv: user_archive_confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?" + success: "Export byl spuštěn. O dokončení celého procesu budete informování pomocí zprávy." failed: "Exportování selhalo. Prosím zkontrolujte logy." rate_limit_error: "Příspěvky mohou být staženy jednou za den. Prosíme, zkuste to znovu zítra." button_text: "Export" button_title: user: "Exportovat kompletní seznam uživatelů v CSV formátu." + staff_action: "Exportovat kompletní akce redakce v CSV formátu." screened_email: "Exportovat kompletní seznam emailů v CSV formátu." screened_ip: "Exportovat kompletní seznam IP adres v CSV formátu." screened_url: "Exportovat kompletní seznam URL v CSV formátu." + export_json: + button_text: "Export" invite: button_text: "Poslat pozvánky" button_title: "Poslat pozvánky" @@ -1778,6 +1811,8 @@ cs: save: "Uložit" new: "Nové" new_style: "Nový styl" + import: "Import" + import_title: "Vyberte soubor nebo vložte text" delete: "Smazat" delete_confirm: "Smazat toto přizpůsobení?" color: "Barva" @@ -1843,7 +1878,6 @@ cs: sent_test: "odesláno!" delivery_method: "Způsob doručení" preview_digest: "Náhled souhrnu" - preview_digest_desc: "Náhled týdenního přehledu pro neaktivní uživatele." refresh: "Aktualizovat" format: "Formát" html: "html" @@ -1936,6 +1970,7 @@ cs: title: "Chybové záznamy" impersonate: title: "Přihlásit se jako" + not_found: "Tento uživatel nebyl nalezen." users: title: 'Uživatelé' create: 'Přidat administrátora' @@ -2200,6 +2235,7 @@ cs: grant: Udělit no_user_badges: "%{name} nezískal žádné oznaky." no_badges: Nejsou tu žádné odznaky, které by se dali rozdat. + none_selected: "Vyberte odznak, abyste mohli začít" allow_title: Povolit užití odzanku jako titul multiple_grant: Může být přiděleno několikrát listable: Zobrazit odznak na veřejné stránce s odzanky @@ -2207,10 +2243,17 @@ cs: icon: Ikona image: Obrázek icon_help: "Použijte buď Font Awesome nebo URL k obrázku." + query: Dotaz na odznak (SQL) trigger: Spouštěč trigger_type: + none: "Aktualizujte denně" + post_action: "Když uživatel reaguje na příspěvek" + post_revision: "Když uživatel upraví nebo vytvoří příspěvek" + trust_level_change: "Když uživatel změní důvěryhodnost" user_change: "Když je uživatel upraven nebo vytvořen" preview: + sql_error_header: "Bohužel, nastala chyba s dotazem." + error_help: "Prohlédněte si následující odkazy, které vám zodpoví dotazy o odznacích." bad_count_warning: header: "VAROVÁNÍ!" grant_count: @@ -2220,6 +2263,9 @@ cs: sample: "Příklad:" grant: with: %{username} + with_post: %{username} for post in %{link} + with_post_time: %{username} for post in %{link} at %{time} + with_time: %{username} at %{time} emoji: title: "Emoji" help: "Vložte nové emoji, které bude dostupné pro všechny na fóru. (Protip: můžete přetáhnout několik souborů najednou.)" @@ -2235,11 +2281,13 @@ cs: title: 'Klávesové zkratky' jump_to: title: 'Jump To' + home: 'g, h Domů' latest: 'g, l Poslední' new: 'g, n Nový' unread: 'g, u Nepřečtěné' categories: 'g, c Kategorie' top: 'g, t Nahoru' + bookmarks: 'g, b Záložky' navigation: title: 'Navigation' jump: '# Jdi na příspěvek #' @@ -2251,7 +2299,6 @@ cs: title: 'Application' create: 'c Create a new topic' notifications: 'n Open notifications' - site_map_menu: '= Otevře hlavní menu' user_profile_menu: 'p Otevře uživatelské menu' show_incoming_updated_topics: '. Ukáže aktualizovaná témata' search: '/ Search' @@ -2279,6 +2326,8 @@ cs: mark_watching: 'm, w Watch topic' badges: title: Odznaky + allow_title: "může být použito jako titul" + multiple_grant: "může být přiděleno několikrát" badge_count: one: "1 odznak" few: "%{count} odznaky" @@ -2313,10 +2362,12 @@ cs: description: Granted all essential community functions member: name: Člen + description: Povoleny pozvánky regular: name: Normální leader: name: Vůdce + description: Povoleno globální editování, připínání, zavírání, archivace, rozdělení a spojení welcome: name: Vítejte description: Obdrženo líbí se mi @@ -2325,6 +2376,7 @@ cs: description: Vypněné informace v profilu. anniversary: name: Výročí + description: Aktivním členem přes rok, přispěl alespoň jednou nice_post: name: Zdařilý příspěvek description: Obdrženo 10 líbí se na příspěvku. Tento odznak můžete získat opakovaně @@ -2373,12 +2425,3 @@ cs: reader: name: Čtenář description: Přečíst každý příspěvek v tématu s více než 100 příspěvky - google_search: | -

      Vyhledání v Google

      -

      - - - - - -

      diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 58f8f43fae..8b0887269c 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -8,6 +8,9 @@ da: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ da: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -82,6 +90,16 @@ da: x_days: one: "1 dag siden" other: "%{count} dage siden" + later: + x_days: + one: "1 dag senere" + other: "%{count} dage senere" + x_months: + one: "1 måned senere" + other: "%{count} måneder senere" + x_years: + one: "1 år senere" + other: "%{count} år senere" share: topic: 'del et link til dette emne' post: 'indlæg #%{postNumber}' @@ -90,6 +108,15 @@ da: facebook: 'del dette link på Facebook' google+: 'del dette link på Google+' email: 'send dette link i en e-mail' + action_codes: + autoclosed: + enabled: 'lukket %{when}' + disabled: 'åbnet %{when}' + closed: + enabled: 'lukket %{when}' + disabled: 'åbnet %{when}' + archived: + enabled: 'arkiveret %{when}' topic_admin_menu: "administrationshandlinger på emne" emails_are_disabled: "Alle udgående emails er blevet deaktiveret globalt af en administrator. Ingen emailnotifikationer af nogen slags vil blive sendt." edit: 'redigér titel og kategori for dette emne' @@ -105,7 +132,7 @@ da: admin_title: "Admin" flags_title: "Flag" show_more: "vis mere" - show_help: "hjælp" + show_help: "indstillinger" links: "Links" links_lowercase: one: "link" @@ -129,6 +156,7 @@ da: every_two_weeks: "hver anden uge" every_three_days: "hver tredje dag" max_of_count: "max af {{count}}" + alternation: "eller" character_count: one: "{{count}} tegn" other: "{{count}} tegn" @@ -188,9 +216,9 @@ da: revert: "Gendan" failed: "Fejlet" switch_to_anon: "Anonym tilstand" - switch_from_anon: "Afbryd anonym tilstand" banner: close: "Afvis denne banner." + edit: "Rediger dette banner >>" choose_topic: none_found: "Ingen emner fundet." title: @@ -207,8 +235,8 @@ da: cancel: "Annuller" view_pending: "vis afventende indlæg" has_pending_posts: - one: "Emnet har 1 indlæg der afventer godkendelse" - many: "Emnet har {{count}} der afventer godkendelse" + one: "Det emne har 1 indlæg der afventer godkendelse" + other: "Dette emne har {{count}} indlæg der afventer godkendelse" confirm: "Gem ændringer" delete_prompt: "Er du sikker på, at du vil slette %{username}? Alle brugerens indlæg bliver slettet og email og IP-adresse bliver blokeret." approval: @@ -266,6 +294,8 @@ da: mods_and_admins: "Kun moderatore og administratore" members_mods_and_admins: "Kun gruppe medlemmer, moderatore og administratore" everyone: "Alle" + trust_levels: + none: "Ingen" user_action_groups: '1': "Likes givet" '2': "Likes modtaget" @@ -285,6 +315,8 @@ da: all_subcategories: "Alle" no_subcategory: "ingen" category: "Kategori" + reorder: + apply_all: "Anvend" posts: "Indlæg" topics: "Emner" latest: "Seneste" @@ -314,6 +346,8 @@ da: topics_entered: "emner indtastet" post_count: "# indlæg" confirm_delete_other_accounts: "Er du sikker på, at du vil slette disse kontoer?" + user_fields: + none: "(vælg en indstilling)" user: said: "{{username}}:" profile: "Profil" @@ -325,11 +359,20 @@ da: private_messages: "Beskeder" activity_stream: "Aktivitet" preferences: "Indstillinger" + expand_profile: "Udvid" bookmarks: "Bogmærker" bio: "Om mig" invited_by: "Inviteret af" trust_level: "Tillidsniveau" notifications: "Underretninger" + desktop_notifications: + perm_denied_btn: "Tilladelse nægtet" + perm_denied_expl: "Du har ikke givet tilladelse til meddelelser. Brug din browser til at aktivere meddelelser og klik derefter på knappen, når du er færdig. (Computer: Ikonet længst til venstre i adresselinjen. Mobil: 'Site info'.)" + disable: "Deaktiver meddelelser" + currently_enabled: "(slået til)" + enable: "Aktiver meddelelser" + currently_disabled: "(slået fra)" + each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere." dismiss_notifications: "Marker alle som læst" dismiss_notifications_tooltip: "Marker alle ulæste meddelelser som læst" disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer" @@ -342,14 +385,15 @@ da: admin: "{{user}} er admin" moderator_tooltip: "Dette bruger er moderator" admin_tooltip: "Denne bruger er administrator" + blocked_tooltip: "Brugeren er blokeret" suspended_notice: "Denne bruger er suspenderet indtil {{date}}." suspended_reason: "Begrundelse: " github_profile: "Github" mailing_list_mode: "Send mig en email for hvert nye indlæg (med mindre, at jeg muter emnet eller kategorien)" watched_categories: "Overvåget" - watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier" + watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner, og antallet af ulæste og nye indlæg vil også stå ved siden af emnet." tracked_categories: "Fulgt" - tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af ulæste og nye indlæg vises ved emnet." + tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af nye indlæg vises ved emnet." muted_categories: "Ignoreret" muted_categories_instructions: "Du ignorerer automatisk alle emner i disse kategorier" delete_account: "Slet min konto" @@ -402,7 +446,7 @@ da: upload_title: "Upload dit profil billede" upload_picture: "Upload et billede" image_is_not_a_square: "Advarsel: vi har klippet i billedet; bredde og højde var ikke ens." - cache_notice: "Du har ændret din avatar, men det kan godt tage lidt tid før ændringen kan ses." + cache_notice: "Du har ændret dit profilbillede, men der kan godt gå lidt tid inden ændringen træder i kraft." change_profile_background: title: "Profil baggrundsbillede" instructions: "Profil baggrunde vil blive centrerede og have en standard bredde på 850 pixels" @@ -430,14 +474,14 @@ da: instructions: "Unikt, ingen mellemrum, kort" short_instructions: "Folk kan benævne dig som @{{username}}" available: "Dit brugernavn er tilgængeligt" - global_match: "E-mail tilsvarende det registrerede brugernavn" + global_match: "E-mail svarer til det registrerede brugernavn" global_mismatch: "Allerede registreret. Prøv {{suggestion}}?" not_available: "Ikke ledigt. Prøv {{suggestion}}?" too_short: "Dit brugernavn er for kort" too_long: "Dit brugernavn er for langt" checking: "Kontrollerer om brugernavnet er ledigt…" enter_email: 'Brugernavn fundet; indtast tilsvarende e-mail' - prefilled: "E-mail tilsvarende dette registrerede brugernavn" + prefilled: "E-mail svarer til dette registrerede brugernavn" locale: title: "sprog" instructions: "Brugerinterface sprog. Det skifter når de reloader siden." @@ -462,38 +506,40 @@ da: every_two_weeks: "hver anden uge" email_direct: "Send mig en email når nogen citerer mig, svarer på mit indlæg, nævner mit @brugernavn eller inviterer mig til et emne" email_private_messages: "Send mig en email når nogen sender mig en besked" - email_always: "Send email notifikationer, selvom jeg er aktiv på forummet" + email_always: "Send mig email-notifikationer, selv når jeg er aktiv på websitet" other_settings: "Andre" categories_settings: "Kategorier" new_topic_duration: label: "Betragt emner som nye når" not_viewed: "Jeg har ikke set dem endnu" last_here: "oprettet siden jeg var her sidst" - after_n_days: - one: "Oprettet i dag" - other: "oprettet indenfor de seneste {{count}} dage" - after_n_weeks: - one: "oprettet indenfor den seneste uge" - other: "oprettet indenfor de sidste {{count}} uger" + after_1_day: "oprettet indenfor den seneste dag" + after_2_days: "oprettet i de seneste 2 dage" + after_1_week: "oprettet i seneste uge" + after_2_weeks: "oprettet i de seneste 2 uger" auto_track_topics: "Følg automatisk emner jeg åbner" auto_track_options: never: "aldrig" immediately: "med det samme" - after_n_seconds: - one: "efter et sekund" - other: "efter {{count}} sekunder" - after_n_minutes: - one: "efter et minut" - other: "efter {{count}} minutter" + after_30_seconds: "efter 30 sekunder" + after_1_minute: "efter 1 minut" + after_2_minutes: "efter 2 minutter" + after_3_minutes: "efter 3 minutter" + after_4_minutes: "efter 4 minutter" + after_5_minutes: "efter 5 minutter" + after_10_minutes: "efter 10 minutter" invited: search: "tast for at søge invitationer…" title: "Invitationer" user: "Inviteret bruger" - none: "Du har ikke inviteret nogen endnu." + sent: "Sendt" + none: "Der er ingen afventende invitationer." truncated: "Viser de første {{count}} invitationer." redeemed: "Brugte invitationer" + redeemed_tab: "Indløst" redeemed_at: "Invitation brugt" pending: "Udestående invitationer" + pending_tab: "Afventende" topics_entered: "Emner åbnet" posts_read_count: "Indlæg læst" expired: "Denne invitation er forældet" @@ -505,6 +551,7 @@ da: days_visited: "Besøgsdage" account_age_days: "Kontoens alder i dage" create: "Send en invitation" + generate_link: "Kopier invitations-link" bulk_invite: none: "Du har ikke inviteret nogen her endnu. Du kan sende individuelle invitationer eller invitere en masse mennesker på én gang ved at uploade en samlet liste over invitationer." text: "Masse invitering fra en fil" @@ -526,6 +573,7 @@ da: title: "Registrerings IP adresse" avatar: title: "Profil Billede" + header_title: "profil, beskeder, bogmærker og indstillinger." title: title: "Titel" filters: @@ -560,7 +608,6 @@ da: read_only_mode: enabled: "Skrivebeskyttet tilstand er aktiv. Du kan fortsætte med at læse indlæg, men du kan ikke ændre noget." login_disabled: "Log in er deaktiveret midlertidigt, da forummet er i \"kun læsnings\" tilstand." - too_few_topics_notice: "Opret mindst 5 offentlige emner og %{posts} offentlige svar for at få startet dialogen. Nye brugere kan ikke optjene tillad medmindre de har noget at læse. Denne besked vises kun til personalet." learn_more: "Læs mere…" year: 'år' year_desc: 'Indlæg oprettet i de seneste 365 dage' @@ -609,10 +656,10 @@ da: reset: "Nulstil adgangskode" complete_username: "Hvis en konto matcher brugernavnet %{username}, vil du om lidt modtage en email med instruktioner om hvordan man nulstiller passwordet." complete_email: "Hvis en konto matcher %{email}, vil du om lidt modtage en email med instruktioner om hvordan man nulstiller passwordet." - complete_username_found: "Vi fandt ingen kontoer tilsvarende brugernavnet %{username}, du burde modtage en e-mail med instruktioner om hvordan du nulstiller din adgangskode, i løbet af kort tid." - complete_email_found: "Vi har fundet en konto tilsvarende %{email}, du burde modtage en e-mail med instruktioner om hvordan du nulstiller din adgangskode, i løbet af kort tid." + complete_username_found: "Vi fandt en konto der svarer til brugernavnet %{username}, du burde i løbet af kort tid modtage en e-mail med instruktioner om hvordan du nulstiller din adgangskode." + complete_email_found: "Vi har fundet en konto der svarer til %{email}, du burde i løbet af kort tid modtage en e-mail med instruktioner om hvordan du nulstiller din adgangskode." complete_username_not_found: "Ingen kontoer passer til brugernavnet %{username}" - complete_email_not_found: "Ingen kontoer tilsvarende %{email}" + complete_email_not_found: "Ingen kontoer svarer til %{email}" login: title: "Log ind" username: "Bruger" @@ -620,6 +667,7 @@ da: email_placeholder: "e-mail eller brugernavn" caps_lock_warning: "Caps Lock er sat til" error: "Ukendt fejl" + rate_limit: "Vent venligst, før du prøver at logge på igen." blank_username_or_password: "Skriv din email adresse eller brugernavn og dit password" reset_password: 'Nulstil adgangskode' logging_in: "Logger ind..." @@ -684,7 +732,6 @@ da: title_placeholder: "Hvad handler diskussionen om i korte træk?" edit_reason_placeholder: "hvorfor redigerer du?" show_edit_reason: "(tilføj en begrundelse for ændringen)" - reply_placeholder: "skriv her. Benyt Markdown, BBCode eller HTML til at formattere. Træk eller indsæt et billede for at uploade det." view_new_post: "Se dit nye indlæg." saving: "Gemmer…" saved: "Gemt!" @@ -759,15 +806,17 @@ da: from_the_web: "Fra nettet" remote_tip: "link til billede" remote_tip_with_attachments: "link til billede eller fil ({{authorized_extensions}})" - local_tip: "klik for at vælge et billede fra din computer." - local_tip_with_attachments: "klik for at vælge et billede eller fil fra din enhed ({{authorized_extensions}})" + local_tip: "vælg billeder fra din enhed" + local_tip_with_attachments: "vælg billeder eller filer fra din enhed ({{authorized_extensions}})" hint: "(du kan også trække og slippe ind i editoren for at uploade dem)" - hint_for_supported_browsers: "(du kan også trække og slippe eller indsætte billeder ind i editoren for at uploade dem)" uploading: "Uploader billede" + select_file: "Vælg fil" image_link: "link som dit billede vil pege på" search: title: "søg efter emner, indlæg, brugere eller kategorier" no_results: "Ingen resultater fundet." + no_more_results: "Ikke flere resultater." + search_help: Hjælp til søgning searching: "Søger…" post_format: "#{{post_number}} af {{username}}" context: @@ -775,7 +824,7 @@ da: category: "Søg i kategorien \"{{category}}\"" topic: "Søg i dette emne" private_messages: "Søg i beskeder" - site_map: "gå til en anden emneoversigt eller kategori" + hamburger_menu: "gå til en anden emneliste eller kategori" go_back: 'gå tilbage' not_logged_in_user: 'bruger side, med oversigt over aktivitet og indstillinger' current_user: 'gå til brugerside' @@ -899,29 +948,29 @@ da: '2_4': 'Du får notifikationer fordi du har besvaret dette emne.' '2_2': 'Du får notifikationer fordi du følger dette emne.' '2': 'Du får notifikationer fordi du har læst dette emne.' - '1_2': 'Du får en notifikation hvis nogen nævner dit @navn eller svarer dit indlæg.' - '1': 'Du får notifikationer hvis nogen nævner dit @navn eller svarer på dit indlæg.' + '1_2': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.' + '1': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.' '0_7': 'Du ignorerer alle notifikationer i denne kategori.' '0_2': 'Du får ingen notifikationer for dette emne.' '0': 'Du får ingen notifikationer for dette emne.' watching_pm: title: "Følger" - description: "Du vil blive underrettet for hver ny post i denne besked. Antallet af ulæste og nye posts vil også blive vist ved siden af emnet" + description: "Du vil modtage en notifikation for hvert nyt svar i denne besked, og en optælling af nye svar vil blive vist." watching: title: "Overvåger" - description: "Du vil blive underrettet for hvert nyt indlæg i denne tråd. En optælling af nye indlæg vil blive vist ved siden af tråden." + description: "Du vil modtage en notifikation for hvert nyt svar i denne tråd, og en optælling af nye svar vil blive vist." tracking_pm: title: "Følger" - description: "Antallet af ulæste og nye indlæg, vil stå efter beskeden. Du bliver notificeret hvis nogen nævner dit @name eller svarer på dit indlæg." + description: "En optælling af nye svar vil blive vist for denne besked. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." tracking: title: "Følger" - description: "Antallet af ulæste og nye indlæg vil stå efter emne linien. Du bliver notificeret hvis nogen nævner dit @name eller svarer på dine indlæg." + description: "En optælling af nye svar vil blive vist for denne tråd. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." regular: - title: "Standard" - description: "Du får notifikationer hvis nogen nævner dit @navn eller svarer på dit indlæg." + title: "Normal" + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." regular_pm: - title: "Standard" - description: "Du får notifikationer hvis nogen nævner dit @navn eller svarer på dit indlæg i denne besked." + title: "Normal" + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." muted_pm: title: "Lydløs" description: "Du vil aldrig få notifikationer om denne besked." @@ -963,7 +1012,6 @@ da: success_message: 'Du har nu rapporteret dette emne til administrator.' feature_topic: title: "Fremhæv dette emne" - pin: "Lad dette emne stå i toppen af {{categoryLink}} kategorien." confirm_pin: "Du har allerede {{count}} fastgjorte emner. Fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et nyt emne i denne kategori?" unpin: "Fjern dette emne fra starten af listen i {{categoryLink}} kategorien." pin_note: "Brugere kan unpinne emnet individuelt." @@ -971,7 +1019,6 @@ da: zero: "Der er ingen fastgjorte emner i {{categoryLink}}." one: "Emner fastgjorte i {{categoryLink}}: 1." other: "Fastgjorte emner i {{categoryLink}}: {{count}}." - pin_globally: "Få dette emne til at stå i toppen af alle emne lister, indtil et medlem af \"staff\" unpinner det." confirm_pin_globally: "Du har allerede {{count}} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?" unpin_globally: "Fjern dette emne fra toppen af alle emne lister." global_pin_note: "Brugere kan unpinne emnet individuelt." @@ -1005,8 +1052,8 @@ da: sso_enabled: "Indtast brugernavnet på den person, du gerne vil invitere til dette emne." to_topic_blank: "Indtast brugernavnet eller en email adresse på den person, du gerne vil invitere til dette emne." to_topic_email: "Du har indtastet en email adresse. Vi vil sende en e-mail invitation, der giver din ven direkte adgang til at svare på dette emne." - to_topic_username: "Du har indtastet et brugernavn. Vi sender en notifikation til denne bruger med et link der inviterer dem til dette emne." - to_username: "Indtast brugernavnet på den person du gerne vil invitere. Vi sender en notifikation til denne bruger med et link der inviterer dem til dette emne." + to_topic_username: "Du har indtastet et brugernavn. Vi sender en notifikation med en invitation til denne tråd." + to_username: "Indtast brugernavnet på den person du vil invitere. Vi sender en notifikation med et link til denne tråd." email_placeholder: 'e-mail-adresse' success_email: "Vi har e-mailet en invitation til {{emailOrUsername}}. Vi notificerer dig, når invitationen er blevet accepteret. Kig på invitations fanebladet på din bruger side for at se status på dine invitationer." success_username: "Vi har inviteret brugeren til at deltage i dette emne." @@ -1054,8 +1101,6 @@ da: one: Du har valgt 1 indlæg. other: Du har valgt {{count}} indlæg. post: - reply: "Svarer til {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Svar til {{link}}" quote_reply: "citér svar" edit: "Redigerer {{link}} {{replyAvatar}} {{username}}" edit_reason: "Reason: " @@ -1076,8 +1121,18 @@ da: more_links: "{{count}} endnu..." unread: "Indlæg er ulæst" has_replies: - one: "Svar" - other: "Svar" + one: "{{count}} svar" + other: "{{count}} svar" + has_likes: + one: "{{count}} like" + other: "{{count}} likes" + has_likes_title: + one: "1 likede dette indlæg" + other: "{{count}} likede dette indlæg" + has_likes_title_you: + zero: "du likede dette indlæg" + one: "du og 1 anden likede dette indlæg" + other: "Du og {{count}} andre likede dette indlæg" errors: create: "Beklager, der opstod en fejl under oprettelsen af dit indlæg. Prøv venligst igen." edit: "Beklager, der opstrod en fejl under redigeringen af dit indlæg. Prøv venligst igen." @@ -1245,12 +1300,14 @@ da: category: can: 'kan… ' none: '(ingen kategori)' + all: 'Alle kategorier' choose: 'Vælg en kategori…' edit: 'redigér' edit_long: "Redigér" view: 'Vis emner i kategori' general: 'Overordnet' settings: 'Indstillinger' + topic_template: "Skabelon for emne" delete: 'Slet kategori' create: 'Ny kategori' save: 'Gem kategori' @@ -1294,13 +1351,13 @@ da: notifications: watching: title: "Kigger" - description: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner og antallet af ulæste og nye indlæg vil også stå ved siden af emnet." + description: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner, og antallet af nye svar vil stå ved siden af emnerne." tracking: title: "Følger" - description: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af ulæste og nye indlæg vises ved emnet." + description: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af nye svar vises ved emnerne." regular: title: "Standard" - description: "Du får notifikationer hvis nogen nævner dit @navn eller svarer på dit indlæg." + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." muted: title: "Ignoreret" description: "Du ignorerer automatisk alle emner i disse kategorier. De vil heller ikke stå i sin \"ulæste\" indikation." @@ -1334,7 +1391,7 @@ da: notify_action: "Besked" topic_map: title: "Emne-resumé" - participants_title: "Hyppig forfattere" + participants_title: "Hyppige forfattere" links_title: "Populære Links" links_shown: "vis alle {{totalLinks}} links..." clicks: @@ -1347,6 +1404,8 @@ da: help: "Du har bogmærket dette emne" locked: help: "emnet er låst; det modtager ikke flere svar" + archived: + help: "emnet er arkiveret; det er frosset og kan ikke ændres" unpinned: title: "Ikke fastgjort" help: "Dette emne er ikke fastgjort for dig; det vil blive vist i den normale rækkefølge" @@ -1356,8 +1415,6 @@ da: pinned: title: "Fastgjort" help: "Dette emne er fastgjort for dig; det vil blive vist i toppen af dets kategori" - archived: - help: "emnet er arkiveret; det er frosset og kan ikke ændres" invisible: help: "Dette emne er ulistet; det vil ikke blive vist i listen over emner og kan kun tilgås med et direkte link" posts: "Indlæg" @@ -1379,7 +1436,7 @@ da: activity: "Aktivitet" likes: "Likes" likes_lowercase: - one: "lies" + one: "like" other: "likes" likes_long: "der er {{number}} likes i dette emne" users: "Deltagere" @@ -1397,7 +1454,10 @@ da: with_topics: "%{filter} emner" with_category: "%{filter} %{category} emner" latest: - title: "Seneste" + title: + zero: "Seneste" + one: "Senest (1)" + other: "Seneste ({{count}})" help: "de seneste emner" hot: title: "Populære" @@ -1450,6 +1510,8 @@ da: title: "Alt" yearly: title: "Årligt" + quarterly: + title: "Kvartalvis" monthly: title: "Månedligt" weekly: @@ -1457,11 +1519,12 @@ da: daily: title: "Dagligt" all_time: "Alt" - this_year: "Dette år" - this_month: "Denne måned" - this_week: "Denne uge" + this_year: "År" + this_quarter: "Kvartal" + this_month: "Måned" + this_week: "Uge" today: "I dag" - other_periods: "Se flere top emner" + other_periods: "se top" browser_update: 'Desværre, din browser er for gammel til at kunne virke med dette forum. Opgradér venligst din browser.' permission_types: full: "Opret / Besvar / Se" @@ -1495,6 +1558,7 @@ da: suspended: 'Suspenderet:' private_messages_short: "Beskeder" private_messages_title: "Beskeder" + mobile_title: "Mobil" space_free: "{{size}} tilbage" uploads: "uploads" backups: "backups" @@ -1626,7 +1690,11 @@ da: name: "Navn" none_installed: "Du har ikke nogen plugins installeret" version: "Version" + enabled: "Aktiveret?" + is_enabled: "J" + not_enabled: "N" change_settings: "Skift indstillinger" + change_settings_short: "Indstillinger" howto: "Hvordan installerer jeg plugins?" backups: title: "Backups" @@ -1692,6 +1760,8 @@ da: screened_email: "Eksporter den fulde screenede email liste som en CSV fil." screened_ip: "Eksporter den fulde screenede IP liste som en CSV fil." screened_url: "Eksporter den fulde screenede URL liste som en CSV fil." + export_json: + button_text: "Eksporter" invite: button_text: "Send Invitationer" button_title: "Send Invitationer" @@ -1719,6 +1789,8 @@ da: save: "Gem" new: "Ny" new_style: "Ny style" + import: "Importer" + import_title: "Vælg en fil eller indsæt tekst" delete: "Slet" delete_confirm: "Slet denne tilpasning?" about: "Modificer CSS stylesheets og HTML headere på sitet. Tilføj en tilpasning for at starte." @@ -1791,7 +1863,6 @@ da: sent_test: "sednt!" delivery_method: "Leveringsmetode" preview_digest: "Forhåndsvisning af sammendrag" - preview_digest_desc: "Forhåndsvisning af indholdet af den ugentlige sammenfatnings email der sendes til inaktive brugere." refresh: "Opdatér" format: "Format" html: "html" @@ -2077,6 +2148,7 @@ da: delete: "Slet" cancel: "Afbryd" delete_confirm: "Er du sikker på at du vil slette det brugerfelt?" + options: "Indstillinger" required: title: "Krævet ved registrering?" enabled: "krævet" @@ -2103,6 +2175,7 @@ da: no_results: "Ingen resultater fundet." clear_filter: "Ryd" add_url: "tilføj URL" + add_host: "tilføj host" categories: all_results: 'Alle' required: 'Obligatoriske' @@ -2197,6 +2270,24 @@ da: name: "Navn" image: "Billede" delete_confirm: "Er du sikker på du vil slette emotikonnet: %{name} ?" + embedding: + feed_polling_enabled: "Importer indlæg via RSS/ATOM" + feed_polling_url: "URL på RSS/ATOM feed der skal kravles" + permalink: + title: "Permalinks" + url: "URL" + topic_id: "Emne ID" + topic_title: "Emne" + post_id: "Indlæg ID" + post_title: "Indlæg" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Ekstern URL" + delete_confirm: Er du sikker på at du vil slette dette permalink? + form: + label: "Ny:" + add: "Tilføj" + filter: "Søg (URL eller ekstern URL)" lightbox: download: "download" search_help: @@ -2223,7 +2314,7 @@ da: title: 'Applikation' create: 'c Opret et nyt emne' notifications: 'n Åbn notifikationer' - site_map_menu: '= Åben site menu' + hamburger_menu: '= Åbn i hamburgermenu' user_profile_menu: 'p Åben bruger menu' show_incoming_updated_topics: '. Vis opdaterede emner' search: '/ Søg' @@ -2338,10 +2429,10 @@ da: description: Inviterede en bruger campaigner: name: Kampagnechef - description: Inviterede 3 medlemmer + description: Inviterede 3 brugere (tillidsniveau 1) champion: name: Mester - description: Inviterede 10 medlemmer + description: Inviterede 5 medlemmer (tillidsniveau 2) first_share: name: Første deling description: Delt et indlæg @@ -2357,12 +2448,9 @@ da: reader: name: Læser description: Har læst hver eneste indlæg i et emne med mere end 100 posts - google_search: | -

      Søg med Google

      -

      - - - - - -

      + popular_link: + name: Populært link + description: Postede et eksternt link med mindst 50 klik + hot_link: + name: Hot link + description: Postede et eksternt link med mindst 300 klik diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index dc1e737e94..5a57b22969 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -8,6 +8,9 @@ de: js: number: + format: + separator: "," + delimiter: "." human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ de: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "HH:mm" long_no_year: "DD. MMM HH:mm" long_no_year_no_time: "DD. MMM" + full_no_year_no_time: "D. MMMM" long_with_year: "DD. MMM YYYY HH:mm" long_with_year_no_time: "DD. MMM YYYY" + full_with_year_no_time: "D. MMMM YYYY" long_date_with_year: "DD. MMM 'YY HH:mm" long_date_without_year: "DD. MMM HH:mm" long_date_with_year_without_time: "DD. MMM 'YY" @@ -82,6 +90,16 @@ de: x_days: one: "vor einem Tag" other: "vor %{count} Tagen" + later: + x_days: + one: "einen Tag später" + other: "%{count} Tage später" + x_months: + one: "einen Monat später" + other: "%{count} Monate später" + x_years: + one: "ein Jahr später" + other: "%{count} Jahre später" share: topic: 'Teile einen Link zu diesem Thema' post: 'Beitrag #%{postNumber}' @@ -90,6 +108,26 @@ de: facebook: 'diesen Link auf Facebook teilen' google+: 'diesen Link auf Google+ teilen' email: 'diesen Link per E-Mail senden' + action_codes: + split_topic: "Thema aufgeteilt, %{when}" + autoclosed: + enabled: 'geschlossen, %{when}' + disabled: 'geöffnet, %{when}' + closed: + enabled: 'geschlossen, %{when}' + disabled: 'geöffnet, %{when}' + archived: + enabled: 'archiviert, %{when}' + disabled: 'aus dem Archiv geholt, %{when}' + pinned: + enabled: 'angeheftet, %{when}' + disabled: 'losgelöst, %{when}' + pinned_globally: + enabled: 'global angeheftet, %{when}' + disabled: 'losgelöst, %{when}' + visible: + enabled: 'sichtbar gemacht, %{when}' + disabled: 'unsichtbar gemacht, {when}' topic_admin_menu: "Thema administrieren" emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt." edit: 'Titel und Kategorie dieses Themas ändern' @@ -105,7 +143,7 @@ de: admin_title: "Administration" flags_title: "Meldungen" show_more: "mehr anzeigen" - show_help: "Hilfe" + show_help: "Optionen" links: "Links" links_lowercase: one: "Link" @@ -129,13 +167,14 @@ de: every_two_weeks: "jede zweite Woche" every_three_days: "alle drei Tage" max_of_count: "von max. {{count}}" + alternation: "oder" character_count: one: "{{count}} Zeichen" other: "{{count}} Zeichen" suggested_topics: title: "Vorgeschlagene Themen" about: - simple_title: "Über" + simple_title: "Über uns" title: "Über %{title}" stats: "Website-Statistiken" our_admins: "Unsere Administratoren" @@ -181,6 +220,7 @@ de: saved: "Gespeichert!" upload: "Hochladen" uploading: "Wird hochgeladen..." + uploading_filename: "{{filename}} wird hochgeladen..." uploaded: "Hochgeladen!" enable: "Aktivieren" disable: "Deaktivieren" @@ -191,6 +231,7 @@ de: switch_from_anon: "Anonymen Modus beenden" banner: close: "Diesen Banner ausblenden." + edit: "Diesen Ankündigungsbanner bearbeiten >>" choose_topic: none_found: "Keine Themen gefunden." title: @@ -207,8 +248,8 @@ de: cancel: "Abbrechen" view_pending: "ausstehende Beiträge anzeigen" has_pending_posts: - one: "Dieses Thema hat 1 Beitrag, der genehmigt werden muss" - many: "Dieses Thema hat {{count}} Beiträge, die genehmigt werden müssen" + one: "Dieses Thema hat einen Beitrag, der genehmigt werden muss" + other: "Dieses Thema hat {{count}} Beiträge, die genehmigt werden müssen" confirm: "Änderungen speichern" delete_prompt: "Bist du sicher, dass du %{username} löschen möchtest? Es werden alle Beiträge des Benutzers gelöscht und dessen E-Mail- und IP-Adresse geblockt." approval: @@ -266,6 +307,8 @@ de: mods_and_admins: "Nur Moderatoren und Administratoren" members_mods_and_admins: "Nur Gruppenmitglieder, Moderatoren und Administratoren" everyone: "Jeder" + trust_levels: + none: "keine" user_action_groups: '1': "Abgegebene Likes" '2': "Erhaltene Likes" @@ -285,6 +328,10 @@ de: all_subcategories: "alle" no_subcategory: "keine" category: "Kategorie" + reorder: + save: "Reihenfolge speichern" + apply_all: "Anwenden" + position: "Position" posts: "Beiträge" topics: "Themen" latest: "Aktuelle Themen" @@ -314,6 +361,8 @@ de: topics_entered: "betrachtete Themen" post_count: "# Beiträge" confirm_delete_other_accounts: "Bist du sicher, dass du diese Konten löschen willst?" + user_fields: + none: "(wähle eine Option aus)" user: said: "{{username}}:" profile: "Profil" @@ -325,11 +374,22 @@ de: private_messages: "Nachrichten" activity_stream: "Aktivität" preferences: "Einstellungen" + expand_profile: "Erweitern" bookmarks: "Lesezeichen" bio: "Über mich" invited_by: "Eingeladen von" trust_level: "Vertrauensstufe" notifications: "Benachrichtigungen" + desktop_notifications: + label: "Desktop-Benachrichtigungen" + not_supported: "Dieser Browser unterstützt leider keine Benachrichtigungen." + perm_default: "Benachrichtigungen einschalten" + perm_denied_btn: "Zugriff verweigert" + disable: "Benachrichtigungen deaktivieren" + currently_enabled: "(derzeit aktiviert)" + enable: "Benachrichtigungen aktivieren" + currently_disabled: "(derzeit deaktiviert)" + each_browser_note: "Hinweis: Du musst diese Einstellung in jedem von dir verwendeten Browser ändern." dismiss_notifications: "Alle als gelesen markieren" dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren" disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe" @@ -342,14 +402,15 @@ de: admin: "{{user}} ist ein Administrator" moderator_tooltip: "Dieser Benutzer ist ein Moderator" admin_tooltip: "Dieser Benutzer ist ein Administrator" + blocked_tooltip: "Dieser Benutzer wird blockiert." suspended_notice: "Dieser Benutzer ist bis zum {{date}} gesperrt." suspended_reason: "Grund: " github_profile: "Github" mailing_list_mode: "Sende mir bei jedem neuen Beitrag eine E-Mail (außer wenn ich das Thema oder die Kategorie stummgeschaltet habe)" watched_categories: "Beobachtet" - watched_categories_instructions: "Du wirst in diesen Kategorien automatisch alle neuen Themen beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt werden. Außerdem wird die Anzahl der ungelesenen und neuen Beiträge neben dem Eintrag in der Themenliste angezeigt." + watched_categories_instructions: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten und über alle neuen Beiträge und Themen benachrichtigt werden. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt." tracked_categories: "Verfolgt" - tracked_categories_instructions: "Du wirst in diesen Kategorien automatisch allen neuen Themen folgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema angezeigt." + tracked_categories_instructions: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt." muted_categories: "Stummgeschaltet" muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in diesen Kategorien und sie werden nicht in deiner Liste ungelesener Themen aufscheinen." delete_account: "Lösche mein Benutzerkonto" @@ -402,7 +463,7 @@ de: upload_title: "Lade dein Bild hoch" upload_picture: "Bild hochladen" image_is_not_a_square: "Achtung: Wir haben dein Bild zugeschnitten, weil Höhe und Breite nicht übereingestimmt haben." - cache_notice: "Dein Profilbild wurde erfolgreich geändert. Aufgrund von Caching im Browser kann es allerdings eine Weile dauern, bis dieses angezeigt wird." + cache_notice: "Du hast dein Profilbild erfolgreich geändert. Aufgrund von Caching im Browser kann es eine Weile dauern, bis dieses angezeigt wird." change_profile_background: title: "Profilhintergrund" instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 850px." @@ -455,45 +516,48 @@ de: website: "Website" email_settings: "E-Mail" email_digests: - title: "Schicke eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:" + title: "Sende eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:" daily: "täglich" every_three_days: "alle drei Tage" weekly: "wöchentlich" - every_two_weeks: "alle drei Tage" + every_two_weeks: "jede zweite Woche" email_direct: "Sende mir eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet, meinen @Namen erwähnt oder mich zu einem Thema einlädt." email_private_messages: "Sende mir eine E-Mail, wenn mir jemand eine Nachricht sendet." - email_always: "E-Mail-Benachrichtigungen nicht unterdrücken, während ich im Forum aktiv bin" + email_always: "Benachrichtige mich per E-Mail auch während ich auf dieser Website aktiv bin" other_settings: "Andere" categories_settings: "Kategorien" new_topic_duration: label: "Themen als neu ansehen, wenn" not_viewed: "ich diese noch nicht betrachtet habe" last_here: "seit meinem letzten Besuch erstellt" - after_n_days: - one: "vor einem Tag erstellt" - other: "in den letzten {{count}} Tagen erstellt" - after_n_weeks: - one: "in der letzten Woche erstellt" - other: "in den letzten {{count}} Wochen erstellt" + after_1_day: "innerhalb des letzten Tages erstellt" + after_2_days: "in den letzten 2 Tagen erstellt" + after_1_week: "in der letzten Woche erstellt" + after_2_weeks: "in den letzten 2 Wochen erstellt" auto_track_topics: "Betrachteten Themen automatisch folgen" auto_track_options: never: "niemals" immediately: "sofort" - after_n_seconds: - one: "nach einer Sekunde" - other: "nach {{count}} Sekunden" - after_n_minutes: - one: "nach einer Minute" - other: "nach {{count}} Minuten" + after_30_seconds: "nach 30 Sekunden" + after_1_minute: "nach 1 Minute" + after_2_minutes: "nach 2 Minuten" + after_3_minutes: "nach 3 Minuten" + after_4_minutes: "nach 4 Minuten" + after_5_minutes: "nach 5 Minuten" + after_10_minutes: "nach 10 Minuten" invited: search: "schreib zum Suchen nach Einladungen..." title: "Einladungen" user: "Eingeladener Benutzer" - none: "Du hast bis jetzt noch niemanden hierher eingeladen." + sent: "Gesendet" truncated: "Zeige die ersten {{count}} Einladungen." redeemed: "Angenommene Einladungen" + redeemed_tab: "Angenommen" + redeemed_tab_with_count: "Angenommen ({{count}})" redeemed_at: "Angenommen" pending: "Ausstehende Einladungen" + pending_tab: "Ausstehend" + pending_tab_with_count: "Ausstehend ({{count}})" topics_entered: "Betrachtete Themen" posts_read_count: "Gelesene Beiträge" expired: "Diese Einladung ist abgelaufen." @@ -561,7 +625,6 @@ de: read_only_mode: enabled: "Der Nur-Lesen-Modus ist aktiviert. Du kannst die Website weiter durchsuchen und lesen. Einige Funktionen werden jedoch wahrscheinlich nicht funktionieren." login_disabled: "Die Anmeldung ist deaktiviert während sich die Website im Nur-Lesen-Modus befindet." - too_few_topics_notice: "Erstelle mindestens 5 öffentliche Themen und %{posts} öffentliche Antworten, um die Diskussion ins Rollen zu bringen. Neue Benutzer können ihre Vertrauensstufe nur erhöhen, wenn es für sie etwas zu Lesen gibt. Diese Meldung erscheint nur für Mitarbeiter." learn_more: "mehr erfahren..." year: 'Jahr' year_desc: 'Themen, die in den letzten 365 Tagen erstellt wurden' @@ -578,6 +641,21 @@ de: replies_lowercase: one: Antwort other: Antworten + signup_cta: + sign_up: "Registrieren" + hide_session: "Erinnere mich morgen" + hide_forever: "Nein danke!" + hidden_for_session: "In Ordnung, ich frag dich morgen wieder. Du kannst dir auch jederzeit mit „Anmelden“ ein Benutzerkonto erstellen." + intro: "Hallo! :heart_eyes: Es sieht so aus, als würde dir die Diskussion gefallen. Du hast aber noch kein Benutzerkonto." + value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzten kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn neue Beiträge verfasst werden. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartbeat:" + methods: + sso: "Die Registrierung ist einfach: Alles was du brauchst, ist ein Benutzerkonto auf der Hauptseite." + only_email: "Die Registrierung ist einfach: Alles was du brauchst, ist eine E-Mail-Adresse und ein Passwort." + only_other: "Benutze dein %{provider} Benutzerkonto, um dich zu registrieren." + one_and_email: "Benutze dein %{provider} Benutzerkonto oder eine E-Mail-Adresse und ein Passwort, um dich zu registrieren." + multiple_no_email: "Die Registrierung ist einfach: Benutze eine unserer %{count} sozialen Anmelde-Methoden." + multiple: "Die Registrierung ist einfach: Benutze eine unserer %{count} sozialen Anmelde-Methoden oder eine E-Mail-Adresse und ein Passwort." + unknown: "Fehler beim Ermitteln der unterstützten Anmelde-Methoden" summary: enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden." description: "Es gibt {{count}} Antworten." @@ -621,6 +699,7 @@ de: email_placeholder: "E-Mail oder Benutzername" caps_lock_warning: "Feststelltaste ist aktiviert" error: "Unbekannter Fehler" + rate_limit: "Warte bitte ein wenig, bevor du erneut versuchst dich anzumelden." blank_username_or_password: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen und dein Passwort ein." reset_password: 'Passwort zurücksetzen' logging_in: "Anmeldung läuft..." @@ -658,7 +737,10 @@ de: emoji_one: "Emoji One" composer: emoji: "Emoji :smile:" + options: "Optionen" + whisper: "flüstern" add_warning: "Dies ist eine offizielle Warnung." + toggle_whisper: "Flüstermodus umschalten" posting_not_on_topic: "Auf welches Thema möchtest du antworten?" saving_draft_tip: "wird gespeichert..." saved_draft_tip: "gespeichert" @@ -685,7 +767,7 @@ de: title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz." edit_reason_placeholder: "Warum bearbeitest du?" show_edit_reason: "(Bearbeitungsgrund hinzufügen)" - reply_placeholder: "Schreibe hier. Verwende Markdown, BBCode oder HTML zur Formatierung. Füge ein Bild ein oder ziehe es herein, um es hochzuladen." + reply_placeholder: "Schreibe hier. Verwende Markdown, BBCode oder HTML zur Formatierung. Füge Bilder ein oder ziehe sie herein." view_new_post: "Sieh deinen neuen Beitrag an." saving: "Speichere..." saved: "Gespeichert!" @@ -739,13 +821,22 @@ de: posted: "

      {{username}} {{description}}

      " edited: "

      {{username}} {{description}}

      " liked: "

      {{username}} {{description}}

      " - private_message: "

      {{username}} {{description}}

      " - invited_to_private_message: "

      {{username}} {{description}}

      " + private_message: "

      {{username}} {{description}}

      " + invited_to_private_message: "

      {{username}} {{description}}

      " invited_to_topic: "

      {{username}} {{description}}

      " invitee_accepted: "

      {{username}} hat deine Einladung angenommen

      " moved_post: "

      {{username}} hat {{description}} verschoben

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Abzeichen '{{description}}' erhalten

      " + alt: + mentioned: "Erwähnt von" + quoted: "Zitiert von" + replied: "Geantwortet" + posted: "Beitrag von" + edited: "Beitrag bearbeitet von" + liked: "Gefällt dein Beitrag" + private_message: "Nachricht von" + invited_to_private_message: "Zu Unterhaltung eingeladen von" popup: mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt' quoted: '{{username}} hat dich in "{{topic}}" - {{site_title}} zitiert' @@ -760,15 +851,28 @@ de: from_the_web: "Aus dem Web" remote_tip: "Link zu Bild" remote_tip_with_attachments: "Link zu Bild oder Datei ({{authorized_extensions}})" - local_tip: "Klicke hier, um ein Bild von deinem Gerät zu wählen." - local_tip_with_attachments: "Klicke hier, um ein Bild oder eine Datei von deinem Gerät zu wählen ({{authorized_extensions}})" + local_tip: "wähle auf deinem Gerät gespeicherte Bilder aus" + local_tip_with_attachments: "wähle auf deinem Gerät gespeicherte Bilder oder Dateien aus ({{authorized_extensions}})" hint: "(du kannst Dateien auch in den Editor ziehen, um diese hochzuladen)" - hint_for_supported_browsers: "(du kannst Bilder auch durch Ziehen in den Editor oder durch Einfügen aus der Zwischenablage hochladen)" + hint_for_supported_browsers: "du kannst Bilder auch in den Editor ziehen oder diese aus der Zwischenablage einfügen" uploading: "Wird hochgeladen" + select_file: "Datei auswählen" image_link: "Der Link deines Bildes verweist auf" search: + sort_by: "Sortieren nach" + relevance: "Relevanz" + latest_post: "letztem Beitrag" + most_viewed: "Anzahl der Aufrufe" + most_liked: "Anzahl der Likes" + select_all: "Alle auswählen" + clear_all: "Auswahl aufheben" + result_count: + one: "1 Ergebnis für \"{{term}}\"" + other: "{{count}} Ergebnisse für \"{{term}}\"" title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien" no_results: "Keine Ergebnisse gefunden." + no_more_results: "Es wurde keine weiteren Ergebnisse gefunden." + search_help: Hilfe zur Suche searching: "Suche ..." post_format: "#{{post_number}} von {{username}}" context: @@ -776,7 +880,7 @@ de: category: "Kategorie „{{category}}“ durchsuchen" topic: "Dieses Thema durchsuchen" private_messages: "Nachrichten durchsuchen" - site_map: "zu einer anderen Themenliste oder Kategorie wechseln" + new_item: "neu" go_back: 'zurückgehen' not_logged_in_user: 'Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen' current_user: 'zu deiner Benutzerseite gehen' @@ -827,6 +931,9 @@ de: bookmarks: "Das waren alle Themen mit Lesezeichen." search: "Es gibt keine weiteren Suchergebnisse." topic: + unsubscribe: + stop_notifications: "Du wirst in Zukunft weniger Benachrichtigungen für {{title}} erhalten" + change_notification_state: "Dein aktueller Benachrichtigungsstatus ist" filter_to: "{{post_count}} Beiträge im Thema" create: 'Neues Thema' create_long: 'Ein neues Thema erstellen' @@ -842,7 +949,7 @@ de: other: '{{count}} ungelesene Themen' title: 'Thema' invalid_access: - title: "Thema ist privat" + title: "Thema ist nicht öffentlich" description: "Entschuldige, du hast keinen Zugriff auf dieses Thema!" login_required: "Du musst dich anmelden, damit du dieses Thema sehen kannst." server_error: @@ -902,29 +1009,29 @@ de: '2_4': 'Du wirst Benachrichtigungen erhalten, weil du eine Antwort zu diesem Thema verfasst hast.' '2_2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema verfolgst.' '2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema gelesen hast.' - '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.' - '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.' + '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet.' + '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet.' '0_7': 'Du ignorierst alle Benachrichtigungen dieser Kategorie.' '0_2': 'Du ignorierst alle Benachrichtigungen dieses Themas.' '0': 'Du ignorierst alle Benachrichtigungen dieses Themas.' watching_pm: title: "Beobachten" - description: "Du wirst über jeden neuen Beitrag in dieser Unterhaltung benachrichtigt. Die Anzahl der ungelesenen und neuen Beiträge wird auch neben dem Thema erscheinen." + description: "Du wirst über jeden neuen Beitrag in dieser Unterhaltung benachrichtigt und die Anzahl der neuen Beiträge wird angezeigt." watching: title: "Beobachten" - description: "Du wirst über jeden neuen Beitrag in diesem Thema benachrichtigt. Die Anzahl der ungelesenen und neuen Beiträge wird auch neben dem Thema erscheinen." + description: "Du wirst über jeden neuen Beitrag in diesem Thema benachrichtigt und die Anzahl der neuen Antworten wird angezeigt." tracking_pm: title: "Verfolgen" - description: "Die Anzahl der ungelesenen und neuen Nachrichten wird neben dem Eintrag in der Nachrichtenliste angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder deine Nachricht beantwortet." + description: "Die Anzahl der neuen Antworten wird bei dieser Unterhaltung angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet." tracking: title: "Verfolgen" - description: "Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet." + description: "Die Anzahl der neuen Antworten wird bei diesem Thema angezeigt. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet." regular: title: "Normal" - description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet." + description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet." regular_pm: title: "Normal" - description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag in der Nachricht antwortet." + description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet." muted_pm: title: "Stummgeschaltet" description: "Du erhältst keine Benachrichtigungen im Zusammenhang mit dieser Unterhaltung." @@ -962,21 +1069,23 @@ de: help: 'teile einen Link zu diesem Thema' flag_topic: title: 'Melden' - help: 'Dieses Thema den Moderatoren melden oder eine private Nachricht senden.' + help: 'Dieses Thema den Moderatoren melden oder eine Nachricht senden.' success_message: 'Du hast dieses Thema erfolgreich gemeldet.' feature_topic: title: "Thema hervorheben" - pin: "Das Thema immer am Anfang der {{categoryLink}} Kategorie anzeigen." + pin: "Dieses Thema am Anfang der {{categoryLink}} Kategorie anzeigen bis" confirm_pin: "Es gibt bereits {{count}} angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema in dieser Kategorie anheften?" - unpin: "Das Thema vom Anfang der {{categoryLink}} Kategorie loslösen." + unpin: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen." + unpin_until: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen oder bis %{until} warten." pin_note: "Benutzer können das Thema für sich selbst loslösen." already_pinned: zero: "Es sind in {{categoryLink}} keine Themen angeheftet." one: "Momentan in {{categoryLink}} angeheftete Themen: 1" other: "Momentan in {{categoryLink}} angeheftete Themen: {{count}}" - pin_globally: "Das Thema immer am Anfang aller Themenlisten anzeigen, bis ein Mitarbeiter es wieder loslöst." + pin_globally: "Dieses Thema am Anfang aller Themenlisten anzeigen bis" confirm_pin_globally: "Es gibt bereits {{count}} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?" - unpin_globally: "Das Thema vom Anfang aller Themenlisten loslösen." + unpin_globally: "Dieses Thema vom Anfang aller Themenlisten loslösen." + unpin_globally_until: "Dieses Thema vom Anfang aller Themenlisten loslösen oder bis %{until} warten." global_pin_note: "Benutzer können das Thema für sich selbst loslösen." already_pinned_globally: zero: "Es sind keine Themen global angeheftet." @@ -1008,8 +1117,8 @@ de: sso_enabled: "Gib den Benutzername der Person ein, die du zu diesem Thema einladen willst." to_topic_blank: "Gib den Benutzername oder die E-Mail-Adresse der Person ein, die du zu diesem Thema einladen willst." to_topic_email: "Du hast eine E-Mail-Adresse eingegeben. Wir werden eine Einladung versenden, die ein direktes Antworten auf dieses Thema ermöglicht." - to_topic_username: "Du hast einen Benutzernamen eingegeben. Wir werden diesen Benutzer benachrichtigen und zur Teilnahme an diesem Thema einladen." - to_username: "Gib den Benutzername der Person ein, die du einladen willst. Wir werden diesen Benutzer benachrichtigen und zur Teilnahme an diesem Thema einladen." + to_topic_username: "Du hast einen Benutzernamen eingegeben. Wir werden eine Benachrichtigung versenden und mit einem Link zur Teilnahme an diesem Thema einladen." + to_username: "Gib den Benutzername der Person ein, die du einladen möchtest. Wir werden eine Benachrichtigung versenden und mit einem Link zur Teilnahme an diesem Thema einladen." email_placeholder: 'name@example.com' success_email: "Wir haben an {{emailOrUsername}} eine Einladung verschickt und werden dich benachrichtigen, sobald die Einladung angenommen wurde. In deinem Benutzerprofil kannst du alle deine Einladungen überwachen." success_username: "Wir haben den Benutzer gebeten, sich an diesem Thema zu beteiligen." @@ -1045,6 +1154,12 @@ de: one: "Bitte wähle den neuen Eigentümer für den Beitrag von {{old_user}}." other: "Bitte wähle den neuen Eigentümer für {{count}} Beiträge von {{old_user}}." instructions_warn: "Bitte beachte, dass alle Benachrichtigungen für diesen Beitrag nicht rückwirkend auf den neuen Benutzer übertragen werden.
      Warnung: Aktuell werden keine Daten, die mit dem Beitrag zusammenhängen an den neuen Benutzer übertragen. Mit Bedacht verwenden." + change_timestamp: + title: "Erstelldatum ändern" + action: "Erstelldatum ändern" + invalid_timestamp: "Das Erstelldatum kann nicht in der Zukunft liegen." + error: "Beim Ändern des Erstelldatums des Themas ist ein Fehler aufgetreten." + instructions: "Wähle bitte ein neues Erstelldatum für das Thema aus. Alle Beitrage im Thema werden unter Beibehaltung der Zeitdifferenz ebenfalls angepasst." multi_select: select: 'auswählen' selected: 'ausgewählt ({{count}})' @@ -1057,8 +1172,8 @@ de: one: Du hast 1 Beitrag ausgewählt. other: Du hast {{count}} Beiträge ausgewählt. post: - reply: "Du antwortest auf {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Auf {{link}} antworten" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "Antwort zitieren" edit: "Du bearbeitest {{link}} {{replyAvatar}} {{username}}" edit_reason: "Grund: " @@ -1079,8 +1194,18 @@ de: more_links: "{{count}} weitere..." unread: "Beitrag ist ungelesen" has_replies: - one: "Antwort" - other: "Antworten" + one: "{{count}} Antwort" + other: "{{count}} Antworten" + has_likes: + one: "{{count}} Like" + other: "{{count}} Likes" + has_likes_title: + one: "dieser Beitrag gefällt 1 Person" + other: "dieser Beitrag gefällt {{count}} Personen" + has_likes_title_you: + zero: "dir gefällt dieser Beitrag" + one: "dir und einer weiteren Person gefällt dieser Beitrag" + other: "dir und {{count}} weiteren Personen gefällt dieser Beitrag" errors: create: "Entschuldige, es gab einen Fehler beim Anlegen des Beitrags. Bitte versuche es noch einmal." edit: "Entschuldige, es gab einen Fehler beim Bearbeiten des Beitrags. Bitte versuche es noch einmal." @@ -1099,7 +1224,7 @@ de: yes_value: "Ja, verwerfen" via_email: "dieser Beitrag ist per E-Mail eingetroffen" wiki: - about: "dieser Beitrag ist ein Wiki; Neulinge können diesen bearbeiten" + about: "dieser Beitrag ist ein Wiki; Anwärter können diesen bearbeiten" archetypes: save: 'Speicheroptionen' controls: @@ -1109,7 +1234,7 @@ de: undo_like: "gefällt mir nicht mehr" edit: "diesen Beitrag bearbeiten" edit_anonymous: "Entschuldige, du musst angemeldet sein, um diesen Beitrag zu bearbeiten." - flag: "Diesen Beitrag den Moderatoren melden oder eine private Nachricht senden." + flag: "Diesen Beitrag den Moderatoren melden oder eine Nachricht senden." delete: "diesen Beitrag löschen" undelete: "diesen Beitrag wiederherstellen" share: "Link zu diesem Beitrag teilen" @@ -1248,12 +1373,14 @@ de: category: can: 'kann… ' none: '(keine Kategorie)' + all: 'Alle Kategorien' choose: 'Kategorie auswählen…' edit: 'bearbeiten' edit_long: "Bearbeiten" view: 'Zeige Themen dieser Kategorie' general: 'Allgemeines' settings: 'Einstellungen' + topic_template: "Themenvorlage" delete: 'Kategorie löschen' create: 'Neue Kategorie' save: 'Kategorie speichern' @@ -1297,16 +1424,16 @@ de: notifications: watching: title: "Beobachten" - description: "Du wirst in diesen Kategorien automatisch alle neuen Themen beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt werden. Außerdem wird die Anzahl der ungelesenen und neuen Beiträge neben dem Thema erscheinen." + description: "Du wirst automatisch alle neuen Themen in dieser Kategorie beobachten und über alle neuen Beiträge und Themen benachrichtigt werden. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt." tracking: title: "Verfolgen" - description: "Du wirst in diesen Kategorien automatisch allen neuen Themen folgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen." + description: "Du wirst automatisch allen neuen Themen in dieser Kategorie folgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt." regular: title: "Normal" - description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet." + description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder dir antwortet." muted: title: "Stummgeschaltet" - description: "Du erhältst keine Benachrichtigungen über neue Themen in diesen Kategorien und sie werden nicht in deiner Liste ungelesener Themen aufscheinen." + description: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden nicht in deiner Liste ungelesener Themen aufscheinen." flagging: title: 'Danke für deine Mithilfe!' private_reminder: 'Meldungen sind vertraulich und nur für Mitarbeiter sichtbar' @@ -1337,7 +1464,7 @@ de: notify_action: "Nachricht" topic_map: title: "Zusammenfassung des Themas" - participants_title: "Autoren regelmäßiger Beiträge" + participants_title: "Autoren vieler Beiträge" links_title: "Beliebte Links" links_shown: "zeige alle {{totalLinks}} Links..." clicks: @@ -1349,7 +1476,9 @@ de: bookmarked: help: "Du hast in diesem Thema ein Lesezeichen gesetzt." locked: - help: "Dieses Thema ist geschlossen; Antworten sind nicht mehr möglich" + help: "Dieses Thema ist geschlossen. Das Antworten ist nicht mehr möglich." + archived: + help: "Dieses Thema ist archiviert; es ist eingefroren und kann nicht mehr geändert werden" unpinned: title: "Losgelöst" help: "Dieses Thema ist für dich losgelöst; es wird in der normalen Reihenfolge angezeigt" @@ -1359,8 +1488,6 @@ de: pinned: title: "Angeheftet" help: "Dieses Thema ist für dich angeheftet; es wird immer am Anfang seiner Kategorie auftauchen" - archived: - help: "Dieses Thema ist archiviert; es ist eingefroren und kann nicht mehr geändert werden" invisible: help: "Dieses Thema ist unsichtbar. Es wird in keiner Themenliste angezeigt und kann nur mit einem direkten Link betrachtet werden." posts: "Beiträge" @@ -1396,7 +1523,10 @@ de: with_topics: "%{filter}e Themen" with_category: "%{filter}e Themen in %{category}" latest: - title: "Aktuell" + title: + zero: "Aktuell" + one: "Aktuell (1)" + other: "Aktuell ({{count}})" help: "die zuletzt geänderten Themen" hot: title: "Beliebt" @@ -1449,6 +1579,8 @@ de: title: "Gesamt" yearly: title: "Jährlich" + quarterly: + title: "Vierteljährlich" monthly: title: "Monatlich" weekly: @@ -1456,11 +1588,12 @@ de: daily: title: "Täglich" all_time: "Gesamt" - this_year: "Dieses Jahr" - this_month: "Dieser Monat" - this_week: "Diese Woche" + this_year: "Jahr" + this_quarter: "Quartal" + this_month: "Monat" + this_week: "Woche" today: "Heute" - other_periods: "zeige weitere angesagte Themen" + other_periods: "zeige angesagte Themen:" browser_update: 'Dein Webbrowser ist leider zu alt, um dieses Forum zu besuchen. Bitte installiere einen neueren Browser.' permission_types: full: "Erstellen / Antworten / Ansehen" @@ -1494,6 +1627,7 @@ de: suspended: 'Gesperrt:' private_messages_short: "Nachr." private_messages_title: "Nachrichten" + mobile_title: "Mobilgerät" space_free: "{{size}} frei" uploads: "Uploads" backups: "Backups" @@ -1625,7 +1759,11 @@ de: name: "Name" none_installed: "Du hast keine Plug-ins installiert." version: "Version" + enabled: "Aktiviert?" + is_enabled: "J" + not_enabled: "N" change_settings: "Einstellungen ändern" + change_settings_short: "Einstellungen" howto: "Wie installiere ich Plug-ins?" backups: title: "Backups" @@ -1691,6 +1829,8 @@ de: screened_email: "Vollständige Liste der gefilterten E-Mail-Adressen im CSV-Format exportieren." screened_ip: "Vollständige Liste der gefilterten IP-Adressen im CSV-Format exportieren." screened_url: "Vollständige Liste der gefilterten URLs im CSV-Format exportieren." + export_json: + button_text: "Exportieren" invite: button_text: "Einladungen versenden" button_title: "Einladungen versenden" @@ -1701,6 +1841,7 @@ de: header: "Kopfbereich" top: "Anfang" footer: "Fußzeile" + embedded_css: "Eingebettetes CSS" head_tag: text: "" title: "HTML das vor dem Tag eingefügt wird." @@ -1718,6 +1859,8 @@ de: save: "Speichern" new: "Neu" new_style: "Neuer Style" + import: "Importieren" + import_title: "Datei auswählen oder Text einfügen" delete: "Löschen" delete_confirm: "Diese Anpassung löschen?" about: "Ändere die Stylesheets (CSS) und den HTML-Header auf der Website. Füge eine Anpassung hinzu, um zu starten." @@ -1790,7 +1933,6 @@ de: sent_test: "Gesendet!" delivery_method: "Versandmethode" preview_digest: "Vorschau auf Neuigkeiten anzeigen" - preview_digest_desc: "Vorschau auf Neuigkeits-Mails anzeigen. Diese werden wöchentlich an inaktive Benutzer gesendet." refresh: "Aktualisieren" format: "Format" html: "HTML" @@ -1855,6 +1997,7 @@ de: delete_post: "Beitrag löschen" impersonate: "Nutzersicht" anonymize_user: "Benutzer anonymisieren" + roll_up: "IP-Adressen zusammenfassen" screened_emails: title: "Gefilterte E-Mails" description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt." @@ -1920,10 +2063,10 @@ de: new: 'Neue Benutzer' pending: 'Benutzer mit ausstehender Genehmigung' newuser: 'Benutzer mit Vertrauensstufe 0 (Neuer Benutzer)' - basic: 'Benutzer mit Vertrauensstufe 1 (Neulinge)' + basic: 'Benutzer mit Vertrauensstufe 1 (Anwärter)' regular: 'Benutzer mit Vertrauensstufe 2 (Mitglied)' leader: 'Benutzer mit Vertrauensstufe 3 (Stammgast)' - elder: 'Benutzer mit Vertrauensstufe 4 (Leitwolf)' + elder: 'Benutzer mit Vertrauensstufe 4 (Anführer)' staff: "Mitarbeiter" admins: 'Administratoren' moderators: 'Moderatoren' @@ -2076,6 +2219,7 @@ de: delete: "Löschen" cancel: "Abbrechen" delete_confirm: "Bist du dir sicher, dass du dieses Benutzerfeld löschen möchtest?" + options: "Optionen" required: title: "Bei Registrierung erforderlich?" enabled: "erforderlich" @@ -2091,6 +2235,7 @@ de: field_types: text: 'Textfeld' confirm: 'Bestätigung' + dropdown: "Dropdown-Liste" site_text: none: "Wähle einen Inhaltstyp, um mit dem Bearbeiten zu beginnen." title: 'Textinhalt' @@ -2102,6 +2247,7 @@ de: no_results: "Keine Ergebnisse gefunden." clear_filter: "Filter zurücksetzen" add_url: "URL hinzufügen" + add_host: "Host hinzufügen" categories: all_results: 'Alle' required: 'Erforderlich' @@ -2123,6 +2269,7 @@ de: backups: "Backups" login: "Anmeldung" plugins: "Plug-ins" + user_preferences: "Benutzereinstellungen" badges: title: Abzeichen new_badge: Neues Abzeichen @@ -2196,6 +2343,33 @@ de: name: "Name" image: "Bild" delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?" + embedding: + confirm_delete: "Möchtest du wirklich diesen Host löschen?" + title: "Einbettung" + host: "Erlaubte Hosts" + edit: "bearbeiten" + add_host: "Host hinzufügen" + settings: "Einbettungseinstellungen" + feed_settings: "Feed-Einstellungen" + crawling_settings: "Crawler-Einstellungen" + feed_polling_enabled: "Beiträge über RSS/ATOM importieren" + feed_polling_url: "URL des RSS/ATOM Feeds für den Import" + save: "Einbettungseinstellungen speichern" + permalink: + title: "Permanentlinks" + url: "URL" + topic_id: "Themen-ID" + topic_title: "Thema" + post_id: "Beitrags-ID" + post_title: "Beitrag" + category_id: "Kategorie-ID" + category_title: "Kategorie" + external_url: "Externe URL" + delete_confirm: Möchtest du wirklich diesen Permanentlink löschen? + form: + label: "Neu:" + add: "Hinzufügen" + filter: "Suche (URL oder externe URL)" lightbox: download: "herunterladen" search_help: @@ -2211,24 +2385,27 @@ de: categories: 'g, c Kategorien' top: 'g, t Anfang' bookmarks: 'g, b Lesezeichen' + profile: 'g, p Profil' + messages: 'g, m Nachrichten' navigation: title: 'Navigation' jump: '# Zeige Beitrag #' back: 'u Zurück' up_down: 'k/j Auswahl ↑ ↓ bewegen' open: 'o oder ↵ Eingabe Ausgewähltes Thema anzeigen' - next_prev: '⇧ Umsch + J / ⇧ Umsch + K Nächster/vorheriger Abschnitt' + next_prev: '⇧ Umsch + j / ⇧ Umsch + k Nächster/vorheriger Abschnitt' application: title: 'Anwendung' create: 'c Neues Thema erstellen' notifications: 'n Benachrichtigungen anzeigen' - site_map_menu: '= Seitenmenü öffnen' + hamburger_menu: '= Hamburger-Menü öffnen' user_profile_menu: 'p Benutzermenü öffnen' show_incoming_updated_topics: '. Zeige aktualisierte Themen' search: '/ Suchen' help: '? Tastaturhilfe anzeigen' dismiss_new_posts: 'x, r Neue Themen / Beiträge ignorieren' dismiss_topics: 'x, t Themen ignorieren' + log_out: '⇧ Umsch + z, ⇧ Umsch + z Abmelden' actions: title: 'Aktionen' bookmark_topic: 'f Lesezeichen auf Thema setzen oder entfernen' @@ -2279,7 +2456,7 @@ de: name: Bearbeiter description: Hat den ersten Beitrag bearbeitet basic_user: - name: Neuling + name: Anwärter description: Ermöglicht das Nutzen alle wesentlichen Community-Funktionen member: name: Mitglied @@ -2288,7 +2465,7 @@ de: name: Stammgast description: Ermöglicht das Verschieben und Umbenennen von Themen, die Veröffentlichung von verfolgbaren Links und den Zugang zur Lounge leader: - name: Leitwolf + name: Anführer description: Ermöglicht das Bearbeiten aller Beiträge und das Anheften, Schließen, Archivieren, Aufteilen und Zusammenfügen von Themen welcome: name: Willkommen @@ -2337,10 +2514,10 @@ de: description: Hat einen Benutzer eingeladen campaigner: name: Aktivist - description: Hat 3 Mitglieder geworben + description: Hat 3 Anwärter (Vertrauensstufe 1) eingeladen champion: name: Verfechter - description: Hat 10 Mitglieder geworben + description: Hat 5 Mitglieder (Vertrauensstufe 2) eingeladen first_share: name: Erste Weitergabe description: Hat einen Beitrag geteilt @@ -2356,8 +2533,17 @@ de: reader: name: Leser description: Hat in einem Thema mit mehr als 100 Beiträgen jeden Beitrag gelesen + popular_link: + name: Beliebter Link + description: Hat einen externen Link veröffentlicht, der mindestens 50 Klicks erhalten hat. + hot_link: + name: Angesagter Link + description: Hat einen externen Link veröffentlicht, der mindestens 300 Klicks erhalten hat. + famous_link: + name: Berühmter Link + description: Hat einen externen Link veröffentlicht, der mindestens 1000 Klicks erhalten hat. google_search: | -

      Mit Google suchen

      +

      Mit Google suchen

      diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 4034dd8b64..4dd0b0cf5c 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -18,6 +18,9 @@ en: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -29,12 +32,17 @@ en: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -92,6 +100,16 @@ en: x_days: one: "1 day ago" other: "%{count} days ago" + later: + x_days: + one: "1 day later" + other: "%{count} days later" + x_months: + one: "1 month later" + other: "%{count} months later" + x_years: + one: "1 year later" + other: "%{count} years later" share: topic: 'share a link to this topic' post: 'post #%{postNumber}' @@ -101,6 +119,27 @@ en: google+: 'share this link on Google+' email: 'send this link in an email' + action_codes: + split_topic: "split this topic %{when}" + autoclosed: + enabled: 'closed %{when}' + disabled: 'opened %{when}' + closed: + enabled: 'closed %{when}' + disabled: 'opened %{when}' + archived: + enabled: 'archived %{when}' + disabled: 'unarchived %{when}' + pinned: + enabled: 'pinned %{when}' + disabled: 'unpinned %{when}' + pinned_globally: + enabled: 'pinned globally %{when}' + disabled: 'unpinned %{when}' + visible: + enabled: 'listed %{when}' + disabled: 'unlisted %{when}' + topic_admin_menu: "topic admin actions" emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." @@ -119,7 +158,7 @@ en: admin_title: "Admin" flags_title: "Flags" show_more: "show more" - show_help: "help" + show_help: "options" links: "Links" links_lowercase: one: "link" @@ -143,6 +182,7 @@ en: every_two_weeks: "every two weeks" every_three_days: "every three days" max_of_count: "max of {{count}}" + alternation: "or" character_count: one: "{{count}} character" other: "{{count}} characters" @@ -205,6 +245,7 @@ en: upload: "Upload" uploading: "Uploading..." + uploading_filename: "Uploading {{filename}}..." uploaded: "Uploaded!" enable: "Enable" @@ -214,10 +255,11 @@ en: failed: "Failed" switch_to_anon: "Anonymous Mode" - switch_from_anon: "Exit Anonymous Mode" + switch_from_anon: "Exit Anonymous" banner: close: "Dismiss this banner." + edit: "Edit this banner >>" choose_topic: none_found: "No topics found." @@ -237,7 +279,7 @@ en: view_pending: "view pending posts" has_pending_posts: one: "This topic has 1 post awaiting approval" - many: "This topic has {{count}} posts awaiting approval" + other: "This topic has {{count}} posts awaiting approval" confirm: "Save Changes" delete_prompt: "Are you sure you want to delete %{username}? This will remove all of their posts and block their email and ip address." @@ -302,6 +344,9 @@ en: mods_and_admins: "Only moderators and Admins" members_mods_and_admins: "Only group members, moderators and admins" everyone: "Everyone" + trust_levels: + title: "Trust level automatically granted to members when they're added:" + none: "None" user_action_groups: "1": "Likes Given" @@ -323,6 +368,14 @@ en: all_subcategories: "all" no_subcategory: "none" category: "Category" + reorder: + title: "Reorder Categories" + title_long: "Reorganize the category list" + fix_order: "Fix Positions" + fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results." + save: "Save Order" + apply_all: "Apply" + position: "Position" posts: "Posts" topics: "Topics" latest: "Latest" @@ -354,6 +407,9 @@ en: post_count: "# posts" confirm_delete_other_accounts: "Are you sure you want to delete these accounts?" + user_fields: + none: "(select an option)" + user: said: "{{username}}:" profile: "Profile" @@ -365,11 +421,23 @@ en: private_messages: "Messages" activity_stream: "Activity" preferences: "Preferences" + expand_profile: "Expand" bookmarks: "Bookmarks" bio: "About me" invited_by: "Invited By" trust_level: "Trust Level" notifications: "Notifications" + desktop_notifications: + label: "Desktop Notifications" + not_supported: "Notifications are not supported on this browser. Sorry." + perm_default: "Turn On Notifications" + perm_denied_btn: "Permission Denied" + perm_denied_expl: "You have denied permission for notifications. Use your browser to enable notifications, then click the button when done. (Desktop: The leftmost icon in the address bar. Mobile: 'Site Info'.)" + disable: "Disable Notifications" + currently_enabled: "(currently enabled)" + enable: "Enable Notifications" + currently_disabled: "(currently disabled)" + each_browser_note: "Note: You have to change this setting on every browser you use." dismiss_notifications: "Mark all as Read" dismiss_notifications_tooltip: "Mark all unread notifications as read" disable_jump_reply: "Don't jump to my post after I reply" @@ -382,14 +450,15 @@ en: admin: "{{user}} is an admin" moderator_tooltip: "This user is a moderator" admin_tooltip: "This user is an admin" + blocked_tooltip: "This user is blocked" suspended_notice: "This user is suspended until {{date}}." suspended_reason: "Reason: " github_profile: "Github" mailing_list_mode: "Send me an email for every new post (unless I mute the topic or category)" watched_categories: "Watched" - watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic's listing." + watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic." tracked_categories: "Tracked" - tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." + tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of new posts will appear next to the topic." muted_categories: "Muted" muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." delete_account: "Delete My Account" @@ -449,7 +518,7 @@ en: upload_title: "Upload your picture" upload_picture: "Upload Picture" image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal." - cache_notice: "You've successfully changed your avatar but it might take some time to appear due to browser caching." + cache_notice: "You've successfully changed your profile picture but it might take some time to appear due to browser caching." change_profile_background: title: "Profile Background" @@ -518,7 +587,7 @@ en: email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" email_private_messages: "Send me an email when someone messages me" - email_always: "Do not suppress email notifications when I am active on the site" + email_always: "Send me email notifications even when I am active on the site" other_settings: "Other" categories_settings: "Categories" @@ -527,33 +596,37 @@ en: label: "Consider topics new when" not_viewed: "I haven't viewed them yet" last_here: "created since I was here last" - after_n_days: - one: "created in the last day" - other: "created in the last {{count}} days" - after_n_weeks: - one: "created in the last week" - other: "created in the last {{count}} weeks" + after_1_day: "created in the last day" + after_2_days: "created in the last 2 days" + after_1_week: "created in the last week" + after_2_weeks: "created in the last 2 weeks" auto_track_topics: "Automatically track topics I enter" auto_track_options: never: "never" immediately: "immediately" - after_n_seconds: - one: "after 1 second" - other: "after {{count}} seconds" - after_n_minutes: - one: "after 1 minute" - other: "after {{count}} minutes" + after_30_seconds: "after 30 seconds" + after_1_minute: "after 1 minute" + after_2_minutes: "after 2 minutes" + after_3_minutes: "after 3 minutes" + after_4_minutes: "after 4 minutes" + after_5_minutes: "after 5 minutes" + after_10_minutes: "after 10 minutes" invited: search: "type to search invites..." title: "Invites" user: "Invited User" - none: "You haven't invited anyone here yet." + sent: "Sent" + none: "There are no pending invites to display." truncated: "Showing the first {{count}} invites." redeemed: "Redeemed Invites" + redeemed_tab: "Redeemed" + redeemed_tab_with_count: "Redeemed ({{count}})" redeemed_at: "Redeemed" pending: "Pending Invites" + pending_tab: "Pending" + pending_tab_with_count: "Pending ({{count}})" topics_entered: "Topics Viewed" posts_read_count: "Posts Read" expired: "This invite has expired." @@ -565,6 +638,8 @@ en: days_visited: "Days Visited" account_age_days: "Account age in days" create: "Send an Invite" + generate_link: "Copy Invite Link" + generated_link_message: '

      Invite link generated successfully!

      Invite link is only valid for this email address: %{invitedEmail}

      ' bulk_invite: none: "You haven't invited anyone here yet. You can send individual invites, or invite a bunch of people at once by uploading a bulk invite file." text: "Bulk Invite from File" @@ -609,11 +684,13 @@ en: server: "Server Error" forbidden: "Access Denied" unknown: "Error" + not_found: "Page Not Found" desc: network: "Please check your connection." network_fixed: "Looks like it's back." server: "Error code: {{status}}" forbidden: "You're not allowed to view that." + not_found: "Oops, the application tried to load a URL that doesn't exist." unknown: "Something went wrong." buttons: back: "Go Back" @@ -626,7 +703,9 @@ en: read_only_mode: enabled: "Read-only mode is enabled. You can continue to browse the site but interactions may not work." login_disabled: "Login is disabled while the site is in read only mode." - too_few_topics_notice: "Create at least 5 public topics and %{posts} public replies to get discussion started. New users cannot earn trust levels unless there's content for them to read. This message appears only to staff." + too_few_topics_and_posts_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics and %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to." + too_few_topics_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics. New visitors need some conversations to read and respond to." + too_few_posts_notice: "Let's get this discussion started! There are currently %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to." learn_more: "learn more..." @@ -647,6 +726,22 @@ en: one: reply other: replies + signup_cta: + sign_up: "Sign Up" + hide_session: "Remind me tomorrow" + hide_forever: "no thanks" + hidden_for_session: "OK, I'll ask you tomorrow. You can always use 'Log In' to create an account, too." + intro: "Hey there! :heart_eyes: Looks like you're enjoying the discussion, but you're not signed up for an account." + value_prop: "When you create an account, we remember exactly what you've read, so you always come right back where you left off. You also get notifications, here and via email, whenever new posts are made. And you can like posts to share the love. :heartbeat:" + methods: + sso: "Signing up is easy: all you need is an account on the main site." + only_email: "Signing up is easy: all you need is an email and password." + only_other: "Use your %{provider} account to sign up." + one_and_email: "Use your %{provider} account, or an email and password, to sign up." + multiple_no_email: "Signing up is easy: use any of our %{count} social logins." + multiple: "Signing up is easy: use any of our %{count} social logins, or an email and password." + unknown: "error getting supported login methods" + summary: enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." description: "There are {{count}} replies." @@ -696,6 +791,7 @@ en: email_placeholder: "email or username" caps_lock_warning: "Caps Lock is on" error: "Unknown error" + rate_limit: "Please wait before trying to log in again." blank_username_or_password: "Please enter your email or username, and password." reset_password: 'Reset Password' logging_in: "Signing In..." @@ -735,8 +831,11 @@ en: composer: emoji: "Emoji :smile:" + options: "Options" + whisper: "whisper" add_warning: "This is an official warning." + toggle_whisper: "Toggle Whisper" posting_not_on_topic: "Which topic do you want to reply to?" saving_draft_tip: "saving..." saved_draft_tip: "saved" @@ -766,7 +865,7 @@ en: title_placeholder: "What is this discussion about in one brief sentence?" edit_reason_placeholder: "why are you editing?" show_edit_reason: "(add edit reason)" - reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste an image to upload it." + reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images." view_new_post: "View your new post." saving: "Saving..." saved: "Saved!" @@ -832,6 +931,21 @@ en: linked: "

      {{username}} {{description}}

      " granted_badge: "

      Earned '{{description}}'

      " + alt: + mentioned: "Mentioned by" + quoted: "Quoted by" + replied: "Replied" + posted: "Post by" + edited: "Edit your post by" + liked: "Liked your post" + private_message: "Private message from" + invited_to_private_message: "Invited to a private message from" + invited_to_topic: "Invited to a topic from" + invitee_accepted: "Invite accepted by" + moved_post: "Your post was moved by" + linked: "Link to your post" + granted_badge: "Badge granted" + popup: mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}' quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}' @@ -847,16 +961,29 @@ en: from_the_web: "From the web" remote_tip: "link to image" remote_tip_with_attachments: "link to image or file ({{authorized_extensions}})" - local_tip: "click to select an image from your device" - local_tip_with_attachments: "click to select an image or file from your device ({{authorized_extensions}})" + local_tip: "select images from your device" + local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" hint: "(you can also drag & drop into the editor to upload them)" - hint_for_supported_browsers: "(you can also drag and drop or paste images into the editor to upload them)" + hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" uploading: "Uploading" + select_file: "Select File" image_link: "link your image will point to" search: + sort_by: "Sort by" + relevance: "Relevance" + latest_post: "Latest Post" + most_viewed: "Most Viewed" + most_liked: "Most Liked" + select_all: "Select All" + clear_all: "Clear All" + result_count: + one: "1 result for \"{{term}}\"" + other: "{{count}} results for \"{{term}}\"" title: "search topics, posts, users, or categories" no_results: "No results found." + no_more_results: "No more results found." + search_help: Search help searching: "Searching ..." post_format: "#{{post_number}} by {{username}}" @@ -866,7 +993,8 @@ en: topic: "Search this topic" private_messages: "Search messages" - site_map: "go to another topic list or category" + hamburger_menu: "go to another topic list or category" + new_item: "new" go_back: 'go back' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: 'go to your user page' @@ -918,6 +1046,9 @@ en: search: "There are no more search results." topic: + unsubscribe: + stop_notifications: "You will now receive less notifications for {{title}}" + change_notification_state: "Your current notification state is " filter_to: "{{post_count}} posts in topic" create: 'New Topic' create_long: 'Create a new Topic' @@ -951,7 +1082,6 @@ en: new_posts: one: "there is 1 new post in this topic since you last read it" other: "there are {{count}} new posts in this topic since you last read it" - likes: one: "there is 1 like in this topic" other: "there are {{count}} likes in this topic" @@ -1014,29 +1144,29 @@ en: "2_4": 'You will receive notifications because you posted a reply to this topic.' "2_2": 'You will receive notifications because you are tracking this topic.' "2": 'You will receive notifications because you read this topic.' - "1_2": 'You will be notified if someone mentions your @name or replies to your post.' - "1": 'You will be notified if someone mentions your @name or replies to your post.' + "1_2": 'You will be notified if someone mentions your @name or replies to you.' + "1": 'You will be notified if someone mentions your @name or replies to you.' "0_7": 'You are ignoring all notifications in this category.' "0_2": 'You are ignoring all notifications on this topic.' "0": 'You are ignoring all notifications on this topic.' watching_pm: title: "Watching" - description: "You will be notified of every new post in this message. A count of unread and new posts will also appear next to the topic." + description: "You will be notified of every new reply in this message, and a count of new replies will be shown." watching: title: "Watching" - description: "You will be notified of every new post in this topic. A count of unread and new posts will also appear next to the topic." + description: "You will be notified of every new reply in this topic, and a count of new replies will be shown." tracking_pm: title: "Tracking" - description: "A count of unread and new posts will appear next to the message. You will be notified if someone mentions your @name or replies to your post." + description: "A count of new replies will be shown for this message. You will be notified if someone mentions your @name or replies to you." tracking: title: "Tracking" - description: "A count of unread and new posts will appear next to the topic. You will be notified if someone mentions your @name or replies to your post. " + description: "A count of new replies will be shown for this topic. You will be notified if someone mentions your @name or replies to you. " regular: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post." + title: "Normal" + description: "You will be notified if someone mentions your @name or replies to you." regular_pm: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post in the message." + title: "Normal" + description: "You will be notified if someone mentions your @name or replies to you." muted_pm: title: "Muted" description: "You will never be notified of anything about this message." @@ -1085,17 +1215,20 @@ en: feature_topic: title: "Feature this topic" - pin: "Make this topic appear at the top of the {{categoryLink}} category." + pin: "Make this topic appear at the top of the {{categoryLink}} category until" confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?" unpin: "Remove this topic from the top of the {{categoryLink}} category." + unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until %{until}." pin_note: "Users can unpin the topic individually for themselves." + pin_validation: "A date is required to pin this topic." already_pinned: zero: "There are no topics pinned in {{categoryLink}}." one: "Topics currently pinned in {{categoryLink}}: 1." other: "Topics currently pinned in {{categoryLink}}: {{count}}." - pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it." + pin_globally: "Make this topic appear at the top of all topic lists until" confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" unpin_globally: "Remove this topic from the top of all topic lists." + unpin_globally_until: "Remove this topic from the top of all topic lists or wait until %{until}." global_pin_note: "Users can unpin the topic individually for themselves." already_pinned_globally: zero: "There are no topics pinned globally." @@ -1130,8 +1263,8 @@ en: sso_enabled: "Enter the username of the person you'd like to invite to this topic." to_topic_blank: "Enter the username or email address of the person you'd like to invite to this topic." to_topic_email: "You've entered an email address. We'll email an invitation that allows your friend to immediately reply to this topic." - to_topic_username: "You've entered a username. We'll send a notification to that user with a link inviting them to this topic." - to_username: "Enter the username of the person you'd like to invite. We'll send a notification to that user with a link inviting them to this topic." + to_topic_username: "You've entered a username. We'll send a notification with a link inviting them to this topic." + to_username: "Enter the username of the person you'd like to invite. We'll send a notification with a link inviting them to this topic." email_placeholder: 'name@example.com' success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." @@ -1174,6 +1307,13 @@ en: other: "Please choose the new owner of the {{count}} posts by {{old_user}}." instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively.
      Warning: Currently, no post-dependent data is transferred over to the new user. Use with caution." + change_timestamp: + title: "Change Timestamp" + action: "change timestamp" + invalid_timestamp: "Timestamp cannot be in the future." + error: "There was an error changing the timestamp of the topic." + instructions: "Please select the new timestamp of the topic. Posts in the topic will be updated to have the same time difference." + multi_select: select: 'select' selected: 'selected ({{count}})' @@ -1187,8 +1327,8 @@ en: other: "You have selected {{count}} posts." post: - reply: "Replying to {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Reply to {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "quote reply" edit: "Editing {{link}} {{replyAvatar}} {{username}}" edit_reason: "Reason: " @@ -1210,8 +1350,20 @@ en: unread: "Post is unread" has_replies: - one: "Reply" - other: "Replies" + one: "{{count}} Reply" + other: "{{count}} Replies" + has_likes: + one: "{{count}} Like" + other: "{{count}} Likes" + + has_likes_title: + one: "1 person liked this post" + other: "{{count}} people liked this post" + + has_likes_title_you: + zero: "you liked this post" + one: "you and 1 other person liked this post" + other: "you and {{count}} other people liked this post" errors: create: "Sorry, there was an error creating your post. Please try again." @@ -1232,6 +1384,7 @@ en: yes_value: "Yes, abandon" via_email: "this post arrived via email" + whisper: "this post is a private whisper for moderators" wiki: about: "this post is a wiki; basic users can edit it" @@ -1390,14 +1543,17 @@ en: category: can: 'can… ' none: '(no category)' + all: 'All categories' choose: 'Select a category…' edit: 'edit' edit_long: "Edit" view: 'View Topics in Category' general: 'General' settings: 'Settings' + topic_template: "Topic Template" delete: 'Delete Category' create: 'New Category' + create_long: 'Create a new category' save: 'Save Category' slug: 'Category Slug' slug_placeholder: '(Optional) dashed-words for url' @@ -1420,6 +1576,7 @@ en: change_in_category_topic: "Edit Description" already_used: 'This color has been used by another category' security: "Security" + special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it." images: "Images" auto_close_label: "Auto-close topics after:" auto_close_units: "hours" @@ -1427,6 +1584,7 @@ en: email_in_allow_strangers: "Accept emails from anonymous users with no accounts" email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, " email_in_disabled_click: 'enable the "email in" setting.' + suppress_from_homepage: "Suppress this category from the homepage." allow_badges_label: "Allow badges to be awarded in this category" edit_permissions: "Edit Permissions" add_permission: "Add Permission" @@ -1441,16 +1599,16 @@ en: reasons: watching: title: "Watching" - description: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." + description: "You will automatically watch all new topics in these categories. You will be notified of every new post in every topic, and a count of new replies will be shown." tracking: title: "Tracking" - description: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." + description: "You will automatically track all new topics in these categories. You will be notified if someone mentions your @name or replies to you, and a count of new replies will be shown." regular: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post." + title: "Normal" + description: "You will be notified if someone mentions your @name or replies to you." muted: title: "Muted" - description: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." + description: "You will never be notified of anything about new topics in these categories, and they will not appear on your unread tab." flagging: title: 'Thanks for helping to keep our community civil!' @@ -1499,7 +1657,9 @@ en: locked: help: "This topic is closed; it no longer accepts new replies" archived: - help: "This topic is archived; it no longer accepts new replies" + help: "This topic is archived; it is frozen and cannot be changed" + locked_and_archived: + help: "This topic is closed and archived; it no longer accepts new replies and cannot be changed" unpinned: title: "Unpinned" help: "This topic is unpinned for you; it will display in regular order" @@ -1509,8 +1669,6 @@ en: pinned: title: "Pinned" help: "This topic is pinned for you; it will display at the top of its category" - archived: - help: "This topic is archived; it is frozen and cannot be changed" invisible: help: "This topic is unlisted; it will not be displayed in topic lists, and can only be accessed via a direct link" @@ -1554,7 +1712,10 @@ en: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: - title: "Latest" + title: + zero: "Latest" + one: "Latest (1)" + other: "Latest ({{count}})" help: "topics with recent posts" hot: title: "Hot" @@ -1609,6 +1770,8 @@ en: title: "All Time" yearly: title: "Yearly" + quarterly: + title: "Quarterly" monthly: title: "Monthly" weekly: @@ -1616,9 +1779,10 @@ en: daily: title: "Daily" all_time: "All Time" - this_year: "This year" - this_month: "This month" - this_week: "This week" + this_year: "Year" + this_quarter: "Quarter" + this_month: "Month" + this_week: "Week" today: "Today" other_periods: "see top" @@ -1660,6 +1824,7 @@ en: suspended: 'Suspended:' private_messages_short: "Msgs" private_messages_title: "Messages" + mobile_title: "Mobile" space_free: "{{size}} free" uploads: "uploads" backups: "backups" @@ -1801,7 +1966,11 @@ en: name: "Name" none_installed: "You don't have any plugins installed." version: "Version" + enabled: "Enabled?" + is_enabled: "Y" + not_enabled: "N" change_settings: "Change Settings" + change_settings_short: "Settings" howto: "How do I install plugins?" backups: @@ -1869,6 +2038,8 @@ en: screened_email: "Export full screened email list in CSV format." screened_ip: "Export full screened IP list in CSV format." screened_url: "Export full screened URL list in CSV format." + export_json: + button_text: "Export" invite: button_text: "Send Invites" @@ -1881,6 +2052,7 @@ en: header: "Header" top: "Top" footer: "Footer" + embedded_css: "Embedded CSS" head_tag: text: "" title: "HTML that will be inserted before the tag" @@ -1898,6 +2070,8 @@ en: save: "Save" new: "New" new_style: "New Style" + import: "Import" + import_title: "Select a file or paste text" delete: "Delete" delete_confirm: "Delete this customization?" about: "Modify CSS stylesheets and HTML headers on the site. Add a customization to start." @@ -1972,7 +2146,7 @@ en: sent_test: "sent!" delivery_method: "Delivery Method" preview_digest: "Preview Digest" - preview_digest_desc: "Preview the content of the weekly digest emails sent to inactive users." + preview_digest_desc: "Preview the content of the digest emails sent to inactive users." refresh: "Refresh" format: "Format" html: "html" @@ -2038,6 +2212,7 @@ en: delete_post: "delete post" impersonate: "impersonate" anonymize_user: "anonymize user" + roll_up: "roll up IP blocks" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -2263,6 +2438,7 @@ en: delete: "Delete" cancel: "Cancel" delete_confirm: "Are you sure you want to delete that user field?" + options: "Options" required: title: "Required at signup?" enabled: "required" @@ -2279,6 +2455,7 @@ en: field_types: text: 'Text Field' confirm: 'Confirmation' + dropdown: "Dropdown" site_text: none: "Choose a type of content to begin editing." @@ -2292,6 +2469,7 @@ en: no_results: "No results found." clear_filter: "Clear" add_url: "add URL" + add_host: "add host" categories: all_results: 'All' required: 'Required' @@ -2313,6 +2491,7 @@ en: backups: "Backups" login: "Login" plugins: "Plugins" + user_preferences: "User Preferences" badges: title: Badges @@ -2389,6 +2568,47 @@ en: image: "Image" delete_confirm: "Are you sure you want to delete the :%{name}: emoji?" + embedding: + get_started: "If you'd like to embed Discourse on another website, begin by adding its host." + confirm_delete: "Are you sure you want to delete that host?" + sample: "Use the following HTML code into your site to create and embed discourse topics. Replace REPLACE_ME with the canonical URL of the page you are embedding it on." + title: "Embedding" + host: "Allowed Hosts" + edit: "edit" + category: "Post to Category" + add_host: "Add Host" + settings: "Embedding Settings" + feed_settings: "Feed Settings" + feed_description: "Providing an RSS/ATOM feed for your site can improve Discourse's ability to import your content." + crawling_settings: "Crawler Settings" + crawling_description: "When Discourse creates topics for your posts, if no RSS/ATOM feed is present it will attempt to parse your content out of your HTML. Sometimes it can be challenging to extract your content, so we provide the ability to specify CSS rules to make extraction easier." + + embed_by_username: "Username for topic creation" + embed_post_limit: "Maximum number of posts to embed" + embed_username_key_from_feed: "Key to pull discourse username from feed" + embed_truncate: "Truncate the embedded posts" + embed_whitelist_selector: "CSS selector for elements that are allowed in embeds" + embed_blacklist_selector: "CSS selector for elements that are removed from embeds" + feed_polling_enabled: "Import posts via RSS/ATOM" + feed_polling_url: "URL of RSS/ATOM feed to crawl" + save: "Save Embedding Settings" + + permalink: + title: "Permalinks" + url: "URL" + topic_id: "Topic ID" + topic_title: "Topic" + post_id: "Post ID" + post_title: "Post" + category_id: "Category ID" + category_title: "Category" + external_url: "External URL" + delete_confirm: Are you sure you want to delete this permalink? + form: + label: "New:" + add: "Add" + filter: "Search (URL or External URL)" + lightbox: download: "download" @@ -2406,6 +2626,8 @@ en: categories: 'g, c Categories' top: 'g, t Top' bookmarks: 'g, b Bookmarks' + profile: 'g, p Profile' + messages: 'g, m Messages' navigation: title: 'Navigation' jump: '# Go to post #' @@ -2417,13 +2639,14 @@ en: title: 'Application' create: 'c Create a new topic' notifications: 'n Open notifications' - site_map_menu: '= Open site menu' + hamburger_menu: '= Open hamburger menu' user_profile_menu: 'p Open user menu' show_incoming_updated_topics: '. Show updated topics' search: '/ Search' help: '? Open keyboard help' dismiss_new_posts: 'x, r Dismiss New/Posts' dismiss_topics: 'x, t Dismiss Topics' + log_out: 'shift+z shift+z Log Out' actions: title: 'Actions' bookmark_topic: 'f Toggle bookmark topic' @@ -2533,10 +2756,10 @@ en: description: Invited a user campaigner: name: Campaigner - description: Invited 3 members + description: Invited 3 basic users (trust level 1) champion: name: Champion - description: Invited 10 members + description: Invited 5 members (trust level 2) first_share: name: First Share description: Shared a post @@ -2552,9 +2775,18 @@ en: reader: name: Reader description: Read every post in a topic with more than 100 posts + popular_link: + name: Popular Link + description: Posted an external link with at least 50 clicks + hot_link: + name: Hot Link + description: Posted an external link with at least 300 clicks + famous_link: + name: Famous Link + description: Posted an external link with at least 1000 clicks google_search: | -

      Search with Google

      +

      Search with Google

      diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index d60fcd620c..4b1f09b9f3 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -8,6 +8,9 @@ es: js: number: + format: + separator: "," + delimiter: "." human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ es: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM, 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM, 'YY" @@ -82,6 +90,16 @@ es: x_days: one: "hace 1 día" other: "hace %{count} días" + later: + x_days: + one: "1 día después" + other: "%{count} días después" + x_months: + one: "%{count} mes después" + other: "%{count} meses después" + x_years: + one: "%{count} año después" + other: "%{count} años después" share: topic: 'comparte un enlace a este tema' post: 'post #%{postNumber}' @@ -90,6 +108,26 @@ es: facebook: 'comparte este enlace en Facebook' google+: 'comparte este enlace en Google+' email: 'comparte este enlace por email' + action_codes: + split_topic: "separó este tema %{when}" + autoclosed: + enabled: 'cerrado %{when}' + disabled: 'abierto %{when}' + closed: + enabled: 'cerrado %{when}' + disabled: 'abierto %{when}' + archived: + enabled: 'archivado %{when}' + disabled: 'desarchivado %{when}' + pinned: + enabled: 'destacado %{when}' + disabled: 'sin destacar %{when}' + pinned_globally: + enabled: 'destacado globalmente %{when}' + disabled: 'sin destacar %{when}' + visible: + enabled: 'listado %{when}' + disabled: 'sin listar %{when}' topic_admin_menu: "acciones de administrador para el tema" emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email." edit: 'editar el título y la categoría de este tema' @@ -105,7 +143,7 @@ es: admin_title: "Admin" flags_title: "Reportes" show_more: "ver más" - show_help: "ayuda" + show_help: "opciones" links: "Enlaces" links_lowercase: one: "enlace" @@ -129,6 +167,7 @@ es: every_two_weeks: "cada dos semanas" every_three_days: "cada tres días" max_of_count: "máximo de {{count}}" + alternation: "o" character_count: one: "{{count}} carácter" other: "{{count}} caracteres" @@ -150,7 +189,7 @@ es: user_count: "Nuevos usuarios" active_user_count: "Usuarios activos" contact: "Contáctanos" - contact_info: "En el transcurso de un error crítico o un asunto urgente referente a este sitio, por favor, contáctanos en %{contact_info}." + contact_info: "En caso de un error crítico o un asunto urgente referente a este sitio, por favor, contáctanos en %{contact_info}." bookmarked: title: "Marcador" clear_bookmarks: "Quitar Marcadores" @@ -159,9 +198,9 @@ es: unbookmark: "Clic para quitar todos los marcadores de este tema" bookmarks: not_logged_in: "Lo sentimos, debes iniciar sesión para guardar posts en marcadores." - created: "has marcado este post como favorito" - not_bookmarked: "has leído este post, haz clic para marcarlo como favorito" - last_read: "este es el último post que has leído; haz clic para marcarlo como favorito" + created: "has guardado este post en marcadores" + not_bookmarked: "has leído este post, haz clic para guardarlo en marcadores" + last_read: "este es el último post que has leído; haz clic para guardarlo en marcadores" remove: "Eliminar marcador" confirm_clear: "¿Seguro que deseas borrar todos los marcadores de este tema?" topic_count_latest: @@ -181,6 +220,7 @@ es: saved: "¡Guardado!" upload: "Subir" uploading: "Subiendo..." + uploading_filename: "Subiendo {{filename}}..." uploaded: "¡Subido!" enable: "Activar" disable: "Desactivar" @@ -188,9 +228,10 @@ es: revert: "Revertir" failed: "Falló" switch_to_anon: "Modo Anónimo" - switch_from_anon: "Salir de Modo Anónimo" + switch_from_anon: "Salir del Modo Anónimo" banner: close: "Descartar este banner." + edit: "Editar este banner >>" choose_topic: none_found: "Ningún tema encontrado." title: @@ -207,8 +248,8 @@ es: cancel: "Cancelar" view_pending: "ver posts pendientes" has_pending_posts: - one: "Este tema tiene 1 post pendiente de aprobación" - many: "Este tema tiene {{count}} posts pendientes de aprobación" + one: "Este tema tiene 1 post esperando aprobación" + other: "Este tema tiene {{count}} posts esperando aprobación" confirm: "Guardar Cambios" delete_prompt: "¿Seguro que quieres eliminar a %{username}? Esto eliminará todos sus posts y bloqueará su email y dirección IP." approval: @@ -266,6 +307,9 @@ es: mods_and_admins: "Solo moderadores y administradores" members_mods_and_admins: "Solo miembros del grupo, moderadores y administradores" everyone: "Todos" + trust_levels: + title: "Nivel de confianza entregado automáticamente a miembros cuando son añadidos:" + none: "Ninguno" user_action_groups: '1': "'Me gusta' Dados" '2': "'Me gusta' Recibidos" @@ -285,6 +329,14 @@ es: all_subcategories: "todas" no_subcategory: "ninguna" category: "Categoría" + reorder: + title: "Reorganizar Categorías" + title_long: "Reorganizar la lista de categorías" + fix_order: "Ordenar posiciones" + fix_order_tooltip: "No todas las categorías tienen un número de posición único, lo que puede causar resultados inesperados." + save: "Guardar orden" + apply_all: "Aplicar" + position: "Posición" posts: "Posts" topics: "Temas" latest: "Recientes" @@ -314,6 +366,8 @@ es: topics_entered: "temas vistos" post_count: "# posts" confirm_delete_other_accounts: "¿Seguro que quieres eliminar estas cuentas?" + user_fields: + none: "(selecciona una opción)" user: said: "{{username}}:" profile: "Perfil" @@ -325,11 +379,23 @@ es: private_messages: "Mensajes" activity_stream: "Actividad" preferences: "Preferencias" + expand_profile: "Expandir" bookmarks: "Marcadores" bio: "Acerca de mí" invited_by: "Invitado Por" trust_level: "Nivel de Confianza" notifications: "Notificaciones" + desktop_notifications: + label: "Notificaciones de escritorio" + not_supported: "Las notificaciones no están disponibles en este navegador. Lo sentimos." + perm_default: "Activar notificaciones" + perm_denied_btn: "Permiso denegado" + perm_denied_expl: "Has denegado el permiso para las notificaciones. Usa tu navegador para activarlas, después haz clic en el botón cuando esté hecho. (En escritorio: el icono a la izquierda de la barra de direcciones. En móvil: 'info del sitio'.)" + disable: "Desactivar notificaciones" + currently_enabled: "(activadas actualmente)" + enable: "Activar notificaciones" + currently_disabled: "(desactivadas actualmente)" + each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses." dismiss_notifications: "Marcador todos como leídos" dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas" disable_jump_reply: "No dirigirme a mi post cuando responda" @@ -342,14 +408,15 @@ es: admin: "{{user}} es un administrador" moderator_tooltip: "Este usuario es un moderador" admin_tooltip: "Este usuario es un administrador" + blocked_tooltip: "El usuario está bloqueado" suspended_notice: "Este usuario ha sido suspendido hasta {{date}}." suspended_reason: "Causa: " github_profile: "Github" mailing_list_mode: "Enviarme un e-mail para cada nuevo post (excepto las categorías o temas que tenga silenciadas)" watched_categories: "Vigiladas" - watched_categories_instructions: "Automáticamente vigilarás todos los temas en estas categorías. Se te notificará de todos los posts y temas, y además aparecerá un contador de posts nuevos y no leídos en la lista de temas." + watched_categories_instructions: "Seguirás automáticamente todos los nuevos temas en estas categorías. Se te notificará de cada nuevo post y tema, y además, se añadirá un contador de posts nuevos y sin leer al lado del tema." tracked_categories: "Siguiendo" - tracked_categories_instructions: "Automáticamente seguirás todos los nuevos temas en estas categorías. Se añadirá un contador de nuevos posts y posts sin leer al lado del tema." + tracked_categories_instructions: "Seguirás automáticamente todos los nuevos temas en estas categorías. Se añadirá un contador de posts nuevos y sin leer al lado del tema." muted_categories: "Silenciado" muted_categories_instructions: "No será notificado de nuevos temas en estas categorías, y no aparecerán en la sección de \"no leídos\"." delete_account: "Borrar Mi Cuenta" @@ -402,7 +469,7 @@ es: upload_title: "Sube tu foto" upload_picture: "Subir Imagen" image_is_not_a_square: "Advertencia: hemos recortado su imagen; la anchura y la altura no eran iguales." - cache_notice: "Has cambiado tu avatar correctamente, podría tardar un poco en aparecer debido al caching del navegador." + cache_notice: "Has cambiado correctamente tu imagen de perfil pero podría tardar un poco en aparecer debido al caching del navegador." change_profile_background: title: "Fondo de perfil" instructions: "Fondos de perfil serán centrados y tendrán un ancho por default de 850px." @@ -462,38 +529,42 @@ es: every_two_weeks: "cada dos semanas" email_direct: "Envíame un email cuando alguien me cite, responda a mis posts, mencione mi @usuario o me invite a un tema" email_private_messages: "Notifícame por email cuando alguien me envíe un mensaje" - email_always: "No detener notificaciones por e-mail cuando estoy activo en el sitio" + email_always: "Quiero recibir notificaciones por email incluso cuando esté de forma activa por el sitio" other_settings: "Otros" categories_settings: "Categorías" new_topic_duration: label: "Considerar que los temas son nuevos cuando" not_viewed: "No los he visto todavía" last_here: "creados desde mi última visita" - after_n_days: - one: "creados en el último día" - other: "creados en los últimos {{count}} días" - after_n_weeks: - one: "creados en la última semana" - other: "creados en las últimas {{count}} semanas" + after_1_day: "creados durante el último día " + after_2_days: "creados durante los últimos 2 días" + after_1_week: "creados durante la última semana" + after_2_weeks: "creados durante las últimas 2 semanas" auto_track_topics: "Seguir automáticamente temas en los que entre" auto_track_options: never: "nunca" immediately: "inmediatamente" - after_n_seconds: - one: "después de 1 segundo" - other: "después de {{count}} segundos" - after_n_minutes: - one: "después de 1 minuto" - other: "después de {{count}} minutos" + after_30_seconds: "después de 30 segundos" + after_1_minute: "después de 1 minuto" + after_2_minutes: "después de 2 minutos" + after_3_minutes: "después de 3 minutos" + after_4_minutes: "después de 4 minutos" + after_5_minutes: "después de 5 minutos" + after_10_minutes: "después de 10 minutos" invited: search: "escribe para buscar invitaciones..." title: "Invitaciones" user: "Invitar Usuario" - none: "No has invitado a nadie todavía." + sent: "Enviadas" + none: "No hay ninguna invitación pendiente que mostrar." truncated: "Mostrando las primeras {{count}} invitaciones." redeemed: "Invitaciones aceptadas" + redeemed_tab: "Usado" + redeemed_tab_with_count: "Aceptadas ({{count}})" redeemed_at: "Aceptada" pending: "Invitaciones Pendientes" + pending_tab: "Pendiente" + pending_tab_with_count: "Pendientes ({{count}})" topics_entered: "Temas Vistos" posts_read_count: "Posts leídos" expired: "Esta invitación ha caducado." @@ -505,6 +576,8 @@ es: days_visited: "Días Visitados" account_age_days: "Antigüedad de la cuenta en días" create: "Enviar una Invitación" + generate_link: "Copiar Enlace de Invitación" + generated_link_message: '

      ¡Enlace de Invitación generado con éxito!

      Este enlace de Invitación es sólo válido para la siguiente dirección de email: %{invitedEmail}

      ' bulk_invite: none: "No has invitado a nadie todavía. Puedes enviar invitaciones individuales o invitar a un grupo de personas a la vez subiendo un archivo para invitaciones en masa." text: "Archivo de Invitación en Masa" @@ -561,7 +634,9 @@ es: read_only_mode: enabled: "Modo solo-lectura activado. Puedes continuar navegando por el sitio pero las interacciones podrían no funcionar." login_disabled: "Iniciar sesión está desactivado mientras el foro esté en modo solo lectura." - too_few_topics_notice: "Crea al menos 5 temas y %{posts} posts públicos para considerar iniciada la discusión. Los nuevos usuarios no podrán ganar niveles de confianza a menos que haya contenido para que lean. Este mensaje sólo les aparecerá a los miembros del staff." + too_few_topics_and_posts_notice: "¡Vamos a dar por comenzada la comunidad! Hay %{currentTopics} / %{requiredTopics} temas y %{currentPosts} / %{requiredPosts} mensajes. Los nuevos visitantes necesitan algo que leer y a lo que responder." + too_few_topics_notice: "¡Vamos a dar por comenzada la comunidad! Hay %{currentTopics} / %{requiredTopics} temas. Los nuevos visitantes necesitan algo que leer y a lo que responder." + too_few_posts_notice: "¡Vamos a dar por empezada la comunidad! Hay %{currentPosts} / %{requiredPosts} mensajes. Los nuevos visitantes necesitan algo que leer y a lo que responder." learn_more: "saber más..." year: 'año' year_desc: 'temas creados en los últimos 365 días' @@ -578,6 +653,21 @@ es: replies_lowercase: one: respuesta other: respuestas + signup_cta: + sign_up: "Registrarse" + hide_session: "Recordar mañana" + hide_forever: "No gracias" + hidden_for_session: "Vale, te preguntaremos mañana. Recuerda que también puedes usar el botón 'Iniciar sesión' para crear una cuenta en cualquier momento." + intro: "¡Hola! :heart_eyes: Parece que estás interesado en las cosas que nuestros usuarios publican, pero no tienes una cuenta registrada." + value_prop: "Si estás registrado, podemos saber exactamente lo que has leído, para que siempre puedas retomar la lectura donde la dejaste. También puedes recibir notificaciones, por aquí o por email, cuando se publiquen nuevos mensajes. Ah, ¡y puedes darle a Me gusta a los mensajes! :heartbeat:" + methods: + sso: "Registrarse es gratis: sólo necesitas una cuenta de la web principal." + only_email: "Registrarse es fácil: sólo necesitas un email y una contraseña." + only_other: "Usa tu cuenta de %{provider} para registrarte." + one_and_email: "Usa tu cuenta de %{provider} para registrarte, o un correo y una contraseña." + multiple_no_email: "Registrarse es fácil: usa cualquiera de nuestras %{count} integraciones con redes sociales." + multiple: "Registrarse es fácil: usa cualquiera de nuestras %{count} integraciones con redes sociales, o un email y una contraseña." + unknown: "error al obtener los métodos de inicio de sesión disponible" summary: enabled_description: "Estás viendo un resumen de este tema: los posts más interesantes determinados por la comunidad." description: "Hay {{count}} respuestas." @@ -621,6 +711,7 @@ es: email_placeholder: "dirección de e-mail o nombre de usuario" caps_lock_warning: "Está activado Bloqueo de Mayúsculas" error: "Error desconocido" + rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión." blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña." reset_password: 'Restablecer Contraseña' logging_in: "Iniciando Sesión" @@ -658,7 +749,10 @@ es: emoji_one: "Emoji One" composer: emoji: "Emoji :smile:" + options: "Opciones" + whisper: "susurrar" add_warning: "Ésta es una advertencia oficial." + toggle_whisper: "Activar/desactivar Susurro" posting_not_on_topic: "¿A qué tema quieres responder?" saving_draft_tip: "guardando..." saved_draft_tip: "guardado" @@ -685,7 +779,7 @@ es: title_placeholder: "En una frase breve, ¿de qué trata este tema?" edit_reason_placeholder: "¿Por qué lo estás editando?" show_edit_reason: "(añadir motivo de edición)" - reply_placeholder: "Escribe aquí. Puedes usar Markdown, BBCode o HTML para dar formato. Arrastra o pega una imagen aquí para subirla." + reply_placeholder: "Escribe aquí. Usa Markdown, BBCode o HTML para darle formato. Arrastra o pega imágenes." view_new_post: "Ver tu nuevo post." saving: "Guardando..." saved: "¡Guardado!" @@ -746,6 +840,20 @@ es: moved_post: "

      {{username}} movió {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Se te ha concedido '{{description}}'

      " + alt: + mentioned: "Mencionado por" + quoted: "Citado por" + replied: "Respondido" + posted: "Publicado por" + edited: "Editado tu post por" + liked: "Gustado tu post" + private_message: "Mensaje privado de" + invited_to_private_message: "Invitado a un mensaje privado de" + invited_to_topic: "Invitado a un tema de" + invitee_accepted: "Invitación aceptada por" + moved_post: "Tu post fue eliminado por" + linked: "Enlace a tu post" + granted_badge: "Distintivo concedido" popup: mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}' quoted: '{{username}} te citó en "{{topic}}" - {{site_title}}' @@ -760,15 +868,28 @@ es: from_the_web: "Desde la web" remote_tip: "enlace a la imagen" remote_tip_with_attachments: "enlace a la imagen o al archivo ({{authorized_extensions}})" - local_tip: "clic para seleccionar una imagen desde tu dispositivo." - local_tip_with_attachments: "clic para seleccionar una imagen o un archivo desde tu dispositivo ({{authorized_extensions}})" + local_tip: "selecciona las imágenes desde tu dispositivo" + local_tip_with_attachments: "selecciona imágenes o archivos desde tu dispositivo ({{authorized_extensions}})" hint: "(también puedes arrastrarlos al editor para subirlos)" - hint_for_supported_browsers: "(también puedes arrastrar o pegar imágenes en el editor para subirlas)" + hint_for_supported_browsers: "puedes también arrastrar o pegar imágenes en el editor" uploading: "Subiendo" + select_file: "Selecciona Archivo" image_link: "el link de tu imagen apuntará a" search: + sort_by: "Ordenar por" + relevance: "Relevancia" + latest_post: "Post más reciente" + most_viewed: "Más visto" + most_liked: "Más \"Me gusta\" recibidos" + select_all: "Seleccionar todo" + clear_all: "Limpiar todo" + result_count: + one: "1 resultado para \"{{term}}\"" + other: "{{count}} resultados para \"{{term}}\"" title: "buscar temas, posts, usuarios o categorías" no_results: "No se ha encontrado ningún resultado." + no_more_results: "No se encontraron más resultados." + search_help: Ayuda para buscar searching: "Buscando ..." post_format: "#{{post_number}} por {{username}}" context: @@ -776,7 +897,8 @@ es: category: "Buscar en la categoría \"{{category}}\"" topic: "Buscar en este tema" private_messages: "Buscar en mensajes" - site_map: "ir a otra lista de temas o categoría" + hamburger_menu: "ir a otra lista de temas o categoría" + new_item: "nuevo" go_back: 'volver' not_logged_in_user: 'página con el resumen de actividad y preferencias' current_user: 'ir a tu página de usuario' @@ -825,6 +947,9 @@ es: bookmarks: "No hay más temas guardados en marcadores." search: "No hay más resultados de búsqueda." topic: + unsubscribe: + stop_notifications: "Ahora recibirás menos notificaciones desde {{title}}" + change_notification_state: "El estado actual de notificación para ti es" filter_to: "{{post_count}} posts en este tema" create: 'Crear tema' create_long: 'Crear un nuevo tema' @@ -867,7 +992,7 @@ es: toggle_information: "detalles del tema" read_more_in_category: "¿Quieres leer más? Consulta otros temas en {{catLink}} o {{latestLink}}." read_more: "¿Quieres leer más? {{catLink}} o {{latestLink}}." - read_more_MF: "Hay { UNREAD, plural, =0 {} one { 1 no leído } other { are # no leídos } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} 1 nuevo tema} other { {BOTH, select, true{y } false { } other{}} # nuevos temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}" + read_more_MF: "Hay { UNREAD, plural, =0 {} one { 1 no leído } other { # no leídos } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} 1 nuevo tema} other { {BOTH, select, true{y } false { } other{}} # nuevos temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}" browse_all_categories: Ver todas las categorías view_latest_topics: ver los temas recientes suggest_create_topic: ¿Por qué no creas un tema? @@ -900,29 +1025,29 @@ es: '2_4': 'Recibirás notificaciones porque has publicado una respuesta en este tema.' '2_2': 'Recibirás notificaciones porque estás siguiendo este tema.' '2': 'Recibirás notificaciones porque has leído este tema.' - '1_2': 'Serás notificado si alguien menciona tu @nombre o responde a un post tuyo.' - '1': 'Serás notificado si alguien menciona tu @nombre o responde a un post tuyo.' + '1_2': 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.' + '1': 'Se te notificará si alguien menciona tu @nombre o te responde a un post.' '0_7': 'Estás ignorando todas las notificaciones en esta categoría.' '0_2': 'Estás ignorando todas las notificaciones en este tema.' '0': 'Estás ignorando todas las notificaciones en este tema.' watching_pm: title: "Vigilar" - description: "Se te notificará de cada nuevo post en este mensaje. Se añadirá un contador de posts nuevos y sin leer al lado del tema." + description: "Se te notificará de cada nuevo post en este mensaje y se mostrará un contador de nuevos posts." watching: title: "Vigilar" - description: "Se te notificará de cada nuevo post en este tema. Se añadirá un contador de posts nuevos y sin leer al lado del tema." + description: "Se te notificará de cada post en este tema y se mostrará un contador de nuevos post." tracking_pm: title: "Seguir" - description: "Un contador de nuevos posts y posts no leídos aparecerá al lado del mensaje. Se te notificará si alguien menciona tu @nombre o responde a un post tuyo." + description: "Se mostrará un contador de nuevos posts para este mensaje y se te notificará si alguien menciona tu @nombre o te responde a un post." tracking: title: "Seguir" - description: "Un contador de posts nuevos posts y posts sin ser leídos aparecerá en seguida del tema. Serás notificado si alguien menciona tu @nombre o responde a un post tuyo." + description: "Se mostrará un contador de nuevos posts en este tema y se te notificará si alguien menciona tu @nombre o te responde a un post." regular: title: "Normal" - description: "Serás notificado si alguien menciona tu @nombre o responde a un post tuyo." + description: "Se te notificará solo si alguien menciona tu @nombre o te responde a un post." regular_pm: title: "Normal" - description: "Se te notificará solo si alguien menciona tu @nombre o responde a tus posts en el hilo de mensajes." + description: "Se te notificará solo si alguien menciona tu @nombre o te responde a un post." muted_pm: title: "Silenciar" description: "Nunca se te notificará nada sobre este hilo de mensajes." @@ -964,17 +1089,20 @@ es: success_message: 'Has reportado este tema correctamente.' feature_topic: title: "Característica de este Tema" - pin: "Hacer que este tema aparecerá en la parte superior de la {{categoryLink}} categoría." + pin: "Hacer que este tema aparezca en el top de la categoría {{categoryLink}} hasta" confirm_pin: "Hay ya {{count}} temas destacados. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema en esta categoría?" unpin: "Eliminar este tema del top de la categoría {{categoryLink}}." + unpin_until: "Quitar este tema del top de la categoría {{categoryLink}} o esperar al %{until}." pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos." + pin_validation: "Es obligatorio especificar una fecha para destacar este tema." already_pinned: zero: "No hay temas destacados en {{categoryLink}}." one: "Temas anclados actualmente en {{categoryLink}}: 1." other: "Temas anclados actualmente en {{categoryLink}}: {{count}}." - pin_globally: "Haz que este tema aparezca en la parte superior de todas las listas de temas, hasta que un miembro del personal le quite el anclaje." + pin_globally: "Hacer que este tema aparezca en el top de todas las listas de temas hasta" confirm_pin_globally: "Hay ya {{count}} temas destacados globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema de forma global?" unpin_globally: "Eliminar este tema de la parte superior de todas las listas de temas." + unpin_globally_until: "Quitar este tema del top de todas las listas de temas o esperar al %{until}." global_pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos." already_pinned_globally: zero: "No hay temas destacados globalmente." @@ -1006,8 +1134,8 @@ es: sso_enabled: "Introduce el nombre de usuario de la persona a la que quieres invitar a este tema." to_topic_blank: "Introduzca el nombre de usuario o dirección de correo electrónico de la persona que desea invitar a este tema." to_topic_email: "Ha introducido una dirección de correo electrónico. Nosotros te enviaremos una invitación que le permita a su amigo responder inmediatamente a este tema." - to_topic_username: "Ha introducido un nombre de usuario. Le enviaremos una notificación a ese usuario con un enlace invitándolo a este tema." - to_username: "Introduce el nombre de usuario de la persona a la que te gustaría invitar. Le enviaremos una notificación con un enlace invitándole a este tema." + to_topic_username: "Has introducido un nombre de usuario. Le enviaremos una notificación con un enlace invitándole a este tema." + to_username: "Introduce el nombre de usuario de la persona a la que quieras invitar. Le enviaremos una notificación con un enlace invitándole a este tema." email_placeholder: 'nombre@ejemplo.com' success_email: "Hemos enviado un email con tu invitación a {{emailOrUsername}}. Te notificaremos cuando se acepte. Puedes revisar la pestaña invitaciones en tu perfil de usuario para consultar el estado de tus invitaciones." success_username: "Hemos invitado a ese usuario a participar en este tema." @@ -1043,6 +1171,12 @@ es: one: "Por favor escoge el nuevo dueño del {{count}} post de {{old_user}}." other: "Por favor escoge el nuevo dueño de los {{count}} posts de {{old_user}}." instructions_warn: "Ten en cuenta que las notificaciones sobre este post no serán transferidas al nuevo usuario de forma retroactiva.
      Aviso: actualmente, los datos que no dependen del post son transferidos al nuevo usuario. Usar con precaución." + change_timestamp: + title: "Cambiar Timestamp" + action: "cambiar timestamp" + invalid_timestamp: "El Timestamp no puede ser futuro" + error: "Hubo un error cambiando el timestamp de este tema." + instructions: "Por favor, señecciona el nuevo timestamp del tema. Los posts en el tema serán actualizados para mantener la diferencia de tiempo." multi_select: select: 'seleccionar' selected: 'seleccionado ({{count}})' @@ -1055,8 +1189,8 @@ es: one: Has seleccionado 1 post. other: Has seleccionado {{count}} posts. post: - reply: "Respondiendo a {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Responder a {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "citar" edit: "Editando {{link}} {{replyAvatar}} {{username}}" edit_reason: "Motivo:" @@ -1077,8 +1211,18 @@ es: more_links: "{{count}} más..." unread: "Post sin leer" has_replies: - one: "Respuesta" - other: "Respuestas" + one: "{{count}} Respuesta" + other: "{{count}} Respuestas" + has_likes: + one: "{{count}} Me gusta" + other: "{{count}} Me gusta" + has_likes_title: + one: "1 persona le ha dado Me gusta a este post" + other: "{{count}} personas le han dado Me gusta a este post" + has_likes_title_you: + zero: "le has dado Me gusta a este post" + one: "tú y 1 persona más habéis dado Me gusta a este post" + other: "tú y {{count}} personas más habéis dado Me gust a a este post" errors: create: "Lo sentimos, hubo un error al crear tu post. Por favor, inténtalo de nuevo." edit: "Lo sentimos, hubo un error al editar tu post. Por favor, inténtalo de nuevo." @@ -1096,6 +1240,7 @@ es: no_value: "No, mantener" yes_value: "Sí, abandonar" via_email: "este post llegó por email" + whisper: "esto post es un susurro privado para moderadores" wiki: about: "Este post es tipo wiki, cualquier usuario registrado puede editarlo" archetypes: @@ -1246,14 +1391,17 @@ es: category: can: 'puede… ' none: '(sin categoría)' + all: 'Todas las categorías' choose: 'Seleccionar una categoría…' edit: 'editar' edit_long: "Editar" view: 'Ver temas en la categoría' general: 'General' settings: 'Ajustes' + topic_template: "Plantilla de tema" delete: 'Eliminar categoría' create: 'Crear categoría' + create_long: 'Crear una nueva categoría' save: 'Guardar categoría' slug: 'Slug de la categoría para URL' slug_placeholder: '(Opcional) palabras-por-guiones para URL' @@ -1276,6 +1424,7 @@ es: change_in_category_topic: "Editar descripción" already_used: 'Este color ha sido usado para otra categoría' security: "Seguridad" + special_warning: "Aviso: esta categoría se ajusta por defecto y las opciones de seguridad no pueden ser editadas. Si no deseas utilizarla, elimínala en vez de reutilizarla." images: "Imágenes" auto_close_label: "Cerrar automaticamente los temas después de:" auto_close_units: "horas" @@ -1283,6 +1432,7 @@ es: email_in_allow_strangers: "Aceptar emails de usuarios anónimos sin cuenta" email_in_disabled: "La posibilidad de publicar nuevos temas por email está deshabilitada en los ajustes del sitio. Para habilitar la publicación de nuevos temas por email," email_in_disabled_click: 'activa la opción "email in".' + suppress_from_homepage: "Ocultar categoría de la página de inicio." allow_badges_label: "Permitir conceder distintivos en esta categoría" edit_permissions: "Editar permisos" add_permission: "Añadir permisos" @@ -1301,7 +1451,7 @@ es: description: "Seguirás automáticamente todos los nuevos temas en estas categorías. Se añadirá un contador de posts nuevos y sin leer al lado del tema." regular: title: "Normal" - description: "Serás notificado si alguien menciona tu @nombre o responde a un post tuyo." + description: "Se te notificará solo si alguien menciona tu @nombre o te responde a un post." muted: title: "Silenciadas" description: "No se te notificará de nuevos temas en estas categorías y no aparecerán en la pestaña de no leídos." @@ -1348,6 +1498,10 @@ es: help: "Has guardado en marcadores este tema." locked: help: "este tema está cerrado; ya no aceptan nuevas respuestas" + archived: + help: "este tema está archivado; está congelado y no puede ser cambiado" + locked_and_archived: + help: "Este tema está cerrado y archivado; no acepta nuevas respuestas y no puede ser cambiado de ningún modo." unpinned: title: "Deseleccionado como destacado" help: "Este tema se ha dejado de destacar para ti; en tu listado de temas se mostrará en orden normal" @@ -1357,8 +1511,6 @@ es: pinned: title: "Destacado" help: "Este tema ha sido destacado para ti; se mostrará en la parte superior de su categoría" - archived: - help: "este tema está archivado; está congelado y no puede ser cambiado" invisible: help: "Este tema es invisible; no se mostrará en la lista de temas y solo puede acceder a él a través de su enlace directo." posts: "Posts" @@ -1396,9 +1548,12 @@ es: categories_list: "Lista de categorías" filters: with_topics: "%{filter} temas" - with_category: "Temas de %{filter} %{category}" + with_category: "Foro de %{category} - %{filter}" latest: - title: "Recientes" + title: + zero: "Recientes" + one: "Recientes (1)" + other: "Recientes ({{count}})" help: "temas con posts recientes" hot: title: "Popular" @@ -1451,6 +1606,8 @@ es: title: "Siempre" yearly: title: "Año" + quarterly: + title: "Trimestral" monthly: title: "Mes" weekly: @@ -1458,11 +1615,12 @@ es: daily: title: "Día" all_time: "Siempre" - this_year: "Este año" - this_month: "Este mes" - this_week: "Esta semana" + this_year: "Año" + this_quarter: "Trimestre" + this_month: "Mes" + this_week: "Semana" today: "Hoy" - other_periods: "ver más temas top" + other_periods: "ver temas top" browser_update: 'Desafortunadamente, tu navegador es demasiado antiguo para funcionar en este sitio. Por favor actualízalo.' permission_types: full: "Crear / Responder / Ver" @@ -1494,8 +1652,9 @@ es: admins: 'Administradores:' blocked: 'Bloqueados:' suspended: 'Suspendidos:' - private_messages_short: "Msjs" + private_messages_short: "Mensajes privados" private_messages_title: "Mensajes" + mobile_title: "Móvil" space_free: "{{size}} libre" uploads: "subidas" backups: "backups" @@ -1627,7 +1786,11 @@ es: name: "Nombre" none_installed: "No tienes plugins instalados." version: "Versión" + enabled: "¿Activado?" + is_enabled: "S" + not_enabled: "N" change_settings: "Cambiar preferencias" + change_settings_short: "Ajustes" howto: "¿Cómo instalo plugins?" backups: title: "Copia de seguridad" @@ -1693,6 +1856,8 @@ es: screened_email: "Exportar la lista completa de emails vistos en formato CSV." screened_ip: "Exportar la lista completa de IP vistas en formato CSV." screened_url: "Exportar la lista completa de URL vistas en formato CSV." + export_json: + button_text: "Exportar" invite: button_text: "Enviar invitaciones" button_title: "Enviar invitaciones" @@ -1703,6 +1868,7 @@ es: header: "Encabezado" top: "Top" footer: "Pie de página" + embedded_css: "CSS embebido" head_tag: text: "" title: "HTML insertado antes de la etiqueta " @@ -1720,6 +1886,8 @@ es: save: "Guardar" new: "Nuevo" new_style: "Nuevo Estilo" + import: "Importar" + import_title: "Selecciona un archivo o pega texto" delete: "Eliminar" delete_confirm: "¿Eliminar esta personalización?" about: "Modifica hojas de estilo CSS y cabeceras HTML en el sitio. Añade una personalización para empezar." @@ -1792,7 +1960,7 @@ es: sent_test: "enviado!" delivery_method: "Método de entrega" preview_digest: "Vista previa de Resumen" - preview_digest_desc: "Previsualiza el contenido de los emails de resumen semanal enviados a usuarios inactivos." + preview_digest_desc: "Previsualiza el contenido del email de resumen enviado a usuarios inactivos." refresh: "Actualizar" format: "Formato" html: "html" @@ -1857,6 +2025,7 @@ es: delete_post: "eliminar post" impersonate: "impersonar" anonymize_user: "anonimizar usuario" + roll_up: "agrupar bloqueos de IP" screened_emails: title: "Correos bloqueados" description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada." @@ -2078,6 +2247,7 @@ es: delete: "Borrar" cancel: "Cancelar" delete_confirm: "Esta seguro que quiere borrar ese campo de usuario?" + options: "Opciones" required: title: "¿Requerido al registrarse?" enabled: "requerido" @@ -2093,6 +2263,7 @@ es: field_types: text: 'Campo de Texto' confirm: 'Confirmación' + dropdown: "Lista" site_text: none: "Elige un tipo de contenido para empezar a editar." title: 'Contenido de Texto' @@ -2104,6 +2275,7 @@ es: no_results: "Ningún resultado encontrado" clear_filter: "Limpiar filtro" add_url: "añadir URL" + add_host: "añadir host" categories: all_results: 'Todo' required: 'Requerido' @@ -2125,6 +2297,7 @@ es: backups: "Copias de seguridad" login: "Login" plugins: "Plugins" + user_preferences: "Preferencias de los Usuarios" badges: title: Distintivos new_badge: Nuevo distintivo @@ -2198,6 +2371,44 @@ es: name: "Nombre" image: "Imagen" delete_confirm: "¿Estás seguro de querer eliminar el emoji :%{name}:?" + embedding: + get_started: "Si quieres insertar Discourse en otro sitio web, empieza por añadir su host." + confirm_delete: "¿Seguro que quieres borrar ese host?" + sample: "Usa el siguiente código HTML en tu sitio para crear e insertar temas. Reempalza REPLACE_ME con la URL canónica de la página donde quieres insertar." + title: "Insertado" + host: "Hosts Permitidos" + edit: "editar" + category: "Publicar a Categoría" + add_host: "Añadir Host" + settings: "Ajustes de Insertado" + feed_settings: "Ajustes de Feed" + feed_description: "Discourse podrá importar tu contenido de forma más fácil si proporcionas un feed RSS/ATOM de tu sitio." + crawling_settings: "Ajustes de Crawlers" + crawling_description: "Cuando Discourse crea temas para tus posts, si no hay un feed RSS/ATOM presente intentará analizar el contenido de tu HTML. A veces puede ser difícil extraer tu contenido, por eso facilitamos la opción de especificar reglas CSS para hacer la extracción más fácil." + embed_by_username: "Usuario para la creación de temas" + embed_post_limit: "Máximo número de posts a incluir" + embed_username_key_from_feed: "Clave para extraer usuario de discourse del feed" + embed_truncate: "Truncar los posts insertados" + embed_whitelist_selector: "Selector CSS para permitir elementos a embeber" + embed_blacklist_selector: "Selector CSS para restringir elementos a embeber" + feed_polling_enabled: "Importar posts usando RSS/ATOM" + feed_polling_url: "URL del feed RSS/ATOM del que extraer datos" + save: "Guardar ajustes de Insertado" + permalink: + title: "Enlaces permanentes" + url: "URL" + topic_id: "ID del tema" + topic_title: "Tema" + post_id: "ID del post" + post_title: "Post" + category_id: "Id de la categoría" + category_title: "Categoría" + external_url: "URL externa" + delete_confirm: ¿Seguro que quieres eliminar este enlace permanente? + form: + label: "Nuevo:" + add: "Añadir" + filter: "Buscar (URL o URL externa)" lightbox: download: "descargar" search_help: @@ -2213,6 +2424,8 @@ es: categories: 'g, c Categorías' top: 'g, t Arriba' bookmarks: 'g, b Marcadores' + profile: 'g, p Perfil' + messages: 'g, m Mensajes' navigation: title: 'Navegación' jump: '# Ir al post #' @@ -2224,13 +2437,14 @@ es: title: 'Aplicación' create: 'c Crear un tema nuevo' notifications: 'n Abrir notificaciones' - site_map_menu: '= Abrir menú del sitio' + hamburger_menu: '= Abrir Menú' user_profile_menu: 'p Abrir menú de usuario' show_incoming_updated_topics: '. Mostrar temas actualizados' search: '/ Buscar' help: '? Abrir la guía de atajos de teclado' dismiss_new_posts: 'x, r Descartar Nuevo/Posts' dismiss_topics: 'x, t Descartar Temas' + log_out: 'shift+z shift+z Cerrar sesión' actions: title: 'Acciones' bookmark_topic: 'f Guardar/Quitar el tema de marcadores' @@ -2339,10 +2553,10 @@ es: description: Invitó a un usuario campaigner: name: Partidiario - description: Invitó a 3 miembros + description: Invitó a 3 usuarios básicos (nivel de confianza 1) champion: name: Campeón - description: Invitó a 10 miembros + description: Invitó a 5 miembros (nivel de confianza 2) first_share: name: Primer Compartido description: Compartió un post @@ -2358,12 +2572,21 @@ es: reader: name: Lector description: Leyó todos los posts en un tema con más de 100 + popular_link: + name: Enlace Popular + description: Publicó un enlace externo con al menos 50 clicks + hot_link: + name: Enlace Candente + description: Publicó un enlace externo con al menos 300 clicks + famous_link: + name: Enlace Famoso + description: Publicó un enlace externo con al menos 1000 clicks google_search: | -

      Buscar con Google

      +

      Buscar con Google

      - - - - - + + + + +

      diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index f42cde43ab..337852a60e 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -8,6 +8,9 @@ fa_IR: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,12 +21,17 @@ fa_IR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -66,6 +74,13 @@ fa_IR: other: "%{count} ساعت پیش" x_days: other: "%{count} روز پیش" + later: + x_days: + other: "%{count} روز بعد" + x_months: + other: "%{count} ماه بعد" + x_years: + other: "%{count} سال بعد" share: topic: 'پیوندی به این موضوع را به اشتراک بگذارید' post: 'ارسال #%{postNumber}' @@ -89,7 +104,6 @@ fa_IR: admin_title: "مدیر" flags_title: "پرچم‌ها" show_more: "بیش‌تر نشان بده" - show_help: "کمک" links: "پیوندها" links_lowercase: other: "پیوندها" @@ -112,6 +126,7 @@ fa_IR: every_two_weeks: "هر دو هفته" every_three_days: "هر سه روز" max_of_count: "حداکثر {{count}}" + alternation: "یا" character_count: other: "{{count}} نویسه" suggested_topics: @@ -167,9 +182,9 @@ fa_IR: revert: "برگشت" failed: "ناموفق" switch_to_anon: "حالت ناشناس " - switch_from_anon: "بیرون آمدن از حالت ناشناس" banner: close: "این سردر را رد بده." + edit: "این بنر را ویرایش کنید >>" choose_topic: none_found: "موضوعی یافت نشد." title: @@ -186,8 +201,7 @@ fa_IR: cancel: "لغو کردن" view_pending: "مشاهده پست های در انتظار " has_pending_posts: - one: "این جستار دارای 1 نوشته ی در انتظار تایید است. " - many: "این جستار دارای {{count}} نوشته ی در انتظار تایید است" + other: "این عنوان دارای {{count}} نوشته‌ی در انتظار تایید است" confirm: "ذخیره سازی تغییرها" delete_prompt: "آیا مطمئن هستی از پاک کردن این %{username}? این باعث پاک شدن تمام پست ها و منجر به بلاک شدن ایمیل و IP می شود." approval: @@ -307,7 +321,7 @@ fa_IR: dismiss_notifications: "علامت گذاری همه به عنوان خوانده شده" dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده" disable_jump_reply: "بعد از پاسخ من به پست من پرش نکن" - dynamic_favicon: "Show new / updated topic count on browser icon" + dynamic_favicon: " تعداد موضوعات جدید یا بروز شده را روی آیکون مرورگر نمایش بده" edit_history_public: "اجازه بده کاربران دیگر اصلاحات نوشته مرا ببینند" external_links_in_new_tab: "همهٔ پیوندهای برون‌رو را در یک تب جدید باز کن" enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده" @@ -321,9 +335,9 @@ fa_IR: github_profile: "Github" mailing_list_mode: "برای هر نوشته جدید، ایمیلی برای من بفرست (مگر اینکه من موضوع یا دسته‌بندی را ساکت کنم)" watched_categories: "تماشا شده" - watched_categories_instructions: "شما همهٔ‌ موضوعات تازه در این دسته‌بندی ها را بطور خودکار خواهید دید. از همهٔ نوشته ها و موضوعات تازه آگاه خواهید شد، هم‌چنین شمار نوشته های تازه و نخوانده پس از فهرست موضوع نشان داده می‌شود." + watched_categories_instructions: "شما به صورت خودکار تمام نوشته‌های این دسته را مشاهده‌ خواهید کرد. به شما تمام عناوین و نوشته‌‌های جدید اطلاع رسانی خواهد شد، و تعداد نوشته‌های جدید هر عنوان در کنار آن نمایش داده می‌شود." tracked_categories: "پی‌گیری شده" - tracked_categories_instructions: "شما همهٔ‌ موضوعات تازه در این دسته‌ بندی ها را به صورت خودکار دنبال خواهید کرد. تعداد نوشته‌های تازه و خوانده نشده در کنار موضوع نشان داده خواهد شد." + tracked_categories_instructions: "شما به صورت خودکار تمام عناوین جدید در این دسته را پیگیری خواهید کرد. تعداد نوشته های جدید در کنار عنواین نمایش داده می‌شود." muted_categories: "بی صدا شد" muted_categories_instructions: "از هر آن‌چه درباره موضوعات تازه در این دسته‌ بندی ها روی دهد، شما آگاه نخواهید شد و در تب نخواندهٔ‌ شما نمایش داده نمی‌شوند." delete_account: "حساب من را پاک کن" @@ -353,6 +367,7 @@ fa_IR: set_password: "تغییر کلمه عبور" change_about: title: "تغییر «دربارهٔ من»" + error: "در فرایند تغییر این مقدار خطایی رخ داد." change_username: title: "تغییر نام کاربری" confirm: "اگر نام کاربری خود را تغییر دهید، همهٔ نقل‌قول‌های پیشین از نوشته‌های شما و اشاره‌های @name از کار می‌افتند. آیا برای انجام این کار اطمینان کامل دارید؟" @@ -367,6 +382,7 @@ fa_IR: change_avatar: title: "عکس نمایه خود را تغییر دهید" gravatar: "گراواتا, بر اساس" + gravatar_title: "تصویرتان را در سایت Gravatar تغییر دهید" refresh_gravatar_title: "تازه‌سازی گراواتارتان" letter_based: "سیستم تصویر پرفایل را اختصاص داده است" uploaded_avatar: "تصویر شخصی" @@ -374,7 +390,6 @@ fa_IR: upload_title: "تصویرتان را بار بگذارید" upload_picture: "بارگذاری تصویر" image_is_not_a_square: "اخطار: ما تصویر شما بریدیم; طول و عرض برابر نبود." - cache_notice: "شما با موفقیت آواتار خود را تعویض نمودید ولی ممکن است کمی زمان ببرد برای ظاهر شدن بدلیل کش مرورگر" change_profile_background: title: "پس‌زمینه نمایه" instructions: "تصاویر پس‌زمینه نمایه‌ها در مرکز قرار میگیرند و به صورت پیش‌فرض طول 850px دارند." @@ -434,34 +449,27 @@ fa_IR: every_two_weeks: "هر دو هفته " email_direct: "به من ایمیل ارسال کن هنگامی که کسی از من نقل قول کرد، به نوشته های من پاسخ داد، یا به من اشاره کرد @username یا مرا به موضوعی دعوت کرد." email_private_messages: "به من ایمیل ارسال کن وقتی کسی به من پیام خصوصی فرستاد" - email_always: "برای من ایمیل آگاه سازی نفرست هنگامی که در سایت فعال هستم" + email_always: "ایمیل های اعلان را وقتی در سایت فعال هستم برای من بفرست" other_settings: "موارد دیگر" categories_settings: "دسته‌بندی ها" new_topic_duration: label: "موضوعات را جدید در نظر بگیر وقتی" not_viewed: "من هنوز آن ها را ندیدم" last_here: "آخرین باری که اینجا بودم ساخته شده‌اند" - after_n_days: - other: " در {{count}} روز گذشته ساخته شده‌" - after_n_weeks: - other: "در {{count}} هفته گذشته ساخته شده‌" auto_track_topics: "دنبال کردن خودکار موضوعاتی که وارد می‌شوم" auto_track_options: never: "هرگز" immediately: "فورا" - after_n_seconds: - other: "پس از {{count}} ثانیه" - after_n_minutes: - other: "پس از {{count}} دقیقه" invited: search: "بنویسید تا فراخوانه‌ها را جستجو کنید..." title: "فراخوانه‌ها" user: "کاربر فراخوانده شده" - none: "هنوز هیچ‌کسی را به اینجا فرانخوانده‌اید" truncated: "نمایش {{count}} فراخوانهٔ نخست" redeemed: "آزاد سازی دعوتنامه" + redeemed_tab: "آزاد شده" redeemed_at: "آزاد سازی" pending: "دعوت های بی‌پاسخ" + pending_tab: "در انتظار" topics_entered: "موضوعات بازدید شد" posts_read_count: "خواندن نوشته ها" expired: "این دعوت منقضی شده است." @@ -494,6 +502,7 @@ fa_IR: title: "نشانی IP ثبت‌نامی" avatar: title: "عکس نمایه" + header_title: "پروفایل، پیام‌ها، نشانک‌ها و ترجیحات" title: title: "سرنویس" filters: @@ -528,7 +537,6 @@ fa_IR: read_only_mode: enabled: "حالت فقط خواندن را فعال است. می توانید به جستجو در وب سایت ادامه دهید ولی ممکن است تعاملات کار نکند." login_disabled: "ورود به سیستم غیر فعال شده همزمان با اینکه سایت در حال فقط خواندنی است." - too_few_topics_notice: "Create at least 5 public topics and %{posts} public replies to get discussion started. New users cannot earn trust levels unless there's content for them to read. This message appears only to staff." learn_more: "بیشتر بدانید..." year: 'سال' year_desc: 'موضوعاتی که در 365 روز گذشته باز شده‌اند' @@ -587,6 +595,7 @@ fa_IR: email_placeholder: "نشانی رایانامه یا نام کاربری" caps_lock_warning: "Caps Lock روشن است" error: "خطای ناشناخته" + rate_limit: "لطفا قبل از ورود مجدد اندکی صبر کنید" blank_username_or_password: "لطفا نام کاربری یا ایمیل خود ، با پسورد وارد نمایید." reset_password: 'نوسازی گذرواژه' logging_in: "درون آمدن..." @@ -651,7 +660,6 @@ fa_IR: title_placeholder: "در یک جملهٔ‌ کوتاه، این موضوع در چه موردی است؟" edit_reason_placeholder: "چرا ویرایش می‌کنید؟" show_edit_reason: "(افزودن دلیل ویرایش)" - reply_placeholder: "اینجا تایپ کنید. استفاده کنید از Markdown, BBCode, or HTML برای فرمت. عکس را بکشید یا برگردانید برای بارگزاری آن. " view_new_post: "نوشته تازه‌تان را ببینید." saving: "در حال ذخیره سازی..." saved: "اندوخته شد!" @@ -726,15 +734,17 @@ fa_IR: from_the_web: "از وب" remote_tip: "لینک به تصویر" remote_tip_with_attachments: "لطفا لینک تصویر یا فایل ({{authorized_extensions}})" - local_tip: "بفشارید تا تصویری را از روی دستگاه خود برگزینید" - local_tip_with_attachments: "برای انتخاب یک تصویر یا فایل از دستگاه خود کلیک کنید ({{authorized_extensions}})" + local_tip: "عکس ها را از روی سیستم خود انتخاب کنید" + local_tip_with_attachments: "عکس ها را از روی سیستم خود انتخاب کنید ({{authorized_extensions}})" hint: "(برای آپلود می توانید فایل را کیشده و در ویرایشگر رها کنید)" - hint_for_supported_browsers: "(شما همچنین می توانید با کشیدن و رها کردن یا چسباندن تصاویر در ویرایشگر آن ها را بار گذاری نمایید)" uploading: "در حال بروز رسانی " + select_file: "انتخاب فایل" image_link: "به لینک تصویر خود اشاره کنید" search: title: "جستجوی موضوعات، نوشته ها، کاربران یا دسته‌ بندی ها" no_results: "چیزی یافت نشد." + no_more_results: "نتایجی بیشتری یافت نشد." + search_help: راهنمای جستجو searching: "جستجو کردن..." post_format: "#{{post_number}} توسط {{username}}" context: @@ -742,7 +752,6 @@ fa_IR: category: "جستجوی دستهٔ «{{category}}»" topic: "جستجوی این موضوع" private_messages: "جستجوی پیام" - site_map: "به فهرست موضوع یا دسته‌ای دیگر بروید" go_back: 'برگردید' not_logged_in_user: 'صفحه کاربر با خلاصه ای از فعالیت های و تنظیمات' current_user: 'به نمایه‌تان بروید' @@ -843,6 +852,7 @@ fa_IR: go_top: "بالا" go_bottom: "پایین" go: "برو" + jump_bottom: "پرش به آخرین نوشته" jump_bottom_with_number: "رفتن به نوشته ی %{post_number}" total: همهٔ نوشته‌ها current: نوشته کنونی @@ -858,29 +868,27 @@ fa_IR: '2_4': 'از آنجا که به این جستار پاسخ فرستادید، از رویدادهای آن آگاه خواهید شد.' '2_2': 'از آنجا که این موضوع را دنبال می‌کنید، از رویدادهای آن آگاه خواهید شد.' '2': 'شما اطلاعیه ای دریافت خواهید کرد چون این موضوع را مطالعه می نمایید.' - '1_2': 'به شما اطلاع داده خواهد شد اگر کسی به شما @name اشاره یا به نوشته شما پاسخ داد. ' - '1': 'به شما اطلاع داده خواهد شد اگر کسی به شما @name اشاره یا به نوشته شما پاسخ داد. ' + '1_2': 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.' + '1': 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.' '0_7': 'شما تمام آگاه سازی های این دسته بندی را نادیده گرفته اید' '0_2': 'شما کل آگاه سازی های این جستار را نادیده گرفته اید' '0': 'شما تمام آگاه سازی های این جستار را نادیده گرفته اید' watching_pm: title: "در حال مشاهده" - description: "به شما برای هر نوشته جدید در این وپیغام اطلاع داده خواهد شد. تعداد نوشته های خوانده نشده در کنار جستار پدیدار می شود" + description: "هر پاسخ جدید به این پیام به اطلاع شما خواهد رسید، و تعداد پاسخ‌های جدید نیز نمایش داده خواهد شد." watching: title: "در حال مشاهده" - description: "به شما برای هر نوشته جدید در این جستار اطلاع رسانی خواهد شد ، و تعداد نوشته های خوانده نشده در کنار موضوع پدیدار می شود." + description: "هر پاسخ جدید در این عنوان به اطلاع شما خواهد رسید، و تعداد پاسخ‌های جدید نیز نمایش داده خواهد شد." tracking_pm: title: "ردگیری" - description: "تعداد نوشته های خوانده نشده و نوشته های جدید به عنوان پیام پدیدار می شود،به شما اطلاع داده خواهد شد اگر کسی به شما @name اشاره یا به نوشته های شما پاسخ دهند" + description: "تعداد پاسخ‌های جدید برای این پیام نمایش داده خواهد شد. در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد، به شما اطلاع رسانی خواهد شد." tracking: title: "ردگیری" - description: "تعداد نوشته های خوانده نشده و نوشته های جدید به در کنار جستار پدیدار می شود، اگر کسی به شما @name اشاره یا به نوشته های شما پاسخ دهند به شما اطلاع داده خواهد شد" + description: "تعداد پاسخ‌های جدید برای این عنوان نمایش داده خواهد شد. در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد، به شما اطلاع رسانی خواهد شد." regular: - title: "منظم" - description: "اگر کسی به شما اشاره @name یا به نوشته های شما پاسخ دهند به شما اطلاع داده خواهد شد." + description: "در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد." regular_pm: - title: "عادی" - description: "به شما در قالب پیام اطلاع داده خواهد شد اگر کسی به شما @name اشاره یا به نوشته های شما پاسخ دهند. " + description: "در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد." muted_pm: title: "بی صدا شد" description: " در باره این پیام هرگز به شما اطلاع رسانی نخواهید شد" @@ -922,7 +930,6 @@ fa_IR: success_message: 'شما باموفقیت این موضوع را پرچم زدید' feature_topic: title: " ویژگی های این موضوع" - pin: "این موضوع را قابل رویت بالای دسته بندی {{categoryLink}} کن." confirm_pin: "شما قبلا این {{count}} موضوع را سنجاق کردید. تعداد زیاد موضوع های سنجاق شده شاید برای کاربران جدید یا ناشناس بار سنگینی ایجاد کند. آیا شما اطمینان دارید از سنجاق کردن یک موضوع دیگر در این دسته بندی ؟" unpin: "این موضوع را از لیست بالاترین‌ های دسته بندی {{categoryLink}} حذف کن" pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند" @@ -930,7 +937,6 @@ fa_IR: zero: "دیگر هیچ موضوعات سنجاق شده وجود ندارد در {{categoryLink}}." one: "موضوعات در حال حاضر سنجاق شده اند {{categoryLink}}: 1." other: "موضوعات در حال حاضر سنجاق شده اند {{categoryLink}}: {{count}}." - pin_globally: "این موضوع را در بالای موضوعات نشان بده٬‌ تا زمانیکه یکی از کارمندان آن را از سنجاق شدن در بیاورند. " confirm_pin_globally: "شما قبلا این موضوع {{count}} را بصورت سراسری سنجاق زده اید. تعداد زیاد موضوع های سنجاق شده برای کاربران جدید و ناشناس می تواند سخت باشد. آیا از سنجاق کردن موضوع ها بصورت سراری اطمینان دارید ؟ " unpin_globally: "حذف این موضوع از بالای همه لیست موضوعات." global_pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند" @@ -964,8 +970,8 @@ fa_IR: sso_enabled: "نام کاربری کسی را که می خواهید برای این موضوع دعوت کنید را وارد نمایید" to_topic_blank: "نام کاربری یا ایمیل کسی را که می خواهید برای این موضوع دعوت کنید را وارد نمایید" to_topic_email: "شما یک ایمیل آدرس وارد کردید. ما یک ایمیل خواهیم فرستاد که به دوستان شما اجازه می دهد سریعا به این جستار پاسخ دهند." - to_topic_username: "شما یک نام کاربری وارد کردید. ما یک آگاه سازی برای آن کاربر به همراه یک پیوند می فرستیم برای دعوت آنها به این جستار. " - to_username: "نام کاربری شخصی را که علاقه مند به دعوت کردن آن هستید وارد کنید. ما برای آن یک آگاه سازی به کاربر به همراه دعوتنامه به این جستار می فرستیم. " + to_topic_username: "شما نام کاربری شخصی را وارد کرده‌اید. ما این امر را به اطلاع او رسانده و او را به این عنوان دعوت می‌کنیم." + to_username: "نام کاربری شخصی که می‌خواهید او را دعوت کنید، وارد کنید. ما این امر را به اطلاع او رسانده و او را به این عنوان دعوت می‌کنیم." email_placeholder: 'name@example.com' success_email: "lما از طریق ایمیل دعوت نامه ارسال کردیم {{emailOrUsername}} . هنگامی که به دعوت شما پاسخ داده شد ما به شما اطلاع خواهیم داد.برای پی گیری به تب دعوت ها در پنل کاربری مراجعه نمایید" success_username: "ما آن کاربر را برای شرکت در این جستار دعوت کردیم." @@ -1008,8 +1014,6 @@ fa_IR: description: other: شما تعداد {{count}} نوشته انتخاب کرده اید post: - reply: "در حال پاسخ به {{link}} {{replyAvatar}} {{username}}" - reply_topic: "پاسخ به {{link}}" quote_reply: "پاسخ با نقل قول" edit: "در حال ویرایش {{link}} {{replyAvatar}} {{username}}" edit_reason: "دلیل:" @@ -1023,10 +1027,20 @@ fa_IR: deleted_by_author: other: "(نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذف می شود مگر اینکه پرچم شود)" expand_collapse: "باز کردن/گستردن" + gap: + other: "{{count}} پاسخ پنهان را مشاهده کنید" more_links: "{{count}} مورد دیگر..." unread: "نوشته خوانده نشده است" has_replies: - other: "پاسخ‌ها" + other: "{{count}} پاسخ" + has_likes: + other: "{{count}} لایک" + has_likes_title: + other: "{{count}} کاربر این مورد را پسندیده اند" + has_likes_title_you: + zero: "شما این نوشته را پسندیده اید" + one: "شما و یک کاربر دیگر این مورد را پسندیده اید" + other: "شما و {{count}} کاربر دیگر این مورد را پسندیده اید" errors: create: "متأسفیم، در فرستادن نوشته شما خطایی روی داد. لطفاً دوباره تلاش کنید." edit: "متأسفیم، در ویرایش نوشته شما خطایی روی داد. لطفاً دوباره تلاش کنید." @@ -1161,6 +1175,7 @@ fa_IR: last: "بازبینی نهایی" hide: "مخفی کردن نسخه" show: "نمایش نسخه" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "نمایش خروجی رندر با اضافات و از بین بردن درون خطی" @@ -1174,12 +1189,14 @@ fa_IR: category: can: 'can… ' none: '(بدون دسته)' + all: 'همهٔ دسته‌بندی ها' choose: 'انتخاب یک دسته بندی…' edit: 'ویرایش' edit_long: "ویرایش" view: 'نمایش موضوعات در دسته' general: 'عمومی' settings: 'تنظیمات' + topic_template: "قالب موضوع" delete: 'پاک کردن دسته' create: 'دسته بندی جدید' save: 'ذخیره سازی دسته بندی' @@ -1223,13 +1240,13 @@ fa_IR: notifications: watching: title: "در حال تماشا" - description: "شما به صورت خود کار تمام نوشته های این دسته بندی را مشاهده خواهید کرد، به شما تمام نوشته های جدید در موضوعات، بعلاوه تعداد نوشته های خوانده نشده اطلاع رسانی خواهد شد و نوشته های جدید در کنار موضوعات پدیدار میشود" + description: "شما به صورت خودکار تمام عناوین این دسته‌ها را مشاهده‌ خواهید کرد. به شما تمام عناوین و نوشته‌‌های جدید اطلاع رسانی خواهد شد، و تعداد نوشته‌های جدید هر عنوان در کنار آن نمایش داده می‌شود." tracking: title: "پیگیری" - description: "شما به صورت خود کار تمام موضوعات جدید در این دسته بندی را پی گیری خواهید کرد . تعداد نوشته های خوانده نشده در کنار موشوعات نمایش داده می شود" + description: "شما به صورت خودکار تمام عناوین جدید در این دسته‌ها را پیگیری خواهید کرد. تعداد نوشته های جدید در کنار عنواین نمایش داده می‌شود." regular: title: "منظم" - description: "به شما اطلاع داده خواهد شد اگر کسی به شما اشاره @name یا به نوشته های شما پاسخ دهند" + description: "در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد." muted: title: "بی صدا شد" description: "به شما همه چیز در رابطه با این دسته بندی اطلاع داده خواهد شد ، و آن ها در تب خوانده نشده پدیدار نمی شوند" @@ -1263,6 +1280,8 @@ fa_IR: notify_action: "پیام" topic_map: title: "چکیدهٔ موضوع" + participants_title: "نویسنده‌های فعال" + links_title: "لینک‌های محبوب" links_shown: "نمایش همه {{totalLinks}} پیوند ها..." clicks: other: "%{count} کلیک ها" @@ -1273,6 +1292,8 @@ fa_IR: help: "شما بر روی این موضوع نشانک گذاشته‌اید." locked: help: "این موضوع بسته شده؛ پاسخ‌های تازه اینجا پذیرفته نمی‌شوند" + archived: + help: "این موضوع بایگانی شده؛ یخ زده و نمی‌تواند تغییر کند." unpinned: title: "خارج کردن از سنجاق" help: "این موضوع برای شما شنجاق نشده است، آن طور منظم نمایش داده خواهد شد" @@ -1282,8 +1303,6 @@ fa_IR: pinned: title: "سنجاق شد" help: "این موضوع برای شما سنجاق شده است، آن طور منظم در بالای دسته بندی نمایش داده خواهد شد." - archived: - help: "این موضوع بایگانی شده؛ یخ زده و نمی‌تواند تغییر کند." invisible: help: "این موضوع از لیست خارج شد: آن درلیست موضوعات نمایش داده نخواهد شد، و فقط از طریق لینک مستقیم در دسترس خواهد بود. " posts: "نوشته‌ها" @@ -1320,7 +1339,10 @@ fa_IR: with_topics: "%{filter} موضوعات" with_category: "%{filter} %{category} موضوعات" latest: - title: "آخرین ها" + title: + zero: "جدیدترین" + one: "جدیدترین(1)" + other: "جدیدترین ({{count}})" help: "موضوعات با نوشته های تازه" hot: title: "داغ" @@ -1380,11 +1402,11 @@ fa_IR: daily: title: "روزانه" all_time: "تمام وقت" - this_year: "امسال" - this_month: "این ماه" - this_week: "این هفته" + this_year: "سال" + this_month: "ماه" + this_week: "هفته" today: "امروز" - other_periods: "دیدن بالاترین‌ موضوعات بیشتر " + other_periods: "دیدن بالاترین مطالب" browser_update: 'متاسفانه,مرورگر شما خیلی قدیمی است برای ادامه کار در این وب سایت. لطفا مرورگر خود را بروز رسانی نمایید.' permission_types: full: "ساختن / پاسخ دادن / دیدن" @@ -1418,6 +1440,7 @@ fa_IR: suspended: 'تعلیق شده:' private_messages_short: "پیام" private_messages_title: "پیام" + mobile_title: "موبایل" space_free: "{{size}} آزاد" uploads: "بارگذاری ها" backups: "پشتیبان ها" @@ -1544,7 +1567,11 @@ fa_IR: name: "نام" none_installed: "شما هیچ افزونه نصب شده ای ندارید" version: "نسخه" + enabled: "فعال شده؟" + is_enabled: "Y" + not_enabled: "N" change_settings: "تغییر تنظیمات" + change_settings_short: "تنظیمات" howto: "چگونه یک افزونه نصب کنیم؟" backups: title: "پشتیبان گیری" @@ -1610,6 +1637,8 @@ fa_IR: screened_email: "برون ریزی کامل لیست ایمیل به نمایش در آمده در فرمت CSV." screened_ip: "برون ریزی کامل لیست IP به نمایش در آمده در فرمت CSV." screened_url: "برون ریزی کامل لیست URL به نمایش در آمده در فرمت CSV." + export_json: + button_text: "خروجی گرفتن" invite: button_text: "ارسال دعوتنامه" button_title: "ارسال دعوتنامه" @@ -1637,6 +1666,8 @@ fa_IR: save: "ذخیره سازی" new: "تازه" new_style: "سبک جدید" + import: "ورود داده‌ها" + import_title: "فایلی را انتخاب یا متنی را پیست کنید" delete: "پاک کردن" delete_confirm: "پاک کردن این شخصی‌سازی؟" about: "اطلاح شیوه نامه CSS و هدر HTML در سایت، اضافه کردنیک سفارشی سازی برای شروع." @@ -1709,7 +1740,6 @@ fa_IR: sent_test: "فرستاده شد!" delivery_method: "روش تحویل" preview_digest: "پیشنمایش خلاصه" - preview_digest_desc: "پیش نمایش بصورت هفتگی خلاصه نوشته های کاربران غیر فعال ارسال شد." refresh: "تازه‌سازی" format: "قالب" html: "html" @@ -1774,6 +1804,7 @@ fa_IR: delete_post: "حذف نوشته" impersonate: "جعل هویت کردن" anonymize_user: "کاربر ناشناس" + roll_up: "آدرس‌های IP بلاک شده را جمع کنید" screened_emails: title: "ایمیل ها نمایش داده شده" description: "وقتی کسی سعی می کند یک حساب جدید ایجاد کند، از آدرس ایمیل زیر بررسی و ثبت نام مسدود خواهد شد، و یا برخی از اقدام های دیگر انجام می شود." @@ -1809,6 +1840,8 @@ fa_IR: impersonate: title: "جعل هویت کردن" help: "با استفاده ازابزار جعل هویت کردن یک حساب کاربری را برای اشکال زدایی انتخاب نمایید، شما باید بعد از اتمام کار یک بار خارج شوید." + not_found: "چنین کاربری یافت نمی‌شود." + invalid: "متأسفیم، شما نمی‌توانید خود را به جای این کاربر جا بزنید." users: title: 'کاربران' create: 'اضافه کردن کاربر ادمین' @@ -2012,6 +2045,7 @@ fa_IR: no_results: "چیزی یافت نشد." clear_filter: "واضح" add_url: "اضافه کردن URL" + add_host: "اضافه کردن هاست" categories: all_results: 'همه' required: 'مورد نیاز' @@ -2106,6 +2140,21 @@ fa_IR: name: "نام" image: "تصویر" delete_confirm: "آیا مطمئنید که می‌خواهید شکلک :{name}%: را پاک کنید؟" + permalink: + title: " پیوند دائمی" + url: "آدرس" + topic_id: "شناسه موضوع" + topic_title: "موضوع" + post_id: "شناسه نوشته" + post_title: "نوشته" + category_id: "شناسه دسته بندی" + category_title: "دسته بندی" + external_url: " آدرس خارجی" + delete_confirm: آیا مطمئنید که می‌خواهید این لینک دائمی را پاک کنید؟ + form: + label: "جدید:" + add: "افزودن" + filter: "جستجو (آدرس یا آدرس خارجی)" lightbox: download: "دریافت" search_help: @@ -2114,11 +2163,13 @@ fa_IR: title: 'میانبر‌های صفحه کلید' jump_to: title: 'بپر به' + home: 'g, h خانه' latest: 'g, lآخرین' new: 'g, n جدید' unread: 'g, u خوانده نشده' categories: 'g, c دسته بندی ها' top: 'g, t بالا ترین' + bookmarks: 'g, h نشانک‌ها' navigation: title: 'راهبری' jump: '# رفتن به نوشته #' @@ -2130,7 +2181,6 @@ fa_IR: title: 'نرم‌افزار' create: 'c ساختن یک موضوع جدید' notifications: 'n باز کردن آگاه‌سازی‌ها' - site_map_menu: '= باز کردن منوی سایت' user_profile_menu: 'p باز کردن منوی کاربران' show_incoming_updated_topics: '. نمایش موضوعات بروز شده' search: '/ جستجو' @@ -2239,6 +2289,15 @@ fa_IR: first_flag: name: پرچم نخست description: نوشته را پرچم زد + promoter: + name: ترویج دهنده + description: دعوت کننده یک کاربر + campaigner: + name: فعال + description: دعوت کننده سه کاربر معمولی (سطح اعتماد ۱) + champion: + name: قهرمان + description: دعوت کننده پنج کاربر عضو (سطح اعتماد ۲) first_share: name: نخستین اشتراک‌گذاری description: نوشته ای به اشتراک گذاشته شده @@ -2254,12 +2313,3 @@ fa_IR: reader: name: خواننده description: مطالعه تمام نوشته‌هایی در یک موضوع که بیش از 100 نوشته دارد. - google_search: | -

      جستجو با گوگل

      -

      - - - - - -

      diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index b56593412d..cb44381653 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -8,6 +8,9 @@ fi: js: number: + format: + separator: "," + delimiter: " " human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ fi: kb: Kt mb: Mt tb: Tt + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "H:mm" long_no_year: "D. MMMM[ta] H:mm" long_no_year_no_time: "D. MMMM[ta]" + full_no_year_no_time: "Do MMMM[ta]" long_with_year: "D. MMMM[ta] YYYY H:mm" long_with_year_no_time: "D. MMMM[ta] YYYY" + full_with_year_no_time: "Do MMMM[ta] YYYY" long_date_with_year: "D. MMMM[ta] YYYY LT" long_date_without_year: "D. MMMM[ta] LT" long_date_with_year_without_time: "D. MMMM[ta] YYYY" @@ -82,6 +90,16 @@ fi: x_days: one: "1 päivä sitten" other: "%{count} päivää sitten" + later: + x_days: + one: "1 päivä myöhemmin" + other: "%{count} päivää myöhemmin" + x_months: + one: "1 kuukausi myöhemmin" + other: "%{count} kuukautta myöhemmin" + x_years: + one: "1 vuosi myöhemmin" + other: "%{count} vuotta myöhemmin" share: topic: 'jaa linkki tähän ketjuun' post: '%{postNumber}. viesti' @@ -90,6 +108,25 @@ fi: facebook: 'jaa tämä linkki Facebookissa' google+: 'jaa tämä linkki Google+:ssa' email: 'lähetä tämä linkki sähköpostissa' + action_codes: + autoclosed: + enabled: 'sulki %{when}' + disabled: 'avasi %{when}' + closed: + enabled: 'sulki %{when}' + disabled: 'avasi %{when}' + archived: + enabled: 'arkistoi %{when}' + disabled: 'palautti %{when}' + pinned: + enabled: 'kiinnitti %{when}' + disabled: 'poisti kiinnityksen %{when}' + pinned_globally: + enabled: 'kiinnitti koko palstalle %{when}' + disabled: 'poisti kiinnityksen %{when}' + visible: + enabled: 'listasi %{when}' + disabled: 'poisti listauksista %{when}' topic_admin_menu: "ketjun ylläpitotoimet" emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä." edit: 'muokkaa tämän ketjun otsikkoa ja aluetta' @@ -105,7 +142,7 @@ fi: admin_title: "Ylläpito" flags_title: "Liput" show_more: "näytä lisää" - show_help: "ohje" + show_help: "astukset" links: "Linkit" links_lowercase: one: "linkki" @@ -129,6 +166,7 @@ fi: every_two_weeks: "kahden viikon välein" every_three_days: "joka kolmas päivä" max_of_count: "korkeintaan {{count}}" + alternation: "tai" character_count: one: "{{count}} merkki" other: "{{count}} merkkiä" @@ -181,6 +219,7 @@ fi: saved: "Tallennettu!" upload: "Lähetä" uploading: "Lähettää..." + uploading_filename: "Lähettää {{filename}}..." uploaded: "Lähetetty!" enable: "Ota käyttöön" disable: "Poista käytöstä" @@ -188,9 +227,9 @@ fi: revert: "Palauta" failed: "Epäonnistui" switch_to_anon: "Anonyymi tila" - switch_from_anon: "Poistu anonyymistä tilasta" banner: close: "Sulje tämä banneri." + edit: "Muokkaa tätä banneria >>" choose_topic: none_found: "Yhtään ketjua ei löydetty." title: @@ -208,7 +247,7 @@ fi: view_pending: "Tarkastele odottavia viestejä" has_pending_posts: one: "1 viesti ketjussa odottaa hyväksyntää" - many: "{{count}} viestiä ketjussa odottaa hyväksyntää" + other: "{{count}} viestiä ketjussa odottaa hyväksyntää" confirm: "Tallenna muutokset" delete_prompt: "Haluatko varmasti poistaa käyttäjän %{username}? Kaikki käyttäjän kirjoittamat viestit poistetaan ja tämän sähköposti- sekä IP-osoitteille asetetaan esto." approval: @@ -242,7 +281,7 @@ fi: time_read: "Lukuaika" topic_count: "Ketjut" topic_count_long: "Luotuja ketjuja" - post_count: "Vastaukset" + post_count: "Vastauksia" post_count_long: "Kirjoitettuja vastauksia" no_results: "Ei tuloksia." days_visited: "Vierailut" @@ -266,6 +305,9 @@ fi: mods_and_admins: "Vain ylläpitäjät ja valvojat" members_mods_and_admins: "Vain ryhmän jäsenet, valvojat ja ylläpitäjät" everyone: "Kaikki" + trust_levels: + title: "Luottamustaso, joka annetaan automaattisesti lisättäessä tähän ryhmään:" + none: "Ei mitään" user_action_groups: '1': "Annetut tykkäykset" '2': "Saadut tykkäykset" @@ -285,6 +327,14 @@ fi: all_subcategories: "kaikki" no_subcategory: "alueettomat" category: "Alue" + reorder: + title: "Järjestä alueet uudelleen" + title_long: "Järjestä alueiden lista uudelleen" + fix_order: "Kiinteä järjestys" + fix_order_tooltip: "Kaikilla alueilla ei ole uniikkia järjestysnumeroa, joka voi aiheuttaa odottamattomia seurauksia." + save: "Tallenna järjestys" + apply_all: "Aseta" + position: "Paikka" posts: "Viestit" topics: "Ketjut" latest: "Tuoreimmat" @@ -314,6 +364,8 @@ fi: topics_entered: "katseltuja ketjuja" post_count: "# viestiä" confirm_delete_other_accounts: "Oletko varma, että haluat poistaa nämä tunnukset?" + user_fields: + none: "(valitse vaihtoehto)" user: said: "{{username}}:" profile: "Profiili" @@ -325,11 +377,23 @@ fi: private_messages: "Viestit" activity_stream: "Toiminta" preferences: "Asetukset" + expand_profile: "Laajenna" bookmarks: "Kirjanmerkit" bio: "Tietoa minusta" invited_by: "Kutsuja" trust_level: "Luottamustaso" notifications: "Ilmoitukset" + desktop_notifications: + label: "Työpöytäilmoitukset" + not_supported: "Tämä selainen ei tue ilmoituksia, pahoittelut." + perm_default: "Näytä ilmoituksia" + perm_denied_btn: "Ei oikeuksia" + perm_denied_expl: "Olet kieltänyt ilmoitusten näyttämisen. Salli ilmoitusten näyttäminen selaimen asetuksista ja klikkaa sen jälkeen painiketta. (Työpöytä: vasemmanpuoleisin kuvake osoiterivillä. Mobiili: 'Sivun tiedot'.)" + disable: "Poista ilmoitukset käytöstä" + currently_enabled: "(nyt käytössä)" + enable: "Näytä ilmoituksia" + currently_disabled: "(pois käytöstä)" + each_browser_note: "Huom: Sinun täytyy vaihtaa tämä asetus kaikissa selaimista, joita käytät." dismiss_notifications: "Merkitse kaikki luetuiksi" dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi" disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen" @@ -342,14 +406,15 @@ fi: admin: "{{user}} on ylläpitäjä" moderator_tooltip: "Tämä käyttäjä on valvoja" admin_tooltip: "Tämä käyttäjä on ylläpitäjä" + blocked_tooltip: "Tämä käyttäjä on estetty" suspended_notice: "Tämä käyttäjätili on hyllytetty {{date}} asti." suspended_reason: "Syy:" github_profile: "GitHub" mailing_list_mode: "Lähetä minulle sähköposti jokaisesta uudesta viestistä (paitsi jos vaimennan ketjun tai alueen)." watched_categories: "Tarkkaillut" - watched_categories_instructions: "Näiden alueiden ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen listauksissa. " + watched_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. " tracked_categories: "Seuratut" - tracked_categories_instructions: "Näiden alueiden ketjut asetetaan automaattisesti seurantaan. Uusien ja lukemattomien viestien lukumäärä näytetään ketjun yhteydessä." + tracked_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä." muted_categories: "Vaimennetut" muted_categories_instructions: "Et saa imoituksia uusista viesteistä näillä alueilla, eivätkä ne näy Lukemattomat-välilehdellä." delete_account: "Poista tilini" @@ -402,7 +467,7 @@ fi: upload_title: "Lataa oma kuva" upload_picture: "Valitse kuva" image_is_not_a_square: "Varoitus: olemme rajanneet kuvaasti; korkeus ja leveys eivät olleet samoja" - cache_notice: "Profiilikuva on vaihdettu onnistuneesti, mutta se ei välttämättä näy heti" + cache_notice: "Olet onnistuneesti vaihtanut profiilikuvasi, mutta saattaa kestää jonkin aikaa, kunnes se tulee näkyviin" change_profile_background: title: "Profiilin taustakuva" instructions: "Profiilin taustakuvan leveys on 850 pikseliä." @@ -462,38 +527,42 @@ fi: every_two_weeks: "joka toinen viikko" email_direct: "Lähetä minulle sähköposti, jos joku lainaa viestiäni, vastaa viestiini, viittaa @nimeeni, tai kutsuu minut viestiketjuun" email_private_messages: "Lähetä minulle sähköposti, kun joku lähettää minulle viestin" - email_always: "Älä jätä lähettämättä sähköposti-ilmoituksia, vaikka olen aktiivinen palstalla." + email_always: "Lähetä sähköposti-ilmoitukset, vaikka olen aktiivinen palstalla." other_settings: "Muut" categories_settings: "Keskustelualueet" new_topic_duration: label: "Tulkitse ketju uudeksi, kun" not_viewed: "en ole avannut sitä vielä" last_here: "se on luotu edellisen käyntini jälkeen" - after_n_days: - one: "se on luotu edellisen päivän aikana" - other: "se on luotu edellisen {{count}} päivän aikana" - after_n_weeks: - one: "se on luotu edellisen viikon aikana" - other: "se on luotu edellisen {{count}} viikon aikana" + after_1_day: "luotu päivän aikana" + after_2_days: "luotu 2 päivän aikana" + after_1_week: "luotu viikon aikana" + after_2_weeks: "luotu 2 viikon aikana" auto_track_topics: "Seuraa automaattisesti ketjuja, jotka avaan" auto_track_options: never: "ei koskaan" immediately: "heti" - after_n_seconds: - one: "yhden sekunnin jälkeen" - other: "{{count}} sekunnin jälkeen" - after_n_minutes: - one: "yhden minuutin jälkeen" - other: "{{count}} minuutin jälkeen" + after_30_seconds: "30 sekunnin jälkeen" + after_1_minute: "1 minuutin jälkeen" + after_2_minutes: "2 minuutin jälkeen" + after_3_minutes: "3 minuutin jälkeen" + after_4_minutes: "4 minuutin jälkeen" + after_5_minutes: "5 minuutin jälkeen" + after_10_minutes: "10 minuutin jälkeen" invited: search: "kirjoita etsiäksesi kutsuja..." title: "Kutsut" user: "Kutsuttu käyttäjä" - none: "Et ole vielä kutsunut ketään." + sent: "Lähetetty" + none: "Avoimia kutsuja ei ole." truncated: "Näytetään ensimmäiset {{count}} kutsua." redeemed: "Hyväksytyt kutsut" + redeemed_tab: "Hyväksytyt" + redeemed_tab_with_count: "Hyväksytyt ({{count}})" redeemed_at: "Hyväksytty" pending: "Odottavat kutsut" + pending_tab: "Odottavat" + pending_tab_with_count: "Avoimet ({{count}})" topics_entered: "Avatut ketjut" posts_read_count: "Luetut viestit" expired: "Tämä kutsu on rauennut." @@ -505,6 +574,8 @@ fi: days_visited: "Päiviä vierailtu" account_age_days: "Tilin ikä päivissä" create: "Lähetä kutsu" + generate_link: "Kopioi kutsulinkki" + generated_link_message: '

      Kutsulinkin kopiointi onnistui!

      Kutsulinkki kelpaa vain tällä sähköpostiosoitteella: %{invitedEmail}

      ' bulk_invite: none: "Et ole kutsunut vielä ketään. Voit lähettää yksittäisiä kutsuja tai kutsua useita ihmisiä kerralla lähettämällä massakutsun tiedostosta." text: "Lähetä massakutsu tiedostosta" @@ -526,6 +597,7 @@ fi: title: "IP osoite rekisteröityessä" avatar: title: "Profiilikuva" + header_title: "profiili, viestit, kirjanmerkit ja asetukset" title: title: "Otsikko" filters: @@ -560,7 +632,6 @@ fi: read_only_mode: enabled: "Olet Vain luku -tilassa. Voit jatkaa selaamista, muttet välttämättä pysty vaikuttamaan sisältöön." login_disabled: "Kirjautuminen ei ole käytössä sivuston ollessa vain luku -tilassa." - too_few_topics_notice: "Luo vähintään 5 julkista ketjua ja %{posts} julkista vastausta saadaksesi keskustelun käyntiin. Uudet käyttäjät eivät voi saavuttaa korkeampia luottamustasoja, jos heillä ei ole tarpeeksi luettavaa sisältöä. Tämä viesti näytetään vain henkilökunnalle." learn_more: "opi lisää..." year: 'vuosi' year_desc: 'viimeisen 365 päivän aikana luodut ketjut' @@ -576,7 +647,7 @@ fi: last_reply_lowercase: edellinen vastaus replies_lowercase: one: vastaus - other: vastaukset + other: vastauksia summary: enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella." description: "Tässä kejussa on {{count}} viestiä." @@ -620,6 +691,7 @@ fi: email_placeholder: "sähköposti tai käyttäjätunnus" caps_lock_warning: "Caps Lock on päällä" error: "Tuntematon virhe" + rate_limit: "Ole hyvä ja odota hetki ennen kuin yrität kirjautua uudelleen." blank_username_or_password: "Kirjoita sähköpostiosoite tai käyttäjänimi ja salasana." reset_password: 'Nollaa salasana' logging_in: "Kirjaudutaan..." @@ -684,7 +756,7 @@ fi: title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?" edit_reason_placeholder: "miksi muokkaat viestiä?" show_edit_reason: "(lisää syy muokkaukselle)" - reply_placeholder: "Kirjoita tähän. Voit käyttää Markdown-, BBCode- tai HTML-tyylimääreitä. Vedä ja pudota kuva hiirellä tai liitä se leikepöydältä jos haluat ladata sen foorumille." + reply_placeholder: "Kirjoita tähän. Käytä Markdownia, BBCodea tai HTML:ää muotoiluun. Raahaa tai liitä kuvia." view_new_post: "Katsele uutta viestiäsi." saving: "Tallennetaan..." saved: "Tallennettu!" @@ -745,6 +817,20 @@ fi: moved_post: "

      {{username}} siirsi {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Ansaitsit '{{description}}'

      " + alt: + mentioned: "Viittaaja" + quoted: "Lainaaja" + replied: "Vastasi" + posted: "Kirjoittaja" + edited: "Viestieäsi muokkasi" + liked: "Viestistäsi tykkäsi" + private_message: "Yksityisviesti lähettäjältä" + invited_to_private_message: "Kutsu yksityisviestiin käyttäjältä" + invited_to_topic: "Kutsu ketjuun käyttäjältä" + invitee_accepted: "Kutsun hyväksyi" + moved_post: "Viestisi siirsi" + linked: "Linkki viestiisi" + granted_badge: "Arvomerkki myönnetty" popup: mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}' quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}' @@ -759,15 +845,18 @@ fi: from_the_web: "Netistä" remote_tip: "linkki kuvaan" remote_tip_with_attachments: "linkki kuvaan tai tiedostoon ({{authorized_extensions}})" - local_tip: "Klikkaa tästä ladataksesi kuvan laitteeltasi" - local_tip_with_attachments: "klikkaa valitaksesi kuvan tai tiedoston laitteeltasi ({{authorized_extensions}})" + local_tip: "valitse kuvia laitteeltasi" + local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi ({{authorized_extensions}})" hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)" - hint_for_supported_browsers: "(voit myös raahata tai liittää kuvia editoriin ladataksesi ne sivustolle)" + hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin" uploading: "Lähettää" + select_file: "Valitse tiedosto" image_link: "linkki, johon kuvasi osoittaa" search: title: "etsi ketjuja, viestejä, käyttäjiä tai alueita" no_results: "Ei tuloksia." + no_more_results: "Enempää tuloksia ei löytynyt." + search_help: Haun ohje searching: "Etsitään ..." post_format: "#{{post_number}} käyttäjältä {{username}}" context: @@ -775,7 +864,6 @@ fi: category: "Etsi alueelta \"{{category}}\"" topic: "Etsi tästä ketjusta" private_messages: "Etsi viesteistä" - site_map: "siirry toiseen ketjuun tai alueelle" go_back: 'mene takaisin' not_logged_in_user: 'käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset' current_user: 'siirry omalle käyttäjäsivullesi' @@ -824,6 +912,9 @@ fi: bookmarks: "Merkattuja ketjuja ei ole enempää." search: "Hakutuloksia ei ole enempää." topic: + unsubscribe: + stop_notifications: "Saat tästä lähtien vähemmän ilmoituksia aiheesta {{title}}" + change_notification_state: "Nykyinen ilmoitusasetuksesti on" filter_to: "{{post_count}} viestiä ketjussa" create: 'Uusi ketju' create_long: 'Luo uusi ketju' @@ -880,8 +971,8 @@ fi: auto_close_remove: "Älä sulje tätä ketjua automaattisesti" progress: title: ketjun edistyminen - go_top: "ylös" - go_bottom: "alas" + go_top: "alkuun" + go_bottom: "loppuun" go: "siirry" jump_bottom: "hyppää viimeisimpään viestiin" jump_bottom_with_number: "hyppää viestiin %{post_number}" @@ -899,29 +990,29 @@ fi: '2_4': 'Saat ilmoituksia, koska olet kirjoittanut ketjuun viestin.' '2_2': 'Saat ilmoituksia, koska olet asettanut ketjun seurantaan.' '2': 'Saat ilmoituksia, koska luet tätä ketjua.' - '1_2': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi.' - '1': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi.' + '1_2': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.' + '1': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.' '0_7': 'Et saa mitään ilmoituksia tältä alueelta.' '0_2': 'Et saa mitään ilmoituksia tästä ketjusta.' '0': 'Et saa mitään ilmoituksia tästä ketjusta.' watching_pm: title: "Tarkkaile" - description: "Saat ilmoituksen kaikista uusista viesteistä tässä viestiketjussa. Uusien ja lukemattomien viestien lukumäärä näytetään ketjun yhteydessä." + description: "Saat ilmoituksen kaikista uusista vastauksista tässä viestiketjussa ja uusien vastausten lukumäärä näytetään." watching: title: "Tarkkaile" - description: "Saat ilmoituksen kaikista uusista viesteistä tässä ketjussa. Uusien ja lukemattomien viestien lukumäärä ilmestyy näkyviin ketjun yhteydessä." + description: "Saat ilmoituksen kaikista uusista vastauksista tässä viestiketjussa ja uusien vastausten lukumäärä näytetään." tracking_pm: title: "Seuraa" - description: "Lukemattomien ja uusien viestien lukumäärä näytetään viestin yhteydessä. Saat ilmoituksen, jos joku mainitsee @nimesi tai vastaa sinulle viestissään." + description: "Tälle ketjulle näytetään uusien vastausten lukumäärä. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." tracking: title: "Seuraa" - description: "Lukemattomien ja uusien viestien lukumäärä näytetään ketjun yhteydessä. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle viestissään." + description: "Tälle ketjulle näytetään uusien vastausten lukumäärä. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." regular: title: "Tavallinen" - description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi." + description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." regular_pm: title: "Tavallinen" - description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi tässä keskustelussa." + description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." muted_pm: title: "Vaimenna" description: "Et saa mitään ilmoituksia tästä keskustelusta." @@ -963,17 +1054,19 @@ fi: success_message: 'Ketjun liputus onnistui.' feature_topic: title: "Nosta tämä ketju" - pin: "Näytä ketju {{categoryLink}}-alueen ylimmäisenä." + pin: "Kiinnitä tämä ketju alueen {{categoryLink}} ylimmäiseksi kunnes" confirm_pin: "Olet kiinnittänyt jo {{count}} ketjua. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun tällä alueella?" unpin: "Älä enää pidä tätä ketjua {{categoryLink}}-aluen ylimmäisenä." + unpin_until: "Poista nyt tämän ketjun kiinnitys alueen {{categoryLink}} ylimmäisenä, tai odota kunnes %{until}." pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään." already_pinned: zero: "Alueella {{categoryLink}} ei ole kiinnitettyjä ketjuja." one: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: 1." other: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: {{count}}." - pin_globally: "Kiinnitä tämä ketju kaikkien ketjulistausten ylimmäiseksi, kunnes henkilökunnan jäsen poistaa kiinnityksen." + pin_globally: "Kiinnitä tämä ketju kaikkien alueiden ylimmäiseksi, kunnes" confirm_pin_globally: "Olet kiinnittänyt jo {{count}} ketjua kaikille alueille. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun kaikille alueille?" unpin_globally: "Älä enää pidä tätä ketjua kaikkien alueiden ylimmäisenä." + unpin_globally_until: "Poista nyt tämän ketjun kiinnitys kaikkien alueiden ylimmäisenä, tai odota kunnes %{until}." global_pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään." already_pinned_globally: zero: "Mitään ketjuja ei ole kiinnitetty kaikille alueille." @@ -1005,8 +1098,8 @@ fi: sso_enabled: "Syötä henkilön käyttäjätunnus, jonka haluaisit kutsua tähän ketjuun." to_topic_blank: "Syötä henkilön käyttäjätunnus tai sähköpostiosoite, jonka haluaisit kutsua tähän ketjuun." to_topic_email: "Syötit sähköpostiosoitteen. Lähetämme ystävällesi sähköpostin, jonka avulla hän voi heti vastata tähän ketjuun." - to_topic_username: "Syötit käyttäjätunnuksen. Lähetämme tälle käyttäjälle ilmoituksen, joka sisältää kutsun ja linkin tähän ketjuun." - to_username: "Kirjoita henkilön nimi, jonka haluat kutsua. Lähetämme tälle käyttäjälle ilmoituksen, joka sisältää kutsun ja linkin tähän ketjuun." + to_topic_username: "Annoit käyttäjänimen. Lähetämme hänelle ilmoituksen, jossa on linkki ja kutsu tähän ketjuun." + to_username: "Kirjoita henkilön käyttäjänimi, jonka haluat kutsua. Lähetämme hänelle ilmoituksen, jossa on linkki ja kutsu tähän ketjuun." email_placeholder: 'nimi@esimerkki.fi' success_email: "Olemme lähettäneet kutsun osoitteeseen {{emailOrUsername}}. Ilmoitamme, kun kutsuun on vastattu. Voit seurata käyttäjäsivusi kutsut-välilehdeltä kutsujesi tilannetta." success_username: "Olemme kutsuneet käyttäjän osallistumaan tähän ketjuun." @@ -1054,8 +1147,8 @@ fi: one: Olet valinnut yhden viestin. other: Olet valinnut {{count}} viestiä. post: - reply: "Vastataan {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Vastaus ketjuun {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "lainaa" edit: "Muokataan {{link}} {{replyAvatar}} {{username}}" edit_reason: "Syy:" @@ -1070,11 +1163,24 @@ fi: one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)" other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)" expand_collapse: "laajenna/pienennä" + gap: + one: "näytä 1 piilotettu vastaus" + other: "näytä {{count}} piilotettua vastausta" more_links: "{{count}} lisää..." unread: "Viesti on lukematon" has_replies: - one: "Vastaus" - other: "Vastaukset" + one: "{{count}} vastaus" + other: "{{count}} vastausta" + has_likes: + one: "{{count}} tykkäys" + other: "{{count}} tykkäystä" + has_likes_title: + one: "1 käyttäjä tykkäsi tästä viestistä" + other: "{{count}} käyttäjää tykkäsi tästä viestistä" + has_likes_title_you: + zero: "sinä tykkäsit tästä viestistä" + one: "sinä ja 1 muu tykkäsitte tästä viestistä" + other: "Sinä ja {{count}} muuta tykkäsivät tästä viestistä" errors: create: "Pahoittelut, viestin luonti ei onnistunut. Ole hyvä ja yritä uudelleen." edit: "Pahoittelut, viestin muokkaus ei onnistunut. Ole hyvä ja yritä uudelleen." @@ -1242,12 +1348,14 @@ fi: category: can: 'voivat… ' none: '(ei aluetta)' + all: 'Kaikki alueet' choose: 'Valitse alue…' edit: 'muokkaa' edit_long: "Muokkaa" view: 'Katsele alueen ketjuja' general: 'Yleistä' settings: 'Asetukset' + topic_template: "Ketjun sapluuna" delete: 'Poista alue' create: 'Uusi alue' save: 'Tallenna alue' @@ -1291,13 +1399,13 @@ fi: notifications: watching: title: "Tarkkaile" - description: "Tämän alueen ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja alueen uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. " + description: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä." tracking: title: "Seuraa" - description: "Näiden alueiden ketjut asetetaan automaattisesti seurantaan. Uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä." + description: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä." regular: title: "Tavallinen" - description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi." + description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." muted: title: "Vaimennettu" description: "Et saa imoituksia uusista viesteistä näillä alueilla, eivätkä ne näy Lukemattomat-välilehdellä" @@ -1344,6 +1452,8 @@ fi: help: "Olet lisännyt ketjun kirjanmerkkeihisi" locked: help: "Tämä ketju on suljettu; siihen ei voi enää vastata." + archived: + help: "Tämä ketju on arkistoitu; se on jäädytetty eikä sitä voi muuttaa" unpinned: title: "Kiinnitys poistettu" help: "Ketjun kiinnitys on poistettu sinulta; se näytetään tavallisessa järjestyksessä." @@ -1353,8 +1463,6 @@ fi: pinned: title: "Kiinnitetty" help: "Tämä ketju on kiinnitetty sinulle; se näytetään alueensa ensimmäisenä" - archived: - help: "Tämä ketju on arkistoitu; se on jäädytetty eikä sitä voi muuttaa" invisible: help: "Tämä ketju on poistettu listauksista; sitä ei näytetä ketjujen listauksissa ja siihen pääsee vain suoralla linkillä" posts: "Viestejä" @@ -1371,7 +1479,7 @@ fi: views_lowercase: one: "katselu" other: "katselut" - replies: "Vastaukset" + replies: "Vastauksia" views_long: "tätä ketjua on katseltu {{number}} kertaa" activity: "Toiminta" likes: "Tykkäykset" @@ -1394,7 +1502,10 @@ fi: with_topics: "%{filter} ketjut" with_category: "%{filter} %{category} ketjut" latest: - title: "Tuoreimmat" + title: + zero: "Tuoreimmat" + one: "Tuoreimmat (1)" + other: "Tuoreimmat ({{count}})" help: "ketjut, joissa on viimeaikaisia viestejä" hot: title: "Kuuma" @@ -1447,6 +1558,8 @@ fi: title: "Kaikkina aikoina" yearly: title: "Vuosittain" + quarterly: + title: "Vuosineljännettäin" monthly: title: "Kuukausittain" weekly: @@ -1454,11 +1567,12 @@ fi: daily: title: "Päivittäin" all_time: "Kaikkina aikoina" - this_year: "Tänä vuonna" - this_month: "Tässä kuussa" - this_week: "Tällä viikolla" + this_year: "Vuosi" + this_quarter: "Vuosineljännes" + this_month: "Kuukausi" + this_week: "Viikko" today: "Tänään" - other_periods: "näytä lisää huippuketjuja" + other_periods: "katso huiput" browser_update: 'Valitettavasti tätä sivustoa ei voi käyttää näin vanhalla selaimella. Ole hyvä ja päivitä selaimesi.' permission_types: full: "Luoda / Vastata / Nähdä" @@ -1492,6 +1606,7 @@ fi: suspended: 'Hyllytetyt:' private_messages_short: "YV:t" private_messages_title: "Viestit" + mobile_title: "Mobiili" space_free: "{{size}} vapaata" uploads: "lataukset" backups: "varmuuskopiot" @@ -1623,7 +1738,11 @@ fi: name: "Nimi" none_installed: "Sinulla ei ole yhtään asennettua lisäosaa." version: "Versio" + enabled: "Otettu käyttöön?" + is_enabled: "K" + not_enabled: "E" change_settings: "Asetukset" + change_settings_short: "Asetukset" howto: "Kuinka asennan lisäosia?" backups: title: "Varmuuskopiot" @@ -1689,6 +1808,8 @@ fi: screened_email: "Vie koko lista seulotuista sähköpostiosoitteista CSV-formaatissa." screened_ip: "Vie koko lista seulotuista IP-osoitteista CSV-formaatissa." screened_url: "Vie koko lista seulotuista URL-osoitteista CSV-formaatissa." + export_json: + button_text: "Vie" invite: button_text: "Lähetä kutsut" button_title: "Lähetä kutsut" @@ -1699,6 +1820,7 @@ fi: header: "Header" top: "Alku" footer: "Footer" + embedded_css: "Upotuksen CSS" head_tag: text: "" title: "HTML, joka lisätään ennen elementtiä" @@ -1716,6 +1838,8 @@ fi: save: "Tallenna" new: "Uusi" new_style: "Uusi tyyli" + import: "Tuo" + import_title: "Valitse tiedosto tai liitä tekstiä" delete: "Poista" delete_confirm: "Poista tämä mukautus?" about: "Muokkaa sivuston CSS tyylitiedostoja ja HTML headeria. Lisää mukautus aloittaaksesi." @@ -1788,7 +1912,6 @@ fi: sent_test: "lähetetty!" delivery_method: "Lähetystapa" preview_digest: "Esikatsele tiivistelmä" - preview_digest_desc: "Esikatsele palstan viikoittaisten sähköpostitiivistelmien sisältöä." refresh: "Päivitä" format: "Muotoilu" html: "html" @@ -1853,6 +1976,7 @@ fi: delete_post: "poista viesti" impersonate: "esiinny käyttäjänä" anonymize_user: "anonymisoi käyttäjä" + roll_up: "Kääri IP estot" screened_emails: title: "Seulottavat sähköpostiosoitteet" description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä." @@ -2074,6 +2198,7 @@ fi: delete: "Poista" cancel: "Peruuta" delete_confirm: "Oletko varma, että haluat poistaa tämän käyttäjäkentän?" + options: "Asetukset" required: title: "Pakollinen täyttää, kun luodaan uusi tili?" enabled: "pakollinen" @@ -2089,6 +2214,7 @@ fi: field_types: text: 'Tekstikenttä' confirm: 'Vahvistus' + dropdown: "Alasvetovalikko" site_text: none: "Valitse sisällön tyyppi aloittaaksesi muokkaamisen." title: 'Tekstit' @@ -2100,6 +2226,7 @@ fi: no_results: "Ei tuloksia." clear_filter: "Tyhjennä" add_url: "Lisää URL" + add_host: "lisää host" categories: all_results: 'Kaikki' required: 'Pakolliset' @@ -2194,6 +2321,21 @@ fi: name: "Nimi" image: "Kuva" delete_confirm: "Oletko varma, että haluat poistaa emojin :%{name}:?" + permalink: + title: "Ikilinkit" + url: "URL" + topic_id: "Ketjun ID" + topic_title: "Ketju" + post_id: "Viestin ID" + post_title: "Viesti" + category_id: "Alueen ID" + category_title: "Alue" + external_url: "Ulkoinen URL" + delete_confirm: Oletko varma, että haluat poistaa tämän ikilinkin? + form: + label: "Uusi:" + add: "Lisää" + filter: "Etsi (URL tai ulkoinen URL)" lightbox: download: "lataa" search_help: @@ -2207,7 +2349,7 @@ fi: new: 'g, n Uudet' unread: 'g, u Lukemattomat' categories: 'g, c Alueet' - top: 'g, t Ylös' + top: 'g, t Huiput' bookmarks: 'g, b Kirjanmerkit' navigation: title: 'Navigointi' @@ -2220,7 +2362,6 @@ fi: title: 'Ohjelmisto' create: 'c Luo uusi ketju' notifications: 'n Avaa ilmoitukset' - site_map_menu: '= Avaa palstan valikko' user_profile_menu: 'p Avaa käyttäjätilin valikko' show_incoming_updated_topics: '. Näytä päivittyneet ketjut' search: '/ Etsi' @@ -2335,10 +2476,10 @@ fi: description: Kutsui käyttäjän campaigner: name: Kampanjoija - description: Kutsui 3 käyttäjää + description: Kutsui 3 haastajaa (luottamustaso 1) champion: name: Kampanjapäällikkö - description: Kutsui 10 käyttäjää + description: Kutsui 5 konkaria (luottamustaso 2) first_share: name: Ensimmäinen jakaminen description: Jakoi viestin @@ -2354,12 +2495,3 @@ fi: reader: name: Lukija description: Luki kaikki viestit ketjusta, jossa on yli 100 viestiä - google_search: | -

      Etsi Googlella

      -

      - - - - - -

      diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 9b6e02537c..f6b80ec36e 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -8,6 +8,9 @@ fr: js: number: + format: + separator: "," + delimiter: " " human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ fr: kb: Ko mb: Mo tb: To + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "H:mm" long_no_year: "DD MMM H:mm" long_no_year_no_time: "D MMM" + full_no_year_no_time: "Do MMMM" long_with_year: "DD MMM YYY H:mm" long_with_year_no_time: "DD MMM YYYY" + full_with_year_no_time: "Do MMMM, YYYY" long_date_with_year: "D MMM, 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM, 'YY" @@ -82,6 +90,16 @@ fr: x_days: one: "Il y a 1 jour" other: "Il y a %{count} jours" + later: + x_days: + one: "1 jour plus tard" + other: "%{count} jours plus tard" + x_months: + one: "1 mois plus tard" + other: "%{count} mois plus tard" + x_years: + one: "1 année plus tard" + other: "%{count} années plus tard" share: topic: 'partager ce sujet' post: 'message #%{postNumber}' @@ -90,6 +108,25 @@ fr: facebook: 'partager ce lien sur Facebook' google+: 'partager ce lien sur Google+' email: 'envoyer ce lien dans un courriel' + action_codes: + autoclosed: + enabled: 'fermé %{when}' + disabled: 'ouvert %{when}' + closed: + enabled: 'fermé %{when}' + disabled: 'ouvert %{when}' + archived: + enabled: 'archivé %{when}' + disabled: 'sorti des archives %{when}' + pinned: + enabled: 'épinglé %{when}' + disabled: 'désépinglé %{when}' + pinned_globally: + enabled: 'épinglé globalement %{when}' + disabled: 'désépinglé %{when}' + visible: + enabled: 'listé %{when}' + disabled: 'délisté %{when}' topic_admin_menu: "actions administrateur pour ce sujet" emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée." edit: 'éditer le titre et la catégorie de ce sujet' @@ -105,7 +142,7 @@ fr: admin_title: "Admin" flags_title: "Signalements" show_more: "afficher plus" - show_help: "aide" + show_help: "options" links: "Liens" links_lowercase: one: "lien" @@ -129,6 +166,7 @@ fr: every_two_weeks: "bi-mensuelles" every_three_days: "tous les trois jours" max_of_count: "maximum sur {{count}}" + alternation: "ou" character_count: one: "{{count}} caractère" other: "{{count}} caractères" @@ -181,6 +219,7 @@ fr: saved: "Sauvegardé !" upload: "Envoyer" uploading: "Envoi en cours..." + uploading_filename: "Téléversement de {{filename}}..." uploaded: "Envoyé !" enable: "Activer" disable: "Désactiver" @@ -188,9 +227,9 @@ fr: revert: "Rétablir" failed: "Echec" switch_to_anon: "Mode anonyme" - switch_from_anon: "Sortir du mode anonyme" banner: close: "Ignorer cette bannière." + edit: "Éditer cette bannière >>" choose_topic: none_found: "Aucun sujet trouvé." title: @@ -207,8 +246,8 @@ fr: cancel: "Annuler" view_pending: "voir les messages en attente" has_pending_posts: - one: "Ce sujet a un message en attente de validation" - many: "Ce sujet a {{count}} messages en attente de validation" + one: "Ce sujet a 1 message en attente de validation" + other: "Ce sujet a {{count}} messages en attente de validation" confirm: "Sauvegarder les modifications" delete_prompt: "Êtes-vous sûr de vouloir supprimer %{username} ? Cela supprimera tous ses messages et bloquera son courriel et son adresse IP." approval: @@ -266,6 +305,9 @@ fr: mods_and_admins: "Seulement les modérateurs et les administrateurs " members_mods_and_admins: "Seulement les membres du groupe, les modérateurs et les administrateurs " everyone: "Tout le monde" + trust_levels: + title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés à :" + none: "Aucun" user_action_groups: '1': "J'aime donnés" '2': "J'aime reçus" @@ -285,6 +327,13 @@ fr: all_subcategories: "toutes" no_subcategory: "aucune" category: "Catégorie" + reorder: + title: "Réordonner les catégories" + title_long: "Réorganiser la liste des catégories" + fix_order_tooltip: "Toutes les catégories n'ont pas une position unique. Cela peut provoquer des résultats non souhaités." + save: "Enregistrer l'ordre" + apply_all: "Appliquer" + position: "Position" posts: "Messages" topics: "Sujets" latest: "Récents" @@ -314,6 +363,8 @@ fr: topics_entered: "sujets visités" post_count: "# messages" confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer tous ces comptes ?" + user_fields: + none: "(choisir une option)" user: said: "{{username}} :" profile: "Profil" @@ -325,11 +376,23 @@ fr: private_messages: "Messages privés" activity_stream: "Activité" preferences: "Préférences" + expand_profile: "Développer" bookmarks: "Signets" bio: "À propos de moi" invited_by: "Invité par" trust_level: "Niveau de confiance" notifications: "Notifications" + desktop_notifications: + label: "Notifications de bureau" + not_supported: "Les notifications ne sont pas supportées avec ce navigateur. Désolé." + perm_default: "Activer les notifications" + perm_denied_btn: "Permission Refusée" + perm_denied_expl: "Vous avez refusé la permission pour les notifications. Utilisez votre navigateur pour activer les notifications, puis appuyez sur le bouton une fois terminé. (Bureau : L'icône la plus à gauche dans la barre d'adresse. Mobile : 'Info Site'.)" + disable: "Désactiver les notifications" + currently_enabled: "(activé actuellement)" + enable: "Activer les notifications" + currently_disabled: "(désactivé actuellement)" + each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez." dismiss_notifications: "Marquer tout comme lu" dismiss_notifications_tooltip: "Marquer comme lues toutes les notifications non lues" disable_jump_reply: "Ne pas se déplacer à mon nouveau message après avoir répondu" @@ -342,14 +405,15 @@ fr: admin: "{{user}} est un administrateur" moderator_tooltip: "Cet utilisateur est un modérateur" admin_tooltip: "Cet utilisateur est un admin" + blocked_tooltip: "Cet utilisateur est bloqué." suspended_notice: "L'utilisateur est suspendu jusqu'au {{date}}." suspended_reason: "Raison :" github_profile: "Github" mailing_list_mode: "M'envoyer un courriel pour tous les nouveaux messages (sauf si vous avez rendu silencieux le sujet ou la catégorie)" watched_categories: "Surveillés" - watched_categories_instructions: "Vous pourrez suivre attentivement automatiquement toutes les nouveaux sujets dans ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, de plus les nombres de messages non lus et de nouveaux messages apparaîtront également à côté de la liste des sujets." + watched_categories_instructions: "Vous surveillerez automatiquement les nouveaux sujets de ces catégories. Vous serez averti de tous les nouveaux messages et sujets. De plus, le nombre de messages non lus apparaîtra en regard de la liste des sujets." tracked_categories: "Suivies" - tracked_categories_instructions: "Vous allez suivre automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de messages non-lus et nouveaux apparaîtra à côté du sujet." + tracked_categories_instructions: "Vous allez suivre automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de nouveaux messages apparaîtra à côté du sujet." muted_categories: "Désactivés" muted_categories_instructions: "Vous ne recevrez aucune notification concernant les nouveaux sujets de ces catégories, et ils n'apparaitront pas dans votre onglet non lu." delete_account: "Supprimer mon compte" @@ -402,7 +466,7 @@ fr: upload_title: "Envoyer votre avatar" upload_picture: "Envoyer une image" image_is_not_a_square: "Attention : nous avons découpé votre image; la largeur et la hauteur n'étaient pas égales." - cache_notice: "Votre avatar a été mis à jour, mais il se peut qu'il mette un certain temps à apparaître à cause des caches de navigateur." + cache_notice: "Votre photo de profil a bien été modifié, mais il se peut qu'il mette un certain temps à apparaître à cause des caches de navigateur." change_profile_background: title: "Arrière plan du profil" instructions: "L'arrière-plan du profil sera centré avec une largeur par défaut de 850 pixels." @@ -462,38 +526,42 @@ fr: every_two_weeks: "toutes les deux semaines" email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo ou m'invite à rejoindre un sujet" email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé" - email_always: "Ne pas recevoir de courriel de notifications lorsque je suis actif sur le site" + email_always: "Recevoir des notifications par email même lorsque je suis actif sur le site" other_settings: "Autre" categories_settings: "Catégories" new_topic_duration: label: "Considérer les sujets comme nouveau quand" not_viewed: "Je ne les ai pas encore vus" last_here: "crées depuis ma dernière visite" - after_n_days: - one: "créés hier" - other: "créés lors des {{count}} derniers jours" - after_n_weeks: - one: "créés la semaine dernière" - other: "créés les {{count}} dernières semaines." + after_1_day: "créés depuis hier" + after_2_days: "créés durant les 2 derniers jours" + after_1_week: "créés durant les 7 derniers jours" + after_2_weeks: "créés durant les 2 dernières semaines" auto_track_topics: "Suivre automatiquement les sujets que je consulte" auto_track_options: never: "jamais" immediately: "immédiatement" - after_n_seconds: - one: "après une seconde" - other: "après {{count}} secondes" - after_n_minutes: - one: "après une minute" - other: "après {{count}} minutes" + after_30_seconds: "après 30 secondes" + after_1_minute: "après 1 minute" + after_2_minutes: "après 2 minutes" + after_3_minutes: "après 3 minutes" + after_4_minutes: "après 4 minutes" + after_5_minutes: "après 5 minutes" + after_10_minutes: "après 10 minutes" invited: search: "commencer à saisir pour rechercher vos invitations..." title: "Invitations" user: "Utilisateurs" - none: "Vous n'avez encore invité personne." + sent: "Envoyé" + none: "Il n'y a plus d'invitation en attente à afficher." truncated: "Affichage des {{count}} premières invitations." redeemed: "Invitations acceptées" + redeemed_tab: "Utilisés" + redeemed_tab_with_count: "Invitations acceptées ({{count}})" redeemed_at: "Acceptée le" pending: "Invitations en attente" + pending_tab: "En attente" + pending_tab_with_count: "En attente ({{count}})" topics_entered: "Sujets consultés" posts_read_count: "Messages lus" expired: "Cette invitation a expirée." @@ -505,6 +573,8 @@ fr: days_visited: "Ratio de présence" account_age_days: "Âge du compte en jours" create: "Envoyer une invitation" + generate_link: "Copier le lien d'invitation" + generated_link_message: '

      Le lien d''invitation a été généré avec succès !

      Le lien d''invitation est valide uniquement pour cette adresse : %{invitedEmail}

      ' bulk_invite: none: "Vous n'avez encore invité personne. Vous pouvez envoyé des invitations individuelles, ou en masse en envoyant un fichier d'invitation contenant la liste des courriels." text: "Invitation massive depuis un fichier" @@ -561,7 +631,6 @@ fr: read_only_mode: enabled: "Le mode lecture seule est activé. Vous pouvez continuer à naviguer sur le site, mais ne pouvez pas prendre part aux discussions." login_disabled: "Impossible de se connecté quand le site est en mode lecture seule." - too_few_topics_notice: "Créez au moins cinq sujets et écrivez %{posts} messages publics pour démarrer des discussions. Les nouveaux utilisateurs ne pourront pas gagner de niveaux de confiance sans contenu à lire. Ce message n’apparaît que pour les responsables." learn_more: "en savoir plus…" year: 'an' year_desc: 'sujets créés durant les 365 derniers jours' @@ -621,6 +690,7 @@ fr: email_placeholder: "courriel ou pseudo" caps_lock_warning: "Majuscules vérrouillées" error: "Erreur inconnue" + rate_limit: "Merci de patienter avant de vous reconnecter." blank_username_or_password: "Merci de saisir votre courriel ou pseudo, et mot de passe." reset_password: 'Réinitialiser le mot de passe' logging_in: "Connexion en cours…" @@ -685,7 +755,7 @@ fr: title_placeholder: "Quel est votre sujet en une phrase descriptive ?" edit_reason_placeholder: "pourquoi éditez-vous ?" show_edit_reason: "(ajouter la raison de l'édition)" - reply_placeholder: "Écrivez ici. Pour mettre en forme le texte, vous pouvez utiliser Markdown, BBCode ou HTML. Glissez ou collez une image pour l'importer." + reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour formatter. Glissez ou collez des images." view_new_post: "Voir votre nouveau message." saving: "Sauvegarde…" saved: "Sauvegardé !" @@ -746,13 +816,27 @@ fr: moved_post: "

      {{username}} a déplacé {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Vous avez gagné {{description}}

      " + alt: + mentioned: "Mentionné par" + quoted: "Cité par" + replied: "Répondu" + posted: "Message par" + edited: "Editer votre message par" + liked: "Aime votre message" + private_message: "Message privé de" + invited_to_private_message: "Invité pour un message privé par" + invited_to_topic: "Invité à un sujet par" + invitee_accepted: "Invitation acceptée par" + moved_post: "Votre message a été déplacé par" + linked: "Lien vers votre message" + granted_badge: "Badge attribué" popup: - mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}' - quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}' - replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}' - posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}' - private_message: '{{username}} vous a envoyé un message direct « {{topic}} » - {{site_title}}' - linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}' + mentioned: '{{username}} vous a mentionné dans «{{topic}}» - {{site_title}}' + quoted: '{{username}} vous a cité dans «{{topic}}» - {{site_title}}' + replied: '{{username}} vous a répondu dans «{{topic}}» - {{site_title}}' + posted: '{{username}} a posté dans «{{topic}}» - {{site_title}}' + private_message: '{{username}} vous a envoyé un message direct «{{topic}}» - {{site_title}}' + linked: '{{username}} a créé un lien vers votre message posté dans «{{topic}}» - {{site_title}}' upload_selector: title: "Ajouter une image" title_with_attachments: "Ajouter une image ou un fichier" @@ -760,15 +844,20 @@ fr: from_the_web: "Depuis le web" remote_tip: "lien vers l'image" remote_tip_with_attachments: "lien vers l'image ou le fichier ({{authorized_extensions}})" - local_tip: "cliquez pour sélectionner une image depuis votre ordinateur" - local_tip_with_attachments: "Cliquez pour sélectionner une image ou un fichier depuis votre ordinateur ({{authorized_extensions}})" + local_tip: "sélectionnez des images depuis votre appareil" + local_tip_with_attachments: "sélectionnez des images depuis votre appareil ({{authorized_extensions}})" hint: "(vous pouvez également faire un glisser-déposer dans l'éditeur pour les télécharger)" - hint_for_supported_browsers: "(vous pouvez aussi glisser et déposer ou coller des images dans l'éditeur pour les envoyer) " + hint_for_supported_browsers: "vous pouvez aussi glisser/déposer ou coller des images dans l'éditeur" uploading: "Fichier en cours d'envoi" + select_file: "Sélectionner Fichier" image_link: "lien vers lequel pointe l'image" search: + select_all: "Tout sélectionner" + clear_all: "Tout supprimer" title: "Rechercher les sujets, messages, utilisateurs ou catégories" no_results: "Aucun résultat." + no_more_results: "Pas davantage de résultats." + search_help: Aide pour la recherche searching: "Recherche en cours…" post_format: "#{{post_number}} par {{username}}" context: @@ -776,7 +865,8 @@ fr: category: "Rechercher dans la catégorie \"{{category}}\"" topic: "Rechercher dans ce sujet" private_messages: "Rechercher des messages" - site_map: "aller à une autre liste de sujet ou catégorie" + hamburger_menu: "se rendre dans une autre liste de sujet ou catégorie" + new_item: "nouveau" go_back: 'retour' not_logged_in_user: 'page utilisateur avec un résumé de l''activité en cours et les préférences ' current_user: 'voir la page de l''utilisateur' @@ -829,6 +919,9 @@ fr: bookmarks: "Il n'y a plus de sujets dans vos signets." search: "Il n'y a plus de résultats à votre recherche." topic: + unsubscribe: + stop_notifications: "Vous recevrez moins de notifications pour {{title}}" + change_notification_state: "Votre statut de notification est" filter_to: "{{post_count}} messages sur ce sujet" create: 'Créer votre sujet' create_long: 'Créer un nouveau sujet' @@ -904,29 +997,29 @@ fr: '2_4': 'Vous recevrez des notifications car vous avez écrit une réponse dans ce sujet.' '2_2': 'Vous recevrez des notifications car vous suivez ce sujet.' '2': 'Vous recevrez des notifications car vous avez lu ce sujet.' - '1_2': 'Vous serez notifié si un utilisateur mentionne votre @pseudo ou réponds à votre message.' - '1': 'Vous serez notifié si un utilisateur mentionne votre @pseudo ou réponds à votre message.' + '1_2': 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.' + '1': 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.' '0_7': 'Vous ignorez toutes les notifications de cette catégorie.' '0_2': 'Vous ignorez toutes les notifications de ce sujet.' '0': 'Vous ignorez toutes les notifications de ce sujet.' watching_pm: title: "Suivre attentivement" - description: "Vous serez averti de chaque nouvelle publication dans ce message. Le nombre de publications non lues et nouvelles apparaîtra également à côté du sujet." + description: "Vous serez notifié de chaque nouvelle réponse dans ce message, et le nombre de nouvelles réponses apparaîtra." watching: title: "Surveiller" - description: "Vous serez notifier de chaque nouveau message de ce sujet. Les nombres de messages non lus et de nouveaux messages apparaîtront également à côté du sujet." + description: "Vous serez notifié de chaque nouvelle réponse dans ce sujet, et le nombre de nouvelles réponses apparaîtra." tracking_pm: title: "Suivi simple" - description: "Le nombre de publications non lues et nouvelles apparaîtra à côté du message. Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre publication." + description: "Le nombre de nouvelles réponses apparaîtra pour ce message. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." tracking: title: "Suivi" - description: "Le nombre de messages non lus et de nouveaux messages apparaîtra à côté du sujet. Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." + description: "Le nombre de nouvelles réponses apparaîtra pour ce sujet. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." regular: title: "Normal" - description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." regular_pm: title: "Normal" - description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre publication dans le message." + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." muted_pm: title: "Silencieux" description: "Vous ne serez jamais averti de quoi que ce soit à propos de ce message." @@ -968,17 +1061,20 @@ fr: success_message: 'Vous avez signalé ce sujet avec succès.' feature_topic: title: "Mettre ce sujet en évidence" - pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}}." + pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}} jusqu'à" confirm_pin: "Vous avez déjà {{count}} sujets épinglés. S'il y a trop de sujets épinglés cela peut être lourd pour les nouveaux utilisateurs et utilisateurs anonymes. Êtes-vous sûr de vouloir ajouter un nouveau sujet épinglé dans cette catégorie?" unpin: "Enlever ce sujet du haut de la catégorie {{categoryLink}}." + unpin_until: "Enlever ce sujet du haut de la catégorie {{categoryLink}} ou attendre jusqu'à %{until}." pin_note: "Les utilisateurs peuvent enlever l'épingle de ce sujet eux-mêmes." + pin_validation: "Une date est requise pour épingler ce sujet." already_pinned: zero: "Aucun sujet actuellement épinglé dans {{categoryLink}}." one: "Sujets actuellement épinglés dans {{categoryLink}}: 1." other: "Sujets actuellement épinglés dans {{categoryLink}}: {{count}}." - pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet, jusqu'à ce qu'un responsable l'enlève." + pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à " confirm_pin_globally: "Vous avez déjà {{count}} sujets épinglés globalement. S'il y a trop de sujets épinglés cela peut être lourd pour les nouveaux utilisateurs et les utilisateurs anonymes. Êtes-vous sûr de vouloir rajouter une sujet épinglé globalement?" unpin_globally: "Enlever ce sujet du haut de toutes les listes de sujet." + unpin_globally_until: "Enlever ce sujet du haut de toutes les listes de sujet ou attendre jusqu'à %{until}." global_pin_note: "Les utilisateurs peuvent enlever l'épingle du sujet individuellement." already_pinned_globally: zero: "Aucun sujet épinglé globalement." @@ -1010,8 +1106,8 @@ fr: sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet." to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet." to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet." - to_topic_username: "Vous avez entré un pseudo. Nous allons envoyer une notification à cet utilisateur avec un lien l'invitant sur ce sujet." - to_username: "Entrez le pseudo de la personne que vous souhaitez inviter. Nous lui enverrons une notification avec un lien vers ce sujet." + to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons envoyer une notification avec un lien les invitant sur ce sujet." + to_username: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter. Nous enverrons une notification avec un lien les invitant sur ce sujet." email_placeholder: 'nom@exemple.com' success_email: "Nous avons envoyé un email à {{emailOrUsername}}. Nous vous avertirons lorsqu'il aura répondu à votre invitation. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur." success_username: "Nous avons invité cet utilisateur à participer à ce sujet." @@ -1047,6 +1143,12 @@ fr: one: "Veuillez choisir un nouvel auteur pour le message de {{old_user}}." other: "Veuillez choisir un nouvel auteur pour les {{count}} messages de {{old_user}}." instructions_warn: "Aucune notification à propos de ce message ne seront transféré rétroactivement à ce nouvel auteur.
      Attention: Actuellement, aucune donnée lié au message n'est transféré vers le nouvel auteur. À utiliser avec précaution." + change_timestamp: + title: "Modifier la date/heure" + action: "modifier la date/heure" + invalid_timestamp: "La date/heure ne peut être dans le futur" + error: "Il y a eu une erreur lors de la modification de la date/heure de ce sujet." + instructions: "Veuillez sélectionner la nouvelle date/heure du sujet. Les messages dans ce topic seront mis à jour pour maintenir la même différence d'heure." multi_select: select: 'sélectionner' selected: '({{count}}) sélectionnés' @@ -1059,8 +1161,8 @@ fr: one: vous avez sélectionné 1 message. other: Vous avez sélectionné {{count}} messages. post: - reply: "Répondre à {{link}} par {{replyAvatar}} {{username}}" - reply_topic: "Répondre à {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "Citer" edit: "Éditer {{link}} par {{replyAvatar}} {{username}}" edit_reason: "Raison :" @@ -1081,8 +1183,18 @@ fr: more_links: "{{count}} de plus..." unread: "Ce message est non lu" has_replies: - one: "Réponse" - other: "Réponses" + one: "{{count}} Réponse" + other: "{{count}} Réponses" + has_likes: + one: "{{count}} J'aime" + other: "{{count}} J'aime" + has_likes_title: + one: "1 personne a aimé ce message" + other: "{{count}} personnes ont aimé ce message" + has_likes_title_you: + zero: "vous avez aimé ce message" + one: "vous et 1 autre personne ont aimé ce message" + other: "vous et {{count}} autres personnes ont aimé ce message" errors: create: "Désolé, il y a eu une erreur lors de la publication de votre message. Merci de réessayer." edit: "Désolé, il y a eu une erreur lors de l'édition de votre message. Merci de réessayer." @@ -1250,14 +1362,17 @@ fr: category: can: 'peut… ' none: '(pas de catégorie)' + all: 'Toutes les catégories' choose: 'Sélectionner une catégorie…' edit: 'éditer' edit_long: "Modifier" view: 'Voir les sujets dans cette catégorie' general: 'Général' settings: 'Paramètres' + topic_template: "Modèle de Sujet" delete: 'Supprimer la catégorie' create: 'Nouvelle catégorie' + create_long: 'Créer une nouvelle catégorie' save: 'Enregistrer la catégorie' slug: 'Identifiant de la catégorie' slug_placeholder: '(Facultatif) insérer tirets entre mots dans url' @@ -1287,6 +1402,7 @@ fr: email_in_allow_strangers: "Accepter les courriels d'utilisateurs anonymes sans compte" email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer," email_in_disabled_click: 'activer le paramètre "email in".' + suppress_from_homepage: "Supprimer cette catégorie de la page d'accueil" allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie" edit_permissions: "Éditer les permissions" add_permission: "Ajouter une Permission" @@ -1299,13 +1415,13 @@ fr: notifications: watching: title: "S'abonner" - description: "Vous pourrez suivre attentivement automatiquement toutes les nouveaux sujets dans ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, de plus les nombres de messages non lus et de nouveaux messages apparaîtront également à côté du sujet." + description: "Vous surveillerez automatiquement les nouveaux sujets dans ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouvelles réponses apparaîtra pour ces sujets." tracking: title: "Suivi" - description: "Vous allez suivre automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de messages non-lus et nouveaux apparaîtra à côté du sujet." + description: "Vous suivrez automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de nouvelles réponses apparaîtra pour ces sujets." regular: title: "Normal" - description: "Vous serez notifié si un utilisateur mentionne votre @pseudo ou réponds à votre message." + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." muted: title: "Silencieux" description: "Vous ne recevrez aucune notification sur les sujets de ces catégories, et ils n'apparaîtront pas dans votre onglet \"non-lus\"." @@ -1352,6 +1468,10 @@ fr: help: "Vous avez ajouté ce sujet à vos signets" locked: help: "Ce sujet est fermé; il n'accepte plus de nouvelles réponses" + archived: + help: "Ce sujet est archivé; il est gelé et ne peut être modifié" + locked_and_archived: + help: "Ce sujet est fermé et archivé ; il n'accepte plus de nouvelles réponses et ne peut plus être modifié" unpinned: title: "Désépinglé" help: "Ce sujet est désépinglé pour vous; il sera affiché dans l'ordre par défaut" @@ -1361,8 +1481,6 @@ fr: pinned: title: "Épingler" help: "Ce sujet est épinglé pour vous; il s'affichera en haut de sa catégorie" - archived: - help: "Ce sujet est archivé; il est gelé et ne peut être modifié" invisible: help: "Ce sujet n'apparait plus dans la liste des sujets et sera seulement accessible via un lien direct" posts: "Messages" @@ -1402,7 +1520,10 @@ fr: with_topics: "Sujets %{filter}" with_category: "Sujets %{filter} sur %{category}" latest: - title: "Récents" + title: + zero: "Récents" + one: "Récent (1)" + other: "Récents ({{count}})" help: "sujets avec des messages récents" hot: title: "Populaires" @@ -1455,6 +1576,8 @@ fr: title: "depuis toujours" yearly: title: "Annuel" + quarterly: + title: "Trimestriel" monthly: title: "Mensuel" weekly: @@ -1462,11 +1585,12 @@ fr: daily: title: "Quotidien" all_time: "Depuis toujours" - this_year: "Cette année" - this_month: "Ce mois-ci" - this_week: "Cette semaine" + this_year: "Année" + this_quarter: "Trimestre" + this_month: "Mois" + this_week: "Semaine" today: "Aujourd'hui" - other_periods: "voir plus de meilleurs sujets" + other_periods: "voir le top" browser_update: 'Malheureusement, votre navigateur est trop vieux pour ce site. Merci de mettre à jour votre navigateur.' permission_types: full: "Créer / Répondre / Voir" @@ -1500,6 +1624,7 @@ fr: suspended: 'Suspendu :' private_messages_short: "Msgs" private_messages_title: "Messages" + mobile_title: "Mobile" space_free: "{{size}} libre" uploads: "téléchargements" backups: "sauvegardes" @@ -1631,7 +1756,11 @@ fr: name: "Nom du plugin" none_installed: "Vous n'avez aucun plugin installé." version: "Version du plugin" + enabled: "Activé ?" + is_enabled: "O" + not_enabled: "N" change_settings: "Changer les paramètres" + change_settings_short: "Paramètres" howto: "Comment installer des plugins ?" backups: title: "Sauvegardes" @@ -1697,6 +1826,8 @@ fr: screened_email: "Exporter la liste des adresses de courriel sous surveillance dans un fichier CSV." screened_ip: "Exporter la liste complète des adresses IP sous surveillance dans un fichier CSV." screened_url: "Exporter toutes les URL sous surveillance vers un fichier CSV" + export_json: + button_text: "Exporter" invite: button_text: "Envoyer invitations" button_title: "Envoyer invitations" @@ -1707,6 +1838,7 @@ fr: header: "En-tête" top: "Top" footer: "Pied de page" + embedded_css: "CSS intégré" head_tag: text: "" title: "HTML qui sera inséré avant la balise " @@ -1724,6 +1856,8 @@ fr: save: "Sauvegarder" new: "Nouveau" new_style: "Nouveau style" + import: "Importer" + import_title: "Sélectionnez un fichier ou collez du texte" delete: "Supprimer" delete_confirm: "Supprimer cette personnalisation" about: "Modification des feuilles de styles et en-têtes de votre site. Ajouter un style personnalisé pour commencer." @@ -1784,8 +1918,8 @@ fr: sending_test: "Envoi en cours du courriel de test..." error: "ERREUR - %{server_error}" test_error: "Il y a eu un problème avec l'envoi du courriel de test. Veuillez vérifier vos paramètres, que votre hébergeur ne bloque pas les connections aux courriels, et réessayer." - sent: "Envoyé" - skipped: "Passé" + sent: "Envoyés" + skipped: "Ignorés" sent_at: "Envoyer à" time: "Heure" user: "Utilisateur" @@ -1861,6 +1995,7 @@ fr: delete_post: "supprimer le message" impersonate: "incarner" anonymize_user: "rendre l'utilisateur anonyme" + roll_up: "consolider des blocs d'IP" screened_emails: title: "Courriels affichés" description: "Lorsque quelqu'un essaye de créé un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée." @@ -2082,6 +2217,7 @@ fr: delete: "Supprimer" cancel: "Annuler" delete_confirm: "Etes vous sur de vouloir supprimer ce champ utilisateur ?" + options: "Options" required: title: "Obligatoire à l'inscription ?" enabled: "obligatoire" @@ -2097,6 +2233,7 @@ fr: field_types: text: 'Zone de texte' confirm: 'Confirmation' + dropdown: "Menu déroulant" site_text: none: "Choisissez un type de contenu pour commencer l'édition." title: 'Contenu' @@ -2108,6 +2245,7 @@ fr: no_results: "Aucun résultat trouvé." clear_filter: "Effacer" add_url: "ajouter URL" + add_host: "ajouter hôte" categories: all_results: 'Toutes' required: 'Requis' @@ -2129,6 +2267,7 @@ fr: backups: "Sauvegardes" login: "Connexion" plugins: "Plugins" + user_preferences: "Préférences" badges: title: Badges new_badge: Nouveau Badge @@ -2202,6 +2341,44 @@ fr: name: "Nom" image: "Image" delete_confirm: "Etes vous sûr de vouloir supprimer l'emoji :%{name}: ?" + embedding: + get_started: "Si vous aimeriez intégrer Discourse dans un autre site, commencez par ajouter l'hôte." + confirm_delete: "Êtes-vous sûr de vouloir supprimer cet hôte?" + sample: "Introduire le code HTML suivant dans votre site pour créer et intégrer des sujets Discourse. Remplacer REPLACE_ME avec l'URL de la page dans laquelle vous l'intégrer." + title: "Intégration externe" + host: "Hôtes permis" + edit: "éditer" + category: "Ajouter dans catégorie" + add_host: "Ajouter hôte" + settings: "Paramètres d'intégration externe" + feed_settings: "Paramètres de flux RSS/ATOM" + feed_description: "Fournir un flux RSS/ATOM pour votre site peut améliorer la capacité de Discourse à importer votre contenu." + crawling_settings: "Paramètres de robot" + crawling_description: "Quand Discourse crée des sujets pour vos message, s'il n'y a pas de flux RSS/ATOM présent, il essayera de parser le contenu à partir du HTML. Parfois il peut être difficile d'extraire votre contenu, alors nous vous donnons ici la possibilité de spécifier des règles CSS pour faciliter l'extraction." + embed_by_username: "Pseudo pour création de sujet" + embed_post_limit: "Le nombre maximum de messages à intégrer" + embed_username_key_from_feed: "Clé pour extraire le pseudo du flux." + embed_truncate: "Tronquer les messages intégrés" + embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés" + embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés" + feed_polling_enabled: "Importer les messages via flux RSS/ATOM" + feed_polling_url: "URL du flux RSS/ATOM à importer" + save: "Sauvegarder paramètres d'intégration" + permalink: + title: "Permaliens" + url: "URL" + topic_id: "ID sujet" + topic_title: "Sujet" + post_id: "ID message" + post_title: "Message" + category_id: "ID catégorie" + category_title: "Catégorie" + external_url: "URL externe" + delete_confirm: Êtes-vous sur de vouloir supprimer ce permalien ? + form: + label: "Nouveau :" + add: "Ajouter" + filter: "Rechercher (URL ou URL externe)" lightbox: download: "télécharger" search_help: @@ -2217,6 +2394,8 @@ fr: categories: 'g, c Catégories' top: 'g, t Haut' bookmarks: 'g, b Favoris' + profile: 'g, p Profil' + messages: 'g, m Messages' navigation: title: 'Navigation' jump: '# Aller au message #' @@ -2228,13 +2407,14 @@ fr: title: 'Application' create: 'c Créer un nouveau sujet' notifications: 'n Ouvrir les notifications' - site_map_menu: '= Ouvrir le menu principal' + hamburger_menu: '= Ouvrir le menu hamburger' user_profile_menu: 'p Ouvrir le menu de votre profil' show_incoming_updated_topics: '. Afficher les sujets mis à jour' search: '/ Rechercher' help: '? Ouvrir l''aide au clavier' dismiss_new_posts: 'x, r Marquer comme lu les nouveaux messages' dismiss_topics: 'x, r Marquer comme lu les sujets' + log_out: 'shift+z shift+z Se déconnecter' actions: title: 'Actions' bookmark_topic: 'f Modifier signet pour ce sujet' @@ -2343,10 +2523,10 @@ fr: description: A invité un utilisateur campaigner: name: Militant - description: A invité 3 membres + description: A invité 3 utilisateurs basiques (Niveau de confiance 1) champion: name: Champion - description: A invité 10 membres + description: A invité 5 membres (Niveau de confiance 2) first_share: name: Premier partage description: A partagé un message @@ -2362,12 +2542,21 @@ fr: reader: name: Lecteur description: A lu tous les messages d'un sujet contenant plus de 100 messages + popular_link: + name: Lien populaire + description: A posté un lien externe avec au moins 50 clics + hot_link: + name: Lien tendance + description: A posté un lien externe avec au moins 300 clics + famous_link: + name: Lien célèbre + description: A posté un lien externe avec au moins 1000 clics google_search: | -

      Rechercher avec Google

      +

      Rechercher avec Google

      - - - - - + + + + +

      diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 18593486c0..3f931cf4d0 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -8,6 +8,9 @@ he: js: number: + format: + separator: " ." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ he: kb: KB mb: MB tb: TB + short: + thousands: "k{{number}}" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -82,6 +90,16 @@ he: x_days: one: "אתמול" other: "לפני %{count} ימים" + later: + x_days: + one: "אחרי יום אחד" + other: "אחרי {count}% ימים" + x_months: + one: "אחרי חודש אחד" + other: "אחרי {{count}}% חודשים" + x_years: + one: "אחרי שנה אחת" + other: "אחרי {{count}}% שנים" share: topic: 'שתפו קישור לנושא זה' post: 'פרסום #%{postNumber}' @@ -90,6 +108,25 @@ he: facebook: 'שתפו קישור זה בפייסבוק' google+: 'שתף קישור זה בגוגל+' email: 'שלח קישור בדוא"ל' + action_codes: + autoclosed: + enabled: 'סגר %{when}' + disabled: 'פתח %{when}' + closed: + enabled: 'סגר %{when}' + disabled: 'פתח %{when}' + archived: + enabled: 'עבר לארכיון %{when}' + disabled: 'הוצא מהארכיון %{when}' + pinned: + enabled: 'ננעץ %{when}' + disabled: 'נעיצה בוטלה %{when}' + pinned_globally: + enabled: 'ננעץ גלובלית %{when}' + disabled: 'נעיצה בוטלה %{when}' + visible: + enabled: 'נכנס לרשימה %{when}' + disabled: 'הוצא מהרשימה %{when}' topic_admin_menu: "פעולות ניהול לנושא" emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, תשלח." edit: 'ערוך את הכותרת והקטגוריה של הנושא' @@ -105,7 +142,7 @@ he: admin_title: "ניהול" flags_title: "סימוני הודעה" show_more: "הראה עוד" - show_help: "עזרה" + show_help: "אפשרויות" links: "קישורים" links_lowercase: one: "קישור" @@ -129,6 +166,7 @@ he: every_two_weeks: "דו-שבועית" every_three_days: "כל שלושה ימים" max_of_count: "מקסימום של {{count}}" + alternation: "או" character_count: one: "תו אחד" other: "{{count}} תווים" @@ -181,6 +219,7 @@ he: saved: "נשמר!" upload: "העלה" uploading: "מעלה..." + uploading_filename: "מעלה {{filename}}..." uploaded: "הועלה!" enable: "לאפשר" disable: "לנטרל" @@ -188,9 +227,9 @@ he: revert: "לחזור" failed: "נכשל" switch_to_anon: "מצב אנונימי" - switch_from_anon: "יצאה ממצב אנונימי" banner: close: "שחרור באנר זה." + edit: "ערוך את הבאנר" choose_topic: none_found: "לא נמצאו נושאים." title: @@ -208,7 +247,7 @@ he: view_pending: "הצג הודעות ממתינות" has_pending_posts: one: " בנושא זה ישנה הודעה אחת הממתינה לאישור" - many: "בנושא זה ישנם {{count}} הודעות הממתינות לאישור" + other: "בנושא זה ישנם {{count}} הודעות הממתינות לאישור" confirm: "שמור שינויים" delete_prompt: "אתה בטוח שאתה רוצה למחוק את המשתמש %{username}? פעולה זו תמחק את כל ההודעות , תחסום את הדואר האלקטרוני וכתובת ה-IP של המשתמש." approval: @@ -266,6 +305,9 @@ he: mods_and_admins: "רק מנחים ומנהלים" members_mods_and_admins: "רק חברי הקבוצה, מנחים ומנהלים" everyone: "כולם" + trust_levels: + title: "רמת אמון הניתנת אוטומטית למשתמשים כשהם נוספים:" + none: "ללא" user_action_groups: '1': "לייקים שניתנו" '2': "לייקים שהתקבלו" @@ -285,6 +327,14 @@ he: all_subcategories: "הכל" no_subcategory: "ללא" category: "קטגוריה" + reorder: + title: "שנה סדר קטגוריות" + title_long: "ארגן מחדש את רשימת הקטגוריות" + fix_order: "סדר מיקומים" + fix_order_tooltip: "לא לכל הקטגוריות יש מספר סידורי יחודי, זה עלול לגרום לבעיות." + save: "שמור סדר" + apply_all: "הפעל" + position: "מיקום" posts: "פרסומים" topics: "נושאים" latest: "לאחרונה" @@ -314,6 +364,8 @@ he: topics_entered: "כניסה לנושאים" post_count: "# פרסומים" confirm_delete_other_accounts: "אתה בטוח שברצונך למחוק חשבונות אלו?" + user_fields: + none: "(בחר נושא)" user: said: "{{username}}:" profile: "פרופיל" @@ -325,11 +377,23 @@ he: private_messages: "הודעות" activity_stream: "פעילות" preferences: "העדפות" + expand_profile: "הרחב" bookmarks: "מועדפים" bio: "אודותיי" invited_by: "הוזמן/הוזמנה על ידי" trust_level: "רמת אמון" notifications: "התראות" + desktop_notifications: + label: "התראות לשולחן העבודה" + not_supported: "התראות לא נתמכות בדפדפן זה. מצטערים." + perm_default: "הדלק התראות" + perm_denied_btn: "הרשאות נדחו" + perm_denied_expl: "נטרלת הראשות עבור התראות. השתמש בדפדפן שלך לאפשר התראות, לאחר מכן לחץ על הכפתור. " + disable: "כבה התראות" + currently_enabled: "(כרגע מאופשר)" + enable: "אפשר התראות" + currently_disabled: "(כרגע לא מאופשר)" + each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד." dismiss_notifications: "סימון הכל כנקרא" dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו" disable_jump_reply: "אל תקפצו לפרסומים שלי לאחר שאני משיב/ה" @@ -342,14 +406,15 @@ he: admin: "{{user}} הוא מנהל ראשי" moderator_tooltip: "משתמש זה הינו מנחה (Moderator)" admin_tooltip: "משתמש זה הינו מנהל מערכת (Admin)" + blocked_tooltip: "משתמש זה חסום" suspended_notice: "המשתמש הזה מושעה עד לתאריך: {{date}}." suspended_reason: "הסיבה: " github_profile: "גיטהאב" mailing_list_mode: "שלחו לי דוא\"ל על כל פרסום חדש (אלא אם אשתיק את המעקב אחר הנושא או הקטגוריה)" - watched_categories: "צופה" - watched_categories_instructions: "את/ה תצפו אוטומטית בכל הנושאים החדשים בקטגוריות האלה ותקבלו התראות על כל ההודעות והנושאים החדשים. כמו כן כמות ההודעות החדשות ואלו שלא נקראו תופיע לצד כל נושא." - tracked_categories: "במעקב" - tracked_categories_instructions: "מעקב אוטומטי אחרי נושאים חדשים בקטגוריות אלו. מספר הפרסומים החדשים ואלו שלא נקראו יופיע לצד הנושא." + watched_categories: "עוקב" + watched_categories_instructions: "תעקבו באופן אוטומטי אחרי כל הנושאים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ונושא חדש." + tracked_categories: "רגיל+" + tracked_categories_instructions: "בקטגוריות אלה סך הפרסומים החדשים שלא נקראו יופיע לצד שם הנושא." muted_categories: "מושתק" muted_categories_instructions: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא נקראו שלך." delete_account: "מחק את החשבון שלי" @@ -379,6 +444,7 @@ he: set_password: "הזן סיסמה" change_about: title: "שינוי בנוגע אליי" + error: "הייתה שגיאה בשינוי הערך" change_username: title: "שנה שם משתמש" confirm: "אם תשנו את שם המשתמש/ת שלך, כל הציטוטים של ההודעות שלך ואזכורי @שם_המשתמש שלך יישברו. את/ה בטוחים לחלוטין שברצונך לשנות?" @@ -393,6 +459,7 @@ he: change_avatar: title: "שינוי תמונת הפרופיל" gravatar: "Gravatar, מבוסס על" + gravatar_title: "שנה את ה-avatar שלך באתר-Gravatar" refresh_gravatar_title: "רענון האווטר שלכם" letter_based: "תמונת פרופיל משובצת מערכתית" uploaded_avatar: "תמונה אישית" @@ -400,7 +467,7 @@ he: upload_title: "העלה את התמונה שלך" upload_picture: "העלאת תמונה" image_is_not_a_square: "אזהרה: קיצצנו את התמונה שלך; האורך והרוחב לא היו שווים." - cache_notice: "שינית בהצלחה את האווטר שלך אבל יתכן ויקח קצת זמן עד שהשינוי יופיע בשל עניני זכרון מטמון בדפדפן." + cache_notice: "שינית את תמונת הפרופיל שלך בהצלחה אבל יכול לקחת קצת זמן עד שהתמונה תופיע." change_profile_background: title: "שינוי רקע פרופיל" instructions: "רקעי הפרופיל ימורכזו ויוצגו ברוחב ברירת מחדל של 850px." @@ -460,38 +527,42 @@ he: every_two_weeks: "כל שבועיים" email_direct: "שלחו לי דוא\"ל כשמישהו/י מצטטים אותי, מגיבם לפרסום שלי, מזכירים את @שם_המשתמש/ת שלי, או מזמינים אותי לנושא" email_private_messages: "שלחו לי דוא\"ל כשמישהו/י שולחים לי מסר" - email_always: "אל תמנעו התראות דוא\"ל כאשר אני פעיל/ה באתר" + email_always: "שלח לי נוטיפקציות מייל גם כשאני פעיל/ה באתר. " other_settings: "אחר" categories_settings: "קטגוריות" new_topic_duration: label: "נושא יחשב כנושא חדש כאשר" not_viewed: "עוד לא ראיתי אותם" last_here: "נוצרו מאז הביקור האחרון שלי כאן" - after_n_days: - one: "נוצר ביום האחרון" - other: "נוצרו ב-{{count}} ימים האחרונים" - after_n_weeks: - one: "נוצר/ו בשבוע האחרון" - other: "נוצר/ו ב-{{count}} שבועות האחרונים" + after_1_day: "נוצר ביום האחרון" + after_2_days: "נוצר במהלך היומיים האחרונים" + after_1_week: "נוצר במהלך השבוע האחרון" + after_2_weeks: "נוצר בשבועיים האחרונים" auto_track_topics: "מעקב אוטומטי נושאים אליהם נכנסתי" auto_track_options: never: "אף פעם" immediately: "מיידי" - after_n_seconds: - one: "אחרי שנייה אחת" - other: "אחרי {{count}} שניות" - after_n_minutes: - one: "אחרי דקה אחת" - other: "אחרי {{count}} שניות" + after_30_seconds: "אחרי 30 שניות" + after_1_minute: "אחרי דקה" + after_2_minutes: "אחרי שתי דקות" + after_3_minutes: "אחרי 3 דקות" + after_4_minutes: "אחרי 4 דקות" + after_5_minutes: "אחרי 5 דקות" + after_10_minutes: "אחרי 10 דקות" invited: search: "הקלידו כדי לחפש הזמנות..." title: "הזמנות" user: "משתמש/ת שהוזמנו" - none: "עוד לא הזמנת לכאן אף אחד." + sent: "נשלח" + none: "אין הזמנות ממתינות להציג" truncated: "מראה את {{count}} ההזמנות הראשונות." redeemed: "הזמנות נוצלו" + redeemed_tab: "נענו" + redeemed_tab_with_count: "נוצלו ({{count}})" redeemed_at: "נפדו ב" pending: "הזמנות ממתינות" + pending_tab: "ממתין" + pending_tab_with_count: "ממתינות ({{count}})" topics_entered: "נושאים נצפו" posts_read_count: "הודעות נקראו" expired: "פג תוקף ההזמנה." @@ -503,6 +574,8 @@ he: days_visited: "מספר ימי ביקור" account_age_days: "גיל החשבון בימים" create: "שליחת הזמנה" + generate_link: "העתק קישור הזמנה" + generated_link_message: '

      הזמנה נוצרה בהצלחה

      לינק ההזמנה תקף רק למייל הזה: %{invitedEmail}

      ' bulk_invite: none: "נכון לעכשיו לא הזמנת לכאן אף אחד. תוכלו לשלוח הזמנות אישיות, או להזמין כמה אנשים בבת אחת באמצעות העלאת קובץ הזמנה קבוצתית." text: "הזמנה קבוצתית מקובץ" @@ -524,6 +597,7 @@ he: title: "כתובת IP בהרשמה" avatar: title: "תמונת פרופיל" + header_title: "פרופיל, הודעות, סימניות והגדרות " title: title: "כותרת" filters: @@ -558,7 +632,6 @@ he: read_only_mode: enabled: "מופעל מצב קריאה בלבד. אפשר להמשיך לגלוש באתר, אך חלק מהפעולות עלולות לא לעבוד." login_disabled: "התחברות אינה מתאפשרת כשהאתר במצב קריאה בלבד." - too_few_topics_notice: "צור לפחות 5 נושאים ציבוריים ו-%{posts} תגובות ציבוריות להתחיל את הדיון. משתמשים חדשים לא יכולים להשיג דרגות אמון אלא אם יש להם תוכן לקרוא. הודעה זו מופיעה רק לצוות." learn_more: "למד עוד..." year: 'שנה' year_desc: 'נושאים שפורסמו ב-365 הימים האחרונים' @@ -615,9 +688,10 @@ he: title: "התחברות" username: "משתמש" password: "סיסמה" - email_placeholder: "דואר אלקטרוני או סיסמה" + email_placeholder: "דואר אלקטרוני או שם משתמש/ת" caps_lock_warning: "מקש Caps Lock לחוץ" error: "שגיאה לא ידועה" + rate_limit: "בבקשה המתן לפני שתנסה להתחבר שוב." blank_username_or_password: "אנא הקישור את כתובת הדוא\"ל או שם המשתמש/ת שלכם וסיסמא." reset_password: 'אפס סיסמה' logging_in: "מתחבר...." @@ -682,6 +756,7 @@ he: title_placeholder: " במשפט אחד, במה עוסק הדיון הזה?" edit_reason_placeholder: "מדוע ערכת?" show_edit_reason: "(הוספת סיבת עריכה)" + reply_placeholder: "הקלד כאן. השתמש ב Markdown, BBCode או HTML לערוך. גרור או הדבק תמונות." view_new_post: "הצגת את ההודעה החדשה שלך." saving: "שומר..." saved: "נשמר!" @@ -742,8 +817,22 @@ he: moved_post: "

      {{username}} הזיז/ה {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      הרוויח/ה '{{description}}'

      " + alt: + mentioned: "הוזכר על ידי" + quoted: "צוטט על ידי" + replied: "השיב" + posted: "פורסם על ידי" + edited: "ערוך את פרסומך על ידי" + liked: "אהב את הפרסום שלך" + private_message: "הודעה פרטית מ" + invited_to_private_message: "הזמנה להודעה פרטית מ" + invited_to_topic: "הוזמנת לנושא חדש מ" + invitee_accepted: "הזמנה התקבלה על ידי" + moved_post: "הפרסום שלך הוזז על ידי" + linked: "קישור לפרסום שלך" + granted_badge: "תג הוענק" popup: - mentioned: '{{username}} הזכיר אוך ב"{{topic}}" - {{site_title}}' + mentioned: '{{username}} הזכיר אותך ב{{topic}}" - {{site_title}}"' quoted: '{{username}} ציטט אותך ב"{{topic}}" - {{site_title}}' replied: '{{username}} הגיב לך ב"{{topic}}" - {{site_title}}' posted: '{{username}} הגיב ב"{{topic}}" - {{site_title}}' @@ -756,15 +845,20 @@ he: from_the_web: "מהאינטרנט" remote_tip: "קישור לתמונה" remote_tip_with_attachments: "קישור לתמונה או קובץ ({{authorized_extensions}})" - local_tip: "לחץ לבחירת תמונה מהמכשיר שלך" - local_tip_with_attachments: "לחץ לבחירת תמונה או קובץ מהמכשיר שלך ({{authorized_extensions}})" + local_tip: "בחר תמונות ממכשירך" + local_tip_with_attachments: "בחר תמונות או קבצים ממכשירך ({{authorized_extensions}})" hint: "(ניתן גם לגרור לעורך להעלאה)" - hint_for_supported_browsers: "(אתה יכול גם לעשות drag and drop או להדביק תמונות אל תוך העורך כדי להעלות אותן)" + hint_for_supported_browsers: "תוכלו גם לגרור או להדביק תמונות לעורך" uploading: "מעלה" + select_file: "בחר קובץ" image_link: "קישור לתמונה יצביע ל" search: + select_all: "בחר הכל" + clear_all: "נקה הכל" title: "חיפוש נושאים, פרסומים, משתמשים או קטגוריות" no_results: "אין תוצאות." + no_more_results: "לא נמצאו עוד תוצאות." + search_help: עזרה בחיפוש searching: "מחפש ..." post_format: "#{{post_number}} מאת {{username}}" context: @@ -772,7 +866,8 @@ he: category: "חיפוש בקטגוריה \"{{category}}\"" topic: "חפשו בנושא זה" private_messages: "חיפוש הודעות" - site_map: "לך לרשימת נושאים או קטגוריה אחרת" + hamburger_menu: "עבור לרשימת נושאים אחרת או קטגוריה" + new_item: "חדש" go_back: 'חזור אחורה' not_logged_in_user: 'עמוד משתמש עם סיכום פעילות נוכחית והעדפות' current_user: 'לך לעמוד המשתמש שלך' @@ -821,6 +916,9 @@ he: bookmarks: "אין עוד סימניות לנושאים." search: "אין עוד תוצאות חיפוש" topic: + unsubscribe: + stop_notifications: "תקבלו פחות התראות עבור {{title}}" + change_notification_state: "מצב ההתראות הנוכחי שלך הוא" filter_to: "{{post_count}} הודעות בנושא" create: 'נושא חדש' create_long: 'יצירת נושא חדש' @@ -863,9 +961,10 @@ he: toggle_information: "הצגת פרטי נושא" read_more_in_category: "רוצה לקרוא עוד? עיין נושאים אחרים ב {{catLink}} או {{latestLink}}." read_more: "רוצה לקרוא עוד? {{catLink}} or {{latestLink}}." + read_more_MF: "There { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" browse_all_categories: עיין בכל הקטגוריות view_latest_topics: הצגת נושאים מדוברים - suggest_create_topic: מדוע לא ליצור נושא? + suggest_create_topic: לחץ כאן כדי ליצור נושא חדש. jump_reply_up: קפיצה לתגובה קודמת jump_reply_down: קפיצה לתגובה מאוחרת deleted: "הנושא הזה נמחק" @@ -879,50 +978,51 @@ he: go_top: "למעלה" go_bottom: "למטה" go: "קדימה" + jump_bottom: "עבור להודעה האחרונה" jump_bottom_with_number: "קפיצה להודעה %{post_number}" total: סך הכל הודעות current: הודעה נוכחית position: "הודעה %{current} מתוך %{total}" notifications: reasons: - '3_6': 'תקבלו התראות כיוון שאת/ה צופה בקטגוריה הזו.' - '3_5': 'תקבל/י התראות כיוון שהתחלת לצפות בנושא הזה אוטומטית.' - '3_2': 'תקבל/י התראות כיוון שאת/ה צופים בנושא הזה.' + '3_6': 'תקבלו התראות כיוון שאת/ה עוקב אחרי קטגוריה זו.' + '3_5': 'תקבל/י התראות כיוון שהתחלת לעקוב אחרי הנושא הזה אוטומטית.' + '3_2': 'תקבל/י התראות כיוון שאת/ה עוקב אחרי נושא הזה.' '3_1': 'תקבל/י התראות כיוון שאת/ה יצרת את הנושא הזה.' - '3': 'תקבל/י התראות כיוון שאת/ה צופה בנושא הזה.' + '3': 'תקבל/י התראות כיוון שאת/ה עוקב אחרי נושא זה.' '2_8': 'תקבלו התראות כיוון שאת/ה צופה בקטגוריה הזו.' '2_4': 'תקבל/י התראות כיוון שפרסמת תגובה לנושא הזה.' - '2_2': 'תקבל/י התראות כיוון שאת/ה עוקב/ת אחרי הנושא הזה.' + '2_2': 'תקבל/י התראות כיוון שאת/ה צופה אחרי הנושא הזה.' '2': 'תקבל/י התראות כיוון שקראת את הנושא הזה.' - '1_2': 'תקבלו הודעה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.' + '1_2': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.' '1': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.' '0_7': 'את/ה מתעלם/מתעלמת מכל ההתראות בקטגוריה זו.' '0_2': 'אתה מתעלם מכל ההתראות בנושא זה.' '0': 'אתה מתעלם מכל ההתראות בנושא זה.' watching_pm: - title: "צופה" - description: "תקבל/י התראה על כל פרסום בהודעה זו. גם סך הפרסומים החדשים ואלו שלא נקראו יופיעו לצד הנושא." + title: "עוקב" + description: "תקבל/י התראה על כל תגובה חדשה בהודעה זו. בנוסף מספר התגובות שלא נקראו יופיעו ליד ההודעה. " watching: - title: "צופה" - description: "תקבל/י התראה על כל פרסום חדש תחת נושא זה. סך הפרסומים החדשים ושלא נקראו יופיע גם לצד הנושא." + title: "עוקב" + description: "תקבל/י התראה על כל תגובה חדשה בנושא זה ומספר התגובות החדשות יוצג. " tracking_pm: - title: "עוקב" - description: "סך הפרסומים החדשים ואלו שלא נקראו יופיע לצד ההודעה. תקבל/י התראה אם מישהו/י יזכירו את @שם_המשתמש/ת שלך או יגיבו לפרסום שלך." + title: "רגיל+" + description: "כמו רגיל, בנוסף מספר התגובות החדשות יוצג ליד ההודעה. " tracking: - title: "עוקב" - description: "סך הפרסום החדשים והלא נקראים יופיע לצד הנושא. תקבלו התראה אם מישהו יזכיר את @שם_המשתמש שלך או ישיב על פרסום שלך." + title: "רגיל+" + description: "כמו רגיל, בנוסף מספר התגובות שלא נקראו יוצג לנושא זה. " regular: title: "רגיל" - description: "תרבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." + description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." regular_pm: title: "רגיל" - description: "תקבל/י התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או יגיב לפרסום שלך בהודעה." + description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." muted_pm: title: "מושתק" - description: "לעולם לא תקבל/י התראה לשום דבר בנוגע להודעה זו." + description: "לעולם לא תקבל/י התראה בנוגע להודעה זו." muted: title: "מושתק" - description: "לעולם לא תקבל/י התראות על הנושא הזה, והוא לא יופיע בעמוד הלא נקראו שלך." + description: "לעולם לא תקבל/י התראות על הנושא הזה, והוא לא יופיע בעמוד ה\"לא נקראו\" שלך." actions: recover: "שחזר נושא" delete: "מחק נושא" @@ -958,18 +1058,24 @@ he: success_message: 'סמנת נושא זה בהצלחה.' feature_topic: title: "הצגת נושא זה" - pin: "גרמו לנושא זה להופיע בראש הקטגוריה {{categoryLink}}." + pin: "גרמו לנושא זה להופיע בראש קטגוריה {{categoryLink}} עד" confirm_pin: "יש לך כבר {{count}} נושאים נעוצים. מספר גדול מידי של נושאים נעוצים עשויים להכביד על משתמשים חדשים או אנונימיים. האם את/ה בטוחים שאתם רוצים להצמיד נושא נוסף בקטגוריה זו? " unpin: "הסרת נושא זה מראש הקטגוריה {{categoryLink}}." + unpin_until: "גרמו לנושא זה להופיע בראש הקטגוריה {{categoryLink}} או המתן עד %{until}." pin_note: "המשתמש/ת יכולים להסיר את הנושא באופן עצמאי עבור עצמם." + pin_validation: "דרוש תאריך על מנת לנעוץ את הנושא. " already_pinned: zero: "אין נושאים מוצמדים בקטגוריה {{categoryLink}}." - pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים, עד שחבר/ת צוות מסירים אותו." + one: "נושאים שנעוצים ב {{categoryLink}}: 1." + other: "נושאים שנעוצים ב{{categoryLink}}: {{count}}." + pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים עד" confirm_pin_globally: "יש לך כבר {{count}} נושאים המוצמדים באופן גלובאלי. עודף נושאים מוצמדים עשוי להכביד על משתמשים חדשים או אנונימיים. האם את/ה בטוחים שאתם מעוניינים להצמיד נושא גלובאלי נוסף?" unpin_globally: "הסרת נושא זה מראש כל רשימות הנושאים." + unpin_globally_until: "הסרת נושא זה מראש כל רשימות הנושאים או המתינו עד %{until}." global_pin_note: "משתמשים יכולים להסיר את הצמדת הנושא באופן עצמאי לעצמם." already_pinned_globally: zero: "אין נושאים המוצמדים באופן גלובלי." + one: "נושאים שכרגע נעוצים גלובלית: 1." other: "נושאים שכרגע מוצמדים גלובלית: {{count}}." make_banner: "הפכו נושא זה לבאנר אשר מופיע בראש כל העמודים." remove_banner: "הסרת הבאנר שמופיע בראש כל העמודים." @@ -981,6 +1087,7 @@ he: automatically_add_to_groups_optional: "הזמנה זו כוללת גישה לקבוצות הללו: (אופציונלי, רק מנהל/ת)" automatically_add_to_groups_required: "הזמנה זו כוללת גישה לקבוצות הללו: (חובה, רק מנהל/ת)" invite_private: + title: 'הזמן להודעה' email_or_username: "כתובת דואר אלקטרוני או שם משתמש של המוזמן" email_or_username_placeholder: "כתובת דואר אלקטרוני או שם משתמש" action: "הזמנה" @@ -995,10 +1102,13 @@ he: to_forum: "נשלח מייל קצר המאפשר לחברך להצטרף באופן מיידי באמצעות לחיצה על קישור, ללא צורך בהתחברות למערכת הפורומים." sso_enabled: "הכנס את שם המשתמש של האדם שברצונך להזמין לנושא זה." to_topic_blank: "הכנס את שם המשתמש או כתובת דואר האלקטרוני של האדם שברצונך להזמין לנושא זה." - to_topic_username: "הכנסת את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." - to_username: "הכנס את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." + to_topic_email: "הזנת כתובת אימייל. אנחנו נשלח הזמנה שתאפשר לחברך להשיב לנושא הזה." + to_topic_username: "הזנת שם משתמש/ת. נשלח התראה עם לינק הזמנה לנושא הזה. " + to_username: "הכנסת את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." email_placeholder: 'name@example.com' + success_email: "שלחנו הזמנה ל: {{emailOrUsername}}. נודיע לך כשהזמנה תענה. בדוק את טאב ההזמנות בעמוד המשתמש שלך בשביל לעקוב אחרי ההזמנות ששלחת. " success_username: "הזמנו את המשתמש להשתתף בנושא." + error: "מצטערים, לא יכלנו להזמין האיש הזה. אולי הוא כבר הוזמן בעבר? (תדירות שליחת ההזמנות מוגבלת)" login_reply: 'התחברו כדי להשיב' filters: n_posts: @@ -1030,6 +1140,12 @@ he: one: "אנא בחר את הבעלים החדש של ההודעות מאת {{old_user}}." other: "אנא בחר את הבעלים החדש של {{count}} ההודעות מאת {{old_user}}." instructions_warn: "יש לשים לב שהתראות על הודעה זו יועברו למשתמש החדש רטרואקטיבית.
      זהירות: כרגע, שום מידע תלוי-הודעה אינו מועבר למשתמש החדש. השתמשו בזהירות." + change_timestamp: + title: "שנה חותמת זמן" + action: "זנה חותמת זמן" + invalid_timestamp: "חותמת זמן לא יכולה להיות בעתיד" + error: "הייתה שגיאה בשינוי חותמת הזמן של הנושא" + instructions: "אנא בחרו את חותמת הזמן החדשה של הנושא. פרסומים בנושא יועדכנו לאותם הפרשי זמנים." multi_select: select: 'בחירה' selected: 'נבחרו ({{count}})' @@ -1042,8 +1158,8 @@ he: one: בחרת הודעה אחת. other: בחרת {{count}} הודעות. post: - reply: "השב ל {{link}} {{replyAvatar}} {{username}}" - reply_topic: "תגובה ל {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "תגובה עם ציטוט" edit: "עורך את {{link}} {{replyAvatar}} {{username}}" edit_reason: "סיבה: " @@ -1058,11 +1174,24 @@ he: one: "(ההודעה בוטלה על ידי הכותב, היא תמחק אוטומטית בעוד %{count} שעות אלא אם תסומן בדגל)" other: "(ההודעה בוטלה על ידי הכותב/ת, היא תמחק אוטומטית בעוד %{count} שעות אלא אם כן היא תסומן )" expand_collapse: "הרחב/צמצם" + gap: + one: "הצג הודעה אחת שהוסתרה" + other: "הצג {{count}} הודעות שהוסתרו" more_links: "עוד {{count}}..." unread: "הפוסט טרם נקרא" has_replies: - one: "תגובה" - other: "תגובות" + one: "תגובה אחת" + other: "{{count}} תגובות" + has_likes: + one: "לייק אחד" + other: "{{count}} לייקים " + has_likes_title: + one: "מישהו אחד אהב את התגובה הזו" + other: "{{count}} אנשים אהבו את התגובה הזו" + has_likes_title_you: + zero: "אתה אהבת את התגובה הזו" + one: "אתה ואדם נוסף אהבתם את התגובה הזו" + other: "אתה ו{{count}} אנשים נוספים אהבתם את התגובה הזו" errors: create: "סליחה, הייתה שגיאה ביצירת ההודעה שלך. אנא נסה שנית." edit: "סליחה, הייתה שגיאה בעריכת ההודעה שלך. אנא נסה שנית." @@ -1080,6 +1209,7 @@ he: no_value: "לא, שמור אותה" yes_value: "כן, נטוש" via_email: "פרסום זה הגיע באמצעות דוא\"ל" + whisper: "פרסום זה הוא לחישה פרטית לצוות האתר" wiki: about: "פרסום זה הינו ויקי; משתמשים בסיסיים יכולים לערוך אותו" archetypes: @@ -1137,6 +1267,7 @@ he: notify_moderators: "{{icons}} הודיעו למנהלים" notify_moderators_with_url: "{{icons}} הודיעו למנהלים" notify_user: "{{icons}} שלח הודעה" + notify_user_with_url: "{{icons}} שלח הודעה" bookmark: "{{icons}} סימנו כמועדף" like: "{{icons}} נתנו לייק" vote: "{{icons}} הצביעו עבור זה" @@ -1162,6 +1293,9 @@ he: notify_moderators: one: "אתה ועוד אחד דגללתם את זה עבור ניהול" other: "את/ה ועוד {{count}} אנשים אחרים סמנתם את זה לניהול" + notify_user: + one: "אתה ו-1 נוסף שלחתם הודעה למשתמש הזה. " + other: "אתה ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה" bookmark: one: "אתה ועוד אחד סימנתם הודעה זו כמועדפת" other: "אתה ועוד {{count}} אנשים אחרים סימנתם הודעה זו כמועדפת" @@ -1212,6 +1346,7 @@ he: last: "מהדורה אחרונה" hide: "הסתרת שינויים" show: "הצגת שינויים" + comparing_previous_to_current_out_of_total: "{{קודם}} {{נוכחי}} / {כוללl}}" displays: inline: title: "הצג את הפלט עם תוספות והסרות בתוכו" @@ -1225,14 +1360,17 @@ he: category: can: 'יכול… ' none: '(ללא קטגוריה)' + all: 'כל הקטגוריות' choose: 'בחר קטגוריה…' edit: 'ערוך' edit_long: "עריכה" view: 'הצג נושאים בקטגוריה' general: 'כללי' settings: 'הגדרות' + topic_template: "תבנית נושא" delete: 'מחק קטגוריה' create: 'קטגוריה חדשה' + create_long: 'צור קטגוריה חדשה' save: 'שמור קטגוריה' slug: 'כתובת חלזונית לקטגוריה' slug_placeholder: '(אופציונאלי) מלים-מחוברות-במקפים-לכתובת-URL' @@ -1255,6 +1393,7 @@ he: change_in_category_topic: "ערוך תיאור" already_used: 'הצבע הזה בשימוש על ידי קטגוריה אחרת' security: "אבטחה" + special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it." images: "תמונות" auto_close_label: "נעל נושאים אוטומטית אחרי:" auto_close_units: "שעות" @@ -1262,6 +1401,7 @@ he: email_in_allow_strangers: "קבלת דוא\"ל ממשתמשים אנונימיים ללא חשבונות במערכת הפורומים" email_in_disabled: "האפשרות פרסום נושאים חדשים דרך הדוא\"ל נוטרלה דרך הגדרות האתר. לאפשר פרסום באמצעות משלוח דוא\"ל." email_in_disabled_click: 'אפשרו את את ההגדרה "דוא"ל נכנס"' + suppress_from_homepage: "הרחק קטגוריה זו מהעמוד הראשי" allow_badges_label: "הרשו לתגים (badges) להיות מוענקים בקטגוריה זו" edit_permissions: "ערוך הרשאות" add_permission: "הוסף הרשאה" @@ -1273,14 +1413,14 @@ he: parent: "קטגורית אם" notifications: watching: - title: "צופה" - description: "תצפו באופן אוטומטי בכל הנושאים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ונושא חדש, ובנוסף, סך הפרסומים החדשים ושלא נקראו יופיעו לצד הנושא." - tracking: title: "עוקב" - description: "תעקבו באופן אוטומטי אחרי כל הנושאים החדשים בקטגוריות אלה. סך הפרסומים החדשים ושלא נקראו יופיעו לצד הנושא." + description: "תעקבו באופן אוטומטי אחרי כל הנושאים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ונושא חדש." + tracking: + title: "רגיל+" + description: "בקטגוריות אלה סך הפרסומים החדשים שלא נקראו יופיע לצד שם הנושא." regular: title: "רגיל" - description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלכם או ישיב לפרסום שלך." + description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." muted: title: "מושתק" description: "לא תקבל התראות בנוגע לנושאים חדשים בקטגוריות האלה, והם לא יופיעו בלשונית ה\"לא נקראו\" שלך." @@ -1289,6 +1429,7 @@ he: private_reminder: 'דגלים הם פרטיים וניתנים לצפייה ע"י הצוות בלבד' action: 'סימון פרסום' take_action: "בצע פעולה" + notify_action: 'הודעה' delete_spammer: "מחק ספאמר" delete_confirm: "אתה עומד למחוק %{posts} הודעות ו-%{topics} נושאים של המשתמש הזה, להסיר את החשבון שלהם, לחסור הרשמה מכתובת ה-IP שלהם %{ip_address}, ולהוסיף את כתובת הדואר האלקטרוני %{email} לרשימה שחורה. אתה בטוח שזה באמת ספאמר?" yes_delete_spammer: "כן, מחק ספאמר" @@ -1310,8 +1451,11 @@ he: flagging_topic: title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!" action: "סימון נושא" + notify_action: "הודעה" topic_map: title: "סיכום נושא" + participants_title: "מפרסמים מתמידים" + links_title: "לינקים פופלארים" links_shown: "הצג את כל הקישורים {{totalLinks}}..." clicks: one: "לחיצה אחת" @@ -1323,6 +1467,10 @@ he: help: "יצרת סימניה לנושא זה" locked: help: "הנושא הזה נעול, הוא לא מקבל יותר תגובות חדשות" + archived: + help: "הנושא הזה אוכסן בארכיון; הוא הוקפא ולא ניתן לשנותו" + locked_and_archived: + help: "הנושא הזה סגור ומאורכב. לא ניתן להגיב בו יותר או לשנות אותו. " unpinned: title: "הורד מנעיצה" help: "נושא זה אינו מקובע עבורך; הוא יופיע בסדר הרגיל" @@ -1332,8 +1480,6 @@ he: pinned: title: "נעוץ" help: "נושא זה מקובע עבורך, הוא יופיע בראש הקטגוריה" - archived: - help: "הנושא הזה אוכסן בארכיון; הוא הוקפא ולא ניתן לשנותו" invisible: help: "נושא זה מוסתר; הוא לא יוצג ברשימות הנושאים, וזמין רק באמצעות קישור ישיר." posts: "הודעות" @@ -1347,12 +1493,21 @@ he: אחר {}} original_post: "הודעה מקורית" views: "צפיות" + views_lowercase: + one: "צפיה" + other: "צפיות" replies: "תגובות" views_long: "הנושא הזה נצפה {{number}} פעמים" activity: "פעילות" likes: "לייקים" + likes_lowercase: + one: "לייקים" + other: "לייקים" likes_long: "יש {{number}} לייקים לנושא הזה" users: "משתמשים" + users_lowercase: + one: "משתמש" + other: "משתמשים" category_title: "קטגוריה" history: "היסטוריה" changed_by: "מאת {{author}}" @@ -1364,7 +1519,10 @@ he: with_topics: "%{filter} נושאים" with_category: "%{filter} %{category} נושאים" latest: - title: "מדוברים" + title: + zero: "פורסמו לאחרונה" + one: "פורסמו לאחרונה" + other: "({{count}}) פורסמו לאחרונה" help: "נושאים עם תגובות לאחרונה" hot: title: "חם" @@ -1372,6 +1530,9 @@ he: read: title: "נקרא" help: "נושאים שקראת, לפי סדר קריאתם" + search: + title: "חיפוש" + help: "חיפוש בכל הנושאים" categories: title: "קטגוריות" title_in: "קטגוריה - {{categoryName}}" @@ -1414,17 +1575,21 @@ he: title: "תמיד" yearly: title: "שנתי" + quarterly: + title: "רבעוני" monthly: title: "חודשי" weekly: title: "שבועי" daily: title: "יומי" - this_year: "השנה" - this_month: "החודש" - this_week: "השבוע" + all_time: "כל הזמנים" + this_year: "שנה" + this_quarter: "רבע" + this_month: "חודש" + this_week: "שבוע" today: "היום" - other_periods: "ראו עוד נושאים מובילים." + other_periods: "ראה חלק עליון" browser_update: 'למרבה הצער, הדפדפן שלכם זקן מידי מכדי לעבוד באתר זה.. אנא שדרגו את הדפדפן שלכם.' permission_types: full: "צרו / תגובה/ צפייה" @@ -1456,6 +1621,9 @@ he: admins: 'מנהלים ראשיים:' blocked: 'חסומים:' suspended: 'מושעים:' + private_messages_short: "הודעות" + private_messages_title: "הודעות" + mobile_title: "סלולר" space_free: "{{size}} חופשיים" uploads: "העלאות" backups: "גיבויים" @@ -1489,6 +1657,7 @@ he: agree_title: "אישור סימון זה כתקין ונכון" agree_flag_modal_title: "הסכמה ו..." agree_flag_hide_post: "קבחה (הסתרת פרסום + שליחת מסר פרטי)" + agree_flag_hide_post_title: "הסתרת הודעה זו ושליחה אוטומטית של הודעה פרטית למשתמש/ת שמאיצה בהם לערוך אותה" agree_flag_restore_post: "הסכמה (שחזור הפרסום)" agree_flag_restore_post_title: "שחזור פרסום זה" agree_flag: "הסכמה עם הסימון" @@ -1560,8 +1729,12 @@ he: name: "שם" add: "הוספה" add_members: "הוספת חברים וחברות" + custom: "מותאם" + automatic: "אוטומטי" automatic_membership_email_domains: "משתמשים אשר נרשמים עם מארח דוא\"ל שתואם בדיוק לאחד מהרשימה, יוספו באופן אוטומטי לקבוצה זו:" automatic_membership_retroactive: "החלת כלל מארח דוא\"ל זהה כדי להוסיף משתמשים רשומים" + default_title: "ברירת המחדל לכל המשתמשים בקבוצה זו" + primary_group: "קבע כקבוצה ראשית באופן אוטומטי" api: generate_master: "ייצר מפתח מאסטר ל-API" none: "אין מפתחות API פעילים כרגע." @@ -1582,7 +1755,11 @@ he: name: "שם" none_installed: "אין לך הרחבות מותקנות" version: "גרסה" + enabled: "מאופשר?" + is_enabled: "Y" + not_enabled: "N" change_settings: "שינוי הגדרות" + change_settings_short: "הגדרות" howto: "איך אני מתקין/מתקינה הרחבות?" backups: title: "גיבויים" @@ -1605,6 +1782,7 @@ he: size: "גודל" upload: label: "העלה" + title: "טען גיבוי לinstance הזה" uploading: "מעלה..." success: "'{{filename}}' הועלה בהצלחה." error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}" @@ -1632,10 +1810,12 @@ he: title: "שחזר את הגיבוי" confirm: "אתה בטוח שברצונך לשחזר את הגיבוי הזה?" rollback: + label: "חזור לאחור" title: "הזחר את מסד הנתונים למצב עבודה קודם" confirm: "אתה בטוח שברצונך להחזיר את מסד הנתונים למצב עבודה קודם?" export_csv: user_archive_confirm: "האם את/ה בטוח/ה שאתם רוצים להוריד את הפרסומים שלכם?" + success: "יצוא החל, תקבלו הודעה כשהתהליך יסתיים" failed: "הייצוא נכשל. אנא בדקו ברישומי הלוג." rate_limit_error: "ניתן להוריד פרסומים פעם ביום, אנא נסו שוב מחר." button_text: "ייצוא" @@ -1645,6 +1825,8 @@ he: screened_email: "יצוא רשימת דוא\"ל מלאה בפורמט CSV" screened_ip: "יצוא רשימת IP מלאה בפורמט CSV" screened_url: "יצוא רשימת URL מלאה בפורמט CSV" + export_json: + button_text: "ייצוא" invite: button_text: "משלוח הזמנות" button_title: "משלוח הזמנות" @@ -1655,6 +1837,7 @@ he: header: "כותרת" top: "למעלה" footer: "כותרת תחתית" + embedded_css: "Embedded CSS" head_tag: text: "" title: "קוד HTML שיוכנס לפני התגית " @@ -1672,6 +1855,8 @@ he: save: "שמור" new: "חדש" new_style: "סגנון חדש" + import: "יבוא" + import_title: "בחר קובץ או הדביקו טקסט" delete: "מחק" delete_confirm: "מחק את ההתאמה הזו?" about: "שינוי סגנונות CSS וכותרות HTML באתר. הוספת התאמות כדי להתחיל לערוך." @@ -1744,7 +1929,7 @@ he: sent_test: "נשלח!" delivery_method: "שיטת העברה" preview_digest: "תצוגה מקדימה של סיכום" - preview_digest_desc: "צפה בתקציר השבועי הנשלח בדואר אלקטרוני למשתמשים לא פעילים." + preview_digest_desc: "תצוגה מקדימה של מייל סיכום שנשלח למשתמשים לא פעילים. " refresh: "רענן" format: "פורמט" html: "html" @@ -1809,6 +1994,7 @@ he: delete_post: "מחיקת פרסום" impersonate: "התחזה" anonymize_user: "הפיכת משתמש/ת לאנונימיים" + roll_up: "roll up IP blocks" screened_emails: title: "הודעות דואר מסוננות" description: "כשמישהו מנסה ליצור חשבון חדש, כתובות הדואר האלקטרוני הבאות ייבדקו וההרשמה תחסם או שיבוצו פעולות אחרות." @@ -1844,6 +2030,8 @@ he: impersonate: title: "התחזות" help: "השתמשו בכלי כזה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו." + not_found: "לא ניתן למצוא את המשתמש הזה." + invalid: "סליחה, אך אינך מורשה להתחזות למשתמש הזה." users: title: 'משתמשים' create: 'הוסף מנהל' @@ -2028,6 +2216,7 @@ he: delete: "מחיקה" cancel: "ביטול" delete_confirm: "האם את/ה בטוחים שאתם רוצים למחוק את שדה משתמש/ת הזה?" + options: "אפשרויות" required: title: "נדרש בעת הרשמה?" enabled: "נדרש" @@ -2043,6 +2232,7 @@ he: field_types: text: 'שדה טקסט' confirm: 'אישור' + dropdown: "נגלל" site_text: none: "בחרו את סוג התוכן לתחילת עריכה." title: 'תוכן טקסטואלי' @@ -2054,6 +2244,7 @@ he: no_results: "לא נמצאו תוצאות." clear_filter: "נקה" add_url: "הוספת כתובת URL" + add_host: "הוסיפו מארח" categories: all_results: 'הכל' required: 'נדרש' @@ -2075,6 +2266,7 @@ he: backups: "גיבויים" login: "התחברות" plugins: "הרחבות" + user_preferences: "הגדרות משתמש" badges: title: תגים new_badge: תג חדש @@ -2148,6 +2340,44 @@ he: name: "שם" image: "תמונה" delete_confirm: "האם את/ה בטוח/ה שאתם רוצים למחוק את האמוג'י :%{name}:?" + embedding: + get_started: "אם ברצונך לשלב את דיסקורס באתר אחר, התחל בהוספת המערך שלו (host). " + confirm_delete: "האם אתה בטוח שאתה רוצה למחוק את הhost הזה? " + sample: "השתמש בקוד HTML הבא באתר שלך על מנת ליצור נושאי דיסקורס משולבים. החלף REPLACE_ME בURL הקאנוני של העמוד שבו אתה מכניס נושא מכונן. " + title: "שילוב (embedding)" + host: "מארחים הורשו" + edit: "ערוך" + category: "פרסם לקטגוריה" + add_host: "הוסיפו מארח" + settings: "הגדרות הטמעה" + feed_settings: "הגדרות פיד" + feed_description: "לספק פיד RSS/ATOM לאתרך יכול לשפר את היכולת של דיסקורס ליבא את התוכן שלך." + crawling_settings: "Crawler Settings" + crawling_description: "When Discourse creates topics for your posts, if no RSS/ATOM feed is present it will attempt to parse your content out of your HTML. Sometimes it can be challenging to extract your content, so we provide the ability to specify CSS rules to make extraction easier." + embed_by_username: "שם משתמש ליצירת נושא" + embed_post_limit: "מספר מקסימלי של פרסומים להטמעה." + embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד." + embed_truncate: "חיתוך הפרסומים המוטמעים." + embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע." + embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות." + feed_polling_enabled: "יבוא פרסומים דרך RSS/ATOM" + feed_polling_url: "URL of RSS/ATOM feed to crawl" + save: "שמור הגדרות הטמעה" + permalink: + title: "קישורים קבועים" + url: "כתובת" + topic_id: "מזהה לנושא" + topic_title: "נושא" + post_id: "מזהה לפרסום" + post_title: "הודעה" + category_id: "מזהה לקטגוריה" + category_title: "קטגוריה" + external_url: "ID חיצוני" + delete_confirm: אתה בטוח שברצונך למחוק את הלינק הקבוע? + form: + label: "חדש:" + add: "הוסף" + filter: "חפש (כתובת או כתובת חיצונית)" lightbox: download: "הורד" search_help: @@ -2156,11 +2386,15 @@ he: title: 'קיצורי מקלדת' jump_to: title: 'קפוץ ל' + home: 'g, h בית' latest: 'g, l Latest' new: 'g, n New' unread: 'g, u Unread' categories: 'g, c Categories' top: 'g, t Top' + bookmarks: 'סימניות g, b' + profile: 'g, p פרופיל' + messages: 'g, m הודעות' navigation: title: 'ניווט' jump: '# מעבר לפרסום #' @@ -2172,13 +2406,14 @@ he: title: 'יישום' create: 'c צור נושא חדש' notifications: 'n פתח התראות' - site_map_menu: '= פתיחת תפריט האתר' + hamburger_menu: '= פתח תפריט המבורגר' user_profile_menu: 'pפתיחת תפריט משתמש/ת' show_incoming_updated_topics: '. הצגת נושאים שעודכנו' search: '/ חיפוש' help: '? הצגת עזרת מקלדת' dismiss_new_posts: 'x, r שחרור הודעות/חדשות' dismiss_topics: 'x, t שחרור נושאים' + log_out: 'shift+z shift+z התנתק' actions: title: 'פעולות' bookmark_topic: 'f החלפת נושא סימניה' @@ -2282,6 +2517,15 @@ he: first_flag: name: סימון ראשון description: סימן/סימנה פרסום + promoter: + name: מקדם + description: הזמן משתמש + campaigner: + name: קמפיינר + description: הזמן 3 משתמשים בסיסים (דרגת אמון 1) + champion: + name: אלוף + description: הזמן 5 משתמשים (דרגת אמון 2) first_share: name: שיתוף ראשון description: שיתף/שיתפה פרסום @@ -2297,12 +2541,21 @@ he: reader: name: מקראה description: קראו כל פרסום בנושא עם יותר מ-100 פרסומים + popular_link: + name: לינק פופלארי + description: פרסם קישור חיצוני עם לפחות 50 לחיצות + hot_link: + name: קישור חם + description: פרסם קישור חיצוני עם לפחות 300 לחיצות + famous_link: + name: קישור מפורסם + description: פרסם קישור חיצוני עם לפחות 1000 לחיצות google_search: | -

      חפשו עם גוגל

      +

      חפש עם גוגל

      - - - - - + + + + +

      diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 349e5d8df3..b3a559e5d6 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -88,7 +88,6 @@ id: admin_title: "Admin" flags_title: "Flags" show_more: "show more" - show_help: "Bantuan" links: "Links" faq: "FAQ" guidelines: "Guidelines" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index cc7a8f3c59..0ddad6637a 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -8,6 +8,9 @@ it: js: number: + format: + separator: "," + delimiter: " '" human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ it: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM YYYY h:mm a" long_with_year_no_time: "D MMM YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM 'YY LT" long_date_without_year: "D MMM LT" long_date_with_year_without_time: "D MMM 'YY" @@ -82,6 +90,16 @@ it: x_days: one: "un giorno fa" other: "%{count} giorni fa" + later: + x_days: + one: "1 giorno dopo" + other: "%{count} giorni dopo" + x_months: + one: "1 mese dopo" + other: "%{count} mesi dopo" + x_years: + one: "1 anno dopo" + other: "%{count} anni dopo" share: topic: 'Condividi un link a questa conversazione' post: 'messaggio n°%{postNumber}' @@ -90,6 +108,25 @@ it: facebook: 'Condividi questo link su Facebook' google+: 'Condividi questo link su Google+' email: 'invia questo collegamento via email' + action_codes: + autoclosed: + enabled: 'chiuso %{when}' + disabled: 'aperto %{when}' + closed: + enabled: 'chiuso %{when}' + disabled: 'aperto %{when}' + archived: + enabled: 'archiviato %{when}' + disabled: 'dearchiviato %{when}' + pinned: + enabled: 'appuntato %{when}' + disabled: 'spuntato %{when}' + pinned_globally: + enabled: 'appuntato globalmente %{when}' + disabled: 'spuntato %{when}' + visible: + enabled: 'listato %{when}' + disabled: 'delistato %{when}' topic_admin_menu: "azioni amministrative sull'argomento" emails_are_disabled: "Tutte le email in uscita sono state disabilitate a livello globale da un amministratore. Non sarà inviata nessun tipo di notifica via email." edit: 'modifica titolo e categoria dell''argomento' @@ -105,7 +142,7 @@ it: admin_title: "Amministrazione" flags_title: "Segnalazioni" show_more: "Altro" - show_help: "aiuto" + show_help: "opzioni" links: "Link" links_lowercase: one: "collegamento" @@ -129,6 +166,7 @@ it: every_two_weeks: "bisettimanale" every_three_days: "ogni tre giorni" max_of_count: "massimo di {{count}}" + alternation: "o" character_count: one: "{{count}} carattere" other: "{{count}} caratteri" @@ -181,6 +219,7 @@ it: saved: "Salvato!" upload: "Carica" uploading: "In caricamento..." + uploading_filename: "Sto caricando {{filename}}..." uploaded: "Caricato!" enable: "Attiva" disable: "Disattiva" @@ -188,9 +227,9 @@ it: revert: "Ripristina" failed: "Fallito" switch_to_anon: "Modalità Anonima" - switch_from_anon: "Esci Modalità Anonima" banner: close: "Nascondi questo banner." + edit: "Modifica questo annuncio >>" choose_topic: none_found: "Nessun argomento trovato." title: @@ -208,7 +247,7 @@ it: view_pending: "vedi messaggi in attesa" has_pending_posts: one: "Questo argomento ha 1 messaggio in attesa di approvazione" - many: "Questo argomento ha {{count}} messaggi in attesa di approvazione" + other: "Questo argomento ha {{count}} messaggi in attesa di approvazione" confirm: "Salva Modifiche" delete_prompt: "Sei sicuro di voler eliminare %{username}? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'IP." approval: @@ -266,6 +305,9 @@ it: mods_and_admins: "Solo i moderatori e gli amministratori" members_mods_and_admins: "Solo i membri del gruppo, i moderatori e gli amministratori" everyone: "Tutti" + trust_levels: + title: "Livello di esperienza automaticamente assegnato ai membri quando vengono aggiunti:" + none: "Nessuno" user_action_groups: '1': "Mi piace - Assegnati" '2': "Mi piace - Ricevuti" @@ -285,6 +327,14 @@ it: all_subcategories: "tutte" no_subcategory: "nessuno" category: "Categoria" + reorder: + title: "Riordina Categorie" + title_long: "Riorganizza l'elenco di categorie" + fix_order: "Posizioni Fisse" + fix_order_tooltip: "Non tutte le categorie hanno un numero di posizionamento univoco, ciò potrebbe causare risultati inattesi." + save: "Salva Ordinamento" + apply_all: "Applica" + position: "Posizione" posts: "Messaggi" topics: "Argomenti" latest: "Più recenti" @@ -314,6 +364,8 @@ it: topics_entered: "argomenti creati" post_count: "n° messaggi" confirm_delete_other_accounts: "Sicuro di voler cancellare questi account?" + user_fields: + none: "(scegli un'opzione)" user: said: "{{username}}:" profile: "Profilo" @@ -325,14 +377,27 @@ it: private_messages: "Messaggi" activity_stream: "Attività" preferences: "Opzioni" + expand_profile: "Espandi" bookmarks: "Segnalibri" bio: "Su di me" invited_by: "Invitato Da" trust_level: "Livello Esperienza" notifications: "Notifiche" + desktop_notifications: + label: "Notifiche Desktop" + not_supported: "Spiacenti, le notifiche non sono supportate su questo browser." + perm_default: "Attiva Notifiche" + perm_denied_btn: "Permesso Negato" + perm_denied_expl: "Hai negato il permesso per le notifiche. Usa il browser per abilitare le notifiche, poi premi il bottone quando hai finito. (Per il desktop: l'icona più a sinistra sulla barra degli indirizzi. Mobile: 'Informazioni sul sito'.)" + disable: "Disabilita Notifiche" + currently_enabled: "(attualmente attivate)" + enable: "Abilita Notifiche" + currently_disabled: "(attualmente disabilitate)" + each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi." dismiss_notifications: "Imposta tutti come Letti" dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette " disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta" + dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser" edit_history_public: "Consenti agli altri utenti di visualizzare le mie revisioni ai messaggi" external_links_in_new_tab: "Apri tutti i link esterni in nuove schede" enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato" @@ -341,14 +406,15 @@ it: admin: "{{user}} è un amministratore" moderator_tooltip: "Questo utente è un moderatore" admin_tooltip: "Questo utente è un amministratore" + blocked_tooltip: "Questo utente è bloccato" suspended_notice: "Questo utente è sospeso fino al {{date}}." suspended_reason: "Motivo: " github_profile: "Github" mailing_list_mode: "Inviami una email per ogni nuovo messaggio (a meno che io non ignori l'argomento o la categoria)" watched_categories: "Osservate" - watched_categories_instructions: "Osserverai automaticamente tutti i nuovi argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti. Inoltre, accanto all'elenco degli argomenti apparirà il conteggio dei messaggi non letti e di quelli nuovi." + watched_categories_instructions: "Osserverai automaticamente tutti i nuovi argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti e, accanto all'argomento, apparirà il conteggio dei nuovi messaggi." tracked_categories: "Seguite" - tracked_categories_instructions: "Seguirai automaticamente tutti i nuovi argomenti appartenenti a queste categorie. Di fianco all'argomento comparirà il conteggio dei messaggi nuovi e non letti." + tracked_categories_instructions: "Seguirai automaticamente tutti i nuovi argomenti appartenenti a queste categorie. Di fianco all'argomento comparirà il conteggio dei nuovi messaggi." muted_categories: "Silenziate" muted_categories_instructions: "Non ti verrà notificato nulla sui nuovi argomenti in queste categorie, e non compariranno nel tab dei non letti." delete_account: "Cancella il mio account" @@ -378,6 +444,7 @@ it: set_password: "Imposta Password" change_about: title: "Modifica i dati personali" + error: "Si è verificato un errore nel cambio di questo valore." change_username: title: "Cambia Utente" confirm: "Se modifichi il tuo nome utente, non funzioneranno più le precedenti citazioni ai tuoi messaggi e le menzioni @nome. Sei sicuro di volerlo fare?" @@ -392,6 +459,7 @@ it: change_avatar: title: "Cambia l'immagine del tuo profilo" gravatar: "Gravatar, basato su" + gravatar_title: "Cambia il tuo avatar sul sito Gravatar" refresh_gravatar_title: "Ricarica il tuo Gravatar" letter_based: "Immagine del profilo assegnata dal sistema" uploaded_avatar: "Immagine personalizzata" @@ -399,7 +467,7 @@ it: upload_title: "Carica la tua foto" upload_picture: "Carica Immagine" image_is_not_a_square: "Attenzione: abbiamo ritagliato l'immagine; la larghezza e l'altezza non erano uguali." - cache_notice: "Il tuo avatar è stato cambiato ma ci potrebbe volere un po' prima che appaia a causa della cache del browser." + cache_notice: "Hai cambiato correttamente la tua immagine di profilo ma potrebbe volerci un po' prima di vederla apparire a causa della cache del browser." change_profile_background: title: "Sfondo Profilo" instructions: "Gli sfondi del profilo saranno centrati e avranno per difetto un'ampiezza di 850px." @@ -459,38 +527,42 @@ it: every_two_weeks: "ogni due settimane" email_direct: "Inviami un'email quando qualcuno mi cita, risponde a un mio messaggio, menziona il mio @nome o mi invita ad un argomento" email_private_messages: "Inviami una email quando qualcuno mi scrive un messaggio" - email_always: "Non sospendere le notifiche via email anche quando sono attivo sul sito" + email_always: "Inviami notifiche via email anche quando sono collegato al sito" other_settings: "Altro" categories_settings: "Categorie" new_topic_duration: label: "Considera un argomento \"nuovo\" se" not_viewed: "non l'ho ancora letto" last_here: "è stato creato dopo la mia ultima visita" - after_n_days: - one: "è stato creato nell'ultimo giorno" - other: "è stato creato negli ultimi {{count}} giorni" - after_n_weeks: - one: "è stato creato nell'ultima settimana" - other: "è stato creato nelle ultime {{count}} settimane" + after_1_day: "creato nell'ultimo giorno" + after_2_days: "creato negli ultimi 2 giorni" + after_1_week: "creato nell'ultima settimana" + after_2_weeks: "creato nelle ultime 2 settimane" auto_track_topics: "Segui automaticamente gli argomenti che leggo" auto_track_options: never: "mai" immediately: "Immediatamente" - after_n_seconds: - one: "per un minuto" - other: "dopo {{count}} secondi" - after_n_minutes: - one: "per 1 minuto" - other: "dopo {{count}} minuti" + after_30_seconds: "dopo 30 secondi" + after_1_minute: "dopo 1 minuto" + after_2_minutes: "dopo 2 minuti" + after_3_minutes: "dopo 3 minuti" + after_4_minutes: "dopo 4 minuti" + after_5_minutes: "dopo 5 minuti" + after_10_minutes: "dopo 10 minuti" invited: search: "digita per cercare inviti..." title: "Inviti" user: "Utente Invitato" - none: "Non hai ancora invitato nessuno qui." + sent: "Spedito" + none: "Non ci sono inviti in sospeso da visualizzare." truncated: "Mostro i primi {{count}} inviti." redeemed: "Inviti Accettati" + redeemed_tab: "Riscattato" + redeemed_tab_with_count: "Riscattato ({{count}})" redeemed_at: "Accettato" pending: "Inviti in sospeso" + pending_tab: "In sospeso" + pending_tab_with_count: "In sospeso ({{count}})" topics_entered: "Argomenti Letti" posts_read_count: "Messaggi Letti" expired: "L'invito è scaduto." @@ -502,6 +574,8 @@ it: days_visited: "Presenza (giorni)" account_age_days: "Età dell'utente in giorni" create: "Invia un Invito" + generate_link: "Copia il collegamento di invito" + generated_link_message: '

      Il link di invito è stato generato con successo!

      Il link sarà disponibile solo per l''email: %{invitedEmail}

      ' bulk_invite: none: "Non hai ancora invitato nessuno qui. Puoi inviare inviti individuali, o invitare un gruppo di persone caricando un file di invito di massa." text: "Invito di Massa da File" @@ -523,6 +597,7 @@ it: title: "Indirizzo IP di Registrazione" avatar: title: "Immagine Profilo" + header_title: "profilo, messaggi, segnalibri e preferenze" title: title: "Titolo" filters: @@ -616,6 +691,7 @@ it: email_placeholder: "email o nome utente" caps_lock_warning: "Il Blocco Maiuscole è attivo" error: "Errore sconosciuto" + rate_limit: "Per favore attendi prima di provare nuovamente ad accedere." blank_username_or_password: "Per favore inserisci la tua email o il tuo nome utente, e la password." reset_password: 'Azzera Password' logging_in: "Connessione in corso..." @@ -680,7 +756,7 @@ it: title_placeholder: "In breve, di cosa tratta questo argomento?" edit_reason_placeholder: "perché stai scrivendo?" show_edit_reason: "(aggiungi motivo della modifica)" - reply_placeholder: "Scrivi qui. Per formattare il testo usa Markdown, BBCode o HTML. Trascina o incolla una immagine per caricarla." + reply_placeholder: "Scrivi qui. Per formattare il testo usa Markdown, BBCode o HTML. Trascina o incolla le immagini." view_new_post: "Visualizza il tuo nuovo messaggio." saving: "Salvataggio..." saved: "Salvato!" @@ -741,8 +817,27 @@ it: moved_post: "

      {{username}} ha spostato {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Guadagnato '{{description}}'

      " + alt: + mentioned: "Menzionato da" + quoted: "Citato da" + replied: "Risposto" + posted: "Messaggio da" + edited: "Modifica il tuo messaggio da" + liked: "Ha assegnato un \"Mi piace\" al tuo messaggio" + private_message: "Messaggio privato da" + invited_to_private_message: "Invitato ad una conversazione privata da" + invited_to_topic: "Invitato ad un argomento da" + invitee_accepted: "Invito accettato da" + moved_post: "Il tuo messaggio è stato spostato da" + linked: "Collegamento al tuo messaggio" + granted_badge: "Targhetta assegnata" popup: mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}' + quoted: '{{username}} ti ha citato in "{{topic}}" - {{site_title}}' + replied: '{{username}} ti ha risposto in "{{topic}}" - {{site_title}}' + posted: '{{username}} ha pubblicato in "{{topic}}" - {{site_title}}' + private_message: '{{username}} ti ha inviato un messaggio privato in "{{topic}}" - {{site_title}}' + linked: '{{username}} ha aggiunto un collegamento a un tuo messaggio da "{{topic}}" - {{site_title}}' upload_selector: title: "Aggiungi un'immagine" title_with_attachments: "Aggiungi un'immagine o un file" @@ -750,15 +845,19 @@ it: from_the_web: "Dal web" remote_tip: "collegamento all'immagine" remote_tip_with_attachments: "collegamento ad un'immagine o a un file ({{authorized_extensions}})" - local_tip: "clicca per selezionare un'immagine dal tuo dispositivo" - local_tip_with_attachments: "clicca per selezionare un'immagine o un file dal tuo dispositivo ({{authorized_extensions}})" + local_tip: "seleziona immagini dal tuo dispositivo" + local_tip_with_attachments: "seleziona immagini o file dal tuo dispositivo ({{authorized_extensions}})" hint: "(puoi anche trascinarle nell'editor per caricarle)" - hint_for_supported_browsers: "(puoi anche trascinare o incollare immagini nell'editor per caricarle)" uploading: "In caricamento" + select_file: "Seleziona File" image_link: "collegamento a cui la tua immagine punterà" search: + select_all: "Seleziona Tutto" + clear_all: "Cancella Tutto" title: "cerca argomenti, messaggi, utenti o categorie" no_results: "Nessun risultato trovato." + no_more_results: "Nessun altro risultato trovato." + search_help: Cerca aiuto searching: "Ricerca in corso..." post_format: "#{{post_number}} da {{username}}" context: @@ -766,7 +865,8 @@ it: category: "Cerca nella categoria \"{{category}}\"" topic: "Cerca in questo argomento" private_messages: "Cerca messaggi" - site_map: "vai a un altro elenco di argomenti o categoria" + hamburger_menu: "vai ad un'altra lista di argomenti o categoria" + new_item: "nuovo" go_back: 'indietro' not_logged_in_user: 'pagina utente con riassunto delle attività correnti e delle impostazioni' current_user: 'vai alla pagina utente' @@ -815,6 +915,9 @@ it: bookmarks: "Non ci sono ulteriori argomenti nei segnalibri." search: "Non ci sono altri risultati di ricerca." topic: + unsubscribe: + stop_notifications: "Da ora riceverai meno notifiche su {{title}}" + change_notification_state: "Lo stato delle tue notifiche è" filter_to: "{{post_count}} suoi messaggi" create: 'Nuovo Argomento' create_long: 'Crea un nuovo Argomento' @@ -857,6 +960,7 @@ it: toggle_information: "commuta i dettagli dell'argomento" read_more_in_category: "Vuoi saperne di più? Leggi altri argomenti in {{catLink}} o {{latestLink}}." read_more: "Vuoi saperne di più? {{catLink}} o {{latestLink}}." + read_more_MF: "{ UNREAD, plural, =0 {} one { un argomento non letto } other { # argomenti non letti } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {} other{}} uno nuovo } other { {BOTH, select, true{e } false {} other{}} # nuovi } } oppure {CATEGORY, select, true {visualizza altri argomenti nella categoria \"{catLink}\"} false {{latestLink}} other {}}" browse_all_categories: Scorri tutte le categorie view_latest_topics: visualizza gli argomenti più recenti suggest_create_topic: Perché non crei un argomento? @@ -873,6 +977,7 @@ it: go_top: "alto" go_bottom: "basso" go: "vai" + jump_bottom: "salta all'ultimo messaggio" jump_bottom_with_number: "Passa al messaggio %{post_number}" total: totale messaggi current: messaggio corrente @@ -888,29 +993,29 @@ it: '2_4': 'Riceverai notifiche perché hai pubblicato una risposta a questo argomento.' '2_2': 'Riceverai notifiche perché stai seguendo questo argomento.' '2': 'Riceverai notifiche perché hai letto questo argomento.' - '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o risponde al tuo messaggio.' - '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o risponde al tuo messaggio.' + '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.' + '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.' '0_7': 'Stai ignorando tutte le notifiche di questa categoria.' '0_2': 'Stai ignorando tutte le notifiche di questo argomento.' '0': 'Stai ignorando tutte le notifiche di questo argomento.' watching_pm: title: "In osservazione" - description: "Riceverai una notifica per ogni nuova pubblicazione in questo messaggio. Accanto all'argomento comparirà anche un conteggio dei messaggi non letti e di quelli nuovi." + description: "Riceverai una notifica per ogni nuova risposta a questo messaggio, e comparirà un conteggio delle nuove risposte." watching: title: "In osservazione" - description: "Riceverai una notifica per ogni nuovo messaggio in questo argomento. Accanto all'argomento comparirà anche un conteggio dei messaggi non letti e di quelli nuovi." + description: "Riceverai una notifica per ogni nuova risposta in questo argomento, e comparirà un conteggio delle nuove risposte." tracking_pm: title: "Seguito" - description: "Vicino al messaggio apparirà il totale dei messaggi non letti e nuovi. Riceverai una notifica se qualcuno menziona il tuo @nome o risponde al tuo messaggio." + description: "Per questo messaggio apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." tracking: title: "Seguito" - description: "Accanto all'argomento comparirà il totale dei messaggi non letti e di quelli nuovi. Riceverai una notifica se qualcuno menziona il tuo @nome o risponde al tuo messaggio." + description: "Per questo argomento apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." regular: title: "Normale" - description: "Riceverai notifiche se qualcuno menziona il tuo @nome o risponde al tuo messaggio." + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." regular_pm: title: "Normale" - description: "Riceverai notifiche se qualcuno menziona il tuo @nome o risponde all'interno del messaggio." + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." muted_pm: title: "Silenziato" description: "Non ti verrà notificato nulla per questo messaggio." @@ -952,18 +1057,25 @@ it: success_message: 'Hai segnalato questo argomento con successo.' feature_topic: title: "Poni argomento in primo piano" - pin: "Fai apparire questo argomento in cima alla categoria {{categoryLink}}." + pin: "Metti questo argomento in cima alla categoria \"{{categoryLink}}\" fino al" + confirm_pin: "Hai già {{count}} argomenti puntati. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento in questa categoria?" unpin: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}}." + unpin_until: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}} o attendi fino al %{until}." pin_note: "Gli utenti possono spuntare gli argomenti individualmente per loro stessi." + pin_validation: "È richiesta una data per appuntare questo argomento" already_pinned: zero: "Non ci sono argomenti puntati in {{categoryLink}}." one: "Argomenti attualmente puntati in {{categoryLink}}: 1." other: "Argomenti attualmente puntati in {{categoryLink}}: {{count}}." - pin_globally: "Poni questo argomento in cima a tutti gli altri finché un membro dello staff non lo spunterà." + pin_globally: "Metti questo argomento in cima a tutte le liste di messaggi fino al" + confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?" unpin_globally: "Togli questo argomento dalla cima degli altri argomenti." + unpin_globally_until: "Rimuovi questo argomento dalla cima di tutte le liste di argomenti o attenti fino al %{until}." global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi." already_pinned_globally: zero: "Non ci sono argomenti puntati globalmente." + one: "Argomenti attualmente puntati globalmente: 1." + other: "Argomenti attualmente puntati globalmente: {{count}}." make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine." remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine." banner_note: "Gli utenti possono rimuovere lo striscione chiudendolo. Solo un argomento alla volta può diventare uno striscione." @@ -983,9 +1095,19 @@ it: group_name: "nome gruppo" invite_reply: title: 'Invita' + username_placeholder: "nome utente" action: 'Invia Invito' + help: 'invita altri su questo argomento via email o notifiche' to_forum: "Invieremo una breve email che permetterà al tuo amico di entrare subito cliccando un collegamento, senza bisogno di effettuare il collegamento." + sso_enabled: "Inserisci il nome utente della persona che vorresti invitare su questo argomento." + to_topic_blank: "Inserisci il nome utente o l'indirizzo email della persona che vorresti invitare su questo argomento." + to_topic_email: "Hai inserito un indirizzo email. Manderemo una email di invito che permettterà al tuo amico di rispondere subito a questo argomento." + to_topic_username: "Hai inserito un nome utente. Gli mandermo una notifica con un link per invitarlo su questo argomento." + to_username: "Inserisci il nome utente della persona che vorresti invitare. Gli manderemo una notifica con un link di invito a questo argomento." email_placeholder: 'nome@esempio.com' + success_email: "Abbiamo mandato un invito via email a {{emailOrUsername}}. Ti avvertiremo quando l'invito verrà riscattato. Controlla la sezione \"inviti\" sulla tua pagina utente per tracciare lo stato degli inviti." + success_username: "Abbiamo invitato l'utente a partecipare all'argomento." + error: "Spiacente, non siamo riusciti ad invitare questa persona. Forse è stata già invitata? (Gli inviti sono limitati)" login_reply: 'Collegati per Rispondere' filters: n_posts: @@ -1017,6 +1139,12 @@ it: one: "Seleziona il nuovo proprietario del messaggio di {{old_user}}." other: "Seleziona il nuovo proprietario dei {{count}} messaggi di {{old_user}}." instructions_warn: "Nota che ogni notifica circa questo messaggio non verrà trasferita al nuovo utente in modo retroattivo.
      Attenzione: al momento nessun dato messaggio-dipendente è stato trasferito al nuovo utente. Usare con cautela." + change_timestamp: + title: "Cambia Timestamp" + action: "cambia timestamp" + invalid_timestamp: "Il timestamp non può essere nel futuro." + error: "Errore durante la modifica del timestamp dell'argomento." + instructions: "Seleziona un nuovo timestamp per l'argomento. I messaggi nell'argomento saranno aggiornati senza modificare l'intervallo di tempo" multi_select: select: 'scegli' selected: 'selezionati ({{count}})' @@ -1029,8 +1157,10 @@ it: one: Hai selezionato 1 messaggio. other: Hai selezionato {{count}} messaggi. post: - reply_topic: "Rispondi a {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "rispondi citando" + edit: "Modifica in corso {{link}} {{replyAvatar}} {{username}}" edit_reason: "Motivo:" post_number: "messaggio {{number}}" last_edited_on: "ultima modifica al messaggio:" @@ -1043,11 +1173,24 @@ it: one: "(post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)" other: "(messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)" expand_collapse: "espandi/raggruppa" + gap: + one: "visualizza 1 riposta nascosta" + other: "visualizza {{count}} riposte nascoste" more_links: "{{count}} altri..." unread: "Messaggio non letto" has_replies: - one: "Risposta" - other: "Risposte" + one: "Una risposta" + other: "{{count}} risposte" + has_likes: + one: "Un \"Mi piace\"" + other: "{{count}} \"Mi piace\"" + has_likes_title: + one: "A una persona piace questo messaggio" + other: "A {{count}} persone piace questo messaggio" + has_likes_title_you: + zero: "Ti è piaciuto questo messaggio" + one: "A te e ad un'altra persona è piaciuto questo messaggio" + other: "A te e ad altre {{count}} persone è piaciuto questo messaggio" errors: create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo." edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo." @@ -1065,15 +1208,16 @@ it: no_value: "No, mantienilo" yes_value: "Si, abbandona" via_email: "questo messaggio è arrivato via email" + whisper: "questo messaggio è un sussurro privato per i moderatori" wiki: about: "questo messaggio è una guida; gli utenti base possono modificarla" archetypes: save: 'Opzioni di salvataggio' controls: reply: "inizia a comporre una risposta a questo messaggio" - like: "il messaggio mi piace" + like: "metti \"Mi piace\" al messaggio" has_liked: "ti è piaciuto questo messaggio" - undo_like: "rimuovi \"mi piace\"" + undo_like: "rimuovi il \"Mi piace\"" edit: "modifica questo messaggio" edit_anonymous: "Spiacente, effettua l'accesso per poter modificare questo messaggio." flag: "segnala privatamente questo post o invia una notifica privata" @@ -1105,14 +1249,14 @@ it: inappropriate: "Segnalalo anche tu" custom_flag: "Segnalalo anche tu" bookmark: "Aggiungi un segnalibro anche tu" - like: "Assegnagli un \"mi piace\" anche tu" + like: "Assegnagli un \"Mi piace\" anche tu" vote: "Votalo anche tu" undo: off_topic: "Rimuovi segnalazione" spam: "Rimuovi segnalazione" inappropriate: "Rimuovi segnalazione" bookmark: "Annulla segnalibro" - like: "Annulla il \"mi piace\"" + like: "Annulla il \"Mi piace\"" vote: "Rimuovi voto" people: off_topic: "{{icons}} l'hanno segnalato come fuori tema" @@ -1121,6 +1265,8 @@ it: inappropriate: "{{icons}} l'hanno segnalato come inappropriato" notify_moderators: "{{icons}} hanno informato i moderatori" notify_moderators_with_url: "{{icons}} hanno informato i moderatori" + notify_user: "{{icons}} ha inviato un messaggio" + notify_user_with_url: "{{icons}} ha inviato un messaggio" bookmark: "{{icons}} l'hanno inserito nei segnalibri" like: "A {{icons}} è piaciuto" vote: "{{icons}} l'hanno votato" @@ -1199,6 +1345,7 @@ it: last: "Ultima revisione" hide: "Nascondi revisione" show: "Mostra revisione" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Mostra il risultato con le aggiunte e le rimozioni in linea" @@ -1212,14 +1359,17 @@ it: category: can: 'può…' none: '(nessuna categoria)' + all: 'Tutte le categorie' choose: 'Seleziona una categoria…' edit: 'modifica' edit_long: "Modifica" view: 'Visualizza Argomenti della Categoria' general: 'Generale' settings: 'Impostazioni' + topic_template: "Modello di argomento" delete: 'Elimina Categoria' create: 'Crea Categoria' + create_long: 'Crea una nuova categoria' save: 'Salva Categoria' slug: 'Abbreviazione di categoria' slug_placeholder: '(Facoltativo) parole-sillabate per URL' @@ -1249,6 +1399,7 @@ it: email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account" email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email," email_in_disabled_click: 'abilita l''impostazione "email entrante".' + suppress_from_homepage: "Elimina questa categoria dalla homepage" allow_badges_label: "Permetti che le targhette vengano assegnate in questa categoria" edit_permissions: "Modifica Permessi" add_permission: "Aggiungi Permesso" @@ -1261,13 +1412,13 @@ it: notifications: watching: title: "In osservazione" - description: "Osserverai automaticamente tutti i nuovi argomenti appartenenti a queste categorie. Verrai avvisato di tutti i nuovi messaggi ed argomenti. Inoltre, accanto all'argomento apparirà il conteggio dei messaggi non letti e di quelli nuovi." + description: "Osserverai automaticamente tutti i nuovi argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti e per tali argomenti apparirà il conteggio delle nuove risposte." tracking: title: "Seguendo" - description: "Seguirai automaticamente tutti i nuovi argomenti appartenenti a queste categorie. Di fianco all'argomento comparirà il conteggio dei messaggi nuovi e non letti." + description: "Seguirai automaticamente tutti i nuovi argomenti in queste categorie. Per tali argomenti apparirà un conteggio delle nuove risposte." regular: title: "Normale" - description: "Riceverai notifiche se qualcuno menziona il tuo @nome o risponde al messaggio." + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." muted: title: "Silenziato" description: "Non ti verrà notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nella tua tab dei non letti." @@ -1301,6 +1452,8 @@ it: notify_action: "Messaggio" topic_map: title: "Riassunto Argomento" + participants_title: "Autori Assidui" + links_title: "Collegamenti Di Successo" links_shown: "mostra tutti i {{totalLinks}} collegamenti..." clicks: one: "1 click" @@ -1312,6 +1465,10 @@ it: help: "Hai aggiunto questo argomento ai segnalibri" locked: help: "Questo argomento è chiuso; non sono ammesse nuove risposte" + archived: + help: "Questo argomento è archiviato; è bloccato e non può essere modificato" + locked_and_archived: + help: "Questo argomento è chiuso e archiviato; non sono ammesse nuove risposte e non può essere modificato" unpinned: title: "Spuntato" help: "Questo argomento è per te spuntato; verrà mostrato con l'ordinamento di default" @@ -1321,8 +1478,6 @@ it: pinned: title: "Appuntato" help: "Questo argomento è per te appuntato; verrà mostrato con l'ordinamento di default" - archived: - help: "Questo argomento è archiviato; è bloccato e non può essere modificato" invisible: help: "Questo argomento è invisibile; non verrà mostrato nella liste di argomenti ed è possibile accedervi solo tramite collegamento diretto" posts: "Messaggi" @@ -1358,7 +1513,10 @@ it: with_topics: "%{filter} argomenti" with_category: "%{filter} %{category} argomenti" latest: - title: "Più recenti" + title: + zero: "Ultimi" + one: "Ultimo (1)" + other: "Ultimi ({{count}})" help: "argomenti con messaggi recenti" hot: title: "Caldo" @@ -1411,6 +1569,8 @@ it: title: "Tutti" yearly: title: "Annuale" + quarterly: + title: "Trimestrale" monthly: title: "Mensile" weekly: @@ -1418,11 +1578,12 @@ it: daily: title: "Giornaliero" all_time: "Tutti" - this_year: "Quest'anno" - this_month: "Questo mese" - this_week: "Questa settimana" + this_year: "Anno" + this_quarter: "Trimestre" + this_month: "Mese" + this_week: "Settimana" today: "Oggi" - other_periods: "vedi altri argomenti di punta" + other_periods: "vedi argomenti di punta" browser_update: 'Purtroppo il tuo browser è troppo vecchio per funzionare su questo forum. Per favore aggiorna il browser.' permission_types: full: "Crea / Rispondi / Visualizza" @@ -1456,6 +1617,7 @@ it: suspended: 'Sospesi: ' private_messages_short: "MP" private_messages_title: "Messaggi" + mobile_title: "Mobile" space_free: "{{size}} liberi" uploads: "caricamenti" backups: "backup" @@ -1565,6 +1727,8 @@ it: automatic: "Automatico" automatic_membership_email_domains: "Gli utenti che si registrano con un dominio email che corrisponde esattamente a uno presente in questa lista, saranno aggiunti automaticamente a questo gruppo:" automatic_membership_retroactive: "Applica la stessa regola sul dominio email per aggiungere utenti registrati esistenti" + default_title: "Titolo predefinito per tutti gli utenti di questo gruppo" + primary_group: "Imposta automaticamente un gruppo principale" api: generate_master: "Genera una Master API Key" none: "Non ci sono chiavi API attive al momento." @@ -1585,7 +1749,11 @@ it: name: "Nome" none_installed: "Non hai installato nessun plugin." version: "Versione" + enabled: "Abilitato?" + is_enabled: "S" + not_enabled: "N" change_settings: "Cambia Impostazioni" + change_settings_short: "Impostazioni" howto: "Come installo i plugin?" backups: title: "Backup" @@ -1651,6 +1819,8 @@ it: screened_email: "Esporta tutta la lista delle email schermate in formato CSV." screened_ip: "Esporta tutta la lista degli IP schermati in formato CSV." screened_url: "Esporta tutta la lista degli URL schermati in formato CSV." + export_json: + button_text: "Esportare" invite: button_text: "Manda Inviti" button_title: "Manda Inviti" @@ -1661,6 +1831,7 @@ it: header: "Intestazione" top: "Alto" footer: "Fondo pagina" + embedded_css: "CSS inclusi" head_tag: text: "" title: "HTML da inserire prima del tag " @@ -1678,6 +1849,8 @@ it: save: "Salva" new: "Nuovo" new_style: "Nuovo Stile" + import: "Importare" + import_title: "Seleziona un file o incolla del testo" delete: "Cancella" delete_confirm: "Cancella questa personalizzazione?" about: "Modifica i fogli di stile CSS e le intestazioni HTML del sito. Aggiungi una personalizzazione per iniziare." @@ -1726,8 +1899,8 @@ it: name: 'successo' description: 'Utilizzato per indicare che un''azione è stata completata con successo.' love: - name: 'mi piace' - description: "Il colore del bottone \"mi piace\"." + name: 'amo' + description: "Il colore del bottone \"Mi piace\"." wiki: name: 'wiki' description: "Colore base usato per lo sfondo dei messaggi wiki." @@ -1750,7 +1923,6 @@ it: sent_test: "inviata!" delivery_method: "Metodo di consegna" preview_digest: "Anteprima Riassunto" - preview_digest_desc: "Vedi in anteprima il contenuto delle email di riassunto inviate agli utenti inattivi." refresh: "Aggiorna" format: "Formato" html: "html" @@ -1815,6 +1987,7 @@ it: delete_post: "cancella messaggio" impersonate: "impersona" anonymize_user: "rendi anonimo l'utente " + roll_up: "inibisci blocchi di indirizzi IP" screened_emails: title: "Email Scansionate" description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione." @@ -1850,6 +2023,8 @@ it: impersonate: title: "Impersona" help: "Usa questo strumento per impersonare un account utente ai fini del debugging. Una volta finito dovrai scollegarti." + not_found: "Impossibile trovare questo utente." + invalid: "Spiacenti, non puoi impersonare questo utente." users: title: 'Utenti' create: 'Aggiungi Utente Amministratore' @@ -1857,7 +2032,7 @@ it: not_found: "Spiacenti, questo nome utente non esiste nel sistema." id_not_found: "Spiacenti, nel nostro sistema non esiste questo id utente." active: "Attivo" - show_emails: "Mostre Email" + show_emails: "Mostra email" nav: new: "Nuovi" active: "Attivi" @@ -2034,6 +2209,7 @@ it: delete: "Cancella" cancel: "Annulla" delete_confirm: "Sicuro di voler cancellare il campo utente?" + options: "Opzioni" required: title: "Richiesto durante la registrazione?" enabled: "richiesto" @@ -2049,6 +2225,7 @@ it: field_types: text: 'Campo Testo' confirm: 'Conferma' + dropdown: "A tendina" site_text: none: "Scegli un tipo di contenuto per iniziare la modifica." title: 'Contenuto Testuale' @@ -2060,6 +2237,7 @@ it: no_results: "Nessun risultato trovato." clear_filter: "Pulisci" add_url: "aggiungi URL" + add_host: "aggiungi host" categories: all_results: 'Tutti' required: 'Obbligatorie' @@ -2081,6 +2259,7 @@ it: backups: "Backup" login: "Accesso" plugins: "Plugin" + user_preferences: "Preferenze utente" badges: title: Targhette new_badge: Nuova Targhetta @@ -2154,6 +2333,42 @@ it: name: "Nome" image: "Immagine" delete_confirm: "Sicuro di voler cancellare l'emoji :%{name}:?" + embedding: + get_started: "Se lo desideri, puoi incorporare Discourse in un altro sito web. Comincia aggiungo il suo nome host" + confirm_delete: "Sei sicuro di volere cancellare questo host?" + sample: "Utilizza il seguente codice HTML nel tuo sito per creare e incorporare gli argomenti di Discourse. Sostituisci REPLACE_ME con l'URL canonical della pagina in cui lo stai incorporando." + title: "Incorporamento" + host: "Host abilitati" + edit: "modifica" + add_host: "Aggiungi host" + settings: "Impostazioni di incorporamento" + feed_settings: "Impostazioni dei feed" + feed_description: "Aggiungendo un feed RSS/AROM al tuo sito, migliori l'importazione dei tuoi contenuti da parte di Discourse" + crawling_settings: "Impostazioni del crawler" + crawling_description: "Quando Discourse crea gli argomenti per i messaggi, se non è presente nessun feed RSS/ATOM, cercherà di estrarre il contenuto dal codice HTML. Il contenuto può risultate a volte ostico da estrarre e, per semplificare il processo, forniamo la possibilità di specificare le regole CSS." + embed_by_username: "Nome utente per la creazione dell'argomento" + embed_post_limit: "Numero massimo di messaggi da includere" + embed_truncate: "Abbrevia i messaggi incorporati" + embed_whitelist_selector: "Selettore CSS per gli elementi da includere negli embed" + embed_blacklist_selector: "Selettore CSS per gli elementi da rimuovere dagli embed" + feed_polling_enabled: "Importa gli articoli via RSS/ATOM" + feed_polling_url: "URL del feed RSS/ATOM da recuperare" + save: "Salva Impostazioni Inclusione" + permalink: + title: "Collegamenti permanenti" + url: "URL" + topic_id: "ID dell'argomento" + topic_title: "Argomento" + post_id: "ID del messaggio" + post_title: "Messaggio" + category_id: "ID della categoria" + category_title: "Categoria" + external_url: "URL esterna" + delete_confirm: Sei sicuro di voler cancellare questo collegamento permanente? + form: + label: "Nuovo:" + add: "Aggiungi" + filter: "Cerca (URL o URL esterna)" lightbox: download: "scaricamento" search_help: @@ -2162,11 +2377,15 @@ it: title: 'Scorciatoie da tastiera' jump_to: title: 'Vai A (G)' + home: 'g, h Home' latest: 'g, l Ultimi' new: 'g, n Nuovi' unread: 'g, u Non Letti' categories: 'g, c Categorie' top: 'g, t Alto' + bookmarks: 'g, b Segnalibri' + profile: 'g, p Profilo' + messages: 'g, m Messaggi' navigation: title: 'Navigazione' jump: '# Vai al messaggio numero' @@ -2178,13 +2397,14 @@ it: title: 'Applicazione' create: 'c Crea un nuovo argomento' notifications: 'n Apri le notifiche' - site_map_menu: '= Apri il menu sito' + hamburger_menu: '= Apri il menu hamburger' user_profile_menu: 'p Apri il menu del profilo utente' show_incoming_updated_topics: '. Mostra argomenti aggiornati' search: '/ Cerca' help: '? Apri l''aiuto per le scorciatoie da tastiera' dismiss_new_posts: 'x, r Chiudi Nuovo/Messaggi' dismiss_topics: 'x, t Chiudi Argomenti' + log_out: 'shift+z shift+z Esci' actions: title: 'Azioni' bookmark_topic: 'f Aggiungi/togli argomento nei segnalibri' @@ -2257,13 +2477,13 @@ it: description: Membro attivo da un anno, ha scritto almeno una volta nice_post: name: Buon Messaggio - description: Ricevuto 10 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 10 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte good_post: name: Ottimo Messaggio - description: Ricevuto 25 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 25 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte. great_post: name: Fantastico Messaggio - description: Ricevuto 50 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 50 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte. nice_topic: name: Argomento Buono description: Ricevuti 10 "Mi piace" per un argomento. Questa targhetta può essere assegnata più volte @@ -2288,6 +2508,15 @@ it: first_flag: name: Prima Segnalazione description: Segnalato un messaggio + promoter: + name: Promotore + description: Ha invitato un utente + campaigner: + name: Pubblicitario + description: Ha invitato 3 utenti Base (livello di esperienza 1) + champion: + name: Campione + description: Ha invitato 5 utenti Assiduo (livello di esperienza 2) first_share: name: Prima Condivisione description: Condiviso un messaggio @@ -2303,8 +2532,17 @@ it: reader: name: Lettore description: Letto tutti i messaggi in un argomento con più di 100 messaggi + popular_link: + name: Collegamento Popolare + description: Ha pubblicato un collegamento esterno con almeno 50 clic + hot_link: + name: Collegamento Caldo + description: Ha pubblicato un collegamento esterno con almeno 300 clic + famous_link: + name: Collegamento Famoso + description: Ha pubblicato un collegamento esterno con almeno 1000 clic google_search: | -

      Cerca con Google

      +

      Cerca con Google

      diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index b87d3a19d1..f4ed722ac7 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -8,22 +8,30 @@ ja: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' units: byte: - other: Bytes + other: バイト gb: GB kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -36,7 +44,7 @@ ja: x_seconds: other: "%{count} 秒" less_than_x_minutes: - other: "< １分" + other: "< %{count} 分" x_minutes: other: "%{count} 分" about_x_hours: @@ -66,6 +74,13 @@ ja: other: "%{count} 時間前" x_days: other: "%{count} 日前" + later: + x_days: + other: "%{count} 日後" + x_months: + other: "%{count} 月後" + x_years: + other: "%{count} 年後" share: topic: 'このトピックのリンクをシェアする' post: 'ポスト #%{postNumber}' @@ -89,7 +104,6 @@ ja: admin_title: "管理者" flags_title: "フラグ" show_more: "もっと見る" - show_help: "ヘルプ" links: "リンク" links_lowercase: other: "リンク集" @@ -112,6 +126,7 @@ ja: every_two_weeks: "隔週" every_three_days: "３日毎" max_of_count: "最大 {{count}}" + alternation: "または" character_count: other: "{{count}} 文字" suggested_topics: @@ -132,7 +147,7 @@ ja: user_count: "新規ユーザ" active_user_count: "アクティブユーザ" contact: "問い合わせ" - contact_info: "このサイトに影響を与える重要な問題や緊急の問題が発生した場合は、 ％{ contact_info }までご連絡ください" + contact_info: "このサイトに影響を与える重要な問題や緊急の問題が発生した場合は、 %{contact_info}までご連絡ください" bookmarked: title: "ブックマーク" clear_bookmarks: "ブックマークをクリア" @@ -147,11 +162,11 @@ ja: remove: "ブックマークを削除" confirm_clear: "このトピックの全てのブックマークを削除してもよいですか？" topic_count_latest: - other: "{{count}} 個新しいトピック" + other: "{{count}} 個の新規または更新されたトピック。" topic_count_unread: - other: "{{count}} 未読トピック" + other: "{{count}} 個の未読トピック。" topic_count_new: - other: "{{count}} 新しいトピック" + other: "{{count}} 個の新規トピック。" click_to_show: "クリックして表示" preview: "プレビュー" cancel: "キャンセル" @@ -161,17 +176,17 @@ ja: upload: "アップロード" uploading: "アップロード中..." uploaded: "アップロードしました" - enable: "有効する" - disable: "無効する" + enable: "有効にする" + disable: "無効にする" undo: "取り消す" revert: "戻す" failed: "失敗" switch_to_anon: "匿名モード" - switch_from_anon: "匿名モード停止" banner: - close: "バナーを閉じる" + close: "バナーを閉じる。" + edit: "このバナーを編集 >>" choose_topic: - none_found: "トピックが見つかりませんでした" + none_found: "トピックが見つかりませんでした。" title: search: "トピック名、URL、または ID でトピックを検索:" placeholder: "ここにトピックのタイトルを入力" @@ -181,17 +196,19 @@ ja: reject: 'リジェクト' delete_user: '削除されたユーザ' title: "承認待ち" - none: "レビュー待ちの投稿はございません。" + none: "レビュー待ちの投稿はありません。" edit: "編集" - cancel: "取り消し" + cancel: "キャンセル" view_pending: "保留とされている投稿を閲覧する" has_pending_posts: - one: "このトピックは1個の投稿が承認待ちです。" - many: "このトピックは{{count}}個の投稿が承認待ちです。" + other: "このトピックは{{count}}個の投稿が承認待ちです" confirm: "変更を保存" + delete_prompt: "%{username}を本当に削除しますか？全ての投稿が削除されるのと同時にメールアドレスとIPアドレスがブロックされます。" approval: title: "この投稿は承認が必要" description: "投稿された新規のポストは受付されましたがモデレータによる承認が必要です。もう少々お待ち下さい。" + pending_posts: + other: "{{count}}個のポストが保留中です。" ok: "実行" user_action: user_posted_topic: "{{user}} が トピック を作成" @@ -234,7 +251,7 @@ ja: posts: "ポスト" alias_levels: title: "このグループを仮名として使えるユーザ" - nobody: "だれも" + nobody: "無し" only_admins: "管理者のみ" mods_and_admins: "管理者とモデレータのみ" members_mods_and_admins: "管理者、モデレータとグループメンバーのみ" @@ -266,10 +283,10 @@ ja: subcategories: "サブカテゴリ:" topic_stats: "新しいトピック数" topic_stat_sentence: - other: "過去 %{unit} 間 %{count}つ 新しいトピック。" - post_stats: "新しいトピック数：" + other: "過去 %{unit} 間 %{count} 個の新規トピック。" + post_stats: "新規トピック数：" post_stat_sentence: - other: "過去%{unit}間%{count}つ新しい投稿。" + other: "過去 %{unit} 間 %{count} 個の新しい投稿。" ip_lookup: title: IPアドレス検索 hostname: ホスト名 @@ -277,7 +294,7 @@ ja: location_not_found: （不明） organisation: 組織 phone: 電話 - other_accounts: "同じIDアドレスを持つアカウント" + other_accounts: "同じIPアドレスを持つアカウント" delete_other_accounts: "%{count} 件削除" username: "ユーザ名" trust_level: "トラストレベル" @@ -285,6 +302,8 @@ ja: topics_entered: "Topics Entered" post_count: "# ポスト" confirm_delete_other_accounts: "これらのアカウントを削除してよいですか？" + user_fields: + none: "(オプションを選択)" user: said: "{{username}}:" profile: "プロフィール" @@ -301,9 +320,21 @@ ja: invited_by: "招待者" trust_level: "トラストレベル" notifications: "通知" + desktop_notifications: + label: "デスクトップ通知" + not_supported: "申し訳ありません。そのブラウザは通知をサポートしていません。" + perm_default: "通知をONにする" + perm_denied_btn: "アクセス拒否" + perm_denied_expl: "通知へのアクセスを拒否されています。利用しているブラウザの通知を有効にし、完了したら、このボタンをクリックしてください。(デスクトップ: アドレスバーの左端のアイコン。 モバイル: \"サイト情報\")" + disable: "通知を無効にする" + currently_enabled: "(現在有効化されています)" + enable: "通知を有効化" + currently_disabled: "(現在無効化されています)" + each_browser_note: "注意: 利用するブラウザ全てでこの設定を変更する必要があります" dismiss_notifications: "全て既読にする" dismiss_notifications_tooltip: "全ての未読の通知を既読にします" disable_jump_reply: "返信したあとに投稿に移動しない" + dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する" edit_history_public: "投稿編集履歴を公開する" external_links_in_new_tab: "外部リンクを全て新しいタブで開く" enable_quoting: "ハイライトしたテキストを引用して回答する" @@ -312,14 +343,15 @@ ja: admin: "{{user}} は管理者です" moderator_tooltip: "このユーザはモデレータであり" admin_tooltip: "このユーザは管理者であり" + blocked_tooltip: "このユーザーはブロックされています" suspended_notice: "このユーザは {{date}} までサスペンド状態です。" suspended_reason: "理由: " github_profile: "Github" mailing_list_mode: "投稿される度にメールで通知を受け取る(ミュートにしたトピック、カテゴリー以外)" watched_categories: "参加中" - watched_categories_instructions: "このカテゴリに新しく投稿されたトピックを自動的に参加します。このカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" + watched_categories_instructions: "これらのカテゴリに新しく投稿されたトピックを自動的に参加します。これらのカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" tracked_categories: "トラック中" - tracked_categories_instructions: "このカテゴリに新しく投稿されたトピックを自動的にトラックします。このカテゴリに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" + tracked_categories_instructions: "これらのカテゴリの新規トピックを自動的にトラックします。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" muted_categories: "ミュート中" muted_categories_instructions: "このカテゴリに投稿されたトピックについての通知を受け取りません。また、未読タブにも通知されません。" delete_account: "アカウントを削除する" @@ -330,11 +362,12 @@ ja: admin_delete: "削除" users: "ユーザ" muted_users: "ミュート" - muted_users_instructions: "これらのユーザからの全ての通知を抑制します" + muted_users_instructions: "これらのユーザからの全ての通知を抑制します。" staff_counters: flags_given: "役に立ったフラグ" flagged_posts: "フラグを立てたポスト" deleted_posts: "削除したポスト" + suspensions: "停止中" warnings_received: "注意" messages: all: "すべて" @@ -345,9 +378,10 @@ ja: in_progress: "(メールを送信中)" error: "(エラー)" action: "パスワードリセット用メールを送信する" - set_password: "パースワードを設定する" + set_password: "パスワードを設定する" change_about: title: "自己紹介の変更" + error: "値変更中にエラーが発生しました。" change_username: title: "ユーザ名の変更" confirm: "ユーザ名を変更すると、あなたのポストの引用と @ユーザ名でタグ付けされたリンクが解除されます。本当にユーザ名を変更しますか？" @@ -361,6 +395,8 @@ ja: success: "このアドレスにメールを送信しました。メールの指示に従って確認処理を行ってください。" change_avatar: title: "プロフィール画像を変更" + gravatar: "Gravatarから取得、基準は" + gravatar_title: "ウェブサイトのアバターを変更" refresh_gravatar_title: "グラバターを更新する" letter_based: "システムプロフィール画像" uploaded_avatar: "カスタム画像" @@ -368,7 +404,7 @@ ja: upload_title: "画像をアップロード" upload_picture: "画像アップロード" image_is_not_a_square: "警告: アップロードされた画像はクロップされました。高さと幅が同じ長さではありませんでした。" - cache_notice: "プロフィール画像の変更は無事に完了されましたがブラウザのキャッシングによって反映されるまで少々時間が掛かる場合もあります。" + cache_notice: "プロフィール画像の更新に成功しました。ブラウザのキャッシュのため、反映されるまでに時間がかかる場合があります" change_profile_background: title: "プロフィール背景" instructions: "プロフィール背景は、幅850pxでセンタリングされます" @@ -380,11 +416,11 @@ ja: instructions: "外部に公開されることはありません" ok: "確認用メールを送信します" invalid: "正しいメールアドレスを入力してください" - authenticated: "あなたのメールアドレスは{{provider}}によって認証されています" + authenticated: "あなたのメールアドレスは {{provider}} によって認証されています" frequency: - zero: "読んでいないメールがあった場合、すぐにメールを送信します" + zero: "未読メールがあった場合、すぐにメールを送信します" one: "直前にページを閲覧していなかった場合だけメールを送信します" - other: "{{count}}分間ページを閲覧していなかった場合だけメールを送信します" + other: "{{count}} 分間ページを閲覧していなかった場合だけメールを送信します" name: title: "名前" instructions: "フルネーム(任意)" @@ -426,36 +462,29 @@ ja: every_three_days: "３日毎" weekly: "毎週" every_two_weeks: "２週間に１回" - email_direct: "投稿されたポストに対する回答があった場合または自分のユーザ名のメンションがあった場合または他ユーザより自分の名前がタグされた場合またはトピックへの招待があった場合、Eメールを送信して下さい。" + email_direct: "他ユーザから私がタグされた場合、または投稿したポストに返信があった場合、または私のユーザ名にメンションがあった場合、またはトピックへの招待があった場合、メールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" - email_always: "ログインしている際にメール通知を受け取る。" + email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" other_settings: "その他" categories_settings: "カテゴリ設定" new_topic_duration: label: "以下の条件でトピックを新規と見なす" not_viewed: "未読のもの" last_here: "前回ログアウト後に投稿されたもの" - after_n_days: - other: "過去{{count}}日間に投稿されたもの" - after_n_weeks: - other: "過去{{count}}週間に投稿されたもの" auto_track_topics: "自動でトピックをトラックする" auto_track_options: never: "トラックしない" immediately: "今すぐ" - after_n_seconds: - other: "{{count}} 秒後" - after_n_minutes: - other: "{{count}} 分後" invited: search: "招待履歴を検索するためにキーワードを入力してください..." title: "招待" user: "招待したユーザ" - none: "まだ招待を送っていません" truncated: "最初の {{count}} 個の招待履歴を表示しています。" redeemed: "受理された招待" + redeemed_tab: "受理" redeemed_at: "受理日" pending: "保留中の招待" + pending_tab: "保留中" topics_entered: "閲覧したトピック数" posts_read_count: "読んだポスト" expired: "この招待の有効期限が切れました。" @@ -488,6 +517,7 @@ ja: title: "登録したときのIPアドレス" avatar: title: "プロフィール画像" + header_title: "プロフィール、メッセージ、ブックマーク、設定" title: title: "タイトル" filters: @@ -503,13 +533,13 @@ ja: reasons: network: "ネットワークエラー" server: "サーバーエラー" - forbidden: "アクセスが許可されていません。" + forbidden: "アクセス拒否" unknown: "エラー" desc: network: "インターネット接続を確認してください。" network_fixed: "ネットワーク接続が回復しました。" server: "エラーコード : {{status}}" - forbidden: "閲覧する許可をされていません" + forbidden: "閲覧する権限がありません" unknown: "エラーが発生しました。" buttons: back: "戻る" @@ -520,6 +550,7 @@ ja: logout: "ログアウトしました" refresh: "Refresh" read_only_mode: + enabled: "読み取り専用モードが有効になっています。サイトをブラウズすることは引き続き出来ますが、機能は動作しません。" login_disabled: "読み取り専用モードにされています。ログインできません。" learn_more: "より詳しく..." year: '年' @@ -566,10 +597,10 @@ ja: action: "パスワードを忘れました" invite: "ユーザ名かメールアドレスを入力してください。パスワードリセット用のメールを送信します。" reset: "パスワードをリセット" - complete_username: "%{username},アカウントにパースワード再設定メールを送りました。" - complete_email: "%{email}にパースワード再設定メールを送りました。" - complete_username_found: "%{username},アカウントにパースワード再設定メールを送りました。" - complete_email_found: "%{email}にパースワード再設定メールを送りました。" + complete_username: "%{username},アカウントにパスワード再設定メールを送りました。" + complete_email: "%{email}にパスワード再設定メールを送りました。" + complete_username_found: "%{username},アカウントにパスワード再設定メールを送りました。" + complete_email_found: "%{email}にパスワード再設定メールを送りました。" complete_username_not_found: " %{username}のアカウントがありません" complete_email_not_found: "%{email}で登録したアカウントがありません。" login: @@ -579,7 +610,8 @@ ja: email_placeholder: "メールアドレスかユーザ名" caps_lock_warning: "Caps Lockがオンになっています。" error: "不明なエラー" - blank_username_or_password: "あなたのEメールアドレスかユーザ名、そしてパスワードを入力して下さい" + rate_limit: "しばらく待ってから再度ログインをお試しください。" + blank_username_or_password: "あなたのメールアドレスかユーザ名、そしてパスワードを入力して下さい。" reset_password: 'パスワードをリセット' logging_in: "ログイン中..." or: "または" @@ -629,6 +661,7 @@ ja: title_too_long: "タイトルは最長で{{max}}未満です。" post_missing: "ポスト内容が空です。" post_length: "ポストは{{min}}文字以上必要です。" + try_like: ' ボタンを試しましたか？' category_missing: "カテゴリを選択してください。" save_edit: "編集内容を保存" reply_original: "元のトピックに回答" @@ -639,7 +672,7 @@ ja: create_pm: "メッセージ" title: "またはCtrl+Enter" users_placeholder: "ユーザの追加" - title_placeholder: "このディスカッションを簡潔に説明してください。" + title_placeholder: "トピックのタイトルを入力してください。" edit_reason_placeholder: "編集する理由は何ですか?" show_edit_reason: "(編集理由を追加)" view_new_post: "新規ポストを見る。" @@ -703,8 +736,12 @@ ja: linked: "

      {{username}} {{description}}

      " granted_badge: "

      {{description}}バッジを付けられました

      " popup: - mentioned: '{{username}} があなたをタグ付けしました "{{topic}}" - {{site_title}}' + mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}' + quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}' + replied: '"{{topic}}"で{{username}}が回答しました - {{site_title}}' posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}' + private_message: '"{{topic}}"で{{username}}からプライベートメッセージが届きました - {{site_title}}' + linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}' upload_selector: title: "画像のアップロード" title_with_attachments: "画像/ファイルをアップロード" @@ -712,15 +749,17 @@ ja: from_the_web: "Web から" remote_tip: "画像へのリンク" remote_tip_with_attachments: "画像かファイルへのリンク ({{authorized_extensions}})" - local_tip: "クリックしてアップロードする画像を選択してください" - local_tip_with_attachments: "ローカルからの画像・ファイルを選択する場合はこちらをクリック ({{authorized_extensions}})" + local_tip: "ローカルからアップロードする画像を選択" + local_tip_with_attachments: "ローカルからアップロードする画像またはファイルを選択 ({{authorized_extensions}})" hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)" - hint_for_supported_browsers: "(アップロードする画像をエディタにドラッグ&ドロップまたは貼り付けることもできます)" uploading: "アップロード中" + select_file: "ファイル選択" image_link: "イメージのリンク先" search: title: "トピック、ポスト、ユーザ、カテゴリを探す" no_results: "何も見つかりませんでした。" + no_more_results: "これ以上結果が見つかりませんでした。" + search_help: 検索ヘルプ searching: "検索中..." post_format: "#{{post_number}} {{username}}から" context: @@ -728,7 +767,6 @@ ja: category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" private_messages: "メッセージ検索" - site_map: "別のトピックリストやカテゴリに移動" go_back: '戻る' not_logged_in_user: 'ユーザアクティビティと設定ページ' current_user: 'ユーザページに移動' @@ -812,6 +850,7 @@ ja: toggle_information: "トピック詳細をトグル" read_more_in_category: "{{catLink}} の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" + read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" browse_all_categories: 全てのカテゴリを閲覧する view_latest_topics: 最新のトピックを見る suggest_create_topic: 新しいトピックを作成しますか？ @@ -828,6 +867,7 @@ ja: go_top: "上" go_bottom: "下" go: "へ" + jump_bottom: "最後の投稿へ" jump_bottom_with_number: "投稿%{post_number}にジャンプ" total: ポスト総数 current: 現在のポスト @@ -850,22 +890,20 @@ ja: '0': 'このトピックに関して一切通知を受け取りません。' watching_pm: title: "参加中" - description: "未読件数と新しい投稿がトピックの横に表示されます。このメッセージに対して新しい投稿があった場合に通知されます。" + description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。" watching: title: "参加中" description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。" tracking_pm: title: "トラック中" - description: "未読件数と新しい投稿がメッセージの横に表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" + description: "新規回答件数がこのメッセージに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" tracking: title: "トラック中" - description: "未読件数と新しい投稿がプライベートメッセージされます。他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます" + description: "新規回答件数がこのトピックに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" regular: - title: "通常" - description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます" + description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" regular_pm: - title: "通常" - description: "他ユーザからタグ付けをされた場合、またはあなたのメッセージ内の投稿に回答が付いた場合に通知されます" + description: "他ユーザからタグ付けをされた場合、またはあなたのメッセージ内の投稿に回答が付いた場合に通知されます。" muted_pm: title: "ミュートされました" description: "このメッセージについての通知を受け取りません。" @@ -889,6 +927,9 @@ ja: feature: pin: "トピックをピンで留める。。。" unpin: "トピックをピンで留める。。。" + pin_globally: "トピックを全サイト的にピン留めする" + make_banner: "バナートピック" + remove_banner: "バナートピックを削除" reply: title: '回答' help: 'このトピックに回答する' @@ -904,15 +945,19 @@ ja: success_message: 'このトピックにフラグを立てました。' feature_topic: title: "トピックを特集" - pin: "このトピックを{{categoryLink}}カテゴリのトップに表示する" + pin: "{{categoryLink}} カテゴリのトップに表示する" confirm_pin: "既に {{count}} 個ピン留めしています。多すぎるピン留めは新規、及び匿名ユーザの負担になる場合があります。このカテゴリの別のトピックのピン留めを続けますか？" unpin: "{{categoryLink}} カテゴリのトップからトピックを削除" + unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、%{until} まで待つ。" pin_note: "ユーザはトピックを個別にピン留め解除することができます" already_pinned: zero: "{{categoryLink}}にはピン留めされたトピックはありません" - pin_globally: "スタッフメンバーがこのトピックをピン留め解除しない限り、トピック一覧のトップに表示する" + one: "{{categoryLink}}内のトピックは現在1個ピン留めされています。" + other: "{{categoryLink}}内のトピックは現在{{count}}個ピン留めされています。" + pin_globally: "このトピックをすべてのトピックリストのトップに表示する" confirm_pin_globally: "既に{{count}} 個ピン留めしています。　多すぎるピン留めは新規ユーザと匿名ユーザの負担になる場合があります。ピン留めを続けますか？" unpin_globally: "トピック一覧のトップからこのトピックを削除します" + unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、%{until} まで待つ。" global_pin_note: "ユーザはトピックを個別にピン留め解除することができます" already_pinned_globally: zero: "現在ピン留めされていません" @@ -941,7 +986,15 @@ ja: action: '招待状を送る' help: 'このトピックに他のユーザをメールまたは通知で招待する。' to_forum: "ログインしなくてもこの投稿に返信ができることを、あなたの友人に知らせます。" + sso_enabled: "このトピックに招待したい人のユーザ名を入れてください" + to_topic_blank: "このトピックに招待したい人のユーザ名かメールアドレスを入れてください" + to_topic_email: "あなたはメールアドレスを入力しました。あなたの友人がすぐにこのトピックに返信をできるように招待状をメールで送信します。" + to_topic_username: "ユーザ名を入力しました。このトピックへの招待リンクの通知を送信します。" + to_username: "招待したい人のユーザ名を入れてください。このトピックへの招待リンクの通知を送信します。" email_placeholder: 'name@example.com' + success_email: "{{emailOrUsername}}に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。" + success_username: "ユーザにこのトピックへの参加を招待しました。" + error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)" login_reply: 'ログインして返信' filters: n_posts: @@ -980,8 +1033,10 @@ ja: description: other: 現在{{count}}個のポストを選択中。 post: - reply_topic: "{{link}} に回答" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "引用して回答" + edit: "編集中 {{link}} {{replyAvatar}} {{username}}" edit_reason: "理由: " post_number: "ポスト{{number}}" last_edited_on: "ポストの最終編集日" @@ -993,10 +1048,20 @@ ja: deleted_by_author: other: "(ポストは執筆者により取り下げられました。フラグがつかない場合%{count}時間後に自動的に削除されます)" expand_collapse: "展開/折りたたみ" + gap: + other: "{{count}}個の隠された回答を表示する" more_links: "{{count}} つリンク..." unread: "未読ポスト" has_replies: - other: "回答" + other: "{{count}} つの回答" + has_likes: + other: "{{count}} 個のいいね！" + has_likes_title: + other: "{{count}}人のユーザがこの回答に「いいね！」しました" + has_likes_title_you: + zero: "この投稿に「いいね！」する" + one: "あなたと1人がこの回答に「いいね！」しました" + other: "あなたと他{{count}}人がこの回答に「いいね！」しました" errors: create: "申し訳ありませんが、ポスト作成中にエラーが発生しました。もう一度やり直してください。" edit: "申し訳ありませんが、ポスト編集中にエラーが発生しました。もう一度やり直してください。" @@ -1068,6 +1133,8 @@ ja: inappropriate: "{{icons}} 不適切であると報告するフラグを立つ" notify_moderators: "{{icons}} がモデレータに通報しました" notify_moderators_with_url: "{{icons}} 通知されたモデレータ" + notify_user: "{{icons}} メッセージを送信しました" + notify_user_with_url: "{{icons}} メッセージを送信しました" bookmark: "{{icons}} がブックマークしました" like: "{{icons}} が「いいね！」しています" vote: "{{icons}} が投票しました" @@ -1106,6 +1173,8 @@ ja: other: "{{count}}人のユーザが不適切であるとフラグを立てました" notify_moderators: other: "{{count}}人のユーザがモデレータ確認を要するとフラグを立てました" + notify_user: + other: "{{count}} 人がこのユーザにメッセージを送信しました" bookmark: other: "{{count}}人のユーザがこのポストをブックマークしました" like: @@ -1127,6 +1196,7 @@ ja: last: "最後のリビジョン" hide: "リビジョンを隠す" show: "リビジョンを表示" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "追加・削除箇所をインラインで表示" @@ -1140,12 +1210,14 @@ ja: category: can: 'can… ' none: '(カテゴリなし)' + all: '全てのカテゴリ' choose: 'カテゴリを選択…' edit: '編集' edit_long: "カテゴリを編集" view: 'カテゴリ内のトピックを見る' general: '一般' settings: '設定' + topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' create: '新しいカテゴリ' save: 'カテゴリを保存する' @@ -1173,7 +1245,7 @@ ja: images: "画像" auto_close_label: "トピックを自動的に閉じるまでの時間:" auto_close_units: "時間" - email_in: "カスタムメールアドレス" + email_in: "カスタムメールアドレス:" email_in_allow_strangers: "登録されていないユーザからメールを受けとります。" email_in_disabled: "メールでの新規投稿は、サイトの設定で無効になっています。メールでの新規投稿を有効にするには" email_in_disabled_click: '"email in"設定を有効にしてください' @@ -1189,19 +1261,19 @@ ja: notifications: watching: title: "カテゴリ参加中" - description: "このカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" + description: "これらのカテゴリに新しく投稿されたトピックを自動的に参加します。これらのカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい回答数がつきます。" tracking: title: "トラック中" - description: "このカテゴリに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" + description: "これらのカテゴリの新規トピックを自動的にトラックします。トピックに対して新しい投稿があった場合、トピック一覧に新しい回答数がつきます。" regular: title: "通常" - description: "他ユーザからタグ付けをされた場合、またはあなたのポストに回答が付いた場合に通知されます" + description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" muted: title: "ミュート中" description: "このカテゴリに投稿されたトピックについての通知を受け取りません。また、未読タブにも通知されません。" flagging: title: '私達のコミュニティの維持を助けてくれてありがとうごうざいます' - private_reminder: 'フラッグはプライベートです。スタッフのみが参照できます' + private_reminder: 'フラグはプライベートです。スタッフのみが参照できます' action: 'フラグをつける' take_action: "アクションをする" notify_action: 'メッセージ' @@ -1210,15 +1282,15 @@ ja: yes_delete_spammer: "はい、スパマーを削除する" ip_address_missing: "(N/A)" hidden_email_address: "(hidden)" - submit_tooltip: "プライベートフラッグを通知する" - take_action_tooltip: "コミュニティのフラッグを待つのではなく、すぐにフラッグを始めましょう" + submit_tooltip: "プライベートフラグを通知する" + take_action_tooltip: "コミュニティのフラグを待つのではなく、すぐにフラグを始めましょう" cant: "申し訳ありませんが、現在このポストにフラグを立てることはできません。" formatted_name: off_topic: "オフトピック" inappropriate: "不適切" spam: "スパム" - custom_placeholder_notify_user: "具体的に、建設的に、そして常に親切にしましょう" - custom_placeholder_notify_moderators: "特に何を懸念しているかを伝えてください。可能な場合、関連するリンクや例を提供してください" + custom_placeholder_notify_user: "具体的に、建設的に、そして常に親切にしましょう。" + custom_placeholder_notify_moderators: "特に何を懸念しているかを伝えてください。可能な場合、関連するリンクや例を提供してください。" custom_message: at_least: "少なくとも{{n}}文字入力してください" more: "あと{{n}}文字..." @@ -1229,16 +1301,20 @@ ja: notify_action: "メッセージ" topic_map: title: "トピックのサマリー" + participants_title: "常連投稿者" + links_title: "人気のリンク" links_shown: "全{{totalLinks}}リンクを表示..." clicks: other: "%{count} クリック" topic_statuses: warning: - help: "これは公式の警告です" + help: "これは公式の警告です。" bookmarked: help: "このトピックをブックマークしました" locked: help: "このトピックは終了しています。新たに回答を投稿することはできません。" + archived: + help: "このトピックはアーカイブされています。凍結状態のため一切の変更ができません" unpinned: title: "ピン留め解除しました" help: "このトピックはピン留めされていません。 既定の順番に表示されます。" @@ -1248,8 +1324,6 @@ ja: pinned: title: "ピン留め" help: "このトピックはピン留めされています。常にカテゴリのトップに表示されます" - archived: - help: "このトピックはアーカイブされています。凍結状態のため一切の変更ができません" invisible: help: "このトピックはリストされていません。トピックリストには表示されません。直接リンクでのみアクセス可能です" posts: "投稿" @@ -1286,7 +1360,10 @@ ja: with_topics: "%{filter} トピック" with_category: "%{filter} %{category} トピック" latest: - title: "最新" + title: + zero: "最新ポスト" + one: "最新ポスト (1)" + other: "最新ポスト ({{count}})" help: "最新のトピック" hot: title: "ホット" @@ -1296,6 +1373,7 @@ ja: help: "既読のトピックを、最後に読んだ順に表示" search: title: "検索" + help: "すべてのトピックを検索" categories: title: "カテゴリ" title_in: "カテゴリ - {{categoryName}}" @@ -1338,6 +1416,8 @@ ja: title: "今まで" yearly: title: "今年" + quarterly: + title: "３ヶ月おき" monthly: title: "今月" weekly: @@ -1345,11 +1425,12 @@ ja: daily: title: "毎日" all_time: "今まで" - this_year: "今年" - this_month: "今月" - this_week: "今週" + this_year: "年" + this_quarter: "４分の１" + this_month: "月" + this_week: "週" today: "本日" - other_periods: "トップとピックをもっと見る" + other_periods: "次の期間のトピックを見る" browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' permission_types: full: "作成できる / 回答できる / 閲覧できる" @@ -1383,6 +1464,7 @@ ja: suspended: '停止中:' private_messages_short: "メッセージ" private_messages_title: "メッセージ" + mobile_title: "モバイル" space_free: "{{size}} free" uploads: "アップロード" backups: "バックアップ" @@ -1413,12 +1495,13 @@ ja: old: "古いフラグ" active: "アクティブなフラグ" agree: "賛成" - agree_title: "有効かつ正しいとしてフラッグを確認" + agree_title: "有効かつ正しいとしてフラグを確認" agree_flag_modal_title: "Agree and..." agree_flag_hide_post: "賛成(ポスト非表示 + プライベートメッセージ送信)" + agree_flag_hide_post_title: "このポストを非表示にし、編集を促すプライベートメッセージを自動的に送信" agree_flag_restore_post: "賛成(投稿を復元)" agree_flag_restore_post_title: "この投稿を復元" - agree_flag: "フラッグに賛成する" + agree_flag: "フラグに賛成する" agree_flag_title: "フラグとポストを変更しないことに賛成" defer_flag: "Defer" defer_flag_title: "フラグを削除します。何のアクションも必要としません" @@ -1432,7 +1515,7 @@ ja: delete_spammer: "スパムユーザーを削除" delete_spammer_title: "ユーザとそのユーザが投稿した全てのポストとトピックを削除します" disagree_flag_unhide_post: "反対する（投稿を表示する）" - disagree_flag_unhide_post_title: "投稿に付けたフラッグを削除する。ポストを表示する" + disagree_flag_unhide_post_title: "投稿に付けたフラグを削除する。ポストを表示する" disagree_flag: "反対する" disagree_flag_title: "無効または、不正としてこのフラグを拒否" clear_topic_flags: "トピックのフラグをクリアしました" @@ -1486,6 +1569,8 @@ ja: automatic: "自動的" automatic_membership_email_domains: "リスト内のメールアドレスのドメインに正確に一致したユーザは自動的にグループに追加される" automatic_membership_retroactive: "同じメールアドレスドメインのルールを既に登録済みのユーザにも適用" + default_title: "このグループのすべてのユーザーのデフォルトタイトル" + primary_group: "自動的にプライマリグループとして設定" api: generate_master: "マスターAPIキーを生成" none: "現在アクティブなAPIキーが存在しません。" @@ -1506,7 +1591,11 @@ ja: name: "名前" none_installed: "インストール済みのプラグインはありません" version: "バージョン" + enabled: "有効" + is_enabled: "有効" + not_enabled: "無効" change_settings: "設定変更" + change_settings_short: "設定" howto: "プラグインをインストールするには？" backups: title: "バックアップ" @@ -1529,6 +1618,7 @@ ja: size: "サイズ" upload: label: "アップロード" + title: "このインスタンスにバックアップをアップロード" uploading: "アップロード中" success: "ファイル'{{filename}}' がアップロードされました。" error: "ファイル '{{filename}}'アップロードエラー: {{message}}" @@ -1561,6 +1651,7 @@ ja: confirm: "本当にデータベースを元の作業状態にロールバックしますか？" export_csv: user_archive_confirm: "あなたのポストをダウンロードしてよいですか？" + success: "エスクポートを開始しました。処理が完了すると、メッセージで通知されます。" failed: "出力失敗。詳しくはログに参考してください。" rate_limit_error: "ポストは１日１回ダウンロードできます。明日試してください" button_text: "エクスポート" @@ -1570,6 +1661,8 @@ ja: screened_email: "全てのスクリーンメールアドレスをCSV出力" screened_ip: "全てのスクリーンIPリストをCSV出力" screened_url: "全てのスクリーンURLリストをCSV出力" + export_json: + button_text: "エクスポート" invite: button_text: "招待を送信" button_title: "招待を送信" @@ -1597,6 +1690,8 @@ ja: save: "保存" new: "新規" new_style: "新規スタイル" + import: "インポート" + import_title: "ファイルを選択するかテキストをペースト" delete: "削除" delete_confirm: "このカスタマイズ設定を削除しますか?" about: "サイトカスタマイズ設定により、サイトのヘッダとスタイルシートを変更できます。設定を選択するか、編集を開始して新たな設定を追加してください。" @@ -1669,7 +1764,6 @@ ja: sent_test: "送信完了!" delivery_method: "送信方法" preview_digest: "ダイジェストのプレビュー" - preview_digest_desc: "非アクティブユーザに送る週刊ダイジェストメールのコンテンツをプレビューします" refresh: "更新" format: "フォーマット" html: "html" @@ -1734,6 +1828,7 @@ ja: delete_post: "ポスト削除" impersonate: "なりすまし" anonymize_user: "匿名ユーザ" + roll_up: "IPブロックをロールアップ" screened_emails: title: "ブロック対象アドレス" description: "新規アカウント作成時、次のメールアドレスからの登録をブロックする。" @@ -1769,6 +1864,8 @@ ja: impersonate: title: "ユーザになる" help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished." + not_found: "ユーザが見つかりませんでした。" + invalid: "申し訳ありませんがこのユーザとして使えません。" users: title: 'ユーザ' create: '管理者を追加' @@ -1946,6 +2043,7 @@ ja: delete: "削除" cancel: "キャンセル" delete_confirm: "ユーザフィールドを削除してもよいですか？" + options: "オプション" required: title: "サインアップ時に必須？" enabled: "必須" @@ -1961,6 +2059,7 @@ ja: field_types: text: 'テキストフィールド' confirm: '確認' + dropdown: "ドロップダウン" site_text: none: "コンテンツの種類を選択してください" title: 'テキストコンテンツ' @@ -1972,6 +2071,7 @@ ja: no_results: "何も見つかりませんでした。" clear_filter: "クリア" add_url: "URL追加" + add_host: "ホストを追加" categories: all_results: '全て' required: '必須設定' @@ -2060,12 +2160,27 @@ ja: with_post_time: %{username} for post in %{link} at %{time} with_time: %{username} at %{time} emoji: - title: "Emoji" + title: "絵文字" help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)" - add: "Add New Emoji" + add: "新しい絵文字を追加" name: "名前" image: "画像" delete_confirm: "Are you sure you want to delete the :%{name}: emoji?" + permalink: + title: "パーマリンク" + url: "URL" + topic_id: "トピックID" + topic_title: "トピック" + post_id: "ポストID" + post_title: "ポスト" + category_id: "カテゴリID" + category_title: "カテゴリ" + external_url: "外部URL" + delete_confirm: このパーマリンクを削除してもよろしいですか？ + form: + label: "新規:" + add: "追加" + filter: "検索(URL または 外部URL)" lightbox: download: "ダウンロード" search_help: @@ -2074,11 +2189,13 @@ ja: title: 'キーボードショートカット' jump_to: title: 'ページ移動' + home: 'g, h ホーム' latest: 'g, l 最新' new: 'g, n 新規' unread: 'g, u 未読' categories: 'g, c カテゴリ' top: 'g, t トップ' + bookmarks: 'g, b ブックマーク' navigation: title: 'ナビゲーション' jump: '# # 投稿へ' @@ -2090,7 +2207,6 @@ ja: title: 'アプリケーション' create: 'c 新しいトピックを作成' notifications: 'n お知らせを開く' - site_map_menu: '= サイトメニュを開く' user_profile_menu: 'p ユーザメニュを開く' show_incoming_updated_topics: '. 更新されたトピックを表示する' search: '/ 検索' @@ -2195,8 +2311,17 @@ ja: name: 初めての「いいね！」 description: 投稿に「いいね！」した first_flag: - name: 最初のフラッグ - description: 投稿にフラッグをつけた + name: 最初のフラグ + description: 投稿にフラグをつけた + promoter: + name: プロモーター + description: 招待したユーザ + campaigner: + name: キャンペイナー + description: 3人のベーシックユーザー(トラストレベル 1)を招待 + champion: + name: チャンピオン + description: 5 メンバー(トラストレベル2)を招待 first_share: name: 初めてのシェア description: 投稿をシェアした @@ -2205,19 +2330,10 @@ ja: description: サイト内投稿のリンクを挿入した first_quote: name: 最初の投稿 - description: ユーザにタグ付けました + description: ユーザにタグを付けた read_guidelines: name: ガイドラインを読んだ description: community guidelinesを読みました reader: name: 閲覧者 description: 100以上の投稿があるトピック内の投稿をすべて読みました。 - google_search: | -

      Googleで探す

      -

      - - - - - -

      diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 745fbf3a7f..4d631210af 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -8,6 +8,9 @@ ko: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,17 +21,22 @@ ko: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}천" + millions: "{{number}}백만" dates: time: "a h:mm" - long_no_year: "MMM D a h:mm " + long_no_year: "M D a h:mm" long_no_year_no_time: "MMM D" - long_with_year: "YYYY MMM D a h:mm" + full_no_year_no_time: "MMMM Do" + long_with_year: "YYYY MMM D a h:mm" long_with_year_no_time: "YYYY MMM D" - long_date_with_year: "MMM D, 'YY LT" + full_with_year_no_time: "YYYY MMMM Do" + long_date_with_year: "'YY MMM D. LT" long_date_without_year: "MMM D, LT" - long_date_with_year_without_time: "MMM D, 'YY" + long_date_with_year_without_time: "'YY MMM D" long_date_without_year_with_linebreak: "MMM D
      LT" - long_date_with_year_with_linebreak: "MMM D, 'YY
      LT" + long_date_with_year_with_linebreak: "'YY MMM D
      LT" tiny: half_a_minute: "< 1분" less_than_x_seconds: @@ -50,7 +58,7 @@ ko: almost_x_years: other: "%{count}년" date_month: "MMM D" - date_year: "'YY M/D" + date_year: "'YY MMM" medium: x_minutes: other: "%{count}분" @@ -58,7 +66,7 @@ ko: other: "%{count}시간" x_days: other: "%{count}일" - date_year: "MMM D, 'YY" + date_year: "'YY MMM D" medium_with_ago: x_minutes: other: "%{count}분 전" @@ -66,30 +74,56 @@ ko: other: "%{count}시간 전" x_days: other: "%{count}일 전" + later: + x_days: + other: "%{count}일 후" + x_months: + other: "%{count}달 후" + x_years: + other: "%{count}년 후" share: topic: '토픽을 공유합니다.' - post: '포스트 #%{postNumber}' + post: '게시글 #%{postNumber}' close: '닫기' twitter: 'twitter로 공유' facebook: 'Facebook으로 공유' google+: 'Google+로 공유' email: '이메일로 공유' + action_codes: + autoclosed: + enabled: '%{when} 닫기' + disabled: '%{when} 열기' + closed: + enabled: '%{when} 닫기' + disabled: '%{when} 열기' + archived: + enabled: '%{when} 보관' + disabled: '%{when} 보관 취소' + pinned: + enabled: '%{when} 고정' + disabled: '%{when} 고정 취소' + pinned_globally: + enabled: '%{when} 전역적으로 고정' + disabled: '%{when} 고정취소' + visible: + enabled: '%{when} 목록에 게시' + disabled: '%{when} 목록에서 감춤' topic_admin_menu: "토픽 관리자 기능" - emails_are_disabled: "관리자가 이메일의 송신을 금지 하였습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다." - edit: '제목과 카테고리를 편집하기' - not_implemented: "죄송합니다. 아직 이용할 수 없는 기능입니다." + emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다." + edit: '이 토픽의 제목과 카테고리 편집' + not_implemented: "죄송합니다. 아직 사용할 수 없는 기능입니다." no_value: "아니오" yes_value: "예" generic_error: "죄송합니다. 오류가 발생하였습니다." generic_error_with_reason: "오류가 발생하였습니다: %{error}" sign_up: "회원가입" log_in: "로그인" - age: "생성" + age: "나이" joined: "가입함" admin_title: "관리자" flags_title: "신고" show_more: "더 보기" - show_help: "도움말" + show_help: "옵션" links: "링크" links_lowercase: other: "링크" @@ -104,14 +138,15 @@ ko: or: "또는" now: "방금 전" read_more: '더 읽기' - more: "더 보기" + more: "더" less: "덜" never: "전혀" daily: "매일" weekly: "매주" every_two_weeks: "격주" every_three_days: "3일마다" - max_of_count: "max of {{count}}" + max_of_count: "최대 {{count}}" + alternation: "또는" character_count: other: "{{count}} 자" suggested_topics: @@ -131,7 +166,7 @@ ko: post_count: "게시글" user_count: "새로운 사용자" active_user_count: "활성화된 사용자" - contact: "Contact Us" + contact: "문의" contact_info: "사이트 운영과 관련된 사항이나 요청이 있으시다면 이메일 %{contact_info}로 연락주시기 바랍니다." bookmarked: title: "북마크" @@ -155,7 +190,7 @@ ko: click_to_show: "보려면 클릭하세요." preview: "미리보기" cancel: "취소" - save: "변경사항을 저장" + save: "변경사항 저장" saving: "저장 중..." saved: "저장 완료!" upload: "업로드" @@ -167,9 +202,9 @@ ko: revert: "되돌리기" failed: "실패" switch_to_anon: "익명 모드" - switch_from_anon: "익명 모드 나가기" banner: close: "배너 닫기" + edit: "이 배너 수정 >>" choose_topic: none_found: "토픽을 찾을 수 없습니다." title: @@ -181,36 +216,36 @@ ko: reject: '거절' delete_user: '사용자 삭제' title: "승인 필요" - none: "리뷰 할 포스트가 없습니다." + none: "리뷰할 포스트가 없습니다." edit: "편집" cancel: "취소" - view_pending: "대기중인 포스트" + view_pending: "대기중인 게시글" has_pending_posts: - one: "이 토픽은 1개의 승인 대기중인 게시글이 있습니다." - many: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." + other: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." confirm: "변경사항 저장" - delete_prompt: "Are you sure you want to delete %{username}? This will remove all of their posts and block their email and ip address." + delete_prompt: "정말로 %{username} 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 블락됩니다." approval: title: "게시글 승인 필요" + description: "새로운 게시글이 있습니다. 그러나 이 게시글이 보여지려면 운영자의 승인이 필요합니다." pending_posts: - other: "{{count}}개 미결 게시글이 있습니다." - ok: "OK" + other: "대기중인 게시글이 {{count}}개 있습니다." + ok: "확인" user_action: - user_posted_topic: "{{user}}가 게시한 토픽" - you_posted_topic: "당신이 게시한 토픽" - user_replied_to_post: "{{user}}가 게시한 답글 {{post_number}}개" - you_replied_to_post: "당신이 게시한 답글 {{post_number}}개" - user_replied_to_topic: "{{user}}가 토픽에 게시한 답글" - you_replied_to_topic: "당신이 토픽에 게시한 답글" - user_mentioned_user: "{{user}}가 {{another_user}}를 언급" - user_mentioned_you: "{{user}}가 당신을 언급" - you_mentioned_user: "당신은 {{another_user}}를 언급" + user_posted_topic: "{{user}}님이 토픽을 게시함" + you_posted_topic: "내가 토픽을 게시함" + user_replied_to_post: "{{user}}님이 {{post_number}} 게시글에 답글 올림" + you_replied_to_post: "내가 {{post_number}} 게시글에 답글 올림" + user_replied_to_topic: "{{user}}님이 토픽에 답글 올림" + you_replied_to_topic: "내가 토픽에 답글 올림" + user_mentioned_user: "{{user}}님이 {{another_user}}를 멘션함" + user_mentioned_you: "{{user}}님이 나를 멘션함" + you_mentioned_user: "내가 {{another_user}}님을 멘션함" posted_by_user: "{{user}}에 의해 게시됨" - posted_by_you: "당신이 게시함" - sent_by_user: "{{user}}가 보냄" - sent_by_you: "당신이 보냄" + posted_by_you: "내가 게시함" + sent_by_user: "{{user}}님이 보냄" + sent_by_you: "내가 보냄" directory: - filter_name: "사용자명으로 필터" + filter_name: "아이디로 필터" title: "사용자" likes_given: "제공한" likes_received: "받은" @@ -222,10 +257,10 @@ ko: post_count: "답글" post_count_long: "답글" no_results: "결과가 없습니다." - days_visited: "방문" - days_visited_long: "일일 방문" + days_visited: "조회수" + days_visited_long: "일일 조회수" posts_read: "읽음" - posts_read_long: "포스트 읽음" + posts_read_long: "게시글 읽음" total_rows: other: "%{count} 사용자" groups: @@ -235,9 +270,9 @@ ko: members: "멤버" posts: "게시글" alias_levels: - title: "누가 이 그룹을 가명으로 사용할 수 있는가" + title: "누가 이 그룹을 별칭으로 사용할 수 있는가?" nobody: "0명" - only_admins: "관리자만" + only_admins: "관리자 전용" mods_and_admins: "운영자 및 관리자만" members_mods_and_admins: "그룹 멤버, 운영자, 관리자만" everyone: "모두" @@ -248,7 +283,7 @@ ko: '4': "토픽" '5': "답글" '6': "응답" - '7': "언급" + '7': "멘션" '9': "인용" '10': "즐겨찾기" '11': "편집" @@ -266,10 +301,10 @@ ko: latest_by: "가장 최근" toggle_ordering: "정렬 컨트롤 토글" subcategories: "하위 카테고리" - topic_stats: "새 토픽의 수" + topic_stats: "새 글타래 수" topic_stat_sentence: other: "지난 %{unit} 동안 %{count}개의 새로운 토픽이 있습니다." - post_stats: "The number of new posts." + post_stats: "새 게시글 수" post_stat_sentence: other: "지난 %{unit} 동안 %{count}개의 새로운 게시글이 있습니다." ip_lookup: @@ -287,6 +322,8 @@ ko: topics_entered: "입력된 제목:" post_count: "포스트 개수" confirm_delete_other_accounts: "정말 이 계정들을 삭제하시겠습니까?" + user_fields: + none: "(옵션을 선택하세요)" user: said: "{{username}}:" profile: "프로필" @@ -300,9 +337,20 @@ ko: preferences: "환경 설정" bookmarks: "북마크" bio: "내 소개" - invited_by: "에 의해 초대되었습니다." + invited_by: "(이)가 초대했습니다." trust_level: "신뢰도" notifications: "알림" + desktop_notifications: + label: "데스크탑 알림" + not_supported: "안타깝게도 지금 사용하고 계시는 브라우저는 알림을 지원하지 않습니다." + perm_default: "알림 켜기" + perm_denied_btn: "권한 거부" + perm_denied_expl: "알림에 대한 권한이 없습니다. 알림을 활성화하기위해 브라우저의 알림설정을 하시고 난 후에 버튼을 눌러주세요. (데스크탑: 주소 표시 막대 가장 왼쪽에 있는 아이콘, 모바일: '사이트 정보'.)" + disable: "알림 비활성화" + currently_enabled: "(현재 활성화됨)" + enable: "알림 활성화" + currently_disabled: "(현재 비활성화됨)" + each_browser_note: "노트: 사용하시는 모든 브라우저에서 이 설정을 변경해야합니다." dismiss_notifications: "모두 읽음으로 표시" dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시" disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다." @@ -315,27 +363,29 @@ ko: admin: "{{user}}님은 관리자 입니다" moderator_tooltip: "이 사용자는 운영자 입니다" admin_tooltip: "이 사용자는 관리자입니다." + blocked_tooltip: "이 사용자는 차단되었습니다" suspended_notice: "이 사용자는 {{date}}까지 접근 금지 되었습니다." suspended_reason: "이유: " github_profile: "Github" - mailing_list_mode: "(토픽이나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." + mailing_list_mode: "(글타래가나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." watched_categories: "지켜보기" - watched_categories_instructions: "이 카테고리들에 있는 모든 새로운 토픽을 지켜봅니다. 새로운 글과 토픽이 작성될 때마다 알림이 오고, 읽지 않은 글과 새로운 글 수가 토픽의 리스트에 나타납니다." + watched_categories_instructions: "이 카테고리 내의 새로운 글타래들을 지켜보도록 자동으로 설정됩니다. 새로운 글이나 글타래에 대하여 알림을 받게되며 글타래 옆에 읽지 않은 글의 수가 표시됩니다." tracked_categories: "추적하기" - tracked_categories_instructions: "현재 카테고리에 있는 모든 토픽을 추적합니다. 읽지 않은 글과 새로운 글 수가 나타납니다." + tracked_categories_instructions: "이 카테고리 내의 새로운 글타래들을 추적하도록 자동으로 설정됩니다. 글타래 옆에 읽지 않은 글의 수가 표시됩니다." muted_categories: "알림 끄기" - muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 토픽에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다." + muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 글타래에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다." delete_account: "내 계정 삭제" - delete_account_confirm: "영구적으로 당신의 계정을 삭제해도 되겠습니까? 이 작업은 되돌릴 수 없습니다." - deleted_yourself: "성공적으로 당신의 계정이 삭제 되었습니다." - delete_yourself_not_allowed: "지금은 당신의 계정을 삭제할 수 없습니다. 관리자에게 당신의 계정을 삭제해달라고 연락해보세요." + delete_account_confirm: "정말로 계정을 삭제할까요? 이 작업은 되돌릴 수 없습니다." + deleted_yourself: "계정이 삭제 되었습니다." + delete_yourself_not_allowed: "지금은 계정을 삭제할 수 없습니다. 관리자에게 연락해 주세요." unread_message_count: "메시지" admin_delete: "삭제" users: "사용자" muted_users: "알람 끄기" + muted_users_instructions: "이 사용자들이 보낸 알림 모두 숨김" staff_counters: flags_given: "유용한 신고" - flagged_posts: "신고된 게시글" + flagged_posts: "신고된 글" deleted_posts: "삭제된 글" suspensions: "정지시킨 계정" warnings_received: "경고" @@ -351,9 +401,10 @@ ko: set_password: "비밀번호 설정" change_about: title: "내 소개 변경" + error: "값을 변경하는데 에러가 발생했습니다." change_username: - title: "사용자 이름 변경" - confirm: "사용자 이름을 변경합니다. 모든 @이름 언급이 끊어집니다. 사용자 이름을 변경하는게 확실한가요?" + title: "아이디 변경" + confirm: "아이디를을 변경하면 모든 인용과 @아이디 멘션이 끊어집니다. 그래도 진행하시겠습니까?" taken: "죄송합니다. 이미 사용 중인 아이디입니다." error: "아이디를 변경하는 중에 오류가 발생했습니다." invalid: "아이디가 잘못되었습니다. 숫자와 문자를 포함해야합니다." @@ -365,6 +416,7 @@ ko: change_avatar: title: "프로필 사진 변경" gravatar: "Gravatar 기반" + gravatar_title: "Gravata 웹사이트에서 아바타 바꾸기" refresh_gravatar_title: "Gravatar 새로고침" letter_based: "자동 생성된 아바타" uploaded_avatar: "커스텀 사진" @@ -372,6 +424,7 @@ ko: upload_title: "프로필 사진 업로드" upload_picture: "사진 업로드" image_is_not_a_square: "경고: 정사각형 이미지가 아니기 때문에 사진을 수정하였습니다." + cache_notice: "프로필 사진을 바꾸는데 성공했습니다만 브라우져 캐쉬로 인해 보여지기까지 시간이 조금 걸립니다." change_profile_background: title: "프로필 배경" instructions: "프로필 배경은 가운데를 기준으로 표시되며 850px이 기본 가로 사이즈 입니다." @@ -381,9 +434,9 @@ ko: email: title: "이메일" instructions: "절대로 공개되지 않습니다." - ok: "당신에게 확인 메일을 보내겠습니다." + ok: "내 이메일로 확인 메일이 전송됩니다." invalid: "유효한 이메일 주소를 입력해주세요." - authenticated: "당신의 이메일은 {{provider}}에 의해 인증되었습니다." + authenticated: "내 이메일이 {{provider}}에 의해 인증되었습니다." frequency: zero: "읽지 않은 내용이 있을 때 즉시 이메일로 알립니다." one: "1분 후에도 내용을 확인하지 않았을 때에 이메일로 알립니다." @@ -397,7 +450,7 @@ ko: username: title: "아이디" instructions: "중복될 수 없으며 띄어쓰기 사용이 불가합니다. 짧을 수록 좋아요." - short_instructions: "@{{username}}으로 언급이 가능합니다." + short_instructions: "@{{username}}으로 멘션이 가능합니다." available: "아이디\x1D로 사용가능합니다." global_match: "이메일이 등록된 아이디와 연결되어 있습니다." global_mismatch: "이미 등록된 아이디입니다. 다시 시도해보세요. {{suggestion}}" @@ -429,38 +482,44 @@ ko: every_three_days: "매 3일마다" weekly: "매주" every_two_weeks: "격주" - email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 언급했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기" + email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 글타래에 나를 초대했을 떄 이메일 보내기" email_private_messages: "누군가 나에게 메시지를 보냈을때 이메일 보내기" - email_always: "싸이트에 방문 중 일 때 이메일 알림을 보내지 마세요." + email_always: "사이트를 이용중 일 때도 이메일 알림 보내기" other_settings: "추가 사항" categories_settings: "카테고리" new_topic_duration: label: "새글을 정의해주세요." not_viewed: "아직 보지 않았습니다." - last_here: "마지막 방문이후 작성된 토픽" - after_n_days: - other: "지난 {{count}}일간 생성된 토픽" - after_n_weeks: - other: "지난 {{count}}주간 생성된 토픽" - auto_track_topics: "마지막 방문이후 작성된 토픽" + last_here: "마지막 방문이후 작성된 글타래" + after_1_day: "지난 하루간 생성된 글타래" + after_2_days: "지난 2일간 생성된 글타래" + after_1_week: "최근 일주일간 생성된 글타래" + after_2_weeks: "지난 2주간 생성된 글타래" + auto_track_topics: "마지막 방문이후 작성된 글타래" auto_track_options: never: "하지않음" immediately: "즉시" - after_n_seconds: - other: "{{count}}초 후" - after_n_minutes: - other: "{{count}}분 후" + after_30_seconds: "30초 후" + after_1_minute: "1분 후" + after_2_minutes: "2분 후" + after_3_minutes: "3분 후" + after_4_minutes: "4분 후" + after_5_minutes: "5분 후" + after_10_minutes: "10분 후" invited: search: "검색" title: "초대" user: "사용자 초대" - none: "어떤 초대도 발견되지 않았습니다." + sent: "보냄" truncated: "처음 {{count}}개 초대장 보여주기" redeemed: "초대를 받았습니다." + redeemed_tab: "Redeemed" redeemed_at: "에 초대되었습니다." pending: "초대를 보류합니다." - topics_entered: "토픽이 입력되었습니다." - posts_read_count: "게시물 읽기" + pending_tab: "보류" + pending_tab_with_count: "지연 ({{count}})" + topics_entered: "글타래가 입력되었습니다." + posts_read_count: "글 읽기" expired: "이 초대장의 기한이 만료되었습니다." rescind: "삭제" rescinded: "초대가 제거되었습니다." @@ -470,6 +529,8 @@ ko: days_visited: "일일 방문" account_age_days: "일일 계정 나이" create: "이 포럼에 친구를 초대하기" + generate_link: "초대 링크 복사" + generated_link_message: '

      초대 링크가 성공적으로 생성되었습니다!

      초대 링크는 다음 이메일에 한해 유효합니다: %{invitedEmail}

      ' bulk_invite: none: "아직 아무도 초대하지 않았습니다. 초대장을 각각 보내거나, uploading a bulk invite file을 이용하여 단체 초대를 보낼 수 있습니다." text: "파일로 대량 초대하기" @@ -491,6 +552,7 @@ ko: title: "IP Address 등록" avatar: title: "프로필 사진" + header_title: "프로필, 메시지, 북마크 그리고 설정" title: title: "호칭" filters: @@ -499,7 +561,7 @@ ko: posted_by: "에 의해 작성되었습니다" sent_by: "에 의해 전송되었습니다" private_message: "메시지" - the_topic: "토픽" + the_topic: "글타래" loading: "로딩 중..." errors: prev_page: "로드하는 중" @@ -525,30 +587,29 @@ ko: read_only_mode: enabled: "읽기 모드가 활성화 되었습니다. 사이트를 열람할 수 있으나 상호작용은 불가능 합니다." login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다." - too_few_topics_notice: "토론을 시작하기 위해 최소 5개의 공개 토픽을 %{posts}개의 공개 답글을 작성해주세요. 읽을거리가 없으면 새로운 사용자가 신뢰도를 올릴 수 없습니다. 이 메시지는 관리자에게만 보입니다." learn_more: "더 배우기" year: '년' - year_desc: '지난 365일간 생성된 토픽' + year_desc: '지난 365일간 생성된 글타래' month: '월' - month_desc: '지난 30일간 생성된 토픽' + month_desc: '지난 30일간 생성된 글타래' week: '주' - week_desc: '지난 7일간 생성된 토픽' + week_desc: '지난 7일간 생성된 글타래' day: '일' - first_post: 첫 번째 게시물 + first_post: 첫 번째 글 mute: 음소거 unmute: 음소거 해제 - last_post: 최근 게시물 + last_post: 최근 글 last_reply_lowercase: 마지막 답글 replies_lowercase: other: 답글 summary: - enabled_description: "현재 토픽에서 가장 인기 있는 몇 개의 글들을 보고 있습니다." + enabled_description: "현재 글타래에서 가장 인기 있는 몇 개의 글들을 보고 있습니다." description: "{{count}}개의 답글이 있습니다." description_time: "총 {{count}}개의 댓글이 있습니다. 예상 소요 시간은 {{readingTime}}분입니다.." - enable: '이 토픽을 요약' + enable: '이 글타래를 요약' disable: 'Show All Posts' deleted_filter: - enabled_description: "이 토픽은 삭제된 글들을 포함하고 있습니다. 삭제된 글을 보이지 않습니다." + enabled_description: "이 글타래는 삭제된 글들을 포함하고 있습니다. 삭제된 글을 보이지 않습니다." disabled_description: "삭제된 글들을 표시하고 있습니다." enable: "삭제된 글 숨김" disable: "삭제된 글 보기" @@ -571,7 +632,7 @@ ko: action: "비밀번호를 잊어버렸습니다." invite: "사용자 이름 또는 이메일 주소를 입력하시면 비밀번호 재설정 이메일을 보내드립니다." reset: "암호 재설정" - complete_username: "당신의 계정이 %{username}와 일치한다면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다." + complete_username: "자신의 아이디가 %{username}이라면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다." complete_email: "만약 계정이 %{email}과 일치한다면, 비밀번호를 재설정하는 방법에 대한 이메일을 곧 받게 됩니다." complete_username_found: "%{username}과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요." complete_email_found: "%{email}과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요." @@ -584,15 +645,16 @@ ko: email_placeholder: "이메일 주소 또는 사용자 이름" caps_lock_warning: "Caps Lock 켜짐" error: "알 수없는 오류" + rate_limit: "다시 로그인 하기전에 잠시만 기다려주세요." blank_username_or_password: "이메일 또는 사용자명과 비밀번호를 입력해 주세요." reset_password: '암호 재설정' logging_in: "로그인 중.." or: "또는" authenticating: "인증 중..." awaiting_confirmation: "계정 활성화를 기다리고 있습니다. 다른 인증 이메일을 받고 싶으면 비밀번호 찾기를 누르세요." - awaiting_approval: "당신의 계정은 아직 스태프에 의해 승인되지 않았습니다. 승인되면 이메일을 받게됩니다." + awaiting_approval: "스태프가 아직 내 계정을 승인하지 않았습니다. 승인되면 이메일을 받게됩니다." requires_invite: "죄송합니다. 초대를 받은 사람만 이용하실 수 있습니다." - not_activated: "당신은 아직 로그인 할 수 없습니다. 계정을 만들었을때 {{sentTo}} 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오." + not_activated: "아직 로그인 할 수 없습니다. 계정을 만들었을때 {{sentTo}} 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오." not_allowed_from_ip_address: "이 IP 주소에서 로그인 할 수 없습니다." admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." resend_activation_email: "다시 인증 이메일을 보내려면 여기를 클릭하세요." @@ -622,41 +684,40 @@ ko: composer: emoji: "Emoji :smile:" add_warning: "공식적인 경고입니다." - posting_not_on_topic: "어떤 토픽에 답글을 작성하시겠습니까?" + posting_not_on_topic: "어떤 글타래에 답글을 작성하시겠습니까?" saving_draft_tip: "저장 중..." saved_draft_tip: "저장 완료" saved_local_draft_tip: "로컬로 저장됩니다." - similar_topics: "작성하려는 내용과 비슷한 토픽들..." + similar_topics: "작성하려는 내용과 비슷한 글타래들..." drafts_offline: "초안" error: title_missing: "제목은 필수 항목입니다" title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다." title_too_long: "제목은 {{max}} 글자 이상일 수 없습니다." - post_missing: "게시글 내용은 필수 입니다." - post_length: "게시글은 최소 {{min}} 글자 이상이어야 합니다." + post_missing: "글 내용은 필수 입니다." + post_length: "글은 최소 {{min}} 글자 이상이어야 합니다." try_like: ' 버튼을 사용해 보셨나요?' category_missing: "카테고리를 선택해주세요." save_edit: "편집 저장" - reply_original: "기존 토픽에 대해 답글을 작성합니다." + reply_original: "기존 글타래에 대해 답글을 작성합니다." reply_here: "여기에 답글을 작성하세요." reply: "답글 전송" cancel: "취소" - create_topic: "토픽(글) 쓰기" + create_topic: "글타래(글) 쓰기" create_pm: "메시지" title: "혹은 Ctrl + Enter 누름" users_placeholder: "사용자 추가" title_placeholder: "이야기 나누고자 하는 내용을 한문장으로 적는다면?" edit_reason_placeholder: "why are you editing?" show_edit_reason: "(add edit reason)" - reply_placeholder: "여기에 입력하세요. 마크 다운이나 BBCode 혹은 HTML 형식을 사용하세요. 이미지는 드래그나 붙여넣고로 업로드 할 수 있어요." - view_new_post: "새로운 게시물을 볼 수 있습니다." + view_new_post: "새로운 글을 볼 수 있습니다." saving: "저장 중..." saved: "저장 완료!" saved_draft: "작성중인 글이 있습니다. 계속 작성하려면 여기를 클릭하세요." uploading: "업로딩 중..." show_preview: '미리보기를 보여줍니다 «' hide_preview: '« 미리보기를 숨기기' - quote_post_title: "전체 게시물을 인용" + quote_post_title: "전체 글을 인용" bold_title: "굵게" bold_text: "굵게하기" italic_title: "강조" @@ -673,7 +734,7 @@ ko: upload_description: "업로드 설명을 입력" olist_title: "번호 매기기 목록" ulist_title: "글 머리 기호 목록" - list_item: "토픽" + list_item: "글타래" heading_title: "표제" heading_text: "표제" hr_title: "수평선" @@ -681,21 +742,21 @@ ko: redo_title: "다시" help: "마크다운 편집 도움말" toggler: "작성 패널을 숨기거나 표시" - admin_options_title: "이 토픽에 대한 옵션 설정" + admin_options_title: "이 글타래에 대한 옵션 설정" auto_close: - label: "자동-닫기 토픽 시간:" + label: "자동-닫기 글타래 시간:" error: "유효한 값은 눌러주세요." - based_on_last_post: "적어도 토픽의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요." + based_on_last_post: "적어도 글타래의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요." all: examples: '시간을 숫자(24이하)로 입력하거나 분을 포함한 시간(17:30) 혹은 타임스탬프(2013-11-22 14:00) 형식으로 입력하세요.' limited: units: "(# 시간)" examples: '시간에 해당하는 숫자를 입력하세요. (24)' notifications: - title: "@name 언급, 게시글과 토픽에 대한 답글, 개인 메시지 등에 대한 알림" + title: "@name 멘션, 글과 글타래에 대한 답글, 개인 메시지 등에 대한 알림" none: "현재 알림을 불러올 수 없습니다." more: "이전 알림을 볼 수 있습니다." - total_flagged: "관심 표시된 총 게시글" + total_flagged: "관심 표시된 총 글" mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " @@ -710,12 +771,12 @@ ko: linked: "

      {{username}} {{description}}

      " granted_badge: "

      '{{description}}' 뱃지를 받았습니다.

      " popup: - mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다' - quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 인용했습니다' - replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신에게 답글을 달았습니다' + mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 멘션했습니다' + quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다' + replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다' posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다' private_message: '{{username}}가 비공개 메시지를 "{{topic}}" - {{site_title}} 에 작성했습니다' - linked: '{{username}}가 "{{topic}}" - {{site_title}}에 당신의 포스트 링크를 게시했습니다' + linked: '{{username}}님이 "{{topic}}" - {{site_title}}에 내 글을 링크했습니다' upload_selector: title: "이미지 추가하기" title_with_attachments: "이미지 또는 파일 추가하기" @@ -723,161 +784,166 @@ ko: from_the_web: "인터넷에서 가져오기" remote_tip: "이미지 링크" remote_tip_with_attachments: "이미지 또는 파일 링크 ({{authorized_extensions}})" - local_tip: "내 컴퓨터에서 이미지를 가져오기" - local_tip_with_attachments: "기기에서 이미지나 파일 선택을 위해 클릭 ({{authorized_extensions}})" + local_tip: "기기에서 이미지 선택" + local_tip_with_attachments: "기기에서이미지 또는 파일을 선택 ({{authorized_extensions}})" hint: "(드래그&드랍으로 업로드 가능)" - hint_for_supported_browsers: "(이미지 파일을 드래그&드랍하거나 붙여넣기하여 업로드 할 수 있습니다.)" uploading: "업로드 중입니다..." + select_file: "파일 선택" image_link: "이 이미지를 누르면 이동할 링크" search: - title: "토픽, 게시글, 사용자, 카테고리 검색" + title: "글타래, 글, 사용자, 카테고리 검색" no_results: "검색 결과가 없습니다" + no_more_results: "더 이상 결과가 없습니다." + search_help: 검색 도움말 searching: "검색중..." post_format: "#{{post_number}} by {{username}}" context: user: "@{{username}}의 글 검색" category: "\"{{category}}\" 카테고리 검색" - topic: "이 토픽을 검색" + topic: "이 글타래를 검색" private_messages: "메시지 검색" - site_map: "다른 토픽이나 카테고리로 이동" + hamburger_menu: "다른 글타래 목록이나 카테고리로 가기" go_back: '돌아가기' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: '사용자 페이지로 이동' topics: bulk: reset_read: "읽기 초기화" - delete: "토픽 삭제" - dismiss_posts: "게시글 닫기" - dismiss_posts_tooltip: "이 토픽들의 '읽지 않은' 표시를 없애고 새 토픽이 발생하면 내 '읽지 않은' 목록에 표시하기" - dismiss_topics: "토픽 닫기" + delete: "글타래 삭제" + dismiss_posts: "글 닫기" + dismiss_posts_tooltip: "이 글타래들의 '읽지 않은' 표시를 없애고 새 글타래가 발생하면 내 '읽지 않은' 목록에 표시하기" + dismiss_topics: "글타래 닫기" dismiss_topics_tooltip: "새글이 발생할 때 내 '읽지 않은' 목록에 표시하지 않기" dismiss_new: "새글 제거" - toggle: "복수토픽 선택 기능" + toggle: "복수글타래 선택 기능" actions: "일괄 적용" change_category: "카테고리 변경" - close_topics: "토픽 닫기" - archive_topics: "토픽 보관하기" + close_topics: "글타래 닫기" + archive_topics: "글타래 보관하기" notification_level: "알림 설정 변경" - choose_new_category: "토픽의 새로운 카테고리를 선택" + choose_new_category: "글타래의 새로운 카테고리를 선택" selected: - other: "{{count}}개의 토픽이 선택되었습니다." + other: "{{count}}개의 글타래가 선택되었습니다." none: - unread: "읽지 않은 토픽이 없습니다." - new: "읽을 새로운 토픽이 없습니다." - read: "아직 어떠한 토픽도 읽지 않았습니다." - posted: "아직 어떠한 토픽도 작성되지 않았습니다." - latest: "최신 토픽이 없습니다." - hot: "인기있는 토픽이 없습니다." - bookmarks: "아직 북마크한 토픽이 없습니다." - category: "{{category}}에 토픽이 없습니다." - top: "Top 토픽이 없습니다." + unread: "읽지 않은 글타래가 없습니다." + new: "읽을 새로운 글타래가 없습니다." + read: "아직 어떠한 글타래도 읽지 않았습니다." + posted: "아직 어떠한 글타래도 작성되지 않았습니다." + latest: "최신 글타래가 없습니다." + hot: "인기있는 글타래가 없습니다." + bookmarks: "아직 북마크한 글타래가 없습니다." + category: "{{category}}에 글타래가 없습니다." + top: "Top 글타래가 없습니다." search: "검색 결과가 없습니다." educate: - new: '

      새로운 토픽은 여기에서 볼 수 있습니다.

      기본 설정으로 2일 이내에 생성된 토픽은 새로운 것으로 간주되며 new 표시가 나타납니다.

      환경설정에서 설정을 변경 할 수 있습니다.

      ' - unread: '

      읽지 않은 토픽은 여기에서 볼 수 있습니다.

      기본 설정으로 다음과 같은 경우 토픽은 읽지 않은 것으로 간주되며 읽지 않은 개수 1 가 표시됩니다.

      • 토픽을 만든 경우
      • 토픽에 리플을 단 경우
      • 토픽을 4분 이상 읽은 경우

      또는 각 토픽 아래에 있는 알림 설정에서 해당 토픽을 추적하거나 지켜보도록 설정한 경우

      환경설정에서 설정을 변경 할 수 있습니다.

      ' + new: '

      새로운 글타래는 여기에서 볼 수 있습니다.

      기본 설정으로 2일 이내에 생성된 글타래는 새로운 것으로 간주되며 new 표시가 나타납니다.

      환경설정에서 설정을 변경 할 수 있습니다.

      ' + unread: '

      읽지 않은 글타래는 여기에서 볼 수 있습니다.

      기본 설정으로 다음과 같은 경우 글타래는 읽지 않은 것으로 간주되며 읽지 않은 개수 1 가 표시됩니다.

      • 글타래를 만든 경우
      • 글타래에 리플을 단 경우
      • 글타래를 4분 이상 읽은 경우

      또는 각 글타래 아래에 있는 알림 설정에서 해당 글타래를 추적하거나 지켜보도록 설정한 경우

      환경설정에서 설정을 변경 할 수 있습니다.

      ' bottom: - latest: "더 이상 읽을 최신 토픽이 없습니다" - hot: "더 이상 읽을 인기있는 토픽이 없습니다" - posted: "더 이상 작성된 토픽이 없습니다" - read: "더 이상 읽을 토픽이 없습니다" - new: "더 이상 읽을 새로운 토픽이 없습니다." - unread: "더 이상 읽지 않은 토픽이 없습니다" - category: "더 이상 {{category}}에 토픽이 없습니다" - top: "더 이상 인기 토픽이 없습니다." - bookmarks: "더이상 북마크한 토픽이 없습니다." + latest: "더 이상 읽을 최신 글타래가 없습니다" + hot: "더 이상 읽을 인기있는 글타래가 없습니다" + posted: "더 이상 작성된 글타래가 없습니다" + read: "더 이상 읽을 글타래가 없습니다" + new: "더 이상 읽을 새로운 글타래가 없습니다." + unread: "더 이상 읽지 않은 글타래가 없습니다" + category: "더 이상 {{category}}에 글타래가 없습니다" + top: "더 이상 인기 글타래가 없습니다." + bookmarks: "더이상 북마크한 글타래가 없습니다." search: "더이상 검색 결과가 없습니다." topic: - filter_to: "이 토픽에서 {{username}}님의 {{post_count}}건의 게시물만 보기" - create: '새 토픽 만들기' - create_long: '새로운 토픽을 개설' + unsubscribe: + change_notification_state: "현재 당신의 알림 설정 : " + filter_to: "이 글타래에서 {{username}}님의 {{post_count}}건의 글만 보기" + create: '새 글타래 만들기' + create_long: '새로운 글타래를 개설' private_message: '메시지 시작' - list: '토픽 목록' - new: '새로운 토픽' + list: '글타래 목록' + new: '새로운 글타래' unread: '읽지 않은' new_topics: - other: '{{count}}개의 새로운 토픽' + other: '{{count}}개의 새로운 글타래' unread_topics: - other: '{{count}}개의 읽지 않은 토픽' - title: '토픽' + other: '{{count}}개의 읽지 않은 글타래' + title: '글타래' invalid_access: - title: "이 토픽은 비공개입니다" - description: "죄송합니다. 그 토픽에 접근 할 수 없습니다!" - login_required: "해당 토픽을 보려면 로그인이 필요합니다." + title: "이 글타래는 비공개입니다" + description: "죄송합니다. 그 글타래에 접근 할 수 없습니다!" + login_required: "해당 글타래를 보려면 로그인이 필요합니다." server_error: - title: "토픽을 불러오지 못했습니다" - description: "죄송합니다. 연결 문제로 인해 해당 토픽을 불러올 수 없습니다. 다시 시도하십시오. 문제가 지속되면 문의해 주시기 바랍니다" + title: "글타래를 불러오지 못했습니다" + description: "죄송합니다. 연결 문제로 인해 해당 글타래를 불러올 수 없습니다. 다시 시도하십시오. 문제가 지속되면 문의해 주시기 바랍니다" not_found: - title: "토픽을 찾을 수 없습니다" - description: "죄송합니다. 토픽을 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다." + title: "글타래를 찾을 수 없습니다" + description: "죄송합니다. 글타래를 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다." total_unread_posts: - other: "이 토픽에 {{count}}개의 읽지 않을 게시 글이 있습니다." + other: "이 글타래에 {{count}}개의 읽지 않을 게시 글이 있습니다." unread_posts: - other: "이 토픽에 {{count}}개의 읽지 않을 게시 글이 있습니다." + other: "이 글타래에 {{count}}개의 읽지 않을 게시 글이 있습니다." new_posts: - other: "최근 읽은 이후 {{count}}개 글이 이 토픽 작성되었습니다." + other: "최근 읽은 이후 {{count}}개 글이 이 글타래 작성되었습니다." likes: - other: "이 토픽에 {{count}}개의 '좋아요'가 있습니다." - back_to_list: "토픽 리스트로 돌아갑니다." - options: "토픽 옵션" - show_links: "이 토픽에서 링크를 표시합니다." - toggle_information: "토픽의 세부 정보를 토글합니다." - read_more_in_category: "더 많은 토픽들은 {{catLink}} 또는 {{latestLink}}에서 찾으실 수 있습니다" - read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다" - read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is 1개의 안 읽은 } other { are #개의 안 읽은 } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1개의 새로운 토픽이} other { {BOTH, select, true{and } false {are } other{}} # 새로운 토픽이} } 남아 있고, {CATEGORY, select, true {{catLink} 토픽도 확인해보세요.} false {{latestLink}} other {}}" + other: "이 글타래에 {{count}}개의 '좋아요'가 있습니다." + back_to_list: "글타래 리스트로 돌아갑니다." + options: "글타래 옵션" + show_links: "이 글타래에서 링크를 표시합니다." + toggle_information: "글타래의 세부 정보를 토글합니다." + read_more_in_category: "더 많은 글타래들은 {{catLink}} 또는 {{latestLink}}에서 찾으실 수 있습니다" + read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 글타래들을 찾으실 수 있습니다" + read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is 1개의 안 읽은 } other { are #개의 안 읽은 } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1개의 새로운 글타래가} other { {BOTH, select, true{and } false {are } other{}} # 새로운 글타래가} } 남아 있고, {CATEGORY, select, true {{catLink} 글타래도 확인해보세요.} false {{latestLink}} other {}}" browse_all_categories: 모든 카테고리 보기 - view_latest_topics: 최신 토픽 보기 + view_latest_topics: 최신 글타래 보기 suggest_create_topic: 토픽(글)을 작성 해 보실래요? jump_reply_up: 이전 답글로 이동 jump_reply_down: 이후 답글로 이동 - deleted: "토픽이 삭제되었습니다" - auto_close_notice: "이 토픽은 곧 자동으로 닫힙니다. %{timeLeft}." - auto_close_notice_based_on_last_post: "이 토픽은 마지막 답글이 달린 %{duration} 후 닫힙니다." + deleted: "글타래가 삭제되었습니다" + auto_close_notice: "이 글타래는 곧 자동으로 닫힙니다. %{timeLeft}." + auto_close_notice_based_on_last_post: "이 글타래는 마지막 답글이 달린 %{duration} 후 닫힙니다." auto_close_title: '자동으로 닫기 설정' auto_close_save: "저장" - auto_close_remove: "이 토픽을 자동으로 닫지 않기" + auto_close_remove: "이 글타래를 자동으로 닫지 않기" progress: - title: 진행 중인 토픽 + title: 진행 중인 글타래 go_top: "맨위" go_bottom: "맨아래" go: "이동" + jump_bottom: "최근 글로 이동" jump_bottom_with_number: "jump to post %{post_number}" - total: 총 게시글 - current: 현재 게시글 + total: 총 글 + current: 현재 글 position: "post %{current} of %{total}" notifications: reasons: '3_6': '이 카테고리를 보고 있어서 알림을 받게 됩니다.' - '3_5': '자동으로 이 게시물을 보고있어서 알림을 받게 됩니다.' - '3_2': '이 토픽을 보고있어서 알림을 받게 됩니다.' - '3_1': '이 토픽을 생성하여서 알림을 받게 됩니다.' - '3': '이 토픽을 보고있어서 알림을 받게 됩니다.' - '2_8': '이 토픽을 추적하고 있어서 알림을 받게 됩니다.' - '2_4': '이 토픽에 답글을 게시하여서 알림을 받게 됩니다.' - '2_2': '이 토픽을 추적하고 있어서 알림을 받게 됩니다.' - '2': '이 토픽을 읽어서 알림을 받게 됩니다. (설정)' - '1_2': '누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다.' - '1': '누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다.' - '0_7': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' - '0_2': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' - '0': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' + '3_5': '자동으로 이 글을 보고있어서 알림을 받게 됩니다.' + '3_2': '이 글타래를 보고있어서 알림을 받게 됩니다.' + '3_1': '이 글타래를 생성하여서 알림을 받게 됩니다.' + '3': '이 글타래를 보고있어서 알림을 받게 됩니다.' + '2_8': '이 글타래를 추적하고 있어서 알림을 받게 됩니다.' + '2_4': '이 글타래에 답글을 게시하여서 알림을 받게 됩니다.' + '2_2': '이 글타래를 추적하고 있어서 알림을 받게 됩니다.' + '2': '이 글타래를 읽어서 알림을 받게 됩니다. (설정)' + '1_2': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.' + '1': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.' + '0_7': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' + '0_2': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' + '0': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' watching_pm: title: "알림 : 주시 중" - description: "메시지의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다." + description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." watching: title: "주시 중" - description: "이 토픽의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다." + description: "이 글타래에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." tracking_pm: title: "알림 : 새 글 표시 중" - description: "읽지 않은 글과 새로운 게시물 수를 볼 수 있습니다. 누군가 당신의 @이름 을 언급했거나 당신의 글에 답글을 작성하면 알림을 받습니다." + description: "이 메시지의 읽지않은 응답의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다." tracking: title: "새 글 표시 중" - description: "읽지 않은 게시글의 수는 토픽 옆에 표시됩니다. 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 작성한 경우에 알림이 작동합니다." + description: "이 글타래의 새로운 답글의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다." regular: - title: "알림: 일반" - description: "누군가 당신의 @이름 을 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." + title: "알림 : 일반" + description: "누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다." regular_pm: - title: "알림: 일반" - description: "누군가 당신의 @이름을 언급했거나 당신의 글에 답글이 달릴 때만 알림을 받게 됩니다." + title: "알림 : 일반" + description: "누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다." muted_pm: title: "알림 : 끔" description: "이 메시지에 대해 어떠한 알림도 받지 않지 않습니다." @@ -885,58 +951,64 @@ ko: title: "알림 없음" description: "아무 알림도 없습니다. '읽지 않은 글' 탭에 나타나지 않습니다." actions: - recover: "토픽 다시 복구" - delete: "토픽 삭제" - open: "토픽 열기" - close: "토픽 닫기" - multi_select: "게시글 선택" + recover: "글타래 다시 복구" + delete: "글타래 삭제" + open: "글타래 열기" + close: "글타래 닫기" + multi_select: "글 선택" auto_close: "자동으로 닫기..." - pin: "토픽 고정..." - unpin: "토픽 고정 취소..." - unarchive: "보관 안된 토픽" - archive: "보관된 토픽" + pin: "글타래 고정..." + unpin: "글타래 고정 취소..." + unarchive: "보관 안된 글타래" + archive: "보관된 글타래" invisible: "목록에서 제외하기" visible: "목록에 넣기" reset_read: "값 재설정" feature: - pin: "토픽 고정" - unpin: "토픽 고정 취소" - pin_globally: "전역적으로 토픽 고정" - make_banner: "배너 토픽" - remove_banner: "배너 토픽 제거" + pin: "글타래 고정" + unpin: "글타래 고정 취소" + pin_globally: "전역적으로 글타래 고정" + make_banner: "배너 글타래" + remove_banner: "배너 글타래 제거" reply: title: '답글' - help: '이 토픽에 대한 답글 구성 시작' + help: '이 글타래에 대한 답글 구성 시작' clear_pin: title: "고정 취소" - help: "더 이상 목록의 맨 위에 표시하지 않도록 이 토픽의 고정 상태를 해제합니다." + help: "더 이상 목록의 맨 위에 표시하지 않도록 이 글타래의 고정 상태를 해제합니다." share: title: '공유' - help: '이 토픽의 링크를 공유' + help: '이 글타래의 링크를 공유' flag_topic: title: '신고' help: '운영자에게 이 글을 신고합니다.' - success_message: '성공적으로 토픽을 신고 하였습니다.' + success_message: '성공적으로 글타래를 신고 하였습니다.' feature_topic: - title: "Feature 토픽" - pin: "이 토픽을 {{categoryLink}} 카테고리 상단에 노출하도록 합니다." - confirm_pin: "이미 {{count}}개의 고정된 토픽이 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 토픽을 고정하시겠습니까?" - unpin: "이 토픽을 {{categoryLink}} 카테고리 상단에서 제거 합니다." - pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + title: "Feature 글타래" + pin: " {{categoryLink}} 카테고리 글타래 목록 상단에 고정 until" + confirm_pin: "이미 {{count}}개의 고정된 글타래가 있습니다. 너무 많은 글타래가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 글타래를 고정하시겠습니까?" + unpin: "이 글타래를 {{categoryLink}} 카테고리 상단에서 제거 합니다." + unpin_until: "{{categoryLink}} 카테고리 글타래 목록 상단에서 이 글타래를 제거하거나 %{until}까지 기다림." + pin_note: "개별적으로 사용자가 글타래 고정을 취소할 수 있습니다." already_pinned: - zero: " {{categoryLink}} 카테고리에 고정된 토픽이 없습니다." - one: "{{categoryLink}} 카테고리에 고정된 토픽: 1." - other: "{{categoryLink}} 카테고리에 고정된 토픽: {{count}}." - pin_globally: "이 토픽을 스태프가 고정 취소하기 전까지 모든 토픽 목록 상단에 고정합니다." - confirm_pin_globally: "이미 {{count}}개의 토픽이 전역적으로 고정되어 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 토픽을 전역적으로 고정하시겠습니까?" - unpin_globally: "모든 토픽 목록 상단에서 이 토픽을 제거" - global_pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + zero: " {{categoryLink}} 카테고리에 고정된 글타래가 없습니다." + one: "{{categoryLink}} 카테고리에 고정된 글타래: 1." + other: "{{categoryLink}} 카테고리에 고정된 글타래: {{count}}." + pin_globally: "모든 글타래 목록 상단 고정 until" + confirm_pin_globally: "이미 {{count}}개의 글타래가 전역적으로 고정되어 있습니다. 너무 많은 글타래가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 글타래를 전역적으로 고정하시겠습니까?" + unpin_globally: "모든 글타래 목록 상단에서 이 글타래를 제거" + unpin_globally_until: "모든 글타래 목록 상단에서 이 글타래를 제거하거나 %{until}까지 기다림." + global_pin_note: "개별적으로 사용자가 글타래 고정을 취소할 수 있습니다." already_pinned_globally: - zero: "전역적으로 고정된 토픽이 없습니다." - one: "전역적으로 고정된 토픽: 1." - other: "전역적으로 고정된 토픽: {{count}}." + zero: "전역적으로 고정된 글타래가 없습니다." + one: "전역적으로 고정된 글타래: 1." + other: "전역적으로 고정된 글타래: {{count}}." + make_banner: "이 글타래를 모든 페이지의 상단에 나타나는 배너로 만들기" + remove_banner: "모든 페이지에서 나타나는 배너에서 제거" + banner_note: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 글타래만이 배너로 지정 가능합니다." already_banner: - zero: "배너 토픽이 없습니다." + zero: "배너 글타래가 없습니다." + one: "현재 배너글타래가 존재합니다." inviting: "초대 중..." automatically_add_to_groups_optional: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (선택, 관리자만 가능)" automatically_add_to_groups_required: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (필수, 관리자만 가능)" @@ -952,16 +1024,16 @@ ko: title: '초대하기' username_placeholder: "아이디" action: '초대장 보내기' - help: '이메일을 통해 다른 사람을 이 토픽에 초대합니다.' + help: '이메일을 통해 다른 사람을 이 글타래에 초대합니다.' to_forum: "친구에게 요약 이메일을 보내고 이 포럼에 가입할 수 있도록 링크를 전송합니다." - sso_enabled: "이 토픽에 초대하고 싶은 사람의 아이디를 입력하세요." - to_topic_blank: "이 토픽에 초대하고 싶은 사람의 아이디나 이메일주소를 입력하세요." - to_topic_email: "이메일 주소를 입력하셨습니다. 당신의 친구에게 이 토픽에 답변 달기가 가능한 초대장을 보내겠습니다." - to_topic_username: "아이디를 입력했습니다. 해당 사용자에게 이 토픽으로 초대하는 링크와 함께 알림을 보내겠습니다." - to_username: "초대하고 싶은 사용자 아이디를 입력하세요. 해당 사용자에게 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." + sso_enabled: "이 글타래에 초대하고 싶은 사람의 아이디를 입력하세요." + to_topic_blank: "이 글타래에 초대하고 싶은 사람의 아이디나 이메일주소를 입력하세요." + to_topic_email: "이메일 주소를 입력하셨습니다. 친구들에게 이 글타래에 답변 달기가 가능하도록 조치하는 초대장을 보내겠습니다." + to_topic_username: "아이디를 입력하셨습니다. 이 글타래에 초대하는 링크와 함께 알림을 보내겠습니다." + to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 글타래에 초대하는 링크와 함께 알림을 보내겠습니다." email_placeholder: '이메일 주소' success_email: "{{emailOrUsername}}로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요." - success_username: "사용자가 이 토픽에 참여할 수 있도록 초대했습니다." + success_username: "사용자가 이 글타래에 참여할 수 있도록 초대했습니다." error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요? (Invites are rate limited)" login_reply: '로그인하고 답글 쓰기' filters: @@ -969,18 +1041,18 @@ ko: other: "{{count}} 글" cancel: "필터 제거" split_topic: - title: "새로운 토픽으로 이동" - action: "새로운 토픽으로 이동" - topic_name: "새로운 토픽 이름" - error: "새로운 토픽으로 이동시키는데 문제가 발생하였습니다." + title: "새로운 글타래로 이동" + action: "새로운 글타래로 이동" + topic_name: "새로운 글타래 이름" + error: "새로운 글타래로 이동시키는데 문제가 발생하였습니다." instructions: - other: "새로운 토픽을 생성하여, 선택한 {{count}}개의 글로 채우려고 합니다." + other: "새로운 글타래를 생성하여, 선택한 {{count}}개의 글로 채우려고 합니다." merge_topic: - title: "이미 있는 토픽으로 옴기기" - action: "이미 있는 토픽으로 옴기기" - error: "이 토픽을 이동시키는데 문제가 발생하였습니다." + title: "이미 있는 글타래로 옮기기" + action: "이미 있는 글타래로 옮기기" + error: "이 글타래를 이동시키는데 문제가 발생하였습니다." instructions: - other: " {{count}}개의 게시물을 옮길 토픽을 선택해주세요." + other: " {{count}}개의 글을 옮길 글타래를 선택해주세요." change_owner: title: "글 소유자 변경" action: "작성자 바꾸기" @@ -1001,14 +1073,14 @@ ko: description: other: {{count}}개의 개시글을 선택하셨어요. post: - reply: "{{link}}{{replyAvatar}} {{username}}에 답글 작성" - reply_topic: "{{link}}에 답글 작성" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "인용한 답글" edit: "{{link}} {{replyAvatar}} {{username}} 편집" edit_reason: "Reason: " - post_number: "{{number}}번째 게시물" + post_number: "{{number}}번째 글" last_edited_on: "마지막으로 편집:" - reply_as_new_topic: "링크된 토픽으로 답글 작성하기" + reply_as_new_topic: "링크된 글타래로 답글 작성하기" continue_discussion: "{{postLink}}에서 토론을 계속:" follow_quote: "인용 글로 이동" show_full: "전체 글 보기" @@ -1016,13 +1088,23 @@ ko: deleted_by_author: other: "(작성자에 의해 취소된 글입니다. 신고당한 글이 아니면 %{count} 시간 뒤에 자동으로 삭제됩니다)" expand_collapse: "확장/축소" + gap: + other: "{{count}}개의 숨겨진 답글 보기" more_links: "{{count}}개 더..." unread: "읽지 않은 포스트" has_replies: - other: "답글" + other: "{{count}} 답글" + has_likes: + other: "{{count}} 좋아요" + has_likes_title: + other: "{{count}}명이 이 글을 좋아합니다" + has_likes_title_you: + zero: "이 글을 좋아합니다." + one: "당신과 다른 1명이 이 글을 좋아합니다." + other: "당신과 {{count}}명이 이 글을 좋아합니다." errors: - create: "죄송합니다. 게시물을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." - edit: "죄송합니다. 게시물을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." + create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." + edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." upload: "죄송합니다. 파일을 업로드하는 동안 오류가 발생했습니다. 다시 시도하십시오." attachment_too_large: "업로드하려는 파일의 크기가 너무 큽니다. 최대 크기는 {{max_size_kb}}kb 입니다." file_too_large: "업로드하시려는 파일이 너무 커요. (최대 허용 파일 크기는 {{max_size_kb}}kb입니다)" @@ -1033,31 +1115,31 @@ ko: attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다." attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다." abandon: - confirm: "게시물 작성을 취소 하시겠습니까?" + confirm: "글 작성을 취소 하시겠습니까?" no_value: "아니오" yes_value: "예" - via_email: "이 토픽은 이메일을 통해 등록되었습니다." + via_email: "이 글타래는 이메일을 통해 등록되었습니다." wiki: - about: "이 게시글은 위키입니다. 누구나 수정할 수 있습니다." + about: "이 글은 위키입니다. 누구나 수정할 수 있습니다." archetypes: save: '옵션 저장' controls: - reply: "이 게시물에 대한 답글을 작성합니다." - like: "이 게시물을 좋아합니다." - has_liked: "이 게시글을 좋아합니다." - undo_like: "'좋아요' 취소하기" - edit: "이 게시물을 편집합니다." - edit_anonymous: "이 토픽을 수정하려면 먼저 로그인을 해야합니다." + reply: "이 글에 대한 답글을 작성합니다." + like: "이 글을 좋아합니다." + has_liked: "이 글을 좋아합니다." + undo_like: "'좋아요' 취소" + edit: "이 글 편집" + edit_anonymous: "이 글타래를 수정하려면 먼저 로그인을 해야합니다." flag: "운영자에게 이 글을 신고합니다." - delete: "이 게시물을 삭제합니다." - undelete: "이 게시물 삭제를 취소합니다." - share: "이 게시물에 대한 링크를 공유합니다." + delete: "이 글을 삭제합니다." + undelete: "이 글 삭제를 취소합니다." + share: "이 글에 대한 링크를 공유합니다." more: "더" delete_replies: confirm: - other: "이 게시글에 작성된 {{count}}개의 댓글도 삭제하시겠습니까?" + other: "이 글에 작성된 {{count}}개의 댓글도 삭제하시겠습니까?" yes_value: "예, 답글도 삭제합니다." - no_value: "아니오, 게시글만 삭제합니다." + no_value: "아니오, 글만 삭제합니다." admin: "관리자 기능" wiki: "위키 만들기" unwiki: "위키 제거하기" @@ -1078,82 +1160,83 @@ ko: like: "저도 '좋아요' 줄래요" vote: "Vote for it too" undo: - off_topic: "X" + off_topic: "신고 취소" spam: "신고 취소" inappropriate: "신고 취소" - bookmark: "X" - like: "'좋아요' 취소하기" - vote: "X" + bookmark: "북마크 취소" + like: "좋아요 취소" + vote: "투표 취소" people: - off_topic: "{{icons}}님이 이 게시물을 토픽에서 제외했습니다." + off_topic: "{{icons}}님이 이 글을 글타래에서 제외했습니다." spam: "{{icons}} 스팸으로 신고되었습니다" spam_with_url: "{{icons}} 스팸으로 표시됨" inappropriate: "{{icons}} 부적절하다고 신고했습니다" - notify_moderators: "{{icons}}님은 이 게시물을 운영자에게 보고했습니다." - notify_moderators_with_url: "{{icons}}님은 이 게시물을 운영자에게 보고했습니다." + notify_moderators: "{{icons}}님은 이 글을 운영자에게 보고했습니다." + notify_moderators_with_url: "{{icons}}님은 이 글을 운영자에게 보고했습니다." notify_user: "{{icons}} 메시지를 보냈습니다" notify_user_with_url: "{{icons}} 메시지를 보냈습니다." bookmark: "{{icons}}님이 북마크했습니다." like: "{{icons}}님이 좋아합니다." vote: "{{icons}}님이 투표했습니다." by_you: - off_topic: "당신은 이 게시물을 토픽에서 벗어남으로 신고했습니다." - spam: "당신은 이 게시물을 스팸으로 신고했습니다." - inappropriate: "당신은 이 게시물을 부적절하다고 신고했습니다" - notify_moderators: "당신은 이 게시물을 운영자에게 보고했습니다." + off_topic: "이 글을 글타래에서 벗어남으로 신고함" + spam: "이 글을 스팸으로 신고함" + inappropriate: "이 글을 부적절로 신고함" + notify_moderators: "이 글을 운영자에게 보고함" notify_user: "이 사용자에게 메시지를 보냈습니다." - bookmark: "당신은 이 게시물을 북마크했습니다." + bookmark: "이 글을 북마크함" like: "'좋아요' 했습니다" - vote: "당신은 이 게시물을 위해 투표했습니다." + vote: "이 글에 투표함" by_you_and_others: off_topic: - other: "당신과 {{count}}명의 다른 사용자가 이 게시물을 토픽에서 제외했습니다." + other: "나와 {{count}}명의 다른 사용자가 이 글을 글타래에서 제외했습니다." spam: - other: "당신과 {{count}}명의 다른 사람들이 스팸이라고 신고했습니다" + other: "나와 {{count}}명의 다른 사람들이 스팸이라고 신고했습니다" inappropriate: - other: "당신과 {{count}}명의 다른 사람들이 부적절하다고 신고했습니다" + other: "나와 {{count}}명의 다른 사람들이 부적절하다고 신고했습니다" notify_moderators: - other: "당신과 {{count}}명의 다른 사람들이 적당하다고 표시했습니다." + other: "나와 {{count}}명의 다른 사람들이 적당하다고 표시했습니다." notify_user: - other: "당신과 {{count}}명의 사용자가 이 사용자에게 메시지를 보냈습니다." + other: "나와 {{count}}명의 사용자가 이 사용자에게 메시지를 보냈습니다." bookmark: - other: "당신과 {{count}}명의 다른 사람들이 북마크 했습니다." + other: "나와 {{count}}명의 다른 사람들이 북마크 했습니다." like: - other: "당신과 {{count}}명의 다른 사람들이 좋아합니다." + other: "나와 {{count}}명의 다른 사람들이 좋아합니다." vote: - other: "당신과 {{count}}명의 다른 사람들이 이 포스트에 투표했습니다." + other: "나와 {{count}}명의 다른 사람들이 이 포스트에 투표했습니다." by_others: off_topic: - other: "{{count}}명의 사용자가 이 게시물을 토픽에서 제외했습니다." + other: "{{count}}명의 사용자가 이 글을 글타래에서 제외했습니다." spam: other: "{{count}}명의 사람들이 스팸이라고 신고했습니다" inappropriate: other: "{{count}}명의 사람들이 부적절하다고 신고했습니다" notify_moderators: - other: "{{count}}명의 사람들이 이 게시물을 운영자에게 신고했습니다" + other: "{{count}}명의 사람들이 이 글을 운영자에게 신고했습니다" notify_user: other: "{{count}}명이 이 사용자에게 메시지를 보냈습니다." bookmark: - other: "{{count}}명의 사용자가 이 게시물을 북마크했습니다." + other: "{{count}}명의 사용자가 이 글을 북마크했습니다." like: other: "{{count}}명이 이 글을 좋아합니다" vote: - other: "{{count}}명의 사용자가 이 게시물을 추천했습니다." + other: "{{count}}명의 사용자가 이 글을 추천했습니다." edits: one: 하나 편집 other: "{{count}}개 편집" zero: 편집 안함 delete: confirm: - other: "모든 게시물들을 삭제하시겠습니까?" + other: "모든 글들을 삭제하시겠습니까?" revisions: controls: - first: "First revision" - previous: "Previous revision" - next: "Next revision" - last: "Last revision" - hide: "리비전 감추기" - show: "리비전 보기" + first: "초판" + previous: "이전 판" + next: "다음 판" + last: "최신판" + hide: "편집 기록 가리기" + show: "편집 기록 보기" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Show the rendered output with additions and removals inline" @@ -1167,12 +1250,14 @@ ko: category: can: '허용' none: '(카테고리 없음)' + all: '모든 카테고리' choose: '카테고리를 선택하세요…' edit: '편집' edit_long: "카테고리 편집" - view: '카테고리안의 토픽보기' + view: '카테고리안의 글타래보기' general: '일반' settings: '설정' + topic_template: "글타래 템플릿" delete: '카테고리 삭제' create: '새 카테고리' save: '카테고리 저장' @@ -1182,7 +1267,7 @@ ko: save_error: 카테고리 저장 중 오류가 발생했습니다. name: "카테고리 이름" description: "설명" - topic: "카테고리 토픽" + topic: "카테고리 글타래" logo: "카테고리 로고 이미지" background_image: "카테고리 백그라운드 이미지" badge_colors: "뱃지 색상" @@ -1198,50 +1283,50 @@ ko: already_used: '이 색은 다른 카테고리에서 사용되고 있습니다.' security: "보안" images: "이미지" - auto_close_label: "토픽 자동 닫기 :" - auto_close_units: "hours" + auto_close_label: "글타래 자동 닫기 :" + auto_close_units: "시간" email_in: "incoming 메일 주소 수정" email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다." - email_in_disabled: "이메일로 새 토픽 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 토픽작성하기'를 활성화 해주세요." + email_in_disabled: "이메일로 새 글타래 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 글타래작성하기'를 활성화 해주세요." email_in_disabled_click: '"email in" 활성화' allow_badges_label: "뱃지가 이 카테고리에서 주어질 수 있도록 허용" edit_permissions: "권한 수정" add_permission: "권한 추가" this_year: "올해" position: "위치" - default_position: "Default Position" + default_position: "기본 위치" position_disabled: "카테고리는 활동량에 따라서 표시됩니다. 목록 내의 카테고리 순서를 지정하하려면" position_disabled_click: '"카테고리 위치 고정" 설정을 활성화 시키십시요.' parent: "부모 카테고리" notifications: watching: title: "주시 중" - description: "이 카테고리 내의 새로운 토픽들을 지켜보도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + description: "이 카테고리 내의 새로운 글타래들을 지켜보도록 자동으로 설정됩니다. 새로운 글이나 글타래에 대하여 알림을 받게되며 글타래 옆에 읽지 않은 글의 수가 표시됩니다." tracking: title: "새 글 표시 중" - description: "이 카테고리 내의 새로운 토픽들을 추적하도록 자동으로 설정됩니다. 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + description: "이 카테고리 내의 새로운 글타래들을 추적하도록 자동으로 설정됩니다. 글타래 옆에 읽지 않은 글의 수가 표시됩니다." regular: title: "알림: 일반" - description: "누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." + description: "누군가 내 @아아디 으로 멘션했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." muted: title: "알림 꺼짐" - description: "이 카테고리의 새로운 토픽에 대한 알림을 받지 않고 읽지 않\x1C은 탭에도 표시하지 않습니다." + description: "이 카테고리의 새로운 글타래에 대한 알림을 받지 않고 읽지 않\x1C은 탭에도 표시하지 않습니다." flagging: title: '우리 커뮤니티에 기여해 주셔서 감사합니다.' private_reminder: '신고는 오직 관리자만 볼 수 있습니다.' - action: '게시물 신고하기' + action: '글 신고하기' take_action: "조치를 취하기" notify_action: '메시지' delete_spammer: "스팸 사용자 삭제" - delete_confirm: "당신은 이 사용자의 %{posts}개의 게시글과 %{topics}개의 토픽을 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 블락 합니다. 이 사용자가 진짜 악성 사용자 입니까? " + delete_confirm: "이 사용자의 %{posts}개의 글과 %{topics}개의 글타래를 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 블락하려고 합니다. 이 사용자가 악성 사용자임이 확실합니까? " yes_delete_spammer: "예, 스팸 사용자 삭제." ip_address_missing: "(알 수 없음)" hidden_email_address: "(감춰짐)" submit_tooltip: "신고 접수하기" take_action_tooltip: "커뮤니티의 신고 수가 채워지기 기다리지 않고, 바로 신고 수를 제재 수준까지 채웁니다." - cant: "죄송합니다, 당신은 지금 이 게시물을 신고 할 수 없습니다." + cant: "죄송합니다, 지금 이 글을 신고 할 수 없습니다." formatted_name: - off_topic: "오프 토픽입니다." + off_topic: "오프 글타래입니다." inappropriate: "부적절함" spam: "스팸입니다" custom_placeholder_notify_user: "구체적이고, 건설적이며, 항상 친절하세요." @@ -1252,10 +1337,12 @@ ko: left: "{{n}} 나머지" flagging_topic: title: "우리 커뮤니티에 기여해 주셔서 감사합니다." - action: "신고된 토픽" + action: "신고된 글타래" notify_action: "메시지" topic_map: - title: "토픽 요약" + title: "글타래 요약" + participants_title: "빈번한 게시자" + links_title: "인기 링크" links_shown: "show all {{totalLinks}} links..." clicks: other: "%{count}번 클릭" @@ -1263,31 +1350,37 @@ ko: warning: help: "공식적인 주의입니다." bookmarked: - help: "북마크한 토픽" + help: "북마크한 글타래" locked: - help: "이 토픽은 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다." + help: "이 글타래는 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다." + archived: + help: "이 글타래는 보관중입니다. 고정되어 변경이 불가능합니다." unpinned: title: "핀 제거" - help: "이 토픽은 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다." + help: "이 글타래는 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다." pinned_globally: title: "핀 지정됨 (전역적)" - help: "이 토픽은 전역적으로 핀 지정 되었습니다. 모든 목록의 최상위에 표시됩니다." + help: "이 글타래는 전역적으로 핀 지정 되었습니다. 모든 목록의 최상위에 표시됩니다." pinned: title: "핀 지정됨" - help: "이 토픽은 고정되었습니다. 카테고리의 상단에 표시됩니다." - archived: - help: "이 토픽은 보관중입니다. 고정되어 변경이 불가능합니다." + help: "이 글타래는 고정되었습니다. 카테고리의 상단에 표시됩니다." invisible: - help: "이 토픽은 목록에서 제외됩니다. 토픽 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다." - posts: "게시물" - posts_lowercase: "게시글" - posts_long: "이 토픽의 게시물 수는 {{number}}개 입니다." - original_post: "원본 게시물" + help: "이 글타래는 목록에서 제외됩니다. 글타래 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다." + posts: "글" + posts_lowercase: "글" + posts_long: "이 글타래의 글 수는 {{number}}개 입니다." + posts_likes_MF: | + This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select, + low {with a high like to post ratio} + med {with a very high like to post ratio} + high {with an extremely high like to post ratio} + other {}} + original_post: "원본 글" views: "조회수" views_lowercase: other: "조회" replies: "답변" - views_long: "이 토픽은 {{number}}번 조회 되었습니다." + views_long: "이 글타래는 {{number}}번 읽혔습니다." activity: "활동" likes: "좋아요" likes_lowercase: @@ -1304,30 +1397,33 @@ ko: not_available: "Raw 이메일이 가능하지 않습니다." categories_list: "카테고리 목록" filters: - with_topics: "%{filter} 토픽" - with_category: "%{filter} %{category} 토픽" + with_topics: "%{filter} 글타래" + with_category: "%{filter} %{category} 글타래" latest: - title: "최신" - help: "가장 최근 토픽" + title: + zero: "최근" + one: "최근 (1)" + other: "최근 ({{count}})" + help: "가장 최근 글타래" hot: title: "인기 있는 글" - help: "가장 인기있는 토픽 중 하나를 선택" + help: "가장 인기있는 글타래 중 하나를 선택" read: title: "읽기" - help: "마지막으로 순서대로 읽은 토픽" + help: "마지막으로 순서대로 읽은 글타래" search: title: "검색" - help: "모든 토픽 검색" + help: "모든 글타래 검색" categories: title: "카테고리" title_in: "카테고리 - {{categoryName}}" - help: "카테고리별로 그룹화 된 모든 토픽" + help: "카테고리별로 그룹화 된 모든 글타래" unread: title: zero: "읽지 않은" one: "읽지 않은(1)" other: "읽지 않은({{count}})" - help: "지켜보거나 추적 중인 읽지 않은 토픽 " + help: "지켜보거나 추적 중인 읽지 않은 글타래 " lower_title_with_count: one: "1개의 읽지 않은 글" other: "{{count}}개의 읽지 않은 글" @@ -1340,26 +1436,28 @@ ko: zero: "새로운" one: "새로운(1)" other: "새로운({{count}})" - help: "며칠 내에 만들어진 토픽" + help: "며칠 내에 만들어진 글타래" posted: - title: "내 게시물" - help: "당신이 게시한 글" + title: "내 글" + help: "내가 게시한 글" bookmarks: title: "북마크" - help: "북마크된 토픽들" + help: "북마크된 글타래들" category: title: zero: "{{categoryName}}" one: "{{categoryName}} (1)" other: "{{categoryName}} ({{count}})" - help: "{{categoryName}}카테고리의 최신 토픽" + help: "{{categoryName}}카테고리의 최신 글타래" top: title: "인기" - help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 토픽" + help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 글타래" all: title: "전체 시간" yearly: title: "연" + quarterly: + title: "분기마다" monthly: title: "월" weekly: @@ -1367,11 +1465,12 @@ ko: daily: title: "일" all_time: "전체 시간" - this_year: "이번 년도" - this_month: "이번 달" - this_week: "이번 주" + this_year: "년" + this_quarter: "분기" + this_month: "월" + this_week: "주" today: "오늘" - other_periods: "더 많은 인기 토픽 보기" + other_periods: "상단 보기" browser_update: '안타깝게도 사용하시는 브라우저가 오래되어서 이 사이트를 이용하기 어렵습니다.. 브라우저를 업그레이드 하시기 바랍니다..' permission_types: full: "생성 / 답글 / 보기" @@ -1405,6 +1504,7 @@ ko: suspended: '접근금지:' private_messages_short: "메시지" private_messages_title: "메시지" + mobile_title: "모바일" space_free: "{{size}} free" uploads: "업로드" backups: "백업" @@ -1439,27 +1539,27 @@ ko: agree_flag_modal_title: "동의 및 ..." agree_flag_hide_post: "동의 (포스트 숨기기 + 개인 메시지 보내기)" agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it" - agree_flag_restore_post: "동의하기(게시글 복원)" - agree_flag_restore_post_title: "게시글을 복원하기" + agree_flag_restore_post: "동의하기(글 복원)" + agree_flag_restore_post_title: "글을 복원하기" agree_flag: "신고에 동의함" - agree_flag_title: "신고에 동의하며 게시글이 수정되지 않도록 유지하기" + agree_flag_title: "신고에 동의하며 글이 수정되지 않도록 유지하기" defer_flag: "연기" defer_flag_title: "신고 제거하기. 현재 어떠한 행위를 할 필요 없음" delete: "삭제" - delete_title: "신고에서 언급된 게시글 삭제하기" - delete_post_defer_flag: "게시글을 삭제하고 신고에 결정을 따름" - delete_post_defer_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기" - delete_post_agree_flag: "게시글을 삭제하고 신고에 동의함" - delete_post_agree_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기" + delete_title: "신고에서 멘션된 글 삭제하기" + delete_post_defer_flag: "글을 삭제하고 신고에 결정을 따름" + delete_post_defer_flag_title: "글을 삭제하고 첫번째 글이면 글타래 삭제하기" + delete_post_agree_flag: "글을 삭제하고 신고에 동의함" + delete_post_agree_flag_title: "글을 삭제하고 첫번째 글이면 글타래 삭제하기" delete_flag_modal_title: "삭제하고.." delete_spammer: "스패머 삭제" - delete_spammer_title: "사용자와 사용자가 작성한 모든 토픽과 게시글을 삭제함 " + delete_spammer_title: "사용자와 사용자가 작성한 모든 글타래과 글을 삭제함 " disagree_flag_unhide_post: "Disagree (글 감추기 취소)" - disagree_flag_unhide_post_title: "게시글의 모든 신고를 삭제하고 게시글을 볼 수 있도록 변경" + disagree_flag_unhide_post_title: "글의 모든 신고를 삭제하고 글을 볼 수 있도록 변경" disagree_flag: "Disagree" disagree_flag_title: "신고를 유효하지 않거나 올바르지 않은 것으로 거부함" clear_topic_flags: "완료" - clear_topic_flags_title: "이 토픽을 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요" + clear_topic_flags_title: "이 글타래를 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요" more: "(더 많은 답글...)" dispositions: agreed: "agreed" @@ -1472,10 +1572,10 @@ ko: error: "뭔가 잘못 됐어요" reply_message: "답글" no_results: "신고가 없습니다." - topic_flagged: "이 토픽은 신고 되었습니다." - visit_topic: "처리하기 위해 토픽으로 이동" - was_edited: "첫 신고 이후에 게시글이 수정되었음" - previous_flags_count: "이 게시글은 이미 {{count}}번 이상 신고 되었습니다." + topic_flagged: "이 글타래은 신고 되었습니다." + visit_topic: "처리하기 위해 글타래로 이동" + was_edited: "첫 신고 이후에 글이 수정되었음" + previous_flags_count: "이 글은 이미 {{count}}번 이상 신고 되었습니다." summary: action_type_3: other: "off-topic x{{count}}" @@ -1522,16 +1622,20 @@ ko: revoke: "폐지" confirm_regen: "API 키를 새로 발급 받으시겠습니까?" confirm_revoke: "API 키를 폐지하겠습니까?" - info_html: "당신의 API 키는 JSON콜을 이용하여 토픽을 생성하거나 수정할 수 있습니다." + info_html: "당신의 API 키는 JSON콜을 이용하여 글타래를 생성하거나 수정할 수 있습니다." all_users: "전체 유저" - note_html: "이 키의 보안에 특별히 주의하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 게시물을 작성할 수 있습니다." + note_html: "이 키의 보안에 특별히 주의하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 글을 작성할 수 있습니다." plugins: title: "플러그인" installed: "설치된 플러그인" name: "이름" none_installed: "설치된 플러그인이 없습니다." version: "버전" + enabled: "활성화?" + is_enabled: "예" + not_enabled: "아니요" change_settings: "설정 변경" + change_settings_short: "설정" howto: "플러그인은 어떻게 설치하나요?" backups: title: "백업" @@ -1586,7 +1690,7 @@ ko: title: "데이터베이스를 이전 workiong state로 되돌리기" confirm: "정말로 이전 작업 상태로 데이터베이스를 롤백하시겠습니까?" export_csv: - user_archive_confirm: "정말로 당신의 포스트를 다운로드 하시겠습니까?" + user_archive_confirm: "정말로 내 글을 다운로드 받습니까?" success: "Export initiated, you will be notified via message when the process is complete." failed: "내보내기가 실패했습니다. 로그를 확인해주세요" rate_limit_error: "글은 하루에 한번 다운로드 받을 수 있습니다. 내일 다시 시도해주십시요." @@ -1597,6 +1701,8 @@ ko: screened_email: "모든 이메일 목록을 CSV 형식으로 내보내기" screened_ip: "모든 표시된 IP 목록을 CSV 형식으로 내보내기" screened_url: "모든 표시된 URL 목록을 CSV 형식으로 내보내기" + export_json: + button_text: "내보니기" invite: button_text: "초대장 보내기" button_title: "초대장 보내기" @@ -1607,6 +1713,7 @@ ko: header: "헤더" top: "Top" footer: "푸터(하단영역)" + embedded_css: "Embedded CSS" head_tag: text: "" title: " 태그 전에 들어갈 HTML" @@ -1624,6 +1731,8 @@ ko: save: "저장" new: "새 사용자 지정" new_style: "새로운 스타일" + import: "가져오기" + import_title: "파일을 선택하거나 텍스트를 붙여넣으세요" delete: "삭제" delete_confirm: "이 정의를 삭제 하시겠습니까?" about: "사이트 Customization은 사이트의 스타일시트와 해더를 수정할 수 있게 해줍니다. 새로운 것을 추가하거나 기존 것을 선택해서 편집하세요." @@ -1664,7 +1773,7 @@ ko: description: "사이트 헤더에 텍스트와 아이콘" highlight: name: '하이라이트' - description: '페이지 내에 강조된 글 및 토픽 등의 배경색' + description: '페이지 내에 강조된 글 및 글타래 등의 배경색' danger: name: '위험' description: '글 삭제 등에 사용되는 강조색' @@ -1676,7 +1785,7 @@ ko: description: "좋아요 버튼 색" wiki: name: '위키' - description: "위키 게시글의 배경색으로 사용될 기본 색상" + description: "위키 글의 배경색으로 사용될 기본 색상" email: title: "이메일" settings: "설정" @@ -1696,7 +1805,7 @@ ko: sent_test: "전송됨!" delivery_method: "전달 방법" preview_digest: "요약 미리보기" - preview_digest_desc: "비활성화중인 사용자에게 보내는 매주 요약된 이메일링의 컨텐츠 미리보기" + preview_digest_desc: "초대 사용자들에게 보낼 요약 메일 내용 미리보기" refresh: "새로고침" format: "형식" html: "html" @@ -1720,8 +1829,8 @@ ko: last_match_at: "마지막 방문" match_count: "방문" ip_address: "IP" - topic_id: "토픽 ID" - post_id: "게시글 ID" + topic_id: "글타래 ID" + post_id: "글 ID" delete: '삭제' edit: '편집' save: '저장' @@ -1757,10 +1866,11 @@ ko: grant_badge: "뱃지 부여" revoke_badge: "뱃지 회수" check_email: "이메일 확인" - delete_topic: "토픽 삭제" - delete_post: "게시글 삭제" + delete_topic: "글타래 삭제" + delete_post: "글 삭제" impersonate: "대역" anonymize_user: "anonymize user" + roll_up: "roll up IP blocks" screened_emails: title: "블락된 이메일들" description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다." @@ -1796,6 +1906,8 @@ ko: impersonate: title: "이 사용자 행세하기" help: "디버깅 목적으로 사용자 계정으로 로그인 할 수 있습니다. 사용이 끝나면 로그아웃하여야 합니다." + not_found: "해당 사용자를 찾을 수 없습니다." + invalid: "죄송합니다. 관리자만 접근할 수 있습니다." users: title: '사용자' create: '관리자 사용자 추가' @@ -1849,7 +1961,7 @@ ko: suspend_reason: "Reason" suspended_by: "접근 금지자" delete_all_posts: "모든 글을 삭제합니다" - delete_all_posts_confirm: "당신은 %{posts}개의 게시글과 %{topics}개의 토픽을 삭제합니다. 확실합니까?" + delete_all_posts_confirm: "%{posts}개의 글과 %{topics}개의 글타래를 지우려고 합니다. 확실합니까?" suspend: "접근 금지" unsuspend: "접근 허용" suspended: "접근 금지?" @@ -1877,10 +1989,10 @@ ko: activity: 활동 like_count: 준/받은 '좋아요' last_100_days: '지난 100일간' - private_topics_count: 개인적인 토픽 수 - posts_read_count: 게시글 읽은 수 - post_count: 게시글 수 - topics_entered: 읽은 토픽 수 + private_topics_count: 개인적인 글타래 수 + posts_read_count: 글 읽은 수 + post_count: 글 수 + topics_entered: 읽은 글타래 수 flags_given_count: 작성한 신고 flags_received_count: 받은 신고 warnings_received_count: 받은 경고 @@ -1919,7 +2031,7 @@ ko: block_failed: '사용자 블락에 문제가 있습니다.' deactivate_explanation: "비활성화 사용자는 이메일 인증을 다시 받아야합니다." suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다." - block_explanation: "블락 사용자는 게시글을 작성하거나 토픽을 작성할 수 없습니다." + block_explanation: "블락 사용자는 글을 작성하거나 글타래를 작성할 수 없습니다." trust_level_change_failed: "신뢰도 변경에 문제가 있습니다." suspend_modal_title: "Suspend User" trust_level_2_users: "신뢰도 2 사용자들" @@ -1935,9 +2047,9 @@ ko: requirement_heading: "필수" visits: "방문수" days: "일" - topics_replied_to: "답글 달린 토픽" - topics_viewed: "읽은 토픽 수" - topics_viewed_all_time: "읽은 토픽 수 (전체 기간)" + topics_replied_to: "답글 달린 글타래" + topics_viewed: "읽은 글타래 수" + topics_viewed_all_time: "읽은 글타래 수 (전체 기간)" posts_read: "읽은 글 수" posts_read_all_time: "읽은 글 수 (전체 기간)" flagged_posts: "신고된 글" @@ -1973,6 +2085,7 @@ ko: delete: "삭제" cancel: "취소" delete_confirm: "사용자 필드를 삭제할까요?" + options: "온셥" required: title: "회원가입시 필수항목?" enabled: "필수" @@ -1988,6 +2101,7 @@ ko: field_types: text: '텍스트 필드' confirm: '확인' + dropdown: "드롭다운" site_text: none: "편집할 콘텐츠 유형을 선택하세요." title: '텍스트 콘텐츠' @@ -1999,12 +2113,13 @@ ko: no_results: "No results found." clear_filter: "Clear" add_url: "URL 추가" + add_host: "Host 추가" categories: all_results: 'All' required: '필수' basic: '기본 설정' users: '사용자' - posting: '게시물' + posting: '글' email: '이메일' files: '파일' trust: '신뢰도' @@ -2020,6 +2135,7 @@ ko: backups: "백업" login: "로그인" plugins: "플러그인" + user_preferences: "사용자 환경 설정" badges: title: 뱃지 new_badge: 새로운 뱃지 @@ -2034,7 +2150,7 @@ ko: modal_title: 뱃지 그룹으로 나누기 granted_by: 배지 부여자 granted_at: 배지 수여일 - reason_help: ( 토픽이나 게시글 링크) + reason_help: ( 글타래가나 글 링크) save: 저장 delete: 삭제 delete_confirm: 정말로 이 뱃지를 삭제하시겠습니까? @@ -2059,7 +2175,7 @@ ko: query: 뱃지 Query(SQL) target_posts: 포스트들을 타겟으로 하는 query auto_revoke: 매일 회수 query를 실행한다. - show_posts: 뱃지 페이지에서 뱃지를 받게한 게시글을 보여줍니다. + show_posts: 뱃지 페이지에서 뱃지를 받게한 글을 보여줍니다. trigger: Trigger trigger_type: none: "매일 업데이트" @@ -2093,6 +2209,32 @@ ko: name: "이름" image: "이미지" delete_confirm: "정말 :%{name}: emoji를 삭제하시겠습니까?" + embedding: + get_started: "다른 웹사이트에 Discourse를 임베드하려면 호스트 추가부터 하세요" + confirm_delete: "정말로 host를 삭제할까요?" + title: "Embedding" + host: "허용 Host" + edit: "편집" + category: "카테고리에 게시" + add_host: "Host 추가" + settings: "Embedding 설정" + feed_settings: "Feed 설정" + crawling_settings: "클롤러 설정" + permalink: + title: "고유링크" + url: "URL" + topic_id: "글타래 ID" + topic_title: "글타래" + post_id: "글 ID" + post_title: "글" + category_id: "카테고리 ID" + category_title: "카테고리" + external_url: "외부 URL" + delete_confirm: 정말로 이 고유 링크를 삭제하시겠습니까? + form: + label: "새로운:" + add: "추가" + filter: "검색 (URL 혹은 외부 URL)" lightbox: download: "download" search_help: @@ -2110,41 +2252,41 @@ ko: bookmarks: 'g, b 북마크' navigation: title: 'Navigation' - jump: '# 게시글 번호로' + jump: '# 글 번호로' back: 'u Back' - up_down: 'k/j 선택된 게시글 이동 ↑ ↓' - open: 'o or Enter 선택한 토픽에 들어갑니다.' + up_down: 'k/j 선택된 글 이동 ↑ ↓' + open: 'o or Enter 선택한 글타래에 들어갑니다.' next_prev: 'shift+j/shift+k 이전/다음 섹션' application: title: 'Application' - create: 'c 새 토픽을 만듭니다.' + create: 'c 새 글타래를 만듭니다.' notifications: 'n Open notifications' - site_map_menu: '= 사이트 메뉴 열기' + hamburger_menu: '= 햄버거 메뉴 열기' user_profile_menu: 'p 사용자 메뉴 열기' - show_incoming_updated_topics: '. 갱신된 토픽 보기' + show_incoming_updated_topics: '. 갱신된 글타래 보기' search: '/ Search' help: '? 키보드 도움말 열기' dismiss_new_posts: 'x, r 새글을 읽은 상태로 표시하기' - dismiss_topics: 'x, t 토픽 무시하기' + dismiss_topics: 'x, t 글타래 무시하기' actions: title: 'Actions' - bookmark_topic: 'f 토글 북마크 토픽' + bookmark_topic: 'f 토글 북마크 글타래' pin_unpin_topic: 'shift+p 핀고정/핀해제' - share_topic: 'shift+s 토픽 공유' - share_post: 's 게시글 공유' - reply_as_new_topic: 't 링크된 토픽으로 답글 작성하기' - reply_topic: 'shift+r 토픽에 답글 달기' - reply_post: 'r 게시글에 답글 달기' + share_topic: 'shift+s 글타래 공유' + share_post: 's 글 공유' + reply_as_new_topic: 't 링크된 글타래로 답글 작성하기' + reply_topic: 'shift+r 글타래에 답글 달기' + reply_post: 'r 글에 답글 달기' quote_post: 'q 인용 글' like: 'l Like post' flag: '! Flag post' bookmark: 'b Bookmark post' edit: 'e Edit post' delete: 'd Delete post' - mark_muted: 'm, m 토픽 알람 : 끄기' - mark_regular: 'm, r 토픽 알람 : 일반(기본)으로 설정하기' - mark_tracking: 'm, t 토픽 알람 : 추적하기' - mark_watching: 'm, w 토픽 알람 : 주시하기' + mark_muted: 'm, m 글타래 알람 : 끄기' + mark_regular: 'm, r 글타래 알람 : 일반(기본)으로 설정하기' + mark_tracking: 'm, t 글타래 알람 : 추적하기' + mark_watching: 'm, w 글타래 알람 : 주시하기' badges: title: 뱃지 allow_title: "can be used as a title" @@ -2203,13 +2345,13 @@ ko: name: 굉장히 좋은 글 description: 작성한 글이 좋아요를 50개 받았습니다. 이 뱃지는 중복 수여 가능합니다. nice_topic: - name: Nice 토픽 + name: Nice 글타래 description: 10개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. good_topic: - name: Good 토픽 + name: Good 글타래 description: 25개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. great_topic: - name: Great 토픽 + name: Great 글타래 description: 50개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. nice_share: name: Nice 공유 @@ -2231,16 +2373,16 @@ ko: description: 사용자 초대 campaigner: name: Campaigner - description: Invited 3 members + description: 기본 사용자 3명 초대하기 (신뢰도 1) champion: name: Champion - description: Invited 10 members + description: 기본 사용자 5명 초대하기 (신뢰도 2) first_share: name: 첫 공유 description: 처음으로 글을 공유했습니다. first_link: name: 첫 링크 - description: 글 작성시, 다른 토픽으로 가는 링크를 처음으로 추가하였습니다. + description: 글 작성시, 다른 글타래로 가는 링크를 처음으로 추가하였습니다. first_quote: name: 첫 인용 description: 글 작성시 다른 사용자의 글을 인용하였습니다. @@ -2249,13 +2391,22 @@ ko: description: 커뮤니티 가이드라인 을 읽었습니다. reader: name: 독서가 - description: 100개가 넘는 댓글이 달린 토픽의 댓글을 모두 읽었습니다. + description: 100개가 넘는 댓글이 달린 글타래의 댓글을 모두 읽었습니다. + popular_link: + name: 인기 링크 + description: 50회 이상 클릭이 발생한 외부 링크 게시 + hot_link: + name: HOT 링크 + description: 300회 이상 클릭이 발생한 외부 링크 게시 + famous_link: + name: Famous 링크 + description: 1000회 이상 클릭이 발생한 외부 링크 게시 google_search: | -

      검색 with Google

      +

      Google 검색

      - +

      diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 3a8e1bacde..bc95f1c0eb 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -8,6 +8,9 @@ nb_NO: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ nb_NO: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM, YYYY h:mm a" long_with_year_no_time: "D MMM, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM, 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM, 'YY" @@ -82,6 +90,16 @@ nb_NO: x_days: one: "1 dag siden" other: "%{count} dager siden" + later: + x_days: + one: "1 dag senere" + other: "%{count} dager senere" + x_months: + one: "1 måned senere" + other: "%{count} måneder senere" + x_years: + one: "1 år senere" + other: "%{count} år senere" share: topic: 'del en lenke til dette emnet' post: 'innlegg #%{postNumber}' @@ -90,10 +108,25 @@ nb_NO: facebook: 'del denne lenken på Facebook' google+: 'del denne lenken på Google+' email: 'del denne lenken i en e-post' + action_codes: + autoclosed: + enabled: 'lukket %{when}' + disabled: 'åpnet %{when}' + closed: + enabled: 'lukket %{when}' + disabled: 'åpnet %{when}' + archived: + enabled: 'arkivert %{when}' + disabled: 'fjernet fra arkiv %{when}' + pinned: + enabled: 'festet %{when}' + disabled: 'avfestet %{when}' + pinned_globally: + enabled: 'festet globalt %{when}' topic_admin_menu: "admin-handlinger for emne" emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt." edit: 'rediger tittelen og kategorien til dette emnet' - not_implemented: "Den funksjonen har ikke blitt implementert ennå, beklager!" + not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda." no_value: "Nei" yes_value: "Ja" generic_error: "Beklager, det har oppstått en feil." @@ -105,7 +138,6 @@ nb_NO: admin_title: "Admin" flags_title: "Rapporteringer" show_more: "vis mer" - show_help: "hjelp" links: "Lenker" links_lowercase: one: "link" @@ -129,6 +161,7 @@ nb_NO: every_two_weeks: "annenhver uke" every_three_days: "hver tredje dag" max_of_count: "maksimum av {{count}}" + alternation: "eller" character_count: one: "{{count}} tegn" other: "{{count}} tegn" @@ -188,9 +221,9 @@ nb_NO: revert: "Reverser" failed: "Mislykket" switch_to_anon: "Anonym modus" - switch_from_anon: "Avslutt anonym modus" banner: close: "Fjern denne banneren" + edit: "Endre denne banneren >>" choose_topic: none_found: "Ingen emner funnet." title: @@ -202,10 +235,21 @@ nb_NO: reject: 'Avvis' delete_user: 'Slett Bruker' title: "Trenger godkjenning" + none: "Det er ingen innlegg som må evalueres." edit: "Rediger" cancel: "Avbryt" + view_pending: "vis påventende innlegg" + has_pending_posts: + one: "Dette emnet har 1 innlegg som venter på godkjenning" + other: "Dette emnet har {{count}} innlegg som venter på godkjenning" confirm: "Lagre endringer" + delete_prompt: "Er du sikker du ønsker å slette %{username}? Dette vil fjerne alle brukerens innnlegg og blokkere epost og ip-addressen." approval: + title: "Innlegg Behøver Godkjenning" + description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Venligst vær tålmodig." + pending_posts: + one: "Du har 1 innlegg som venter på godkjenning." + other: "Du har {{count}} innlegg som venter på godkjenning." ok: "OK" user_action: user_posted_topic: "{{user}} postet emnet" @@ -303,6 +347,8 @@ nb_NO: topics_entered: "emner laget" post_count: "# innlegg" confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?" + user_fields: + none: "(velg et alternativ)" user: said: "{{username}}:" profile: "Profil" @@ -319,9 +365,18 @@ nb_NO: invited_by: "Invitert av" trust_level: "Tillitsnivå" notifications: "Varsler" + desktop_notifications: + perm_default: "Slå på varslinger" + perm_denied_btn: "Tillatelse avslått" + disable: "Slå av varslinger" + currently_enabled: "(slått på)" + enable: "Slå på varslinger" + currently_disabled: "(slått av)" + each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker." dismiss_notifications: "Merk alle som lest" dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest" disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar" + dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet" edit_history_public: "La andre brukere se mine innleggsrevisjoner" external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane" enable_quoting: "Aktiver svar med sitat for uthevet tekst" @@ -330,14 +385,15 @@ nb_NO: admin: "{{user}} er en admin" moderator_tooltip: "Denne brukeren er en moderator" admin_tooltip: "Denne brukeren er en administrator" + blocked_tooltip: "Denne brukeren er blokkert" suspended_notice: "Denne brukeren er bannlyst til {{date}}." suspended_reason: "Begrunnelse:" github_profile: "Github" mailing_list_mode: "Send meg en e-post for hvert nye innlegg (hvis ikke emnet eller kategorien er dempet)" watched_categories: "Følger" - watched_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner samt at antallet uleste og nye innlegg vil vises sammen med emneoppføringen." + watched_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner. Antallet uleste og nye emner vil også vises." tracked_categories: "Sporet" - tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Antallet uleste og nye emner vil vises ved siden av emnet." + tracked_categories_instructions: "Du vil automatisk spore alle nye emner i disse kategoriene. Antallet uleste og nye innlegg vil vises ved emnets oppføring." muted_categories: "Dempet" muted_categories_instructions: "Du vil ikke bli varslet om nye emner i disse kategoriene og de vil ikke vises i listen over ulest innhold." delete_account: "Slett kontoen min" @@ -367,6 +423,7 @@ nb_NO: set_password: "Sett passord" change_about: title: "Rediger om meg" + error: "Det skjedde en feil ved endring av denne verdien" change_username: title: "Endre brukernavn" confirm: "Hvis du endrer brukernavn vil alle siteringer av dine innlegg og nevning ved ditt @navn gå i stykker. Er du sikker på at du vil gjøre det?" @@ -381,6 +438,7 @@ nb_NO: change_avatar: title: "Bytt profilbilde" gravatar: "Gravatar, basert på" + gravatar_title: "Endre din avatar på Gravatars nettside" refresh_gravatar_title: "Oppdater din Gravatar" letter_based: "Systemtildelt profilbilde" uploaded_avatar: "Egendefinert bilde" @@ -388,7 +446,6 @@ nb_NO: upload_title: "Last opp bilde" upload_picture: "Last opp bilde" image_is_not_a_square: "Vi har beskjært bildet ditt, høyde og bredde er ikke lik" - cache_notice: "Du har byttet avatar, men det kan ta litt tid før endringen trer i kraft." change_profile_background: title: "Profilbakgrunn" instructions: "Profil bakgrunner vil bli sentrert med en standard bredde på 850px" @@ -448,38 +505,27 @@ nb_NO: every_two_weeks: "annenhver uke" email_direct: "Motta en e-post når noen siterer deg, svarer på dine innlegg, nevner ditt brukernavn eller inviterer deg til et emne" email_private_messages: "Motta en e-post når noen sender deg en melding" - email_always: "Ikke stans e-postvarsler mens jeg er aktiv på nettstedet." + email_always: "Send meg varsler på epost selv når jeg er aktiv på nettstedet" other_settings: "Annet" categories_settings: "Kategorier" new_topic_duration: label: "Anse emner som nye når" not_viewed: "Jeg har ikke sett på dem enda." last_here: "opprettet siden jeg var her sist" - after_n_days: - one: "opprettet den siste {{count}} dagen" - other: "opprettet de siste {{count}} dagene" - after_n_weeks: - one: "opprettet den siste {{count}} uken" - other: "opprettet de siste {{count}} ukene" auto_track_topics: "Følg automatisk emner jeg åpner" auto_track_options: never: "aldri" immediately: "øyeblikkelig" - after_n_seconds: - one: "etter 1 sekund" - other: "etter {{count}} sekunder" - after_n_minutes: - one: "etter 1 minutt" - other: "etter {{count}} minutter" invited: search: "skriv for å søke etter invitasjoner..." title: "invitasjoner" user: "Invitert bruker" - none: "Du har ikke invitert noen hit ennå." truncated: "Viser de første {{count}} invitasjoner." redeemed: "Løs inn invitasjoner" + redeemed_tab: "Brukt" redeemed_at: "Løst inn ved" pending: "Ventende invitasjoner" + pending_tab: "På vent" topics_entered: "Emner vist" posts_read_count: "Innlegg lest" expired: "Denne invitasjonen har utløpt" @@ -512,6 +558,7 @@ nb_NO: title: "Registreringens IP-adresse." avatar: title: "Profilbilde" + header_title: "Profil, meldinger, bokmerker og innstillinger" title: title: "Tittel" filters: @@ -544,6 +591,7 @@ nb_NO: logout: "Du ble logget ut" refresh: "Refresh" read_only_mode: + enabled: "Skrivebeskyttet modus er aktivert. Du kan fortsette å benytte siden med enkelte funksjoner vil muligens ikke fungere." login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus." learn_more: "lær mer..." year: 'år' @@ -575,6 +623,7 @@ nb_NO: private_message_info: title: "Send" invite: "Inviter andre..." + remove_allowed_user: "Er du sikker på at du vil fjerne {{name}} fra denne meldingen?" email: 'E-post' username: 'Brukernavn' last_seen: 'Sist sett' @@ -603,6 +652,7 @@ nb_NO: email_placeholder: "e-postadresse eller brukernavn" caps_lock_warning: "Caps Lock er på" error: "Ukjent feil" + rate_limit: "Vennligst vent litt før du logger inn igjen." blank_username_or_password: "Vennligst oppgi din e-postadresse eller brukernavn og ditt passord." reset_password: 'Nullstill passord' logging_in: "Logger på..." @@ -667,7 +717,6 @@ nb_NO: title_placeholder: "Oppsummert i en setning, hva handler denne diskusjonen om?" edit_reason_placeholder: "hvorfor endrer du?" show_edit_reason: "(legg till endringsbegrunnelse)" - reply_placeholder: "Skriv her. Bruk Markdown, BBCode eller HTML for formattering. Dra og slipp et bilde for å laste det opp." view_new_post: "Se ditt nye innlegg." saving: "Lagrer..." saved: "Lagret!" @@ -711,9 +760,11 @@ nb_NO: units: "(# timer)" examples: 'Før inn antall timer (24).' notifications: + title: "varsler om at ditt @navn blir nevnt, svar på dine innlegg, emner, meldinger, osv" none: "Notifikasjoner er ikke tilgjengelig for øyeblikket." more: "se gamle varsler" total_flagged: "totalt rapporterte innlegg" + mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " @@ -721,6 +772,7 @@ nb_NO: liked: "

      {{username}} {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " + invited_to_topic: "

      {{username}} {{description}}

      " invitee_accepted: "

      {{username}} accepted your invitation

      " moved_post: "

      {{username}} moved {{description}}

      " linked: "

      {{username}} {{description}}

      " @@ -739,15 +791,17 @@ nb_NO: from_the_web: "Fra nettet" remote_tip: "link til bilde" remote_tip_with_attachments: "link til bilde eller fil ({{authorized_extensions}})" - local_tip: "klikk for å velge et bilde fra din enhet." - local_tip_with_attachments: "klikk for å velge et bilde eller en fil fra din enhet ({{authorized_extensions}})" + local_tip: "velg bilder fra din enhet" + local_tip_with_attachments: "velg bilder eller filer fra din enhet ({{authorized_extensions}})" hint: "(du kan også drag & drop inn i editoren for å laste dem opp)" - hint_for_supported_browsers: "(du kan også drag og drop eller lime inn bilder inn i editoren for å laste dem opp)" uploading: "Laster opp bilde" + select_file: "Velg Fil" image_link: "lenken som bildet skal peke til" search: title: "søk etter emner, innlegg, brukere eller kategorier" no_results: "Ingen resultater funnet." + no_more_results: "Ingen flere resultater funnet." + search_help: Søkehjelp searching: "Søker ..." post_format: "#{{post_number}} av {{username}}" context: @@ -755,7 +809,6 @@ nb_NO: category: "Søk i kategorien \"{{category}}\"" topic: "Søk i dette emnet" private_messages: "Søk i meldinger" - site_map: "gå til en annen emneliste eller kategori" go_back: 'gå tilbake' not_logged_in_user: 'brukerside med oppsummering av nylig aktivtet og preferanser.' current_user: 'go til din brukerside' @@ -846,6 +899,7 @@ nb_NO: toggle_information: "vis/skjul emnedetaljer" read_more_in_category: "Vil du lese mer? Bla gjennom andre emner i {{catLink}} eller {{latestLink}}." read_more: "Vil du lese mer? {{catLink}} eller {{latestLink}}." + read_more_MF: "There { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" browse_all_categories: Se alle kategorier view_latest_topics: se siste emner suggest_create_topic: Hvorfor ikke opprette et emne? @@ -862,6 +916,7 @@ nb_NO: go_top: "topp" go_bottom: "bunn" go: "Gå" + jump_bottom: "Hopp til nyeste innlegg" jump_bottom_with_number: "hopp til innlegg %{post_number}" total: innlegg totalt current: gjeldende innlegg @@ -877,28 +932,32 @@ nb_NO: '2_4': 'Du vil motta varsler fordi du svarte på dette emnet.' '2_2': 'Du vil motta varsler fordi du følger dette emnet.' '2': 'Du vil motta varsler fordi du read this topic.' - '1_2': 'Du vil bli varslet hvis noen nevner ditt @navn eller svarer på din post.' - '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på din post.' + '1_2': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.' + '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.' '0_7': 'Du ignorerer alle varsler i denne kategorien.' '0_2': 'Du ignorerer alle varsler på dette emnet.' '0': 'Du ignorerer alle varsler på dette emnet.' watching_pm: title: "Følger" + description: "Du vil bli varslet om hvert nye innlegg i denne meldingen. Antall nye tilbakemeldinger vil også bli vist. " watching: title: "Følger" - description: "Du vil bli varslet om hvert nye innlegg i dette emnet. Antallet uleste og nye emner vil også vises ved siden av emnets oppføring." + description: "Du vil bli varslet om hvert nye innlegg i dette emnet. Antall nye tilbakemeldinger vil også bli vist. " tracking_pm: title: "Følger" + description: "Antall nye tilbakemeldinger vil bli vist for denne meldingen. Du vil bli varslet om noen nevner ditt @name eller svarer på din melding. " tracking: title: "Følger" - description: "En opptelling av uleste og nye poster vil visest ved siden av emnet. Du vil bli varslet om noen nevner ditt @navn eller svarer på din post." + description: "Antall nye svar vil bli vist for dette emnet. Du vil bli varslet om noen nevner ditt @name eller svarer på ditt innlegg.. " regular: - title: "Aktivt medlem" - description: "Du vil bli varslet om noen nevnet ditt @navn eller svarer på din post." + title: "Normal" + description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg." regular_pm: - title: "Aktivt medlem" + title: "Normal" + description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg." muted_pm: title: "Dempet" + description: "Du vil ikke få varslinger om noe i denne meldingnen. " muted: title: "Dempet" description: "du vil ikke bli varslet om noen ting i dette emnet, og det vil ikke visest som ulest." @@ -907,16 +966,19 @@ nb_NO: delete: "slett emne" open: "Åpne Emne" close: "Lukk Emne" + multi_select: "Velg Innlegg..." + auto_close: "Lukk Automatisk" pin: "Feste emnet..." + unpin: "Løsgjør Emne" unarchive: "Uarkiver Emne" archive: "Arkiver Emne" invisible: "Skjul Emnet" visible: "Vist Emnet" reset_read: "Tilbakestill Lesedata" feature: - pin: "Lås Emne" - unpin: "Lås Opp Emne" - pin_globally: "Lås Emne Globalt" + pin: "Fest Emnet" + unpin: "Løsgjør Emnet" + pin_globally: "Fest Emnet Globalt" make_banner: "Banneremne" remove_banner: "Fjern Banneremne" reply: @@ -934,7 +996,6 @@ nb_NO: success_message: 'Du har rapportert dette emnet' feature_topic: title: "Fremhev dette emnet" - pin: "Plasser dette emnet på toppen av {{categoryLink}} kategorien." confirm_pin: "Du har allerede {{count}} låste emner. For mange låste emner kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å låse et til emne i denne kategorien?" unpin: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien." pin_note: "Brukere kan låse opp emnet selv." @@ -942,7 +1003,6 @@ nb_NO: zero: "Det er ingen låste emner i {{categoryLink}}." one: "Emner for øyeblikket låst i {{categoryLink}}: 1." other: "Emner for øyeblikket låst i {{categoryLink}}: {{count}}." - pin_globally: "Gjør at dette emnet dukker opp på toppen av alle emnelister frem til en i staben låser det opp. " confirm_pin_globally: "Du har allerede {{count}} globalt låste emner. For mange låste emner kan bli en byrde for nye og anonyme brukere. Er du sikker på at du vil låse et til emne globalt? " unpin_globally: "Fjern dette emnet fra toppen av alle emnelister. " global_pin_note: "Brukere kan låse opp emner for dem selv. " @@ -964,14 +1024,24 @@ nb_NO: email_or_username: "Invitertes e-post eller brukernavn." email_or_username_placeholder: "e-postadresse eller brukernavn" action: "Inviter" + success: "Vi har invitert denne brukeren til å delta i denne meldingen." error: "Beklager, det oppstod en feil ved å invitere den brukeren." group_name: "gruppenavn" invite_reply: title: 'Inviter' username_placeholder: "brukernavn" action: 'Send Invitasjon' + help: 'Inviter andre til dette emnet via epost eller varsler' to_forum: "Vi sender en kortfattet e-post som gjør det mulig for en venn å umiddelbart registreres ved å klikke på en lenke. Ingen innlogging er nødvendig." + sso_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til dette emnet." + to_topic_blank: "Oppgi brukernavnet eller epost-adressen til personen du ønsker å invitere til dette emnet." + to_topic_email: "Du har oppgitt en epostadresse. Vi vil sende invitasjonen som later vennen din umiddelbart svare på dette emnet." + to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en link som inviterer dem til dette emnet." + to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer dem til dette emnet." email_placeholder: 'navn@example.com' + success_email: "Vi har sendt ut en invitasjon til {{emailOrUsername}}. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å holde styr på invitasjonene dine." + success_username: "Vi har invitert brukeren til å delta i dette emnet." + error: "Beklager, vi kunne ikke invitere den brukeren. De har muligens allerede blitt invitert?" login_reply: 'Logg Inn for å svare' filters: n_posts: @@ -1015,9 +1085,8 @@ nb_NO: one: Du har valgt 1 innlegg. other: Du har valgt {{count}} innlegg. post: - reply: "Svarer på {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Svar til {{link}}" quote_reply: "siter svar" + edit: "Redigerer {{link}} {{replyAvatar}} {{username}}" edit_reason: "Begrunnelse:" post_number: "post {{number}}" last_edited_on: "innlegg sist redigert" @@ -1028,13 +1097,26 @@ nb_NO: show_hidden: 'Se skjult innhold' deleted_by_author: one: "(innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)" - other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter % {count} timer, med mindre det blir rapportert)" + other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)" expand_collapse: "utvid/vis" + gap: + one: "vis 1 skjult svar" + other: "vis {{count}} skjulte svar" more_links: "{{count}} flere..." unread: "Innlegget er ulest" has_replies: - one: "Svar" - other: "Svar" + one: "{{count}} Svar" + other: "{{count}} Svar" + has_likes: + one: "{{count}} Like" + other: "{{count}} liker" + has_likes_title: + one: "{{count}} bruker likte dette innlegget" + other: "{{count}} brukere likte dette innlegget" + has_likes_title_you: + zero: "du likte dette innlegget" + one: "du og 1 annen bruker likte dette innlegget" + other: "du og {{count}} andre likte dette innlegget" errors: create: "Beklager, det oppstod en feil ved å publisere ditt innlegg. Vennligst prøv igjen." edit: "Beklager, det oppstod en feil ved redigeringen av ditt innlegg. Vennligst prøv igjen." @@ -1108,6 +1190,8 @@ nb_NO: inappropriate: "{{icons}} rapporterte dette som upassende" notify_moderators: "{{icons}} varslet moderatorene" notify_moderators_with_url: "{{icons}} varslet moderatorene" + notify_user: "{{icons}} sendte en melding" + notify_user_with_url: "{{icons}} sente en melding" bookmark: "{{icons}} bokmerket dette" like: "{{icons}} likte dette" vote: "{{icons}} stemte for dette" @@ -1133,6 +1217,9 @@ nb_NO: notify_moderators: one: "Du og 1 annen markerte dette for moderering" other: "Du og {{count}} andre rapporterte dette for moderering" + notify_user: + one: "Du og 1 annen bruker sendte en melding til denne brukeren" + other: "Du og {{count}} andre brukere har sendt en melding til denne brukeren" bookmark: one: "Du og 1 annen bokmerket dette innlegget" other: "Du og {{count}} andre bokmerket dette innlegget" @@ -1155,6 +1242,9 @@ nb_NO: notify_moderators: one: "1 bruker markerte dette for moderering" other: "{{count}} brukere rapporterte dette for moderering" + notify_user: + one: "1 person har sendt en melding til denne brukeren" + other: "{{count}} har sendt en melding til denne brukeren" bookmark: one: "1 bruker bokmerket dette innlegget" other: "{{count}} brukere bokmerket dette innlegget" @@ -1180,6 +1270,7 @@ nb_NO: last: "Siste revisjon" hide: "Skjul revisjon" show: "Vis revisjon" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Vis endelig tekst med endringene der de er gjort" @@ -1193,12 +1284,14 @@ nb_NO: category: can: 'kan…' none: '(no category)' + all: 'Alle kategorier' choose: 'Velg en katekori…' edit: 'rediger' edit_long: "Rediger" view: 'Se Emner i Kategori' general: 'Generellt' settings: 'Innstillinger' + topic_template: "Emnemal" delete: 'Slett kategori' create: 'Ny Kategori' save: 'Lagre Kategori' @@ -1245,10 +1338,10 @@ nb_NO: description: "Du vil automatisk følge alle nye emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner. Antallet uleste og nye emner vil også vises." tracking: title: "Sporing" - description: "Du vil automatisk følge alle nye emner i disse kategoriene. En teller for antall uleste og nye innlegg vil vises ved siden av emnet." + description: "Du vil automatisk spore alle nye emner i disse kategoriene. Antallet nye svar vises for disse." regular: title: "Vanlig" - description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på din post." + description: "Du vil bli varslet om noen nevner ditt @navn eller svarer deg." muted: title: "Dempet" description: "Du vil ikke bli varslet om noe vedrørende disse emnene i disse kategoriene og de vil ikke vises i din ulest-liste." @@ -1282,6 +1375,8 @@ nb_NO: notify_action: "Melding" topic_map: title: "Emneoppsummering" + participants_title: "Hyppige Bidragsytere" + links_title: "Populære Lenker" links_shown: "vis alle {{totalLinks}} linker..." clicks: one: "1 klikk" @@ -1293,6 +1388,8 @@ nb_NO: help: "Du lagret dette emnet" locked: help: "dette emnet er låst; det aksepterer ikke lenger nye svar" + archived: + help: "dette emnet er arkivert; det er fryst og kan ikke bli aktivert" unpinned: title: "Løsgjort" help: "Dette emnet er ikke lenger fastsatt, det vil vises i vanlig rekkefølge" @@ -1302,13 +1399,17 @@ nb_NO: pinned: title: "Fastsatt" help: "Dette emnet er fastsatt for deg; det vil vises i toppen av sin kategori" - archived: - help: "dette emnet er arkivert; det er fryst og kan ikke bli aktivert" invisible: help: "Dette emnet er ikke listet; det vil ikke vises i emnelister, og kan kun leses via en direktelenke" posts: "Innlegg" posts_lowercase: "innlegg" posts_long: "{{number}} innlegg i dette emnet" + posts_likes_MF: | + This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select, + low {with a high like to post ratio} + med {with a very high like to post ratio} + high {with an extremely high like to post ratio} + other {}} original_post: "Originalt Innlegg" views: "Visninger" views_lowercase: @@ -1337,7 +1438,10 @@ nb_NO: with_topics: "%{filter} emner" with_category: "%{filter} %{category} emner" latest: - title: "Siste" + title: + zero: "Siste" + one: "Siste (1)" + other: "Siste ({{count}})" help: "de sist oppdaterte emnene" hot: title: "Populære" @@ -1390,6 +1494,8 @@ nb_NO: title: "Totalt" yearly: title: "Årlig" + quarterly: + title: "Kvartalsvis" monthly: title: "Månedlig" weekly: @@ -1397,11 +1503,12 @@ nb_NO: daily: title: "Daglig" all_time: "Totalt" - this_year: "Dette året" - this_month: "Denne måneden" - this_week: "Denne uken" + this_year: "År" + this_quarter: "Kvartal" + this_month: "Måned" + this_week: "Uke" today: "I dag" - other_periods: "vis flere populære emner" + other_periods: "se toppen" browser_update: 'Dessverre, Din nettleser er for gammel og fungerer ikke med dette nettstedet.. Vennligst oppgrader nettleseren din.' permission_types: full: "Opprett / Svar / Se" @@ -1435,10 +1542,12 @@ nb_NO: suspended: 'Bannlyst:' private_messages_short: "Meldinger" private_messages_title: "Meldinger" + mobile_title: "Mobil" space_free: "{{size}} ledig" uploads: "opplastinger" backups: "sikkerhetskopier" traffic_short: "Trafikk" + traffic: "Applikasjon webforespørsler" page_views: "API forespørsler" page_views_short: "API forespørsler" show_traffic_report: "Vis detaljert trafikkrapport" @@ -1467,6 +1576,7 @@ nb_NO: agree_title: "Bekreft at denne rapporteringen er gyldig og korrekt" agree_flag_modal_title: "Godta og..." agree_flag_hide_post: "Godta (skjul innlegg + send PM)" + agree_flag_hide_post_title: "Skjul dette innlegget og automatisk send brukeren en melding som oppfordrer vedkommende til å foreta endringer" agree_flag_restore_post: "Gi medhold (gjenopprett innlegg)" agree_flag_restore_post_title: "Gjenopprett dette innlegget" agree_flag: "Si deg enig med rapportering" @@ -1540,6 +1650,10 @@ nb_NO: add_members: "Legg til medlemmer" custom: "Egendefinert" automatic: "Automatisk" + automatic_membership_email_domains: "Brukere som registererer seg med et epostdomene som matcher en i denne listen vil automatisk bli lagt til i denne gruppen." + automatic_membership_retroactive: "Benytt samme epostdomeneregel for å legge til eksisterende brukere" + default_title: "Standardtittel for alle brukere i denne gruppen" + primary_group: "Sett som primærgruppe automatisk" api: generate_master: "Generer Master API-nøkkel" none: "Det er ingen aktive API-nøkler akkurat nå." @@ -1555,13 +1669,17 @@ nb_NO: all_users: "Alle brukere" note_html: "Hold denne nøkkelen hemmelig. Alle brukere som har den vil kunne opprette vilkårlige innlegg som en hvilken som helst bruker. " plugins: - title: "Plugins" - installed: "Installerte Plugins" + title: "Utvidelser" + installed: "Installerte Utvidelser" name: "Navn" - none_installed: "Du har ikke installert noen plugins." + none_installed: "Du har ikke installert noen utvidelser." version: "Versjon" + enabled: "Aktivert?" + is_enabled: "J" + not_enabled: "N" change_settings: "Endre instillinger" - howto: "Hvordan innstallerer jeg plugins?" + change_settings_short: "Innstillinger" + howto: "Hvordan installerer jeg utvidelser?" backups: title: "Sikkerhetskopieringer" menu: @@ -1571,9 +1689,11 @@ nb_NO: read_only: enable: title: "Aktiver skrivebeskyttet modus" + label: "Aktiver skrivebeskyttet modus" confirm: "Er du sikker på at du vil aktivere skrivebeskyttet modus?" disable: title: "Deaktiver skrivebeskyttet modus" + label: "Deaktiver skrivebeskyttet modus" logs: none: "Ingen logger enda..." columns: @@ -1581,6 +1701,7 @@ nb_NO: size: "Størrelse" upload: label: "Last opp" + title: "Last opp en sikkerhetskopi til denne instansen" uploading: "Laster opp..." success: "'{{filename}}' har blitt lastet opp." error: "Det oppsto en feil ved opplastingen av '{{filename}}': {{message}}" @@ -1613,6 +1734,7 @@ nb_NO: confirm: "Er du sikker på at du vil gjenopprette databasen til en tidligere fungerende tilstand?" export_csv: user_archive_confirm: "Er du sikker på at du vil laste ned innleggene dine?" + success: "Eksportering iverksatt. Du vil bli varslet med en melding når prosessen er fullført." failed: "Eksporteringen feilet. Venligst undersøk loggene." rate_limit_error: "Innlegg kan lastes ned en gang om dagen, vennligst prøv igjen i morgen." button_text: "Eksporter" @@ -1622,6 +1744,8 @@ nb_NO: screened_email: "Eksporter komplett liste over filtrerte epostadresser i CSV format." screened_ip: "Eksporter komplett liste over filtrerte IP-addresser i CSV format." screened_url: "Eksporter komplett liste over filtrerte URL'er i CSV format." + export_json: + button_text: "Eksporter" invite: button_text: "Send invitasjoner" button_title: "Send invitasjoner" @@ -1632,10 +1756,13 @@ nb_NO: header: "Header" top: "Topp" footer: "Footer" + embedded_css: "Innebygd CSS" head_tag: text: "" + title: "HTML som settes inn før taggen." body_tag: text: "" + title: "HTML som settes inn før taggen." override_default: "Ikke inkluder standard stilark" enabled: "Aktivert?" preview: "forhåndsvisning" @@ -1647,6 +1774,8 @@ nb_NO: save: "Lagre" new: "Ny" new_style: "Ny Stil" + import: "Importer" + import_title: "Velg en fil eller lim inn tekst" delete: "Slett" delete_confirm: "Slett denne tilpasningen?" about: "Endre CSS og HTML-headere på nettstedet. Legg til en tilpasning for å starte." @@ -1719,7 +1848,6 @@ nb_NO: sent_test: "sendt!" delivery_method: "Leveringsmetode" preview_digest: "Forhåndsvis Oppsummering" - preview_digest_desc: "Forhåndsvis innholdet i det ukentlige e-postsammendraget sendt til inaktive medlemmer." refresh: "Refresh" format: "Format" html: "html" @@ -1784,6 +1912,7 @@ nb_NO: delete_post: "slett innlegg" impersonate: "overta brukerkonto" anonymize_user: "anonymiser bruker" + roll_up: "rull opp IP-blokker" screened_emails: title: "Kontrollerte e-poster" description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført." @@ -1818,6 +1947,8 @@ nb_NO: impersonate: title: "Fremstå som" help: "Bruk dette verktøyet for å fremstå som en annen bruker for feilsøking. Du må logge ut når du er ferdig." + not_found: "Den brukeren kunne ikke bli funnet." + invalid: "Beklager, du kan ikke gi deg ut for å være den brukeren." users: title: 'Brukere' create: 'Legg til Admin Bruker' @@ -1917,8 +2048,12 @@ nb_NO: approve_bulk_success: "Suksess! Alle valgte brukere har blitt godkjent og varslet." time_read: "Lesetid" anonymize: "Anonymiser Bruker" + anonymize_confirm: "Ønsker du virkelig å anonymisere denne kontoen? Dette vil endre brukernavn og e-post samt tilbakestille kontoinnstillinger." + anonymize_yes: "Ja, anonymiser denne kontoen" + anonymize_failed: "Det oppstod en feil ved anonymisering av denne kontoen." delete: "Slett Bruker" delete_forbidden_because_staff: "Administratorer og moderatorer kan ikke slettes." + delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer." delete_forbidden: one: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)" other: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dager kan ikke slettes.)" @@ -1998,6 +2133,7 @@ nb_NO: delete: "Slett" cancel: "Avbryt" delete_confirm: "Er du sikker på at du vil fjerne brukerfeltet?" + options: "Alternativer" required: title: "Nødvendig ved registrering?" enabled: "nødvendig" @@ -2013,6 +2149,7 @@ nb_NO: field_types: text: 'Tekstfelt' confirm: 'Bekreftelse' + dropdown: "Nedtrekk" site_text: none: "Velg en innholdstype for å starte redigering." title: 'Tekstinnhold' @@ -2024,6 +2161,7 @@ nb_NO: no_results: "Ingen treff funnet." clear_filter: "Tøm" add_url: "legg til URL" + add_host: "legg til host" categories: all_results: 'Alle' required: 'Påkrevd' @@ -2044,7 +2182,7 @@ nb_NO: uncategorized: 'Annet' backups: "Sikkerhetskopier" login: "Login" - plugins: "Plugins" + plugins: "Utvidelser" badges: title: Merker new_badge: Nytt merke @@ -2065,6 +2203,7 @@ nb_NO: delete_confirm: Er du sikker på at du vil slette dette merket? revoke: Tilbakedra reason: Grunn + expand: Ekspander revoke_confirm: Er du sikker på at du vil tilbakedra dette merket? edit_badges: Rediger merker grant_badge: Tildel merke @@ -2112,10 +2251,26 @@ nb_NO: with_time: %{username} - %{time} emoji: title: "Emoji" + help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROTIP: Dra og slipp flere filer samtidig)" add: "Legg til ny Emoji" name: "Navn" image: "Bilde" delete_confirm: "Sikker på at du vil slette: %{name}: emoji?" + permalink: + title: "Permalenker" + url: "URL" + topic_id: "Emne ID" + topic_title: "Emne" + post_id: "Innlegg ID" + post_title: "Innlegg" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Ekstern URL" + delete_confirm: Er du sikker du vil slette denne permalenken? + form: + label: "Ny:" + add: "Legg til" + filter: "Søk (URL eller ekstern URL)" lightbox: download: "last ned" search_help: @@ -2124,11 +2279,13 @@ nb_NO: title: 'Tastatursnarveier' jump_to: title: 'Hopp til' + home: 'g, h Hjem' latest: 'g, l Siste' new: 'g, n Nye' unread: 'g, u Ules' categories: 'g, c Kategorier' top: 'g, t Topp' + bookmarks: 'g, b Bokmerker' navigation: title: 'Navigasjon' jump: '# Gå til innlegg #' @@ -2140,7 +2297,6 @@ nb_NO: title: 'Applikasjon' create: 'c Opprett nytt emne' notifications: 'n Åpne varsler' - site_map_menu: '= Åpne nettstedsmenyen' user_profile_menu: 'p Åpne brukermenyen' show_incoming_updated_topics: '. Vis oppdaterte emner' search: '/ Søk' @@ -2250,6 +2406,15 @@ nb_NO: first_flag: name: Første rapportering description: Rapportert et innlegg + promoter: + name: Forfrem + description: Inviterte en bruker + campaigner: + name: Campaigner + description: Inviterte 3 medlemmer (tillitsnivå 1) + champion: + name: Mester + description: Inviterte 5 medlemmer (tillitsnivå 2) first_share: name: Første deling description: Delt et innlegg @@ -2265,12 +2430,3 @@ nb_NO: reader: name: Leser description: Leste hvert innlegg i et emne med mer enn 100 innlegg - google_search: | -

      Søk med Google

      -

      - - - - - -

      diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 656e39a82f..7474d3ec9d 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -8,6 +8,9 @@ nl: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ nl: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -82,6 +90,16 @@ nl: x_days: one: "1 day geleden" other: "%{count} dagen geleden" + later: + x_days: + one: "1 dag later" + other: "%{count} dagen later" + x_months: + one: "1 maand later" + other: "%{count} maanden later" + x_years: + one: "1 jaar later" + other: "%{count} jaren later" share: topic: 'deel een link naar deze topic' post: 'bericht #%{postNumber}' @@ -90,8 +108,28 @@ nl: facebook: 'deel deze link op Facebook' google+: 'deel deze link op Google+' email: 'deel deze link via e-mail' + action_codes: + split_topic: "deze topic splitsen %{when}" + autoclosed: + enabled: 'gesloten %{when}' + disabled: 'geopend %{when}' + closed: + enabled: 'gesloten %{when}' + disabled: 'geopend %{when}' + archived: + enabled: 'gearchiveerd %{when}' + disabled: 'gedearchiveerd %{when}' + pinned: + enabled: 'vastgepind %{when}' + disabled: 'niet vastgepind %{when}' + pinned_globally: + enabled: 'globaal vastgepind %{when}' + disabled: 'niet vastgepind %{when}' + visible: + enabled: 'zichtbaar %{when}' + disabled: 'niet zichtbaar %{when}' topic_admin_menu: "Adminacties voor topic" - emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie zal verstuurd worden" + emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie wordt verstuurd." edit: 'bewerk de titel en categorie van deze topic' not_implemented: "Die functie is helaas nog niet beschikbaar. Sorry!" no_value: "Nee" @@ -105,7 +143,7 @@ nl: admin_title: "Beheer" flags_title: "Meldingen" show_more: "meer..." - show_help: "help" + show_help: "opties" links: "Links" links_lowercase: one: "link" @@ -129,6 +167,7 @@ nl: every_two_weeks: "elke twee weken" every_three_days: "elke drie dagen" max_of_count: "maximaal {{count}}" + alternation: "of" character_count: one: "{{count}} teken" other: "{{count}} tekens" @@ -150,12 +189,12 @@ nl: user_count: "Nieuwe leden" active_user_count: "Actieve leden" contact: "Neem contact met ons op" - contact_info: "In het geval van een kritieke kwestie of dringende vraagstukken in verband met deze site neem contact op met ons op via %{contact_info}." + contact_info: "In het geval van een kritieke kwestie of dringende vraagstukken in verband met deze site, neem contact op met ons op via %{contact_info}." bookmarked: title: "Voeg toe aan favorieten" clear_bookmarks: "Verwijder favorieten" help: - bookmark: "Klik om het eerste bericht in dit topic toe te voegen aan je favorieten" + bookmark: "Klik om het eerste bericht van deze topic toe te voegen aan je favorieten" unbookmark: "Klik om alle favorieten in dit topic te verwijderen" bookmarks: not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen" @@ -181,6 +220,7 @@ nl: saved: "Opgeslagen!" upload: "Upload" uploading: "Uploaden..." + uploading_filename: "Uploaden {{filename}}..." uploaded: "Geupload!" enable: "Inschakelen" disable: "Uitschakelen" @@ -188,9 +228,10 @@ nl: revert: "Zet terug" failed: "Mislukt" switch_to_anon: "Anonieme modus" - switch_from_anon: "Verlaat anonieme modus" + switch_from_anon: "Anoniem afsluiten" banner: close: "Verberg deze banner." + edit: "Wijzig deze banner >>" choose_topic: none_found: "Geen topics gevonden." title: @@ -207,8 +248,8 @@ nl: cancel: "Annuleer" view_pending: "bekijk wachtende berichten" has_pending_posts: - one: "Dit topic heeft 1 bericht dat goedgekeurd moet worden" - many: "Dit topic heeft {{count}} berichten die goedgekeurd moeten worden" + one: "Voor deze topic staat 1 bericht klaar om goedgekeurd te worden" + other: "Voor dit topic staan {{count}} berichten klaar om goedgekeurd te worden" confirm: "Sla wijzigingen op" delete_prompt: "Weet je zeker dat je %{username} wilt verwijderen? Dit zal alle zijn berichten verwijderen en zal zijn email en ip-adres blokkeren." approval: @@ -239,7 +280,7 @@ nl: likes_received: "Ontvangen" topics_entered: "Bezocht" topics_entered_long: "Topics bezocht" - time_read: "Tijd Gelezen" + time_read: "Tijd gelezen" topic_count: "Topics" topic_count_long: "Topics gemaakt" post_count: "Antwoorden" @@ -266,6 +307,9 @@ nl: mods_and_admins: "Alleen moderatoren and admins" members_mods_and_admins: "Alleen leden van de groep, moderatoren en admins" everyone: "Iedereen" + trust_levels: + title: "Trustlevel dat automatisch wordt toegekend aan nieuwe gebruikers:" + none: "Geen" user_action_groups: '1': "Likes gegeven" '2': "Likes ontvangen" @@ -285,6 +329,13 @@ nl: all_subcategories: "alle" no_subcategory: "geen" category: "Categorie" + reorder: + title: "Categorieën Herschikken " + title_long: "Reorganiseer de categorielijst" + fix_order: "Posities fixen" + save: "Volgorde Opslaan" + apply_all: "Toepassen" + position: "Positie" posts: "Berichten" topics: "Topics" latest: "Laatste" @@ -314,22 +365,36 @@ nl: topics_entered: "topics ingevoerd" post_count: "# berichten" confirm_delete_other_accounts: "Weet je zeker dat je deze accounts wil verwijderen?" + user_fields: + none: "(selecteer een optie)" user: said: "{{username}}:" profile: "Profiel" mute: "Negeer" edit: "Wijzig voorkeuren" download_archive: "Download mijn berichten" - new_private_message: "Nieuw Bericht" + new_private_message: "Nieuw bericht" private_message: "Bericht" private_messages: "Berichten" activity_stream: "Activiteit" preferences: "Voorkeuren" + expand_profile: "Uitklappen" bookmarks: "Bladwijzers" bio: "Over mij" invited_by: "Uitgenodigd door" trust_level: "Trustlevel" notifications: "Notificaties" + desktop_notifications: + label: "Desktop Notificaties" + not_supported: "Notificaties worden niet ondersteund door deze browser. Sorry." + perm_default: "Notificaties Aanzetten" + perm_denied_btn: "Toestemming Geweigerd" + perm_denied_expl: "Gebruik van notificaties staat niet ingeschakeld. Gebruik je browser om notificaties toe te staan, klik vervolgens op de knop. (Desktop: Het meest linkse icoon op de adresbalk. Mobiel: 'Site Info' )" + disable: "Notificaties Uitschakelen" + currently_enabled: "(momenteel ingeschakeld)" + enable: "Notificaties Inschakelen" + currently_disabled: "(momenteel uitgeschakeld)" + each_browser_note: "Let op: Je moet deze optie instellen voor elke browser die je gebruikt." dismiss_notifications: "Markeer alles als gelezen" dismiss_notifications_tooltip: "Markeer alle ongelezen berichten als gelezen" disable_jump_reply: "Niet naar je nieuwe bericht gaan na reageren" @@ -342,14 +407,15 @@ nl: admin: "{{user}} is een beheerder" moderator_tooltip: "Deze gebruiker is een moderator" admin_tooltip: "Deze gebruiker is een admin" + blocked_tooltip: "Deze gebruiker is geblokeerd" suspended_notice: "Deze gebruiker is geschorst tot {{date}}." suspended_reason: "Reden: " github_profile: "Github" mailing_list_mode: "Ontvang een mail als er een nieuw bericht op het forum geplaatst is (tenzij je het topic of de betreffende categorie op stil zet)" watched_categories: "In de gaten gehouden" - watched_categories_instructions: "Je zal automatisch alle nieuwe topics in deze categorieën bekijken. Je ontvangt een notificatie van alle nieuwe berichten en topics. Daarnaast zal het aantal ongelezen en nieuwe berichten naast de topiclijst verschijnen." + watched_categories_instructions: "Je krijgt automatisch alle nieuwe topics in deze categorie te zien. Je ontvangt notificaties bij nieuwe berichten en topics, naast het topic wordt het aantal nieuwe berichten weergegeven. " tracked_categories: "Gevolgd" - tracked_categories_instructions: "Je zal automatisch alle nieuwe topics in deze categorieën volgen. Het aantal ongelezen en nieuwe berichten zal naast de topiclijst verschijnen." + tracked_categories_instructions: "Je volgt automatisch alle nieuwe topics in deze categorie. Naast het topic wordt het aantal nieuwe berichten weergegeven." muted_categories: "Genegeerd" muted_categories_instructions: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën en ze verschijnen niet op je ongelezen overzicht." delete_account: "Verwijder mijn account" @@ -379,6 +445,7 @@ nl: set_password: "Stel wachtwoord in" change_about: title: "Wijzig bio" + error: "Het veranderen van deze waarde is mislukt." change_username: title: "Wijzig gebruikersnaam" confirm: "Het wijzigen van je gebruikersnaam kan consequenties hebben. Weet je zeker dat je dit wil doen?" @@ -391,30 +458,31 @@ nl: error: "Het veranderen van je e-mailadres is mislukt. Misschien is deze al in gebruik?" success: "We hebben een mail gestuurd naar dat adres. Volg de bevestigingsinstructies in die mail." change_avatar: - title: "Wijzig je profiel afbeelding" + title: "Wijzig je profielafbeelding" gravatar: "Gravatar, gebaseerd op" + gravatar_title: "Verander je avatar op de Gravatar website" refresh_gravatar_title: "Laad je Gravatar opnieuw" - letter_based: "Door systeem toegekende profiel afbeelding" + letter_based: "Door systeem toegekende profielafbeelding" uploaded_avatar: "Eigen afbeelding" uploaded_avatar_empty: "Voeg een eigen afbeelding toe" upload_title: "Upload je afbeelding" upload_picture: "Upload afbeelding" image_is_not_a_square: "Let op: we hebben je afbeelding bijgesneden; breedte en hoogte waren niet gelijk." - cache_notice: "Je hebt je avatar succesvol veranderd, maar het kan even duren voordat deze zichtbaar is wegens browser caching." + cache_notice: "Je hebt je profielfoto succesvol gewijzigd, maar het kan even duren voordat deze zichtbaar is wegens browser caching." change_profile_background: title: "Profielachtergrond" - instructions: "Profiel achtergronden worden gecentreerd en hebben een standaard breedte van 850px." + instructions: "Profielachtergronden worden gecentreerd en hebben een standaard breedte van 850px." change_card_background: title: "Achtergrond gebruikersprofiel" - instructions: "Achtergrond afbeeldingen worden gecentreerd en hebben een standaard breedte van 590px." + instructions: "Achtergrondafbeeldingen worden gecentreerd en hebben een standaard breedte van 590px." email: title: "E-mail" instructions: "Nooit publiekelijk vertonen" - ok: "We sturen een email ter bevestiging" - invalid: "Vul een geldig email adres in " - authenticated: "Je email is geauthenticeerd door {{provider}}" + ok: "We sturen een e-mail ter bevestiging" + invalid: "Vul een geldig e-mailadres in " + authenticated: "Je e-mail is geauthenticeerd door {{provider}}" frequency: - zero: "We zullen je onmiddelijk e-mailen als je het ding waarover we je e-mailen niet gelezen hebt." + zero: "We zullen je onmiddelijk e-mailen als je hetgeen waarover we je e-mailen niet gelezen hebt." one: "We zullen je alleen maar e-mailen als we je de laatste paar minuten niet gezien hebben." other: "We zullen je alleen maar e-mailen als we je de laatste {{count}} minuten niet gezien hebben." name: @@ -434,7 +502,7 @@ nl: too_short: "Je gebruikersnaam is te kort." too_long: "Je gebruikersnaam is te lang." checking: "Kijken of gebruikersnaam beschikbaar is..." - enter_email: 'Gebruikersnaam gevonden. Vul het bijbehorende emailadres in.' + enter_email: 'Gebruikersnaam gevonden. Vul het bijbehorende e-mailadres in.' prefilled: "Je e-mailadres komt overeen met je geregistreerde gebruikersnaam." locale: title: "Interfacetaal" @@ -458,40 +526,44 @@ nl: every_three_days: "elke drie dagen" weekly: "wekelijks" every_two_weeks: "elke twee weken" - email_direct: "Stuur me een email wanneer iemand me citeert, reageert op mijn bericht, mijn @gebruikersnaam noemt of uitnodigt voor een topic." + email_direct: "Stuur me een e-mail wanneer iemand me citeert, reageert op mijn bericht, mijn @gebruikersnaam noemt of uitnodigt voor een topic." email_private_messages: "Ontvang een mail wanneer iemand je een bericht heeft gestuurd." - email_always: "E-mailnotificaties niet onderdrukken als ik actief ben op de site" + email_always: "Stuur me e-mail notificaties, zelfs als ik ben actief op de site" other_settings: "Overige" categories_settings: "Categorieën" new_topic_duration: label: "Beschouw topics als nieuw wanneer" not_viewed: "Ik heb ze nog niet bekeken" last_here: "aangemaakt sinds de laatste keer dat ik hier was" - after_n_days: - one: "gemaakt gisteren" - other: "gemaakt in de afgelopen {{count}} dagen" - after_n_weeks: - one: "gemaakt in de afgelopen week" - other: "gemaakt in de afgelopen {{count}} weken" + after_1_day: "gemaakt in de afgelopen dag" + after_2_days: "gemaakt in de afgelopen 2 dagen" + after_1_week: "gemaakt in de afgelopen week" + after_2_weeks: "gemaakt in de afgelopen 2 weken" auto_track_topics: "Automatisch topics volgen die ik bezocht heb" auto_track_options: never: "nooit" immediately: "direct" - after_n_seconds: - one: "na één seconde" - other: "na {{count}} seconden" - after_n_minutes: - one: "na één minuut" - other: "na {{count}} minuten" + after_30_seconds: "na 30 seconden" + after_1_minute: "na 1 minuut" + after_2_minutes: "na 2 minuten" + after_3_minutes: "na 3 minuten" + after_4_minutes: "na 4 minuten" + after_5_minutes: "na 5 minuten" + after_10_minutes: "na 10 minuten" invited: search: "Typ om uitnodigingen te zoeken..." title: "Uitnodigingen" user: "Uitgenodigd lid" - none: "Je hebt nog niemand uitgenodigd." + sent: "Verzonden" + none: "Er zijn geen uitstaande uitnodigingen om weer te geven." truncated: "De eerste {{count}} uitnodigingen." redeemed: "Verzilverde uitnodigingen" + redeemed_tab: "Verzilverd" + redeemed_tab_with_count: "Verzilverd ({{count}})" redeemed_at: "Verzilverd" pending: "Uitstaande uitnodigingen" + pending_tab: "Uitstaand" + pending_tab_with_count: "Uitstaand ({{count}})" topics_entered: "Topics bekeken" posts_read_count: "Berichten gelezen" expired: "Deze uitnodiging is verlopen." @@ -503,6 +575,8 @@ nl: days_visited: "Dagen bezocht" account_age_days: "leeftijd van account in dagen" create: "Stuur een uitnodiging" + generate_link: "Kopieer Uitnodiging Link" + generated_link_message: '

      Uitnodiging link succesvol aangemaakt!

      Uitnodiging link is alleen geldig voor dit e-mail adres: %{invitedEmail}

      ' bulk_invite: none: "Je hebt nog niemand uitgenodigd. Je kan individueel uitnodigen of een groep mensen tegelijk door een groepsuitnodiging-bestand te uploaden" text: "Groepsuitnodiging via bestand" @@ -514,7 +588,7 @@ nl: too_short: "Je wachtwoord is te kort." common: "Dat wachtwoord wordt al te vaak gebruikt." same_as_username: "Je wachtwoord is hetzelfde als je gebruikersnaam." - same_as_email: "Je wachtwoord is hetzelfde als je email." + same_as_email: "Je wachtwoord is hetzelfde als je e-mail." ok: "Je wachtwoord ziet er goed uit." instructions: "Minimaal %{count} tekens." associated_accounts: "Logins" @@ -524,6 +598,7 @@ nl: title: "Registratie IP-adres" avatar: title: "Profielfoto" + header_title: "profiel, berichten, favorieten en voorkeuren" title: title: "Titel" filters: @@ -556,9 +631,11 @@ nl: logout: "Je bent uitgelogd." refresh: "Ververs" read_only_mode: - enabled: "Alleen lezen modus is aangezet. Je kan de site bekijken, maar interacties werken mogelijk niet." + enabled: "Alleen-lezen modus is aangezet. Je kan de site bekijken, maar interacties werken mogelijk niet." login_disabled: "Zolang de site in read-only modus is, kan er niet ingelogd worden." - too_few_topics_notice: "Maak ten minste 5 openbare topics en %{posts} openbare berichten aan om de discussie te starten. Nieuwe gebruikers kunnen geen vertrouwensniveau's verdienen tenzij er berichten zijn die zij kunnen lezen. Dit bericht wordt alleen getoond aan de beheerders." + too_few_topics_and_posts_notice: "Laten we de discussie starten! Er zijn al %{currentTopics} / %{requiredTopics} topics en %{currentPosts} / %{requiredPosts} berichten. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren." + too_few_topics_notice: "Laten we de discussie starten! Er zijn al %{currentTopics} / %{requiredTopics} topics en %{currentPosts} / %{requiredPosts} berichten. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren." + too_few_posts_notice: "Laten we de discussie starten!. Er zijn al %{currentPosts} / %{requiredPosts} posts Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren." learn_more: "leer meer..." year: 'jaar' year_desc: 'topics die in de afgelopen 365 dagen gemaakt zijn' @@ -575,11 +652,16 @@ nl: replies_lowercase: one: reactie other: reacties + signup_cta: + sign_up: "Aanmelden" + hide_session: "Herrinner me morgen" + hide_forever: "Nee bedankt" + hidden_for_session: "Ok, ik vraag het je morgen. Je kunt altijd 'Log in' gebruiken om in te loggen." summary: enabled_description: "Je leest een samenvatting van dit topic: alleen de meeste interessante berichten zoals bepaald door de community. " description: "Er zijn {{count}} reacties." description_time: "Er zijn {{count}} reacties met een gemiddelde leestijd van {{readingTime}} minuten." - enable: 'Samenvatting van topic' + enable: 'Samenvatting Topic' disable: 'Alle berichten' deleted_filter: enabled_description: "Dit topic bevat verwijderde berichten, die niet getoond worden." @@ -596,7 +678,7 @@ nl: created: 'Gemaakt' created_lowercase: 'gemaakt' trust_level: 'Trustlevel' - search_hint: 'gebruikersnaam, email of IP adres' + search_hint: 'gebruikersnaam, e-mail of IP-adres' create_account: title: "Maak een nieuw account" failed: "Er ging iets mis, wellicht is het e-mailadres al geregistreerd. Probeer de 'Wachtwoord vergeten'-link." @@ -618,6 +700,7 @@ nl: email_placeholder: "e-mail of gebruikersnaam" caps_lock_warning: "Caps Lock staat aan" error: "Er is een onbekende fout opgetreden" + rate_limit: "Wacht even voor je opnieuw probeert in te loggen." blank_username_or_password: "Vul je email of gebruikersnaam en je wachtwoord in." reset_password: 'Herstel wachtwoord' logging_in: "Inloggen..." @@ -628,7 +711,7 @@ nl: requires_invite: "Toegang tot dit forum is alleen op uitnodiging." not_activated: "Je kan nog niet inloggen. We hebben je een activatie-mail gestuurd (naar {{sentTo}}). Volg de instructies in die mail om je account te activeren." not_allowed_from_ip_address: "Je kunt niet inloggen vanaf dat IP-adres." - admin_not_allowed_from_ip_address: "Je kan jezelf niet aanmelden vanaf dat IP adres." + admin_not_allowed_from_ip_address: "Je kan jezelf niet aanmelden vanaf dat IP-adres." resend_activation_email: "Klik hier om de activatiemail opnieuw te ontvangen." sent_activation_email_again: "We hebben een nieuwe activatiemail gestuurd naar {{currentEmail}}. Het kan een aantal minuten duren voor deze aan komt. Check ook je spamfolder." google: @@ -657,7 +740,7 @@ nl: emoji: "Emoji :smile:" add_warning: "Dit is een officiële waarschuwing." posting_not_on_topic: "In welke topic wil je je antwoord plaatsen?" - saving_draft_tip: "Opslaan..." + saving_draft_tip: "opslaan..." saved_draft_tip: "opgeslagen" saved_local_draft_tip: "lokaal opgeslagen" similar_topics: "Jouw topic lijkt op..." @@ -675,14 +758,13 @@ nl: reply_here: "Reageer hier" reply: "Reageer" cancel: "Annuleer" - create_topic: "Maak Topic" + create_topic: "Maak topic" create_pm: "Bericht" title: "Of druk op Ctrl-Return" users_placeholder: "Voeg een lid toe" title_placeholder: "Waar gaat de discussie over in één korte zin?" edit_reason_placeholder: "vanwaar de wijziging?" show_edit_reason: "(geef een reden)" - reply_placeholder: "Schrijf hier je bericht. Gebruik Markdown, BBCode of HTML voor de tekstopmaak. Sleep of plak een afbeelding in dit vak om deze te uploaden." view_new_post: "Bekijk je nieuwe bericht." saving: "Opslaan..." saved: "Opgeslagen!" @@ -743,6 +825,20 @@ nl: moved_post: "

      {{username}} verplaatste {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      '{{description}}' ontvangen

      " + alt: + mentioned: "Genoemd door" + quoted: "Gequoot door" + replied: "Gereageerd" + posted: "Geplaatst door" + edited: "Wijzig je bericht door" + liked: "Vind je bericht leuk" + private_message: "Privébericht van" + invited_to_private_message: "Uitgenodigd voor een privébericht van" + invited_to_topic: "Uitgenodigd voor een topic door" + invitee_accepted: "Uitnodiging geaccepteerd door" + moved_post: "Je bericht is verplaatst door" + linked: "Link naar je bericht" + granted_badge: "Badge toegekend" popup: mentioned: '{{username}} heeft je genoemd in "{{topic}}" - {{site_title}}' quoted: '{{username}} heeft je geciteerd in "{{topic}}" - {{site_title}}' @@ -757,15 +853,24 @@ nl: from_the_web: "Vanaf het web" remote_tip: "link naar afbeelding" remote_tip_with_attachments: "vul een url in van een afbeelding of bestand (toegestane extensies: {{authorized_extensions}})." - local_tip: "klik om een afbeelding vanaf je apparaat te selecteren." - local_tip_with_attachments: "klik om een afbeelding of bestand vanaf je apparaat te selecteren (toegestane extensies: {{authorized_extensions}})." + local_tip: "selecteer afbeeldingen van uw apparaat" + local_tip_with_attachments: "Selecteer afbeeldingen of bestanden van je apparaat ({{authorized_extensions}})" hint: "(je kan afbeeldingen ook slepen in de editor om deze te uploaden)" - hint_for_supported_browsers: "(je kan ook afbeeldingen hierheen slepen of copy/pasten om ze te uploaden)" uploading: "Uploaden" + select_file: "Selecteer een bestand" image_link: "de link waar je afbeelding naar verwijst" search: + sort_by: "Sorteren op" + relevance: "Relevantie" + latest_post: "Laatste bericht" + most_viewed: "Meest bekeken" + most_liked: "Meest geliked" + select_all: "Selecteer Alles" + clear_all: "Wis Alles" title: "zoek naar topics, berichten, gebruikers of categorieën" no_results: "Geen resultaten gevonden." + no_more_results: "Geen resultaten meer gevonden." + search_help: Zoek in help searching: "Zoeken..." post_format: "#{{post_number}} door {{username}}" context: @@ -773,7 +878,8 @@ nl: category: "Doorzoek de \"{{category}}\" categorie" topic: "Zoek in deze topic" private_messages: "Zoek berichten" - site_map: "ga naar een andere topiclijst of categorie" + hamburger_menu: "ga naar een andere topiclijst of categorie" + new_item: "nieuw" go_back: 'ga terug' not_logged_in_user: 'gebruikerspagina met samenvatting van huidige activiteit en voorkeuren' current_user: 'ga naar je gebruikerspagina' @@ -822,6 +928,9 @@ nl: bookmarks: "Er zijn niet meer topics met een bladwijzer." search: "Er zijn geen zoekresultaten meer." topic: + unsubscribe: + stop_notifications: "Je zal nu minder notificaties ontvangen voor {{title}}" + change_notification_state: "Je huidige notificatie status is" filter_to: "{{post_count}} berichten in topic" create: 'Nieuw topic' create_long: 'Maak een nieuw topic' @@ -881,6 +990,7 @@ nl: go_top: "bovenaan" go_bottom: "onderkant" go: "ga" + jump_bottom: "spring naar laatste bericht" jump_bottom_with_number: "spring naar bericht %{post_number}" total: totaal aantal berichten current: huidige bericht @@ -896,32 +1006,32 @@ nl: '2_4': 'Je ontvangt notificaties omdat je een reactie in dit topic hebt geplaatst.' '2_2': 'Je ontvangt notificaties omdat je dit topic volgt.' '2': 'Je ontvangt notificaties omdat je dit topic hebt gelezen.' - '1_2': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op je bericht.' - '1': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op je bericht.' + '1_2': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou.' + '1': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou.' '0_7': 'Je negeert alle notificaties in deze categorie.' '0_2': 'Je negeert alle notificaties in deze topic.' '0': 'Je negeert alle notificaties in deze topic.' watching_pm: title: "In de gaten houden" - description: "Je krijgt een notificatie voor elk nieuw bericht in deze conversatie. Het aantal ongelezen en nieuwe berichten zal naast de topiclijst verschijnen." + description: "Je krijgt een notificatie voor elke nieuwe reactie op dit bericht, en het aantal nieuwe reacties wordt weergegeven." watching: title: "In de gaten houden" - description: "Je krijgt een notificatie voor elk nieuw bericht in dit topic. Het aantal ongelezen en nieuwe berichten zal naast de topiclijst verschijnen." + description: "Je krijgt een notificatie voor elke nieuwe reactie op dit bericht, en het aantal nieuwe reacties wordt weergegeven." tracking_pm: title: "Volgen" - description: "Het aantal ongelezen en nieuwe berichten verschijnt naast het bericht. Je krijgt alleen een notificatie als iemand je @naam noemt of reageert op je bericht." + description: "Het aantal nieuwe reacties op dit bericht wordt weergegeven. Je krijgt een notificatie als iemand je @name noemt of reageert." tracking: title: "Volgen" - description: "Het aantal ongelezen en nieuwe berichten wordt getoond naast het topic in het overzicht. Je krijgt enkel een notificatie als iemand je @naam noemt of een bericht van jou beantwoord." + description: "Het aantal nieuwe reacties op dit bericht wordt weergegeven. Je krijgt een notificatie als iemand je @name noemt of reageert." regular: title: "Normaal" - description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op je bericht." + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." regular_pm: title: "Normaal" - description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op je bericht." + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." muted_pm: title: "Negeren" - description: "Je zal geen enkele notificatie ontvangen over dit bericht.," + description: "Je zal geen enkele notificatie ontvangen over dit bericht." muted: title: "Negeren" description: "Je zal geen notificaties krijgen van dit topic en het zal ook niet verschijnen in je lijst ongelezen topics." @@ -960,17 +1070,20 @@ nl: success_message: 'Je hebt dit topic gemarkeerd' feature_topic: title: "Feature dit topic" - pin: "Zorg ervoor dat dit topic bovenaan de {{categoryLink}} categorie komt." + pin: "Zet deze topic bovenaan in de {{categoryLink}} categorie tot" confirm_pin: "Je hebt al {{count}} vastgepinde topics. Teveel vastgepinde topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet je zeker dat je nog een topic wilt vastpinnen in deze categorie?" unpin: "Zorg ervoor dat dit topic niet langer bovenaan de {{categoryLink}} categorie komt." - pin_note: "Gebruikers kunnen dit topic voor zichzelf ontpinnen." + unpin_until: "Zet deze topic niet langer bovenaan in de {{categoryLink}} categorie of wacht tot %{until}." + pin_note: "Gebruikers kunnen het vastpinnen voor dit topic voor zichzelf ongedaan maken." + pin_validation: "Een datum is vereist om deze topic vast te pinnen." already_pinned: zero: "Er zijn geen topics vastgepind in {{categoryLink}}." one: "Topics welke vastgepind zijn in {{categoryLink}}: 1." other: "Topics welke vastgepind zijn in {{categoryLink}}: {{count}}." - pin_globally: "Zorg ervoor dat dit topic bovenaan alle all topic lijsten komt, totdat een beheerder deze ontpint." + pin_globally: "Zet deze topic bovenaan in alle topic lijsten tot" confirm_pin_globally: "Je hebt al {{count}} globaal vastgepinde topics. Teveel vastgepinde topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet je zeker dat je nog een topic globaal wilt vastpinnen?" unpin_globally: "Zorg ervoor dat dit topic niet langer bovenaan alle topic lijsten komt." + unpin_globally_until: "Zet deze topic niet langer bovenaan in alle topic lijsten of wacht tot %{until}." global_pin_note: "Gebruikers kunnen dit topic voor zichzelf ontpinnen." already_pinned_globally: zero: "Er zijn geen globaal vastgepinde topics." @@ -986,6 +1099,7 @@ nl: automatically_add_to_groups_optional: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (optioneel, alleen voor beheerders)" automatically_add_to_groups_required: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (Verplicht, alleen voor beheerders)" invite_private: + title: 'Uitnodigen voor Bericht' email_or_username: "E-mail of gebruikersnaam van genodigde" email_or_username_placeholder: "e-mailadres of gebruikersnaam" action: "Uitnodigen" @@ -997,12 +1111,12 @@ nl: username_placeholder: "gebruikersnaam" action: 'Stuur Uitnodiging' help: 'nodig anderen uit voor dit topic via email of notificaties' - to_forum: "We sturen een kort mailtje waarmee je vriend direct zich kan aanmelden door op een link te klikken, zonder te hoeven inloggen." + to_forum: "We sturen een kort mailtje waarmee je vriend zich direct kan aanmelden door op een link te klikken, zonder te hoeven inloggen." sso_enabled: "Voer de gebruikersnaam in van de persoon die je uit wil nodigen voor dit topic." to_topic_blank: "Voer de gebruikersnaam of het email-adres in van de persoon die je uit wil nodigen voor dit topic." to_topic_email: "Je hebt een email-adres ingevuld. We zullen een uitnodiging e-mailen waarmee je vriend direct kan antwoorden op dit topic." - to_topic_username: "Je hebt een gebruikersnaam ingevuld. We zullen een notificatie sturen naar die gebruiker met een link voor deelname aan dit topic." - to_username: "Vul de gebruikersnaam in van de persoon die je wilt uitnodigen. We zullen een notificatie sturen naar die gebruiker met een link voor deelname aan dit topic." + to_topic_username: "Je hebt een gebruikersnaam ingevuld. We sturen een notificatie met een link om deel te nemen aan dit topic." + to_username: "Vul de gebruikersnaam in van de persoon die je wilt uitnodigen. We sturen een notificatie met een link om deel te nemen aan dit topic" email_placeholder: 'naam@voorbeeld.nl' success_email: "We hebben een uitnodiging gemaild naar {{emailOrUsername}}. We stellen je op de hoogte als op de uitnodiging is ingegaan. Controleer de uitnodigingen tab op je gebruikerspagina om een overzicht te hebben van je uitnodigingen." success_username: "We hebben die gebruiker uitgenodigd om deel te nemen in dit topic." @@ -1038,6 +1152,12 @@ nl: one: "Kies de nieuwe eigenaar van het bericht door {{old_user}}." other: "Kies de nieuwe eigenaar van de {{count}} berichten door {{old_user}}." instructions_warn: "Let op dat alle meldingen over deze discussie niet met terugwerkende kracht worden overgedragen aan de nieuwe gebruiker.
      Waarschuwing: Momenteel wordt geen bericht-afhankelijke gegevens overgedragen aan de nieuwe gebruiker. Wees voorzichtig met het gebruik hier van." + change_timestamp: + title: "Wijzig Tijdsaanduiding" + action: "wijzig tijdsaanduiding" + invalid_timestamp: "Tijdsaanduiding kan niet in de toekomst zijn" + error: "Het wijzigen van de tijdsaanduiding van de topic is niet gelukt." + instructions: "Kies een nieuwe tijdsaanduiding voor de topic. Berichten in de topic worden aangepast zodat het onderlinge tijdsverschil gelijk blijft." multi_select: select: 'selecteer' selected: 'geselecteerd ({{count}})' @@ -1050,8 +1170,8 @@ nl: one: Je hebt één bericht geselecteerd. other: Je hebt {{count}} berichten geselecteerd. post: - reply: "Reageren op {{link}} door {{replyAvatar}} {{username}}" - reply_topic: "Reageer op {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "citeer" edit: "Bewerken van {{link}} door {{replyAvatar}} {{username}}" edit_reason: "Reden: " @@ -1064,13 +1184,26 @@ nl: show_hidden: 'Bekijk verborgen inhoud' deleted_by_author: one: "(bericht ingetrokken door de schrijver), wordt automatisch verwijderd over %{count} uur, tenzij gemarkeerd." - other: "(berichten ingetrokken door de schrijver), worden automatisch verwijderd over %{count} uur, tenzij gemarkeerd." + other: "(bericht ingetrokken door de schrijver, wordt automatisch verwijderd over %{count} uur, tenzij gemarkeerd)" expand_collapse: "in-/uitvouwen" + gap: + one: "bekijk 1 verborgen reactie" + other: "bekijk {{count}} verborgen reacties" more_links: "{{count}} meer..." unread: "Bericht is ongelezen" has_replies: - one: "Reactie" - other: "Reacties" + one: "1 Reactie" + other: "{{count}} Reacties" + has_likes: + one: "1 Like" + other: "{{count}} Likes" + has_likes_title: + one: "iemand vind dit bericht leuk" + other: "{{count}} mensen vinden dit bericht leuk" + has_likes_title_you: + zero: "Je vind dit bericht leuk" + one: "jij en 1 ander persoon vinden dit leuk" + other: "jij en {{count}} anderen vinden dit leuk" errors: create: "Sorry, er is iets misgegaan bij het plaatsen van je bericht. Probeer het nog eens." edit: "Sorry, er is iets misgegaan bij het bewerken van je bericht. Probeer het nog eens." @@ -1119,6 +1252,9 @@ nl: unhide: "Toon" actions: flag: 'Markeer' + defer_flags: + one: "Markering negeren" + other: "Markeringen negeren" it_too: off_topic: "Markeer het ook" spam: "Markeer het ook" @@ -1221,6 +1357,7 @@ nl: last: "Laatste revisie" hide: "Verberg revisie" show: "Toon revisie" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Toon de het gerenderde bericht met wijzigingen als één geheel" @@ -1234,15 +1371,20 @@ nl: category: can: 'kan...' none: '(geen categorie)' + all: 'Alle categorieën' choose: 'Selecteer een categorie…' edit: 'bewerk' edit_long: "Wijzig" view: 'Bekijk topics in categorie' general: 'Algemeen' settings: 'Instellingen' + topic_template: "Template voor Topic" delete: 'Verwijder categorie' create: 'Nieuwe categorie' + create_long: 'Maak categorie aan' save: 'Bewaar categorie' + slug: 'Gestandaardiseerde Naam Categorie' + slug_placeholder: '(Optioneel) woorden-met-koppelteken-verbinden voor url' creation_error: Er ging bij het maken van de categorie iets mis. save_error: Er ging iets mis bij het opslaan van de categorie. name: "Naam categorie" @@ -1269,6 +1411,7 @@ nl: email_in_allow_strangers: "Accepteer mails van anonieme gebruikers zonder account" email_in_disabled: "Het plaatsen van nieuwe discussies via e-mail is uitgeschakeld in de Site Instellingen. Om het plaatsen van nieuwe discussie via e-mail aan te zetten," email_in_disabled_click: 'schakel "e-mail in" instelling in.' + suppress_from_homepage: "Negeer deze categorie op de homepage" allow_badges_label: "Laat badges toekennen voor deze categorie" edit_permissions: "Wijzig permissies" add_permission: "Nieuwe permissie" @@ -1281,13 +1424,13 @@ nl: notifications: watching: title: "In de gaten houden" - description: "Je zal automatisch alle nieuwe topics in deze categorieën bekijken. Je ontvangt een notificatie van alle nieuwe berichten en topics. Daarnaast zal het aantal ongelezen en nieuwe berichten naast het topic verschijnen." + description: "Je ziet automatisch alle nieuwe topics in deze categorieën. Je ontvangt notificaties bij nieuwe berichten en topics, het aantal nieuwe reacties wordt voor deze topics weergegeven." tracking: title: "Volgen" - description: "Je zal automatisch alle nieuwe topics in deze categorieën volgen. Het aantal ongelezen en nieuwe berichten zal naast het topic verschijnen." + description: "Je volgt automatisch alle topics in deze categorieën. Het aantal nieuwe reacties wordt voor deze topics weergegeven." regular: title: "Regulier" - description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op je bericht." + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." muted: title: "Genegeerd" description: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën en ze verschijnen niet op je ongelezen overzicht." @@ -1321,6 +1464,8 @@ nl: notify_action: "Bericht" topic_map: title: "Topicsamenvatting" + participants_title: "Frequente schrijvers" + links_title: "Populaire links" links_shown: "laat alle {{totalLinks}} links zien..." clicks: one: "1 click" @@ -1332,6 +1477,10 @@ nl: help: "Je hebt een bladwijzer aan deze topic toegevoegd" locked: help: "Deze topic is gesloten; reageren is niet meer mogelijk" + archived: + help: "Deze topic is gearchiveerd en kan niet meer gewijzigd worden" + locked_and_archived: + help: "Deze topic is gesloten en gearchiveerd; reageren of wijzigen is niet langer mogelijk." unpinned: title: "Niet vastgepind" help: "Dit topic is niet langer vastgepind voor je en zal weer in de normale volgorde getoond worden" @@ -1340,9 +1489,7 @@ nl: help: "Deze topic is globaal vastgepind en zal bovenaan alle topiclijsten getoond worden" pinned: title: "Vastgepind" - help: "Deze topic is vastgepind voor je en zal bovenaan de categorie getoond worden" - archived: - help: "Deze topic is gearchiveerd en kan niet meer gewijzigd worden" + help: "Dit topic is vastgepind voor je en zal bovenaan de categorie getoond worden" invisible: help: "Dit topic is niet zichtbaar; het zal niet verschijnen in de topiclijst en kan alleen bekeken worden met een directe link" posts: "Berichten" @@ -1382,7 +1529,10 @@ nl: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: - title: "Recent" + title: + zero: "Laatste" + one: "Laatste (1)" + other: "Laatste ({{count}})" help: "topics met recente reacties" hot: title: "Populair" @@ -1435,6 +1585,8 @@ nl: title: "Sinds het begin" yearly: title: "Jaarlijks" + quarterly: + title: "Per Kwartaal" monthly: title: "Maandelijks" weekly: @@ -1442,11 +1594,12 @@ nl: daily: title: "Dagelijks" all_time: "Sinds het begin" - this_year: "Dit jaar" - this_month: "Deze maand" - this_week: "Deze week" + this_year: "Jaar" + this_quarter: "Kwartaal" + this_month: "Maand" + this_week: "Week" today: "Vandaag" - other_periods: "bekijk meer top-topics" + other_periods: "bekijk eerste" browser_update: 'Helaas is je browser te oud om te kunnen werken met deze site. Upgrade a.u.b. je browser.' permission_types: full: "Maak topic / Reageer / Bekijk" @@ -1480,6 +1633,7 @@ nl: suspended: 'Geschorst:' private_messages_short: "PB's" private_messages_title: "Berichten" + mobile_title: "Mobiel" space_free: "{{size}} beschikbaar" uploads: "uploads" backups: "backups" @@ -1611,7 +1765,11 @@ nl: name: "Naam" none_installed: "Je hebt geen plugins geinstalleerd." version: "Versie" + enabled: "Ingeschakeld?" + is_enabled: "J" + not_enabled: "N" change_settings: "Wijzig instellingen" + change_settings_short: "Instellingen" howto: "Hoe kan ik plugins installeren" backups: title: "Backups" @@ -1677,6 +1835,8 @@ nl: screened_email: "Exporteer volledige gescreende email lijst in CSV formaat." screened_ip: "Exporteer volledige gescreende IP lijst in CSV formaat." screened_url: "Exporteerd volledige gescreende URL lijst in CSV formaat." + export_json: + button_text: "Exporteer" invite: button_text: "Verstuur uitnodigingen" button_title: "Verstuur uitnodigingen" @@ -1687,6 +1847,7 @@ nl: header: "Header" top: "Top" footer: "Voettekst" + embedded_css: "Embedded CSS" head_tag: text: "" title: "HTML dat ingevoegd wordt voor de tag" @@ -1704,6 +1865,8 @@ nl: save: "Opslaan" new: "Nieuw" new_style: "Nieuwe stijl" + import: "Importeer" + import_title: "Selecteer een bestand of plak tekst." delete: "Verwijder" delete_confirm: "Verwijder deze aanpassing?" about: "Pas CSS stylesheets en HTML headers aan op de site. Voeg een aanpassing toe om te beginnen." @@ -1729,7 +1892,7 @@ nl: description: 'Meeste teksten, iconen en randen.' secondary: name: 'secundaire' - description: 'De achtergrondkleur, tekst en knoppen.' + description: 'De achtergrond- en tekstkleur van sommige knoppen.' tertiary: name: 'tertiaire' description: 'Links, knoppen, notificaties en accentkleur.' @@ -1776,7 +1939,7 @@ nl: sent_test: "verzonden!" delivery_method: "Verzendmethode" preview_digest: "Voorbeeld digestmail" - preview_digest_desc: "Vooraf beoordeling van de inhoud van de wekelijkse digest emails zien die naar inactieve gebruikers wordt verzonden." + preview_digest_desc: "Voorbeeld van de digest e-mails die naar inactieve leden worden verzonden." refresh: "Verniew" format: "Formaat" html: "html" @@ -1841,6 +2004,7 @@ nl: delete_post: "verwijder bericht" impersonate: "Log in als gebruiker" anonymize_user: "maak gebruiker anoniem" + roll_up: "groepeer verbannen IP-adressen" screened_emails: title: "Gescreende e-mails" description: "Nieuwe accounts met een van deze mailadressen worden geblokkeerd of een andere actie wordt ondernomen." @@ -1862,18 +2026,22 @@ nl: actions: block: "Blokkeer" do_nothing: "Sta toe" + allow_admin: "Toestaan Beheerder" form: label: "Nieuw:" ip_address: "IP-adres" add: "Voeg toe" filter: "Zoek" roll_up: + text: "Groepeer verbannen IP adressen" title: "Creëer nieuwe subnet ban entries als er tenminste 'min_ban_entries_for_roll_up' entries zijn." logster: title: "Fout Logs" impersonate: title: "Log in als gebruiker" help: "Gebruik dit hulpmiddel om in te loggen als een gebruiker voor debug-doeleinden. Je moet uitloggen als je klaar bent." + not_found: "Die gebruiker is niet gevonden" + invalid: "Sorry, maar als deze gebruiker mag je niet inloggen." users: title: 'Leden' create: 'Voeg beheerder toe' @@ -2058,6 +2226,7 @@ nl: delete: "Verwijder" cancel: "Annuleer" delete_confirm: "Weet je zeker dat je dat gebruikersveld wilt verwijderen?" + options: "Opties" required: title: "Verplicht bij inschrijven?" enabled: "verplicht" @@ -2073,6 +2242,7 @@ nl: field_types: text: 'Tekstveld' confirm: 'Bevestiging' + dropdown: "Uitklapbaar" site_text: none: "Kies een type van inhoud om te beginnen met bewerken." title: 'Tekst Inhoud' @@ -2084,6 +2254,7 @@ nl: no_results: "Geen resultaten." clear_filter: "Wis" add_url: "voeg URL toe" + add_host: "host toevoegen" categories: all_results: 'Alle' required: 'Vereist' @@ -2105,6 +2276,7 @@ nl: backups: "Backups" login: "Gebruikersnaam" plugins: "Plugins" + user_preferences: "Gebruikersvoorkeuren" badges: title: Badges new_badge: Nieuwe badge @@ -2142,6 +2314,8 @@ nl: image: Afbeelding icon_help: "Gebruik ofwel een Font Awesome klasse of een URL naar een afbeelding" query: Badge Query (SQL) + target_posts: Geassocieerde berichten opvragen + auto_revoke: Intrekkingsquery dagelijks uitvoeren show_posts: Toon bericht verlenend badge op badge pagina trigger: Trekker trigger_type: @@ -2152,6 +2326,8 @@ nl: user_change: "Wanneer een gebruiker is gewijzigd of gecreeerd" preview: link_text: "Voorbeeld toegekende badges" + plan_text: "Voorbeeld met uitvoeringsplan" + modal_title: "Proefverwerking Badge Query" sql_error_header: "Er ging iets fout met de query." error_help: "Bekijk de volgende links voor hulp met badge queries." bad_count_warning: @@ -2174,6 +2350,44 @@ nl: name: "Naam" image: "Afbeelding" delete_confirm: "Weet je zeker dat je de :%{name}: emoji wilt verwijderen?" + embedding: + get_started: "Als je Discourse wilt embedden in een andere website, begin met het toevoegen van de host van die website." + confirm_delete: "Weet je zeker dat je die host wilt verwijderen?" + sample: "Gebruik de volgende HTML code om discourse topics te maken en te embedden in je website . Vervang REPLACE_ME met de canonical URL van de pagina waarin je wilt embedden." + title: "Embedden" + host: "Toegestane Hosts" + edit: "wijzig" + category: "Bericht naar Categorie" + add_host: "Host Toevoegen" + settings: "Embedding Instellingen" + feed_settings: "Feed Instellingen" + feed_description: "Een RRS/ATOM feed op je site kan de import van content naar Discourse verbeteren." + crawling_settings: "Crawler Instellingen" + crawling_description: "Als Discourse topics maakt voor je berichten, zonder dat er gebruik gemaakt wordt van RSS/ATOM feed, dan zal Discourse proberen je content vanuit je HTML te parsen. Soms kan het een complex zijn om je content af te leiden, daarom voorziet Discourse in de mogelijkheid voor het specificeren van CSS regels om het afleiden gemakkelijker te maken." + embed_by_username: "Gebruikersnaam voor het maken van topics" + embed_post_limit: "Maximaal aantal berichten om te embedden" + embed_username_key_from_feed: "Key voor de Discourse gebruikersnaam in de feed." + embed_truncate: "Embedde berichten inkorten" + embed_whitelist_selector: "CSS selector voor elementen die worden toegestaan bij embedding" + embed_blacklist_selector: "CSS selector voor elementen die worden verwijderd bij embedding" + feed_polling_enabled: "Importeer berichten via RSS/ATOM" + feed_polling_url: "URL van RSS/ATOM feed voor crawling" + save: "Embedding Instellingen Opslaan " + permalink: + title: "Permalink" + url: "URL" + topic_id: "Topic ID" + topic_title: "Topic" + post_id: "Bericht ID" + post_title: "Bericht" + category_id: "Categorie ID" + category_title: "Categorie" + external_url: "Externe URL" + delete_confirm: Weet je zeker dat je deze permalink wil verwijderen? + form: + label: "Nieuw:" + add: "Voeg toe" + filter: "Zoeken (URL of Externe URL)" lightbox: download: "download" search_help: @@ -2188,6 +2402,9 @@ nl: unread: 'g, u Ongelezen' categories: 'g, c Categoriën' top: 'g, t Top' + bookmarks: 'g, b Favorieten' + profile: 'g, p Profiel' + messages: 'g, m Berichten' navigation: title: 'Navigatie' jump: '# Ga naar bericht #' @@ -2199,22 +2416,23 @@ nl: title: 'Applicatie' create: 'c Maak nieuwe topic' notifications: 'n Open notificaties' - site_map_menu: '= Open site menu' + hamburger_menu: '= Open hamburger menu' user_profile_menu: 'p Open gebruikersmenu' show_incoming_updated_topics: '. Toon gewijzigde topics' search: '/ Zoek' help: '? Open sneltoetsen help' dismiss_new_posts: 'x, r Seponeer Nieuw/Berichten' dismiss_topics: 'x, t Seponeer Topics' + log_out: 'shift+z shift+z Uitloggen' actions: title: 'Acties' bookmark_topic: 'f Toggle bladwijzer van topic' - pin_unpin_topic: 'shift+p Vastpinnen/Ontpin topic' + pin_unpin_topic: 'shift+p Vastpinnen/Ontpinnen topic' share_topic: 'shift+s Deel topic' share_post: 's Deel bericht' reply_as_new_topic: 't Reageer als verwezen topic' reply_topic: 'shift+r Reageer op topic' - reply_post: 'shift r Reageer op topic' + reply_post: 'shift r Reageer op bericht' quote_post: 'q Citeer bericht' like: 'l Vind bericht leuk' flag: '! Markeer bericht' @@ -2253,7 +2471,7 @@ nl: name: Schrijven badge: editor: - name: Auteur + name: Redacteur description: Eerste berichtwijziging basic_user: name: Basis @@ -2283,7 +2501,7 @@ nl: name: Goed bericht description: 25 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend. great_post: - name: Fantastisch bericht + name: Fantastisch Bericht description: 50 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend. nice_topic: name: Leuk Topic @@ -2314,10 +2532,10 @@ nl: description: Heeft een gebruiker uitgenodigd campaigner: name: Campaigner - description: Heeft 3 leden uitgenodigd + description: Heeft 3 leden (trust level 1) uitgenodigd champion: name: Kampioen - description: Heeft 10 leden uitgenodigd + description: Heeft 5 leden (trust level 2) uitgenodigd first_share: name: Eerste deel actie description: Een bericht gedeeld @@ -2333,8 +2551,17 @@ nl: reader: name: Lezer description: Lees elk bericht in een topic met meer dan 100 berichten. + popular_link: + name: Populaire Link + description: Heeft een externe link geplaatst die 50 keer of vaker is aangeklikt. + hot_link: + name: Zeer Populaire Link + description: Heeft een externe link geplaatst die 300 keer of vaker is aangeklikt + famous_link: + name: Uiterst Populaire Link + description: Heeft een externe link geplaatst die 1000 keer of vaker is aangeklikt google_search: | -

      Zoek met Google

      +

      Zoek met Google

      diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 254bf6b5f0..e25fbb600b 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -8,6 +8,9 @@ pl_PL: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -20,12 +23,17 @@ pl_PL: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "H:mm" long_no_year: "D MMM H:mm" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM YYYY H:mm" long_with_year_no_time: "D MMM YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM 'YY" @@ -98,6 +106,19 @@ pl_PL: one: "wczoraj" few: "%{count} dni temu" other: "%{count} dni temu" + later: + x_days: + one: "1 dzień później" + few: "%{count} dni później" + other: "%{count} dni później" + x_months: + one: "1 miesiąc później" + few: "%{count} miesiące później" + other: "%{count} miesięcy później" + x_years: + one: "1 rok później" + few: "%{count} lata później" + other: "%{count} lat później" share: topic: 'udostępnij odnośnik do tego tematu' post: 'wpis #%{postNumber}' @@ -106,6 +127,25 @@ pl_PL: facebook: 'udostępnij ten odnośnik na Facebooku' google+: 'udostępnij ten odnośnik na Google+' email: 'wyślij ten odnośnik przez email' + action_codes: + autoclosed: + enabled: 'zamknięcie %{when}' + disabled: 'otworzenie %{when}' + closed: + enabled: 'zamknięcie %{when}' + disabled: 'otworzenie %{when}' + archived: + enabled: 'archiwizacja %{when}' + disabled: 'dearchiwizacja %{when}' + pinned: + enabled: 'przypięcie %{when}' + disabled: 'odpięcie %{when}' + pinned_globally: + enabled: 'globalne przypięcie %{when}' + disabled: 'globalne odpięcie %{when}' + visible: + enabled: 'wylistowanie %{when}' + disabled: 'odlistowanie %{when}' topic_admin_menu: "akcje administratora" emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane." edit: 'edytuj tytuł i kategorię tego tematu' @@ -146,6 +186,7 @@ pl_PL: every_two_weeks: "co dwa tygodnie" every_three_days: "co trzy dni" max_of_count: "max z {{count}}" + alternation: "lub" character_count: one: "1 znak" few: "{{count}} znaki" @@ -202,6 +243,7 @@ pl_PL: saved: "Zapisano!" upload: "Dodaj" uploading: "Wysyłam…" + uploading_filename: "Wysyłanie {{filename}}..." uploaded: "Wgrano!" enable: "Włącz" disable: "Wyłącz" @@ -209,9 +251,9 @@ pl_PL: revert: "Przywróć" failed: "Niepowodzenie" switch_to_anon: "Tryb anonimowy" - switch_from_anon: "Zakończ tryb anonimowy" banner: close: "Zamknij ten baner." + edit: "Edytuj ten baner >>" choose_topic: none_found: "Nie znaleziono tematów." title: @@ -229,7 +271,8 @@ pl_PL: view_pending: "wyświetl oczekujące wpisy" has_pending_posts: one: "Ten temat posiada 1 wpis oczekujący na akceptację" - many: "Ten temat posiada {{count}} wpisów oczekujących na akceptację" + few: "Ten temat posiada {{count}} wpisy oczekujące na akceptację" + other: "Ten temat posiada {{count}} wpisów oczekujących na akceptację" confirm: "Zapisz zmiany" delete_prompt: "Czy na pewno chcesz usunąć %{username}? Zostaną usunięte wszystkie wpisy utworzone z tego konta oraz zostanie zablokowany powiązany e-mail oraz adres IP." approval: @@ -290,6 +333,9 @@ pl_PL: mods_and_admins: "Tylko moderatorzy i administratorzy" members_mods_and_admins: "Tylko członkowie grupy, moderatorzy i administratorzy" everyone: "Wszyscy" + trust_levels: + title: "Domyślny poziom zaufania przyznawany nowych użytkownikom:" + none: "Brak" user_action_groups: '1': "Przyznane polubienia" '2': "Otrzymane polubienia" @@ -309,6 +355,14 @@ pl_PL: all_subcategories: "wszystkie" no_subcategory: "żadne" category: "Kategoria" + reorder: + title: "Zmień kolejność kategorii" + title_long: "Zmień kolejność listy kategorii" + fix_order: "Popraw pozycje" + fix_order_tooltip: "Nie wszystkie kategorie posiadają unikalny numer porządkowy, co może wygenerować nieoczekiwane wyniki." + save: "Zapisz kolejność" + apply_all: "Zastosuj" + position: "Pozycja" posts: "Wpisy" topics: "Tematy" latest: "Aktualne" @@ -340,6 +394,8 @@ pl_PL: topics_entered: "wprowadzone tematy:" post_count: "# wpisów" confirm_delete_other_accounts: "Czy na pewno chcesz usunąć wybrane konta?" + user_fields: + none: "(wybierz opcję)" user: said: "{{username}}:" profile: "Profil" @@ -351,11 +407,23 @@ pl_PL: private_messages: "Wiadomości" activity_stream: "Aktywność" preferences: "Ustawienia" + expand_profile: "Rozwiń" bookmarks: "Zakładki" bio: "O mnie" invited_by: "Zaproszono przez" trust_level: "Poziom zaufania" notifications: "Powiadomienia" + desktop_notifications: + label: "Powiadomienia systemowe" + not_supported: "Powiadomienia nie są wspierane przez tę przeglądarkę. Przepraszamy." + perm_default: "Włącz powiadomienia" + perm_denied_btn: "Brak uprawnień" + perm_denied_expl: "Wyświetlanie powiadomień jest zablokowane. Użyj ustawień swojej przeglądarki, aby odblokować powiadomienia dla tej domeny." + disable: "Wyłącz powiadomienia" + currently_enabled: "(aktualnie włączone)" + enable: "Włącz powiadomienia" + currently_disabled: "(aktualnie wyłączone)" + each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz." dismiss_notifications: "Oznacz jako przeczytane" dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane" disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu" @@ -368,14 +436,15 @@ pl_PL: admin: "{{user}} jest adminem" moderator_tooltip: "Ten użytkownik jest moderatorem" admin_tooltip: "Ten użytkownik jest administratorem" + blocked_tooltip: "Ten użytkownik jest zablokowany" suspended_notice: "ten użytkownik jest zawieszony do {{date}}." suspended_reason: "Powód: " github_profile: "Github" mailing_list_mode: "Wysyłaj e-mail z każdym nowym wpisem (o ile nie wyciszysz kategorii lub tematu)." watched_categories: "Obserwowane" - watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach: liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów. Dodatkowo będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie." + watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie, a liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów. " tracked_categories: "Śledzone" - tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach: licznik nowych i nieprzeczytanych wpisów pojawi się obok tytułu." + tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Licznik nowych wpisów pojawi się obok tytułu na liście tematów." muted_categories: "Wyciszone" muted_categories_instructions: "Nie będziesz powiadamiany o niczym dotyczącym nowych tematów w tych kategoriach, i nie będą się one pojawiać na karcie nieprzeczytanych." delete_account: "Usuń moje konto" @@ -428,7 +497,7 @@ pl_PL: upload_title: "Wyślij swoją grafikę" upload_picture: "Wyślij grafikę" image_is_not_a_square: "Uwaga: grafika została przycięta ponieważ jej wysokość i szerokość nie były równe. " - cache_notice: "Twój awatar został pomyślnie zmieniony, ale nowa wersja może pojawić się za jakiś czas z uwagi na cache przeglądarki." + cache_notice: "Twój awatar został pomyślnie zmieniony, ale z uwagi na cache przeglądarki nowa wersja może pojawić się dopiero za jakiś czas." change_profile_background: title: "Tło profilu" instructions: "Tła w profilach są wycentrowane i posiadają domyślną szerokość 850px." @@ -488,42 +557,42 @@ pl_PL: every_two_weeks: "co dwa tygodnie" email_direct: "Wysyłaj e-mail gdy ktoś mnie cytuje, odpowiada na mój wpis, wywołuje moją @nazwę lub zaprasza mnie do tematu." email_private_messages: "Wyślij e-mail, gdy ktoś napisze mi prywatną wiadomość" - email_always: "Wysyłaj powiadomienia email nawet gdy przejawiam aktywność na forum" + email_always: "Wysyłaj powiadomienia email nawet, gdy przejawiam aktywność w serwisie" other_settings: "Inne" categories_settings: "Kategorie" new_topic_duration: label: "Uznaj, że temat jest nowy, jeśli" not_viewed: "niewidziane " last_here: "dodane od ostatniej wizyty" - after_n_days: - one: "dodane w ciągu ostatniego dnia" - few: "dodane w ciągu ostatnich {{count}} dni" - other: "dodane w ciągu ostatnich {{count}} dni" - after_n_weeks: - one: "dodane w ciągu ostatniego tygodnia" - few: "dodane w ciągu ostatnich {{count}} tygodni" - other: "dodane w ciągu ostatnich {{count}} tygodni" + after_1_day: "utworzone w ciągu ostatniego dnia" + after_2_days: "utworzone w ciągu ostatnich 2 dni" + after_1_week: "utworzone w ostatnim tygodniu" + after_2_weeks: "utworzone w ostatnich 2 tygodniach" auto_track_topics: "Automatycznie śledź tematy które odwiedzę" auto_track_options: never: "nigdy" immediately: "natychmiast" - after_n_seconds: - one: "po 1 sekundzie" - few: "po {{count}} sekundach" - other: "po {{count}} sekundach" - after_n_minutes: - one: "po 1 minucie" - few: "po {{count}} minutach" - other: "po {{count}} minutach" + after_30_seconds: "po 30 sekundach" + after_1_minute: "po 1 minucie" + after_2_minutes: "po 2 minutach" + after_3_minutes: "po 3 minutach" + after_4_minutes: "po 4 minutach" + after_5_minutes: "po 5 minutach" + after_10_minutes: "po 10 minutach" invited: search: "wpisz aby szukać zaproszeń…" title: "Zaproszenia" user: "Zaproszony(-a) użytkownik(-czka)" - none: "Jeszcze nikt nie został przez ciebie zaproszony." + sent: "Wysłane" + none: "Nie ma żadnych zaproszeń do wyświetlenia." truncated: "Pokaż pierwsze {{count}} zaproszeń." redeemed: "Cofnięte zaproszenia" + redeemed_tab: "Przyjęte" + redeemed_tab_with_count: "Zrealizowane ({{count}})" redeemed_at: "Przyjęte" pending: "Oczekujące zaproszenia" + pending_tab: "Oczekujący" + pending_tab_with_count: "Oczekujące ({{count}})" topics_entered: "Obejrzane tematy" posts_read_count: "Przeczytane wpisy" expired: "To zaproszenie wygasło." @@ -535,6 +604,8 @@ pl_PL: days_visited: "Dni odwiedzin" account_age_days: "Wiek konta w dniach" create: "Wyślij zaproszenie" + generate_link: "Skopiuj link z zaproszeniem" + generated_link_message: '

      Link z zaproszeniem został wygenerowany pomyślnie!

      Link zaproszenia jest ważny jedynie dla tego adresu e-mail: %{invitedEmail}

      ' bulk_invite: none: "Jeszcze nikogo nie zaproszono. Możesz wysłać pojedyncze zaproszenie lub zaprosić wiele osób na raz wysyłając odpowiedni plik." text: "Zaproszenia hurtowe z pliku" @@ -591,7 +662,6 @@ pl_PL: read_only_mode: enabled: "Aktywowani tryb tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje zmieniające stan i treść mogą nie działać." login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu." - too_few_topics_notice: "Utwórz co najmniej 5 publicznych tematów i %{posts} publicznych wpisów by rozpocząć dyskurs. Nowi użytkownicy nie będą mogli podnieść poziomu zaufania jeśli nie będą mieć do czytania wystarczającej ilości treści. Ten komunikat widzą tylko członkowie zespołu." learn_more: "dowiedz się więcej…" year: 'rok' year_desc: 'tematy dodane w ciągu ostatnich 365 dni' @@ -652,6 +722,7 @@ pl_PL: email_placeholder: "adres email lub nazwa użytkownika" caps_lock_warning: "Caps Lock jest włączony" error: "Nieznany błąd" + rate_limit: "Poczekaj, zanim ponowisz próbę logowania." blank_username_or_password: "Podaj swój email lub nazwę użytkownika i hasło" reset_password: 'Resetuj hasło' logging_in: "Uwierzytelnianie…" @@ -716,7 +787,7 @@ pl_PL: title_placeholder: "O czym jest ta dyskusja w jednym zwartym zdaniu. " edit_reason_placeholder: "z jakiego powodu edytujesz?" show_edit_reason: "(dodaj powód edycji)" - reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML. Przeciągnij i upuść grafikę, aby dołączyć do treści." + reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML. Możesz też przeciągnąć tu obrazek." view_new_post: "Zobacz Twój nowy wpis." saving: "Zapisuję…" saved: "Zapisano!" @@ -777,6 +848,20 @@ pl_PL: moved_post: "

      {{username}} przenosi {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Otrzymujesz '{{description}}'

      " + alt: + mentioned: "Wywołanie przez" + quoted: "Cytowanie przez" + replied: "Odpowiedź" + posted: "Autor wpisu" + edited: "Edycja twojego wpisu" + liked: "Polubienie twojego wpisu" + private_message: "Prywatna wiadomość od" + invited_to_private_message: "Zaproszenie do prywatnej wiadomości od" + invited_to_topic: "Zaproszenie do tematu od" + invitee_accepted: "Zaproszenie zaakceptowane przez" + moved_post: "Twój wpis został przeniesiony przez" + linked: "Linkownie do twojego wpisu" + granted_badge: "Przyznanie odznaki" popup: mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}' quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}' @@ -791,15 +876,20 @@ pl_PL: from_the_web: "Z Internetu" remote_tip: "link do obrazu" remote_tip_with_attachments: "odnośnik do obrazu lub pliku ({{authorized_extensions}})" - local_tip: "kliknij, aby wybrać obraz z Twojego urządzenia" - local_tip_with_attachments: "kliknij aby wybrać obraz lub plik ze swojego urządzenia ({{authorized_extensions}})" + local_tip: "wybierz obrazy ze swojego urządzenia" + local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia ({{authorized_extensions}})" hint: "(możesz także upuścić plik z katalogu komputera w okno edytora)" - hint_for_supported_browsers: "(możesz przeciągnąć lub wkleić obrazy do edytora, aby je wgrać)" + hint_for_supported_browsers: "możesz też przeciągać lub wklejać grafiki do edytora" uploading: "Wgrywanie" + select_file: "Wybierz plik" image_link: "odnośnik do którego Twój obraz będzie kierował" search: + select_all: "Zaznacz wszystkie" + clear_all: "Wyczyść wszystkie" title: "szukaj tematów, wpisów, użytkowników lub kategorii" no_results: "Brak wyników wyszukiwania" + no_more_results: "Nie znaleziono więcej wyników." + search_help: Wyszukaj w pomocy searching: "Szukam…" post_format: "#{{post_number}} za {{username}}" context: @@ -807,7 +897,8 @@ pl_PL: category: "Szukaj w kategorii \"{{category}}\"" topic: "Szukaj w tym temacie" private_messages: "Wyszukiwanie wiadomości" - site_map: "przejdź do innej listy tematów lub kategorii" + hamburger_menu: "przejdź do innej listy lub kategorii" + new_item: "nowy" go_back: 'wróć' not_logged_in_user: 'strona użytkownika z podsumowaniem bieżących działań i ustawień' current_user: 'idź do swojej strony użytkowanika' @@ -819,7 +910,7 @@ pl_PL: dismiss_posts_tooltip: "Wyczyść liczniki nieprzeczytanych wpisów w tych tematach, ale informuj mnie jeśli pojawią się w nich nowe wpisy w przyszłości." dismiss_topics: "Wyczyść status termatów" dismiss_topics_tooltip: "Nie pokazuj tych tematów na mojej liście nieprzeczytanych gdy pojawią się w nich nowe wpisy." - dismiss_new: "Zignoruj nowe" + dismiss_new: "Wyczyść nieprzeczytane" toggle: "włącz grupowe zaznaczanie tematów" actions: "Operacje grupowe" change_category: "Zmień kategorię" @@ -859,6 +950,9 @@ pl_PL: bookmarks: "Nie ma więcej zakładek." search: "Nie znaleziono więcej wyników." topic: + unsubscribe: + stop_notifications: "Będziesz otrzymywać mniej powiadomień o {{title}}" + change_notification_state: "Twój aktualny stan powiadomień to" filter_to: "{{post_count}} wpisów w temacie" create: 'Nowy temat' create_long: 'Utwórz nowy temat' @@ -939,29 +1033,29 @@ pl_PL: '2_4': 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem odpowiedzi w tym temacie.' '2_2': 'Będziesz otrzymywać powiadomienia, ponieważ śledzisz ten temat.' '2': 'Będziesz otrzymywać powiadomienia, ponieważ ten temat został uznany za przeczytany.' - '1_2': 'Dostaniesz powiadomienie jedynie gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.' - '1': 'Dostaniesz powiadomienie jedynie gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.' + '1_2': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.' + '1': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.' '0_7': 'Ignorujesz wszystkie powiadomienia z tej kategorii.' '0_2': 'Ignorujesz wszystkie powiadomienia w tym temacie.' '0': 'Ignorujesz wszystkie powiadomienia w tym temacie.' watching_pm: title: "Obserwuj wszystko" - description: "Otrzymasz powiadomienie o każdym nowym wpisie w tej dyskusji. Liczba nowych i nieprzeczytanych wpisów pojawi się obok jej tytułu na liście wiadomości." + description: "Dostaniesz powiadomienie o każdym nowym wpisie w tej dyskusji. Liczba nowych wpisów pojawi się obok jej tytułu na liście wiadomości." watching: title: "Obserwuj wszystko" - description: "Dostaniesz powiadomienie o każdym nowym wpisie w tym temacie. Liczba nowych i nieprzeczytanych wpisów pojawi się obok jego tytułu." + description: "Dostaniesz powiadomienie o każdym nowym wpisie w tym temacie. Liczba nowych wpisów pojawi się obok jego tytułu na liście wiadomości." tracking_pm: title: "Śledzenie" - description: "Licznik nowych i nieprzeczytanych wpisów pojawi się obok wiadomości. Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." + description: "Licznik nowych wpisów pojawi się obok tej dyskusji. Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." tracking: title: "Śledzenie" - description: "Licznik nowych i nieprzeczytanych wpisów pojawi się obok tytułu tego tematu. Dostaniesz powiadomienie jedynie gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." + description: "Licznik nowych odpowiedzi pojawi się obok tytułu tego tematu. Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." regular: title: "Normalny" - description: "Dostaniesz powiadomienie jedynie gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." + description: "Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." regular_pm: title: "Normalny" - description: "Otrzymasz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis w tej dyskusji." + description: "Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." muted_pm: title: "Wyciszono" description: "Nie będziesz otrzymywać powiadomień dotyczących tej dyskusji." @@ -1003,17 +1097,20 @@ pl_PL: success_message: 'Ten temat został pomyślnie zgłoszony.' feature_topic: title: "Wyróżnij ten temat" - pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} " + pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} do" confirm_pin: "Czy na pewno przypiąć ten temat w tej kategorii? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów." unpin: "Odepnij ten temat z początku kategorii {{categoryLink}}." + unpin_until: "Odepnij ten temat z początku kategorii {{categoryLink}} lub poczekaj do %{until}." pin_note: "Użytkownicy mogą przypinać tematy dla samych siebie." + pin_validation: "Przypięcie tego tematu wymaga podania daty." already_pinned: zero: "Brak przypiętych tematów w {{categoryLink}}." one: "Tematy przypięte w {{categoryLink}}: 1." other: "Tematy przypięte w {{categoryLink}}: {{count}}." - pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list." + pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list do" confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów." unpin_globally: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list." + unpin_globally_until: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list lub poczekaj do %{until}." global_pin_note: "Użytkownicy mogą przypinać tematy dla samych siebie." already_pinned_globally: zero: "Brak przypiętych globalnie tematów." @@ -1045,7 +1142,7 @@ pl_PL: sso_enabled: "Podaj nazwę użytkownika lub e-mail osoby którą chcesz zaprosić do tego tematu." to_topic_blank: "Podaj nazwę użytkownika lub e-mail osoby którą chcesz zaprosić do tego tematu." to_topic_email: "Wprowadzony został adres e-mail. Wyślemy tam zaproszenie umożliwiające wskazanej osobie odpowiedź w tym temacie." - to_topic_username: "Wprowadzono nazwę użytkownika. Wskazane konto otrzyma powiadomienie z linkiem do tematu." + to_topic_username: "Konto o wprowadzonej nazwie użytkownika otrzyma powiadomienie z linkiem do tego tematu." to_username: "Podaj nazwę użytkownika osoby którą chcesz zaprosić. Otrzyma powiadomienie z linkiem do tego tematu." email_placeholder: 'nazwa@example.com' success_email: "Wysłaliśmy zaproszenie do {{emailOrUsername}}. Otrzymasz powiadomienie, gdy zaproszenie zostanie przyjęte. Sprawdź zakładkę zaproszenia w swoim profilu, aby śledzić status tego i innych zaproszeń." @@ -1086,6 +1183,12 @@ pl_PL: few: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa {{old_user}}." other: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa {{old_user}}." instructions_warn: "Przeszłe powiadomienia dla tego wpisu nie zostaną przypisane do nowego użytkownika.
      Uwaga: Aktualnie, żadne dane uzależnione od wpisu nie są przenoszone do nowego użytkownika. Zachowaj ostrożność." + change_timestamp: + title: "Zmień znacznik czasu" + action: "zmień znacznik czasu" + invalid_timestamp: "Znacznik czasu nie może wskazywać na przyszłość." + error: "Wystąpił błąd podczas zmiany znacznika czasu tego tematu." + instructions: "Wybierz nowy znacznik czasu dla tematu. Wpisy w temacie zostaną zaktualizowane o tę samą różnicę." multi_select: select: 'wybierz' selected: 'wybrano ({{count}})' @@ -1099,8 +1202,8 @@ pl_PL: few: Wybrano {{count}} wpisy. other: Wybrano {{count}} wpisów. post: - reply: "Odpowiedź na {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Odpowiedź na {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "odpowiedz na ten cytat" edit: "Edycja {{link}} {{replyAvatar}} {{username}}" edit_reason: "Powód" @@ -1123,9 +1226,21 @@ pl_PL: more_links: "{{count}} więcej…" unread: "Nieprzeczytany wpis" has_replies: - one: "Odpowiedź" - few: "Odpowiedzi" - other: "Odpowiedzi" + one: "{{count}} odpowiedź" + few: "{{count}} odpowiedzi" + other: "{{count}} odpowiedzi" + has_likes: + one: "{{count}} polubienie" + few: "{{count}} polubienia" + other: "{{count}} polubień" + has_likes_title: + one: "1 osoba polubiła ten wpis" + few: "{{count}} osoby polubiły ten wpis" + other: "{{count}} osób polubiło ten wpis" + has_likes_title_you: + zero: "polubiono ten wpis" + one: "wpis polubiony przez ciebie i 1 inną osobę" + other: "wpis polubiony przez ciebie i {{count}} innych osób" errors: create: "Przepraszamy, podczas tworzenia twojego wpisu wystąpił błąd. Spróbuj ponownie." edit: "Przepraszamy, podczas edytowania twojego wpisu wystąpił błąd. Spróbuj ponownie." @@ -1143,6 +1258,7 @@ pl_PL: no_value: "Nie, pozostaw" yes_value: "Tak, porzuć" via_email: "ten wpis został dodany emailem" + whisper: "ten wpis jest prywatną notatką dla moderatorów" wiki: about: "to wpis typu Wiki: zwykli użytkownicy mogą go edytować" archetypes: @@ -1312,14 +1428,17 @@ pl_PL: category: can: 'może… ' none: '(brak kategorii)' + all: 'Wszystkie kategorie' choose: 'Wybierz kategorię…' edit: 'edytuj' edit_long: "Edytuj" view: 'Pokaż Tematy w Kategorii' general: 'Ogólne' settings: 'Ustawienia' + topic_template: "Szablon tematu" delete: 'Usuń kategorię' create: 'Nowa kategoria' + create_long: 'Utwórz nową kategorię' save: 'Zapisz kategorię' slug: 'Slug kategorii' slug_placeholder: '(opcjonalne) słowa-z-myślnikiem dla URLi' @@ -1342,6 +1461,7 @@ pl_PL: change_in_category_topic: "Edytuj opis" already_used: 'Ten kolor jest używany przez inną kategorię' security: "Bezpieczeństwo" + special_warning: "Uwaga: Ta kategoria jest generowana automatycznie i jej ustawienia bezpieczeństwa nie mogą być edytowane. Jeśli nie zamierzasz jej używać, skasuj ją, zamiast zmieniać jej przeznaczenie." images: "Obrazy" auto_close_label: "Automatycznie zamykaj tematy po:" auto_close_units: "godzin" @@ -1349,6 +1469,7 @@ pl_PL: email_in_allow_strangers: "Akceptuj wiadomości email od anonimowych, nieposiadających kont użytkowników " email_in_disabled: "Tworzenie nowych tematów emailem jest wyłączone w ustawieniach serwisu. " email_in_disabled_click: 'Kliknij tu, aby włączyć.' + suppress_from_homepage: "Nie wyświetlaj tej kategorii na stronie głównej." allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii" edit_permissions: "Edytuj uprawnienia" add_permission: "Dodaj uprawnienie" @@ -1361,13 +1482,13 @@ pl_PL: notifications: watching: title: "Obserwuj wszystko" - description: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach: liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów. Dodatkowo będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie." + description: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Dostaniesz powiadomienie o każdym nowym wpisie i temacie. Liczba nowych odpowiedzi będzie wyświetlana na liście tematów." tracking: title: "Śledzona" - description: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach: licznik nowych i nieprzeczytanych wpisów pojawi się obok ich tytułów." + description: "Będziesz automatycznie śledzić wszystkie tematy w tych kategoriach. Llicznik nowych odpowiedzi pojawi się obok ich tytułów." regular: title: "Normalny" - description: "Dostaniesz powiadomienie jedynie gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." + description: "Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis." muted: title: "Wyciszone" description: "Nie będziesz powiadamiany o nowych tematach w tych kategoriach i nie będą się one pojawiać w karcie Nieprzeczytane." @@ -1415,6 +1536,10 @@ pl_PL: help: "Temat został dodany do zakładek." locked: help: "Temat został zamknięty. Dodawanie nowych odpowiedzi nie jest możliwe." + archived: + help: "Ten temat został zarchiwizowany i nie można go zmieniać" + locked_and_archived: + help: "Ten temat jest zamknięty i zarchiwizowany. Dodawanie odpowiedzi i jego edycja nie są możliwe." unpinned: title: "Nieprzypięty" help: "Temat nie jest przypięty w ramach twojego konta. Będzie wyświetlany w normalnej kolejności." @@ -1424,8 +1549,6 @@ pl_PL: pinned: title: "Przypięty" help: "Temat przypięty dla twojego konta. Będzie wyświetlany na początku swojej kategorii." - archived: - help: "Ten temat został zarchiwizowany i nie można go zmieniać" invisible: help: "Temat jest niewidoczny: nie będzie wyświetlany na listach tematów a dostęp do niego można uzyskać jedynie poprzez link bezpośredni" posts: "Wpisy" @@ -1462,7 +1585,10 @@ pl_PL: with_topics: "%{filter} tematy" with_category: "%{filter} tematy w %{category} " latest: - title: "Aktualne" + title: + zero: "Aktualne" + one: "Aktualne (1)" + other: "Aktualne ({{count}})" help: "tematy z ostatnimi wpisami" hot: title: "Gorące" @@ -1515,6 +1641,8 @@ pl_PL: title: "Cały czas" yearly: title: "Rocznie" + quarterly: + title: "Kwartalnie" monthly: title: "Miesięcznie" weekly: @@ -1522,11 +1650,12 @@ pl_PL: daily: title: "Dziennie" all_time: "Cały czas" - this_year: "W tym roku" - this_month: "W tym miesiącu" - this_week: "W tym tygodniu" + this_year: "Rok" + this_quarter: "Kwartał" + this_month: "Miesiąc" + this_week: "Tydzień" today: "Dzisiaj" - other_periods: "zobacz więcej popularnych tematów" + other_periods: "zobacz najważniejsze" browser_update: 'Niestety twoja przeglądarka jest zbyt przestarzała, aby obsłużyć ten serwis. Prosimy zaktualizuj swoją przeglądarkę.' permission_types: full: "tworzyć / odpowiadać / przeglądać" @@ -1560,6 +1689,7 @@ pl_PL: suspended: 'Zawieszeni:' private_messages_short: "Wiad." private_messages_title: "Wiadomości" + mobile_title: "Mobile" space_free: "{{size}} wolne" uploads: "załączniki" backups: "kopie zapasowe" @@ -1696,7 +1826,11 @@ pl_PL: name: "Nazwa" none_installed: "Brak zainstalowanych wtyczek." version: "Wersja" + enabled: "Włączono?" + is_enabled: "T" + not_enabled: "N" change_settings: "Zmień ustawienia" + change_settings_short: "Ustawienia" howto: "Jak zainstalować wtyczkę?" backups: title: "Kopie zapasowe" @@ -1762,6 +1896,8 @@ pl_PL: screened_email: "Eksportuj listę monitorowanych adresów email do formatu CSV." screened_ip: "Eksportuj listę monitorowanych IP do formatu CSV." screened_url: "Eksportuj listę monitorowanych URLi do formatu CSV." + export_json: + button_text: "Eksport" invite: button_text: "Wyślij zaproszenia" button_title: "Wysyłanie zaproszeń" @@ -1772,6 +1908,7 @@ pl_PL: header: "Nagłówki" top: "Nagłówek" footer: "Stopka" + embedded_css: "Osadzony CSS" head_tag: text: "" title: "Kod HTML, który zostanie umieszczony przed tagiem " @@ -1789,6 +1926,8 @@ pl_PL: save: "Zapisz" new: "Nowy" new_style: "Nowy styl" + import: "Import" + import_title: "Wybierz plik lub wklej tekst" delete: "Usuń" delete_confirm: "Usunąć tę personalizację?" about: "Zmień arkusze stylów CSS i nagłówki HTML w witrynie. Dodaj własne ustawienie aby rozpocząć." @@ -1861,7 +2000,7 @@ pl_PL: sent_test: "wysłany!" delivery_method: "Metoda Dostarczenia" preview_digest: "Pokaż zestawienie aktywności" - preview_digest_desc: "Podgląd treści emaila z zestawieniem aktywności jaki jest wysyłany nieaktywnym użytkownikom." + preview_digest_desc: "Podgląd treści zestawienia wysyłanego e-mailem do nieaktywnych użytkowników." refresh: "Odśwież" format: "Format" html: "html" @@ -1926,6 +2065,7 @@ pl_PL: delete_post: "usunięcie wpisu" impersonate: "udawanie użytkownika" anonymize_user: "anonimizuj użytkownika" + roll_up: "zwiń bloki IP" screened_emails: title: "Ekranowane emaile" description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana." @@ -2154,6 +2294,7 @@ pl_PL: delete: "Usuń" cancel: "Anuluj" delete_confirm: "Czy na pewno chcesz usunąć to pole?" + options: "Opcje" required: title: "Wymagane przy rejestracji?" enabled: "wymagane" @@ -2169,6 +2310,7 @@ pl_PL: field_types: text: 'Pole tekstowe' confirm: 'Potwierdzenie' + dropdown: "Lista rozwijana" site_text: none: "Aby rozpocząć edycję, wybierz typ treści. " title: 'Kontekst' @@ -2180,6 +2322,7 @@ pl_PL: no_results: "Brak wyników wyszukiwania" clear_filter: "Wyczyść" add_url: "dodaj URL" + add_host: "dodaj host" categories: all_results: 'Wszystkie' required: 'Wymagane' @@ -2201,6 +2344,7 @@ pl_PL: backups: "Kopie zapasowe" login: "Logowanie" plugins: "Wtyczki" + user_preferences: "Ustawienia użytk." badges: title: Odznaki new_badge: Nowa odznaka @@ -2274,6 +2418,44 @@ pl_PL: name: "Nazwa" image: "Grafika" delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}: ?" + embedding: + get_started: "Jeśli chcesz osadzić Discourse na innej stronie, rozpocznij podając jej host." + confirm_delete: "Czy na pewno chcesz usunąć ten host?" + sample: "Użyj poniższego kodu HTML na swojej stronie, aby osadzić tematy z Discourse. Zastąp REPLACE_ME domyślnym adresem URL strony na której osadzasz." + title: "Osadzanie" + host: "Dozwolone hosty" + edit: "edytuj" + category: "Publikuj w kategorii" + add_host: "Dodaj host" + settings: "Ustawienia osadzania" + feed_settings: "Ustawienia kanału" + feed_description: "Wprowadzenie kanału RSS/ATOM twojego serwisu ułatwia import treści." + crawling_settings: "Ustawienia crawlera" + crawling_description: "Gdy Discourse tworzy tematy reprezentujące twoje wpisy, a kanał RSS/ATOM nie został podany, treść będzie pobierana poprzez parsowanie HTML. Proces ten może okazać się trudny dlatego umożliwiamy podanie dodatkowych reguł CSS, które usprawniają proces parsowania." + embed_by_username: "Użytkownik tworzący tematy" + embed_post_limit: "Maksymalna ilość osadzanych wpisów " + embed_username_key_from_feed: "Klucz używany do pobrania nazwy użytkownika z kanału" + embed_truncate: "Skracaj treść osadzanych wpisów" + embed_whitelist_selector: "Selektor CSS elementów jakie mogą być osadzane" + embed_blacklist_selector: "Selektor CSS elementów jakie są usuwane podczas osadzania" + feed_polling_enabled: "Importowanie wpisów via RSS/ATOM" + feed_polling_url: "URL kanału RSS/ATOM" + save: "Zapisz" + permalink: + title: "Permalinki" + url: "URL" + topic_id: "ID tematu" + topic_title: "Temat" + post_id: "ID wpisu" + post_title: "Wpis" + category_id: "ID kategorii" + category_title: "Kategoria" + external_url: "Zewnętrzny URL" + delete_confirm: Czy na pewno chcesz usunąć ten permalink? + form: + label: "Nowy:" + add: "Dodaj" + filter: "Wyszukaj (URL or zewnętrzny URL)" lightbox: download: "pobierz" search_help: @@ -2289,6 +2471,8 @@ pl_PL: categories: 'g, c Kategorie' top: 'g, t Popularne' bookmarks: 'g, b Zakładki' + profile: 'g, p Profil' + messages: 'g, m Wiadomości' navigation: title: 'Nawigacja' jump: '# idź do wpisu #' @@ -2300,13 +2484,14 @@ pl_PL: title: 'Aplikacja' create: 'c utwórz nowy temat' notifications: 'n pokaż powiadomienia' - site_map_menu: '= menu strony' + hamburger_menu: '= Otwórz menu' user_profile_menu: 'p menu użytkownika' show_incoming_updated_topics: '. nowe zmiany w tematach' search: '/ wyszukaj' help: '? skróty klawiszowe' dismiss_new_posts: 'x, r wyczyść listę wpisów' dismiss_topics: 'x, t wyczyść listę tematów' + log_out: 'shift+z shift+z Wylogowanie' actions: title: 'Operacje' bookmark_topic: 'f dodaj/usuń zakładkę na temat' @@ -2418,10 +2603,10 @@ pl_PL: description: Zaproszenie użytkownika campaigner: name: Działacz - description: Zaproszenie 3 użytkowników + description: Zaproszenie 3 użytkowników (poziom zaufania 1) champion: name: Czempion - description: Zaproszenie 10 użytkowników + description: Zaproszenie 5 użytkowników (poziom zaufania 2) first_share: name: Pierwsze udostępnienie description: Udostępniono wpis @@ -2437,8 +2622,17 @@ pl_PL: reader: name: Czytelnik description: Przeczytanie każdego wpisu w temacie z ponad 100 wpisami + popular_link: + name: Popularny link + description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć + hot_link: + name: Gorący link + description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć + famous_link: + name: Słynny link + description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć google_search: | -

      Szukaj z Google

      +

      Wyszukaj z Google

      diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 617a69c904..593e8db406 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -8,6 +8,9 @@ pt: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ pt: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "hh:mm" long_no_year: "DD MMM hh:mm" long_no_year_no_time: "DD MMM" + full_no_year_no_time: "Do MMMM" long_with_year: "DD MMM YYYY hh:mm" long_with_year_no_time: "DD MMM YYYY" + full_with_year_no_time: "Do MMMM, YYYY" long_date_with_year: "DD MMM, 'YY LT" long_date_without_year: "DD MMM, LT" long_date_with_year_without_time: "DD MMM, 'YY" @@ -82,6 +90,16 @@ pt: x_days: one: "1 dia atrás" other: "%{count} dias atrás" + later: + x_days: + one: "1 dia mais tarde" + other: "%{count} dias mais tarde" + x_months: + one: "1 mês mais tarde" + other: "%{count} meses mais tarde" + x_years: + one: "1 ano mais tarde" + other: "%{count} anos mais tarde" share: topic: 'partilhar uma hiperligação para este tópico' post: 'Mensagem #%{postNumber}' @@ -90,6 +108,26 @@ pt: facebook: 'partilhar esta hiperligação no Facebook' google+: 'partilhar esta hiperligação no Google+' email: 'enviar esta hiperligação por email' + action_codes: + split_topic: "dividir este tópico %{when}" + autoclosed: + enabled: 'fechado %{when}' + disabled: 'aberto %{when}' + closed: + enabled: 'fechado %{when}' + disabled: 'aberto %{when}' + archived: + enabled: 'arquivado %{when}' + disabled: 'removido do arquivo %{when}' + pinned: + enabled: 'fixado %{when}' + disabled: 'desafixado %{when}' + pinned_globally: + enabled: 'fixado globalmente %{when}' + disabled: 'desafixado %{when}' + visible: + enabled: 'listado %{when}' + disabled: 'removido da lista %{when}' topic_admin_menu: "Ações administrativas dos Tópicos" emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado." edit: 'editar o título e a categoria deste tópico' @@ -98,14 +136,14 @@ pt: yes_value: "Sim" generic_error: "Pedimos desculpa, ocorreu um erro." generic_error_with_reason: "Ocorreu um erro: %{error}" - sign_up: "Registar" + sign_up: "Inscrever-se" log_in: "Entrar" age: "Idade" joined: "Juntou-se" admin_title: "Administração" flags_title: "Sinalizações" show_more: "mostrar mais" - show_help: "Ajuda" + show_help: "opções" links: "Hiperligações" links_lowercase: one: "hiperligação" @@ -129,6 +167,7 @@ pt: every_two_weeks: "a cada duas semanas" every_three_days: "a cada três dias" max_of_count: "máximo de {{count}}" + alternation: "ou" character_count: one: "{{count}} caracter" other: "{{count}} caracteres" @@ -181,6 +220,7 @@ pt: saved: "Guardado!" upload: "Carregar" uploading: "A carregar…" + uploading_filename: "A carregar {{filename}}..." uploaded: "Carregado!" enable: "Ativar " disable: "Desativar" @@ -188,9 +228,10 @@ pt: revert: "Reverter" failed: "Falhou" switch_to_anon: "Modo Anónimo" - switch_from_anon: "Sair do Modo Anónimo" + switch_from_anon: "Sair de Anónimo" banner: close: "Destituir esta faixa." + edit: "Editar esta faixa >>" choose_topic: none_found: "Nenhum tópico encontrado." title: @@ -200,14 +241,23 @@ pt: topic: "Tópico:" approve: 'Aprovar' reject: 'Rejeitar' + delete_user: 'Eliminar Utilizador' title: "Necessita de Aprovação" none: "Não há mensagens para rever." edit: "Editar" cancel: "Cancelar" + view_pending: "ver mensagens pendentes" + has_pending_posts: + one: "Este tópico tem 1 mensagem à espera de aprovação" + other: "Este tópico tem {{count}} mensagens à espera de aprovação" confirm: "Guardar Alterações" + delete_prompt: "Tem a certeza que deseja eliminar %{username}? Isto irá remover todas as suas mensagens e bloquear os seus emails e endereços ip." approval: title: "A Mensagem Necessita de Aprovação" description: "Recebemos a sua nova mensagem mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente." + pending_posts: + one: "Tem 1 mensagem pendente." + other: "Tem {{count}} mensagens pendentes." ok: "OK" user_action: user_posted_topic: "{{user}} publicou o tópico" @@ -257,6 +307,9 @@ pt: mods_and_admins: "Apenas moderadores e Administradores" members_mods_and_admins: "Apenas membros do grupo, moderadores e administradores" everyone: "Todos" + trust_levels: + title: "Nível de confiança concedido automaticamente a membros quando são adicionados:" + none: "Nenhum" user_action_groups: '1': "Gostos Dados" '2': "Gostos Recebidos" @@ -276,6 +329,14 @@ pt: all_subcategories: "todas" no_subcategory: "nenhuma" category: "Categoria" + reorder: + title: "Re-organizar Categorias" + title_long: "Re-organizar a lista de categorias" + fix_order: "Fixar Posições" + fix_order_tooltip: "Nem todas as categorias têm um número único de posição, o que pode causar resultados inesperados." + save: "Guardar Ordem" + apply_all: "Aplicar" + position: "Posição" posts: "Mensagens" topics: "Tópicos" latest: "Recentes" @@ -305,6 +366,8 @@ pt: topics_entered: "tópicos inseridos" post_count: "# mensagens" confirm_delete_other_accounts: "Tem a certeza que quer apagar estas contas?" + user_fields: + none: "(selecione uma opção)" user: said: "{{username}}:" profile: "Perfil" @@ -316,14 +379,27 @@ pt: private_messages: "Mensagens" activity_stream: "Atividade" preferences: "Preferências" + expand_profile: "Expandir" bookmarks: "Marcadores" bio: "Sobre mim" invited_by: "Convidado Por" trust_level: "Nível de Confiança" notifications: "Notificações" + desktop_notifications: + label: "Notificações de Desktop" + not_supported: "Não são suportadas notificações neste navegador. Desculpe." + perm_default: "Ligar Notificações" + perm_denied_btn: "Permissão Negada" + perm_denied_expl: "Tem permissões negadas para notificações. Utilize o seu navegador para ativar notificações, de seguida clique no botão quando concluir. (Desktop: O ícone mais à esquerda na barra de endereço. Móvel: 'Info do Sítio'.)" + disable: "Desativar Notificações" + currently_enabled: "(atualmente ativo)" + enable: "Ativar Notificações" + currently_disabled: "(atualmente inativo)" + each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza." dismiss_notifications: "Marcar tudo como lido" dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler" disable_jump_reply: "Não voltar para a minha mensagem após ter respondido" + dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser." edit_history_public: "Permitir que outros utilizadores vejam as minhas revisões de publicação" external_links_in_new_tab: "Abrir todas as hiperligações externas num novo separador" enable_quoting: "Ativar resposta usando citação de texto destacado" @@ -332,14 +408,15 @@ pt: admin: "{{user}} é um administrador" moderator_tooltip: "Este utilizador é um moderador" admin_tooltip: "Este utilizador é um administrador" + blocked_tooltip: "Este utilizador está bloqueado" suspended_notice: "Este utilizador está suspenso até {{date}}." suspended_reason: "Motivo: " github_profile: "Github" mailing_list_mode: "Enviar-me um email por cada nova mensagem (a não ser que eu silencie o tópico ou categoria)" watched_categories: "Vigiado" - watched_categories_instructions: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todos as novas mensagens e tópicos. Além disso, a contagem de mensagens novas e não lidas surgirá junto do tópico. " + watched_categories_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas mensagens e tópicos, e uma contagem de novas mensagens irá aparecer junto ao tópico." tracked_categories: "Acompanhado" - tracked_categories_instructions: "Acompanhará automaticamente todos os tópicos novos nestas categorias. Uma contagem de mensagens novas e não lidas surgirá ao lado do tópico." + tracked_categories_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas mensagens irá aparecer junto ao tópico." muted_categories: "Silenciado" muted_categories_instructions: "Não será notificado relativamente a novos tópicos nestas categorias, e não aparecerão no seu separador de tópicos não lidos." delete_account: "Eliminar A Minha Conta" @@ -369,6 +446,7 @@ pt: set_password: "Definir Palavra-passe" change_about: title: "Modificar Sobre Mim" + error: "Ocorreu um erro ao alterar este valor." change_username: title: "Alterar Nome de Utilizador" confirm: "Se mudar o seu nome de utilizador, todas as citações anteriores das suas mensagens e menções a @nome serão quebradas. Tem a certeza que deseja fazê-lo?" @@ -383,6 +461,7 @@ pt: change_avatar: title: "Alterar a sua imagem de perfil" gravatar: "Gravatar, baseado em" + gravatar_title: "Mude o seu avatar no sítio Gravatar" refresh_gravatar_title: "Atualize o seu Gravatar" letter_based: "Imagem de perfil atribuída pelo sistema" uploaded_avatar: "Foto personalizada" @@ -390,7 +469,7 @@ pt: upload_title: "Carregar a sua foto" upload_picture: "Carregar Imagem" image_is_not_a_square: "Alerta: cortámos a sua imagem; o comprimento e a altura não eram iguais." - cache_notice: "Alterou o seu avatar com sucesso mas poderá demorar algum tempo até este aparecer devido à cache do navegador de internet." + cache_notice: "Alterou a sua fotografia de perfil com sucesso mas poderá demorar algum tempo até esta aparecer devido à cache do navegador de internet." change_profile_background: title: "Fundo de Perfil" instructions: "O fundo do perfil será centrado e terá por defeito uma largura de 850px." @@ -450,38 +529,42 @@ pt: every_two_weeks: "a cada duas semanas" email_direct: "Enviar-me um email quando alguém me citar, responder às minhas mensagens, mencionar o meu @nomedeutilizador, ou convidar-me para um tópico" email_private_messages: "Enviar-me um email quando alguém me envia uma mensagem" - email_always: "Não suprimir notificações de email quando estou ativo no sítio" + email_always: "Enviar-me notificações de email mesmo quando estou ativo no sítio" other_settings: "Outros" categories_settings: "Categorias" new_topic_duration: label: "Considerar tópicos como novos quando" not_viewed: "Ainda não os vi" last_here: "criado desde a última vez que aqui estive" - after_n_days: - one: "criadas no último dia" - other: "criadas nos últimos {{count}} dias" - after_n_weeks: - one: "criada na última semana" - other: "criadas nas últimas {{count}} semanas" + after_1_day: "criado no último dia" + after_2_days: "criado nos últimos 2 dias" + after_1_week: "criado na última semana" + after_2_weeks: "criado nas últimas 2 semanas" auto_track_topics: "Acompanhar automaticamente os tópicos em que eu entro" auto_track_options: never: "nunca" immediately: "imediatamente" - after_n_seconds: - one: "passado 1 segundo" - other: "passado {{count}} segundos" - after_n_minutes: - one: "passado 1 minuto" - other: "passado {{count}} minutos" + after_30_seconds: "após 30 segundos" + after_1_minute: "após 1 minuto" + after_2_minutes: "após 2 minutos" + after_3_minutes: "após 3 minutos" + after_4_minutes: "após 4 minutos" + after_5_minutes: "após 5 minutos" + after_10_minutes: "após 10 minutos" invited: search: "digite para procurar convites..." title: "Convites" user: "Utilizadores Convidados" - none: "Ainda não convidou ninguém." + sent: "Enviado" + none: "Não há convites pendentes para mostrar." truncated: "A mostrar os primeiros {{count}} convites." redeemed: "Convites Resgatados" + redeemed_tab: "Resgatado" + redeemed_tab_with_count: "Resgatados ({{count}})" redeemed_at: "Resgatado" pending: "Convites Pendentes" + pending_tab: "Pendente" + pending_tab_with_count: "Pendentes ({{count}})" topics_entered: "Tópicos Visualizados" posts_read_count: "Mensagens Lidas" expired: "Este convite expirou." @@ -493,6 +576,8 @@ pt: days_visited: "Dias Visitados" account_age_days: "Idade da conta, em dias" create: "Enviar um Convite" + generate_link: "Copiar Hiperligação do Convite" + generated_link_message: '

      Hiperligação do Convite gerada corretamente!

      A hiperligação do convite é válida apenas para este endereço de email: %{invitedEmail}

      ' bulk_invite: none: "Ainda não convidou ninguém. Pode enviar convites individuais, ou convidar um grupo de pessoas de uma única vez carregando um ficheiro com convites em massa." text: "Convite em massa a partir de ficheiro" @@ -514,6 +599,7 @@ pt: title: "Endereço IP de registo" avatar: title: "Imagem de Perfil" + header_title: "perfil, mensagens, marcadores e preferências" title: title: "Título" filters: @@ -546,7 +632,11 @@ pt: logout: "A sua sessão estava encerrada." refresh: "Atualizar" read_only_mode: + enabled: "O modo só de leitura está ativo. Pode continuar a navegar no sítio mas as interações podem não funcionar." login_disabled: "A função de início de sessão está desativada enquanto o sítio se encontrar no modo só de leitura." + too_few_topics_and_posts_notice: "Vamos começar esta discussão! Atualmente existem %{currentTopics} / %{requiredTopics} tópicos e %{currentPosts} / %{requiredPosts} mensagens. Novos visitantes precisam de conversações para ler e responder a." + too_few_topics_notice: "Vamos começar esta discussão! Atualmente existem %{currentTopics} / %{requiredTopics} tópios. Novos visitantes precisam de algumas conversações para ler e responder a." + too_few_posts_notice: "Vamos começar esta discussão! Atualmente existem %{currentPosts} / %{requiredPosts} mensagens. Novos visitantes precisam de algumas conversações para ler e responder a." learn_more: "saber mais..." year: 'ano' year_desc: 'tópicos criados nos últimos 365 dias' @@ -563,6 +653,21 @@ pt: replies_lowercase: one: resposta other: respostas + signup_cta: + sign_up: "Inscrever-se" + hide_session: "Lembrar-me amanhã" + hide_forever: "Não obrigado" + hidden_for_session: "OK, Irei perguntar-lhe amanhã. Pode sempre usar 'Iniciar Sessão' para criar uma conta, também." + intro: "Olá! :heart_eyes: Parece que está a gostar da discussão, mas não está inscrito para uma conta." + value_prop: "Quando cria uma conta, pode acompanhar exatamente o que leu, por isso volta sempre ao sítio onde ficou. Pode também obter notificações, aqui e por email, sempre que novas mensagens são feitas. E pode gostar de mensagens para partilhar o amor. :heartbeat:" + methods: + sso: "Inscrever-se é fácil: tudo o que precisa é uma conta no sítio principal." + only_email: "Inscrever-se é fácil: tudo o que precisa é um email e uma palavra-passe." + only_other: "Utilize a sua conta %{provider} para se inscrever." + one_and_email: "Utilize a sua conta %{provider}, ou um email e palavra-passe, para se inscrever." + multiple_no_email: "Inscrever-se é fácil: utilize qualquer um dos nossos %{count} inícios de sessão sociais." + multiple: "Inscrever-se é fácil: utilize qualquer um dos nossos %{count} inícios de sessão sociais, ou um email e palavra-passe." + unknown: "erro ao obter métodos suportados de início de sessão " summary: enabled_description: "Está a ver um resumo deste tópico: as mensagens mais interessantes são determinados pela comunidade." description: "Existem {{count}} respostas." @@ -606,6 +711,7 @@ pt: email_placeholder: "email ou nome de utilizador" caps_lock_warning: "Caps Lock está ligado" error: "Erro desconhecido" + rate_limit: "Por favor espere antes de tentar iniciar sessão novamente." blank_username_or_password: "Por favor insira o seu email ou nome de utilizador, e palavra-passe." reset_password: 'Repor Palavra-passe' logging_in: "A iniciar sessão..." @@ -643,7 +749,10 @@ pt: emoji_one: "Emoji One" composer: emoji: "Emoji :smile:" + options: "Opções" + whisper: "susurro" add_warning: "Este é um aviso oficial." + toggle_whisper: "Alternar Sussuro" posting_not_on_topic: "A que tópico quer responder?" saving_draft_tip: "a guardar..." saved_draft_tip: "guardado" @@ -670,6 +779,7 @@ pt: title_placeholder: "Numa breve frase, de que se trata esta discussão?" edit_reason_placeholder: "Porque está a editar?" show_edit_reason: "(adicione a razão para a edição)" + reply_placeholder: "Digite aqui. Utilize Markdown, BBCode, ou HTML para formatar. Arraste ou cole imagens." view_new_post: "Ver a sua nova mensagem." saving: "A Guardar..." saved: "Guardado!" @@ -730,6 +840,27 @@ pt: moved_post: "

      {{username}} moveu {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Ganhou '{{description}}'

      " + alt: + mentioned: "Mencionado por" + quoted: "Citado por" + replied: "Respondido" + posted: "Publicado por" + edited: "Edição da sua mensagem por" + liked: "Gostou da sua mensagem" + private_message: "Mensagem privada de" + invited_to_private_message: "Convidado para uma mensagem privada de" + invited_to_topic: "Convidado para um tópico de" + invitee_accepted: "Convite aceite por" + moved_post: "A sua mensagem foi movida por" + linked: "Hiperligação para a sua mensagem" + granted_badge: "Distintivo concedido" + popup: + mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}' + quoted: '{{username}} citou-o em "{{topic}}" - {{site_title}}' + replied: '{{username}} respondeu-lhe em "{{topic}}" - {{site_title}}' + posted: '{{username}} publicou em "{{topic}}" - {{site_title}}' + private_message: '{{username}} enviou-lhe uma mensagem privada em "{{topic}}" - {{site_title}}' + linked: '{{username}} ligou-se à sua mensagem a partir de "{{topic}}" - {{site_title}}' upload_selector: title: "Adicionar uma imagem" title_with_attachments: "Adicionar uma imagem ou um ficheiro" @@ -737,15 +868,28 @@ pt: from_the_web: "Da internet" remote_tip: "hiperligação para imagem" remote_tip_with_attachments: "hiperligação para imagem ou ficheiro ({{authorized_extensions}})" - local_tip: "Clique para selecionar um ficheiro do seu dispositivo" - local_tip_with_attachments: "clique para selecionar uma imagem ou ficheiro do seu dispositivo ({{authorized_extensions}})" + local_tip: "selecionar imagens do seu dispositivo" + local_tip_with_attachments: "selecionar imagens ou ficheiros do seu dispositivo ({{authorized_extensions}})" hint: "(pode também arrastar o ficheiro para o editor para fazer o carregamento)" - hint_for_supported_browsers: "(pode também arrastar ou colar imagens no editor de forma a carregá-las)" + hint_for_supported_browsers: "pode também arrastar e largar ou colar imagens no editor" uploading: "A carregar" + select_file: "Selecionar Ficheiro" image_link: "hiperligação da imagem irá apontar para" search: + sort_by: "Ordenar por" + relevance: "Relevância" + latest_post: "Última Mensagem" + most_viewed: "Mais Visto" + most_liked: "Mais Gostos" + select_all: "Selecionar Tudo" + clear_all: "Limpar Tudo" + result_count: + one: "1 resultado para \"{{term}}\"" + other: "{{count}} resultados para \"{{term}}\"" title: "pesquisar tópicos, mensagens, utilizadores, ou categorias" no_results: "Não foi encontrado nenhum resultado." + no_more_results: "Mais nenhum resultado encontrado." + search_help: Procurar ajuda searching: "A procurar..." post_format: "#{{post_number}} de {{username}}" context: @@ -753,7 +897,8 @@ pt: category: "Procurar na categoria \"{{category}}\"" topic: "Pesquisar este tópico" private_messages: "Pesquisar mensagens" - site_map: "ir para outra lista de tópicos ou categorias" + hamburger_menu: "ir para outra lista de tópicos ou categorias" + new_item: "novo" go_back: 'voltar atrás' not_logged_in_user: 'página de utilizador com resumo da atividade atual e preferências ' current_user: 'ir para a sua página de utilizador' @@ -802,6 +947,9 @@ pt: bookmarks: "Não há mais tópicos marcados." search: "Não há mais resultados na pesquisa." topic: + unsubscribe: + stop_notifications: "Irá passar a receber menos notificações para {{title}}" + change_notification_state: "O seu estado de notificação atual é" filter_to: "{{post_count}} mensagens no tópico" create: 'Novo Tópico' create_long: 'Criar um novo Tópico' @@ -844,6 +992,7 @@ pt: toggle_information: "alternar detalhes do tópico" read_more_in_category: "Pretende ler mais? Procure outros tópicos em {{catLink}} ou {{latestLink}}." read_more: "Pretende ler mais? {{catLink}} ou {{latestLink}}." + read_more_MF: "{ UNREAD, plural, =0 {} one { Existe 1 não lido } other { Existem # não lidos } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {existe } other{}} 1 novo tópico} other { {BOTH, select, true{e } false {existem } other{}} # novos tópicos} } restantes, ou {CATEGORY, select, true {pesquise outros tópicos em {catLink}} false {{latestLink}} other {}}" browse_all_categories: Pesquisar em todas as categorias view_latest_topics: ver os tópicos mais recentes suggest_create_topic: Porque não começar um tópico? @@ -860,6 +1009,7 @@ pt: go_top: "topo" go_bottom: "fim" go: "ir" + jump_bottom: "saltar para a última mensagem" jump_bottom_with_number: "avançar para a mensagem %{post_number}" total: total de mensagens current: mensagem atual @@ -875,29 +1025,29 @@ pt: '2_4': 'Receberá notificações porque publicou uma resposta a este tópico.' '2_2': 'Receberá notificações porque está a acompanhar este tópico.' '2': 'Receberá notificações porque leu este tópico.' - '1_2': 'Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens' - '1': 'Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens' + '1_2': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.' + '1': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.' '0_7': 'Está a ignorar todas as notificações nesta categoria.' '0_2': 'Está a ignorar todas as notificações para este tópico.' '0': 'Está a ignorar todas as notificações para este tópico.' watching_pm: title: "A vigiar" - description: "Será notificado de todas as novas publicações nesta mensagem. Uma contagem das publicações não lidas e novas irá também aparecer junto do tópico." + description: "Será notificado de cada nova resposta nesta mensagem, e uma contagem de novas respostas será exibida." watching: title: "A vigiar" - description: "Será notificado sobre todas as novas mensagens neste tópico. Será também apresentada uma contagem de mensagens novas e não lidas junto do tópico." + description: "Será notificado de cada nova resposta neste tópico, e uma contagem de novas respostas será exibida." tracking_pm: title: "Acompanhar" - description: "Uma contagem de publicações não lidas e novas irá aparecer junto à mensagem. Será notificado se alguém mencionar o seu @nome ou responder à sua publicação." + description: "Uma contagem de novas respostas será exibida para esta mensagem. Será notificado se alguém mencionar o seu @nome ou responder-lhe." tracking: title: "Acompanhar" - description: "Será apresentada uma contagem de mensagens novas e não lidas junto do tópico Será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." + description: "Uma contagem de novas respostas será exibida para este tópico. Será notificado se alguém mencionar o seu @nome ou responder-lhe." regular: title: "Habitual" - description: "Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens." + description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe." regular_pm: title: "Habitual" - description: "Será notificado se alguém mencionar o seu @nome ou responder à sua publicação na mensagem." + description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe." muted_pm: title: "Silenciado" description: "Não será notificado de nada relacionado com esta mensagem." @@ -939,17 +1089,20 @@ pt: success_message: 'Sinalizou este tópico com sucesso.' feature_topic: title: "Destacar este tópico" - pin: "Fazer com que este tópico apareça no topo da categoria {{categoryLink}}." + pin: "Fazer este tópico aparecer no topo da categoria {{categoryLink}} até" confirm_pin: "Já tem {{count}} tópicos fixados. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico nesta categoria?" unpin: "Remover este tópico do topo da categoria {{categoryLink}}." + unpin_until: "Remover este tópico do topo da categoria {{categoryLink}} ou espere até %{until}." pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios." + pin_validation: "É necessária uma data para fixar este tópico." already_pinned: zero: "Não há tópicos fixados em {{categoryLink}}." one: "Tópicos atualmente fixados em {{categoryLink}}: 1." other: "Tópicos atualmente fixados em {{categoryLink}}: {{count}}." - pin_globally: "Fazer este tópico aparecer no topo de todas as listas de tópicos, até que um membro do pessoal o desafixe." + pin_globally: "Fazer com que este tópico apareça no topo da lista de todos os tópicos até" confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?" unpin_globally: "Remover este tópico do topo de todas as listas de tópicos." + unpin_globally_until: "Remover este tópico do topo da lista de todos os tópicos ou espere até %{until}." global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios." already_pinned_globally: zero: "Não há tópicos fixados globalmente." @@ -981,8 +1134,8 @@ pt: sso_enabled: "Introduza o nome de utilizador da pessoa que gostaria de convidar para este tópico." to_topic_blank: "Introduza o nome de utilizador ou endereço de email da pessoa que gostaria de convidar para este tópico." to_topic_email: "Introduziu um endereço de email. Iremos enviar um email com um convite que permite aos seus amigos responderem a este tópico imediatamente." - to_topic_username: "Introduziu um nome de utilizador. Iremos enviar uma notificação a esse utilizador com uma hiperligação convidando-o para este tópico." - to_username: "Introduza o nome de utilizador da pessoa que gostava de convidar. Iremos enviar uma notificação para esse utilizador com uma hiperligação convidando-o para este tópico." + to_topic_username: "Introduziu um nome de utilizador. Iremos enviar-lhe uma notificação com uma hiperligação convidando-o para este tópico." + to_username: "Introduza o nome de utilizador da pessoa que deseja convidar. Iremos enviar-lhe uma notificação com uma hiperligação convidando-o para este tópico." email_placeholder: 'nome@exemplo.com' success_email: "Enviámos por email um convite para {{emailOrUsername}}. Iremos notificá-lo quando o convite for utilizado. Verifique o separador de convites na sua página de utilizador para acompanhar os seus convites." success_username: "Convidámos esse utilizador para participar neste tópico." @@ -1018,6 +1171,12 @@ pt: one: "Por favor seleccione o novo titular da mensagem de {{old_user}}." other: "Por favor selecione o novo titular das {{count}} mensagens de {{old_user}}." instructions_warn: "Note que quaisquer notificações relacionadas com esta mensagem serão transferidas retroativamente para o novo utilizador.
      Aviso: Atualmente nenhum dado dependente da mensagem é transferido para o novo utilizador. Usar com cautela." + change_timestamp: + title: "Alterar Selo Temporal" + action: "alterar selo temporal" + invalid_timestamp: "O selo temporal não pode ser no futuro." + error: "Ocorreu um erro ao alterar o selo temporal do tópico." + instructions: "Por favor selecione o novo selo temporal do tópico. Mensagens no tópico serão atualizadas para terem a mesma diferença temporal." multi_select: select: 'selecionar' selected: '({{count}}) selecionados' @@ -1030,8 +1189,8 @@ pt: one: Selecionou 1 mensagem. other: Selecionou {{count}} mensagens. post: - reply: "Em resposta a {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Responder a {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "citar resposta" edit: "Editar {{link}} {{replyAvatar}} {{username}}" edit_reason: "Motivo:" @@ -1046,11 +1205,24 @@ pt: one: "(mensagens abandonadas pelo autor serão removidas automaticamente em %{count} hora a não ser que estejam sinalizadas)" other: "(mensagens abandonadas pelo autor serão eliminadas automaticamente em %{count} horas a não ser que estejam sinalizadas)" expand_collapse: "expandir/colapsar" + gap: + one: "ver 1 resposta oculta" + other: "ver {{count}} respostas ocultas" more_links: "{{count}} mais..." unread: "Mensagem não lida" has_replies: - one: "Resposta" - other: "Respostas" + one: "{{count}} Resposta" + other: "{{count}} Respostas" + has_likes: + one: "{{count}} Gosto" + other: "{{count}} Gostos" + has_likes_title: + one: "1 pessoa gostou desta mensagem" + other: "{{count}} pessoas gostaram desta mensagem" + has_likes_title_you: + zero: "você gostou desta mensagem" + one: "você e 1 outra pessoa gostaram desta mensagem" + other: "você e {{count}} outras pessoas gostaram desta mensagem" errors: create: "Pedimos desculpa, ocorreu um erro ao criar a sua mensagem. Por favor, tente novamente." edit: "Pedimos desculpa, ocorreu um erro ao editar a sua mensagem. Por favor, tente novamente." @@ -1068,6 +1240,7 @@ pt: no_value: "Não, manter" yes_value: "Sim, abandonar" via_email: "esta mensagem chegou por email" + whisper: "esta mensagem é um susurro privado para os moderadores" wiki: about: "esta mensagem é uma wiki; utilizadores comuns podem editá-la" archetypes: @@ -1204,6 +1377,7 @@ pt: last: "Última revisão" hide: "Esconder revisão" show: "Mostrar revisão" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Mostrar o resultado renderizado com inserções e remoções em-linha." @@ -1217,14 +1391,17 @@ pt: category: can: 'pode… ' none: '(sem categoria)' + all: 'Todas as categorias' choose: 'Selecione uma category…' edit: 'editar' edit_long: "Editar" view: 'Visualizar Tópicos na Categoria' general: 'Geral' settings: 'Configurações' + topic_template: "Modelo do Tópico" delete: 'Eliminar Categoria' create: 'Nova Categoria' + create_long: 'Criar uma nova categoria' save: 'Guardar Categoria' slug: 'Título da Categoria' slug_placeholder: '(Opcional) palavras com travessão no URL' @@ -1247,6 +1424,7 @@ pt: change_in_category_topic: "Editar Descrição" already_used: 'Esta cor já foi usada para outra categoria' security: "Segurança" + special_warning: "Aviso: Esta categoria é uma categoria pré-preenchida e as configurações de segurança não podem ser editadas. Se não deseja utilizar esta categoria, elimine-a em vez de lhe dar um novo propósito." images: "Imagens" auto_close_label: "Fechar tópicos automaticamente depois de:" auto_close_units: "horas" @@ -1254,6 +1432,7 @@ pt: email_in_allow_strangers: "Aceitar emails de utilizadores anónimos sem conta" email_in_disabled: "Publicar novos tópicos através do email está desactivado nas Configurações do Sítio. Para permitir a publicação de novos tópicos através do email," email_in_disabled_click: 'ative a definição "email em".' + suppress_from_homepage: "Suprimir esta categoria da página principal." allow_badges_label: "Permitir a atribuição de distintivos nesta categoria" edit_permissions: "Editar Permissões" add_permission: "Adicionar Permissões" @@ -1266,13 +1445,13 @@ pt: notifications: watching: title: "A vigiar" - description: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas mensagens e tópicos. Além disso, a contagem de mensagens novas e não lidas surgirá junto do tópico." + description: "Irá vigiar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas mensagens e tópicos, e uma contagem de novas respostas irá aparecer para estes tópicos." tracking: title: "Acompanhar" - description: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de mensagens novas e não lidas surgirá junto do tópico." + description: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas respostas irá aparecer para estes tópicos." regular: title: "Habitual" - description: "Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens." + description: "Será notificado se alguém mencionar o seu @nome ou responder-lhe." muted: title: "Silenciado" description: "Não será notificado relativamente acerca de novos tópicos nestas categorias, e não aparecerão no seu separador de não lidos." @@ -1306,6 +1485,8 @@ pt: notify_action: "Mensagem" topic_map: title: "Sumário do Tópico" + participants_title: "Autores Frequentes" + links_title: "Hiperligações Populares" links_shown: "mostrar todas as {{totalLinks}} hiperligações..." clicks: one: "1 clique" @@ -1317,6 +1498,10 @@ pt: help: "Adicionou este tópico aos marcadores" locked: help: "Este tópico está fechado; já não são aceites novas respostas" + archived: + help: "Este tópico está arquivado; está congelado e não pode ser alterado" + locked_and_archived: + help: "Este tópico está fechado e arquivado; já não aceita novas respostas e não pode ser modificado" unpinned: title: "Desafixado" help: "Este tópico foi desafixado por si; será mostrado na ordem habitual" @@ -1326,8 +1511,6 @@ pt: pinned: title: "Fixado" help: "Este tópico foi fixado por si; será mostrado no topo da sua categoria" - archived: - help: "Este tópico está arquivado; está congelado e não pode ser alterado" invisible: help: "Este tópico não está listado; não será apresentado na lista de tópicos e poderá ser acedido apenas através de uma hiperligação direta" posts: "Mensagens" @@ -1367,7 +1550,10 @@ pt: with_topics: "%{filter} tópicos" with_category: "%{filter} %{category} tópicos" latest: - title: "Recentes" + title: + zero: "Recentes" + one: "Recente (1)" + other: "Recentes ({{count}})" help: "tópicos com mensagens recentes" hot: title: "Quente" @@ -1420,6 +1606,8 @@ pt: title: "Em Qualquer Altura" yearly: title: "Anual" + quarterly: + title: "Trimestral" monthly: title: "Mensal" weekly: @@ -1427,11 +1615,12 @@ pt: daily: title: "Diário" all_time: "Em Qualquer Altura" - this_year: "Este ano" - this_month: "Este mês" - this_week: "Esta semana" + this_year: "Ano" + this_quarter: "Trimestre" + this_month: "Mês" + this_week: "Semana" today: "Hoje" - other_periods: "ver mais tópicos principais" + other_periods: "ver topo" browser_update: 'Infelizmente, o seu navegador é demasiado antigo para funcionar com este sítio. Por favor atualize o seu navegador.' permission_types: full: "Criar / Responder / Ver" @@ -1443,7 +1632,7 @@ pt: title: 'Administração Discourse' moderator: 'Moderador' dashboard: - title: "Painel Administrativo" + title: "Painel de Administração" last_updated: "Painel atualizado em:" version: "Versão" up_to_date: "Está atualizado!" @@ -1465,9 +1654,10 @@ pt: suspended: 'Suspenso: ' private_messages_short: "Msgs" private_messages_title: "Mensagens" + mobile_title: "Móvel" space_free: "{{size}} livre" uploads: "carregamentos" - backups: "cópias de segurança" + backups: "fazer cópias de segurança" traffic_short: "Tráfego" traffic: "Pedidos de aplicação web" page_views: "Pedidos API" @@ -1596,12 +1786,16 @@ pt: name: "Nome" none_installed: "Não tem nenhum plugin instalado." version: "Versão" + enabled: "Ativado?" + is_enabled: "S" + not_enabled: "N" change_settings: "Alterar Configurações" + change_settings_short: "Configurações" howto: "Como instalo plugins?" backups: - title: "Cópias de Segurança" + title: "Fazer Cópias de Segurança" menu: - backups: "Cópias de Segurança" + backups: "Fazer Cópias de Segurança" logs: "Logs" none: "Nenhuma cópia de segurança disponível." read_only: @@ -1631,7 +1825,7 @@ pt: title: "Cancelar a operação atual" confirm: "Tem a certeza que deseja cancelar a operação atual?" backup: - label: "Cópia de segurança" + label: "Fazer Cópia de segurança" title: "Criar uma cópia de segurança" confirm: "Deseja criar uma nova cópia de segurança?" without_uploads: "Sim (não incluir ficheiros)" @@ -1662,6 +1856,8 @@ pt: screened_email: "Exportar lista total de emails selecionados em formato CSV." screened_ip: "Exportar lista total de IP selecionados em formato CSV." screened_url: "Exportar lista total de URL selecionados em formato CSV." + export_json: + button_text: "Exportar" invite: button_text: "Enviar Convites" button_title: "Enviar Convites" @@ -1672,6 +1868,7 @@ pt: header: "Cabeçalho" top: "Topo" footer: "Rodapé" + embedded_css: "CSS incorporado" head_tag: text: "" title: "HTML que será introduzido antes da tag " @@ -1689,6 +1886,8 @@ pt: save: "Guardar" new: "Novo" new_style: "Novo Estilo" + import: "Importar" + import_title: "Selecione um ficheiro ou cole texto" delete: "Eliminar" delete_confirm: "Remover esta personalização?" about: "Modificar folha de estilo CSS e cabeçalhos HTML no sítio. Adicionar personalização para iniciar." @@ -1761,7 +1960,7 @@ pt: sent_test: "enviado!" delivery_method: "Método de Entrega" preview_digest: "Pré-visualizar Resumo" - preview_digest_desc: "Pre-visualizar o conteúdo do resumo semanal de emails enviados para utilizadores inactivos" + preview_digest_desc: "Pré-visualizar o conteúdo dos emails de resumo enviados aos utilizadores inativos." refresh: "Atualizar" format: "Formato" html: "html" @@ -1826,6 +2025,7 @@ pt: delete_post: "eliminar mensagem" impersonate: "personificar" anonymize_user: "tornar utilizador anónimo" + roll_up: "agregar blocos IP" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada." @@ -1861,6 +2061,8 @@ pt: impersonate: title: "Personificar" help: "Utilize este ferramenta de forma a personificar uma conta de utilizador para fins de depuração. Terá de encerrar a sessão assim que terminar." + not_found: "Esse utilizador não foi encontrado." + invalid: "Pedimos desculpa, não pode personificar esse utilizador." users: title: 'Utilizadores' create: 'Adicionar Utilizador da Admnistração' @@ -2045,6 +2247,7 @@ pt: delete: "Eliminar" cancel: "Cancelar" delete_confirm: "Tem a certeza que quer eliminar esse campo de utilizador?" + options: "Opções" required: title: "Obrigatório na inscrição?" enabled: "obrigatório" @@ -2060,6 +2263,7 @@ pt: field_types: text: 'Campo de Texto' confirm: 'Confirmação' + dropdown: "Suspenso" site_text: none: "Escolha um tipo de conteúdo para começar a editar." title: 'Conteúdo do Texto' @@ -2071,6 +2275,7 @@ pt: no_results: "Não foi encontrado nenhum resultado." clear_filter: "Limpar" add_url: "adicionar URL" + add_host: "adicionar host" categories: all_results: 'Todos' required: 'Necessário' @@ -2089,9 +2294,10 @@ pt: embedding: "Incorporação" legal: "Legal" uncategorized: 'Outro' - backups: "Cópias de Segurança" + backups: "Fazer Cópias de Segurança" login: "Iniciar Sessão" plugins: "Plugins" + user_preferences: "Preferências do Utilizador" badges: title: Distintivos new_badge: Novo Distintivo @@ -2165,6 +2371,44 @@ pt: name: "Nome" image: "Imagem" delete_confirm: "Tem a certeza que deseja eliminar o emoji :%{name}:?" + embedding: + get_started: "Se deseja incorporar o Discourse noutro sítio, comece por adicionar o seu servidor." + confirm_delete: "Tem certeza que deseja eliminar este servidor?" + sample: "Utilize o seguinte código HTML no seu sítio para criar e incorporar tópicos do discourse. Substitua REPLACE_ME pelo URL canónico da página onde está a incorporá-los." + title: "Incorporação" + host: "Servidores Permitidos" + edit: "editar" + category: "Mensagem para Categoria" + add_host: "Adicionar Servidor" + settings: "Configurações de Incorporação" + feed_settings: "Configurações do Feed" + feed_description: "Fornecer um fed RSS/ATOM para o seu sítio pode melhorar a habilidade do Discourse de importar o seu conteúdo." + crawling_settings: "Configurações de Rastreio" + crawling_description: "Quando o Discourse cria tópicos para as suas mensagens, se nenhum feed RSS/ATOM está presente o Discourse irá tentar analisar o seu conteúdo fora do seu HTML. Algumas vezes pode ser um desafio extrair o seu conteúdo, por isso temos a habilidade de especificar regras CSS para tornar a extração mais fácil. " + embed_by_username: "Nome de uilizador para criação do tópico" + embed_post_limit: "Número máximo de mensagens a incorporar" + embed_username_key_from_feed: "Chave para puxar o nome de utilizador discouse do feed" + embed_truncate: "Truncar as mensagens incorporadas" + embed_whitelist_selector: "Seletor CSS para elementos que são permitidos nas incorporações" + embed_blacklist_selector: "Seletor CSS para elementos que são removidos das incorporações" + feed_polling_enabled: "Importar mensagens através de RSS/ATOM" + feed_polling_url: "URL do feed RSS/ATOM para rastreio" + save: "Guardar Configurações de Incorporação" + permalink: + title: "Hiperligações Permanentes" + url: "URL" + topic_id: "ID do Tópico" + topic_title: "Tópico" + post_id: "ID da Mensagem" + post_title: "Mensagem" + category_id: "ID da Categoria" + category_title: "Categoria" + external_url: "URL Externo" + delete_confirm: Tem a certeza que deseja eliminar esta hiperligação permanente? + form: + label: "Novo:" + add: "Adicionar" + filter: "Pesquisar (URL ou URL Externo)" lightbox: download: "descarregar" search_help: @@ -2173,11 +2417,15 @@ pt: title: 'Atalhos de Teclado' jump_to: title: 'Ir Para' + home: 'g, h Página Principal' latest: 'g, l Recentes' new: 'g, n Novo' unread: 'g, u Não lido' categories: 'g, c Categorias' top: 'g, t Os Melhores' + bookmarks: 'g, b Marcadores' + profile: 'g, p Perfil' + messages: 'g, m Mensagens' navigation: title: 'Navegação' jump: '# Ir para o post #' @@ -2189,13 +2437,14 @@ pt: title: 'Aplicação' create: 'c Criar um novo tópico' notifications: 'n Abrir notificações' - site_map_menu: '= Abrir menu do sítio' + hamburger_menu: '= Abrir menu hamburger' user_profile_menu: 'p Abrir menu do utilizador' show_incoming_updated_topics: '. Mostrar tópicos atualizados' search: '/ Pesquisar' help: '? Abrir ajuda do teclado' dismiss_new_posts: 'x, r Destituir Novos/Mensagens' dismiss_topics: 'x, t Destituir Tópicos' + log_out: 'shift+z shift+z Terminar Sessão' actions: title: 'Ações' bookmark_topic: 'f Alternar marcador de tópico' @@ -2299,6 +2548,15 @@ pt: first_flag: name: Primeira Sinalização description: Sinalizou uma mensagem + promoter: + name: Promotor + description: Convidou um utilizador + campaigner: + name: Partidário + description: Convidou 3 utilizadores básicos (nível de confiança 1) + champion: + name: Campeão + description: Convidou 5 membros (nível de confiança 2) first_share: name: Primeira Partilha description: Partilhou uma mensagem @@ -2314,8 +2572,17 @@ pt: reader: name: Leitor description: Ler todas as mensagens num tópico com mais de 100 mensagens + popular_link: + name: Hiperligação Popular + description: Foi publicada uma hiperligação externa com pelo menos 50 cliques + hot_link: + name: Hiperligação Quente + description: Foi publicada uma hiperligação externa com pelo menos 300 cliques + famous_link: + name: Hiperligação Famosa + description: Foi publicada uma hiperligação externa com pelo menos 1000 cliques google_search: | -

      Pesquisar com o Google

      +

      Pesquise com o Google

      diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 3289beb0e1..d9e7b21341 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -8,6 +8,9 @@ pt_BR: js: number: + format: + separator: "," + delimiter: "." human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ pt_BR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, YY" @@ -82,6 +90,16 @@ pt_BR: x_days: one: "1 dia atrás" other: "%{count} dias atrás" + later: + x_days: + one: "1 dia depois" + other: "%{count} dias depois" + x_months: + one: "1 mês depois" + other: "%{count} meses depois" + x_years: + one: "1 ano depois" + other: "%{count} anos depois" share: topic: 'compartilhe o link desse tópico' post: 'post #%{postNumber}' @@ -105,7 +123,6 @@ pt_BR: admin_title: "Admin" flags_title: "Sinalizações" show_more: "mostrar mais" - show_help: "Ajuda" links: "Links" links_lowercase: one: "link" @@ -129,6 +146,7 @@ pt_BR: every_two_weeks: "a cada duas semanas" every_three_days: "a cada três dias" max_of_count: "max de {{count}}" + alternation: "ou" character_count: one: "{{count}} caracter" other: "{{count}} caracteres" @@ -188,9 +206,9 @@ pt_BR: revert: "Reverter" failed: "Falhou" switch_to_anon: "Modo Anônimo" - switch_from_anon: "Sair Modo Anônimo" banner: close: "Ignorar este banner." + edit: "Editar este banner >>" choose_topic: none_found: "Nenhum tópico encontrado." title: @@ -208,7 +226,7 @@ pt_BR: view_pending: "ver mensagens pendentes" has_pending_posts: one: "Este tópico tem 1 mensagem aguardando aprovação" - many: "Este tópico tem {{count}} mensagens aguardando aprovação" + other: "Este tópico tem {{count}} mensagens aguardando aprovação" confirm: "Salvar Mudanças" delete_prompt: "Você tem certeza que deseja deletar %{username}? Isso irá remover todas as mensagens e irá bloquear o email e endereço IP desse usuário." approval: @@ -314,6 +332,8 @@ pt_BR: topics_entered: "tópicos em que entrou" post_count: "# mensagens" confirm_delete_other_accounts: "Você tem certeza que deseja apagar essas contas?" + user_fields: + none: "(selecione uma opção)" user: said: "{{username}}:" profile: "Perfil" @@ -330,6 +350,14 @@ pt_BR: invited_by: "Convidado por" trust_level: "Nível de Confiança" notifications: "Notificações" + desktop_notifications: + not_supported: "Notificações não são suportadas nesse browser. Desculpe-nos." + perm_denied_btn: "Permissão Negada" + disable: "Desativar Notificações" + currently_enabled: "(atualmente ativado)" + enable: "Ativar Notificações" + currently_disabled: "(atualmente desativado)" + each_browser_note: "Nota: Você deve modificar essa configuração em todos navegadores que você usa." dismiss_notifications: "Marcar todas como lidas" dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos" disable_jump_reply: "Não pular para o meu tópico depois que eu respondo" @@ -342,12 +370,13 @@ pt_BR: admin: "{{user}} é um administrador" moderator_tooltip: "Esse usuário é da moderação" admin_tooltip: "Esse usuário é da administração" + blocked_tooltip: "Esse usuário está bloqueado." suspended_notice: "Esse usuário está suspenso até {{date}}." suspended_reason: "Motivo:" github_profile: "Github" mailing_list_mode: "Me envie um email para cada novo post (a menos que eu torne o tópico ou a categoria mudos)" watched_categories: "Acompanhados" - watched_categories_instructions: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos. Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado a lista do tópico." + watched_categories_instructions: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos. Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado do tópico." tracked_categories: "Monitorado" tracked_categories_instructions: "Automaticamente monitora todos novos tópicos nestas categorias. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico." muted_categories: "Silenciado" @@ -379,6 +408,7 @@ pt_BR: set_password: "Definir Senha" change_about: title: "Modificar Sobre Mim" + error: "Houve um erro ao alterar este valor." change_username: title: "Alterar Nome de Usuário" confirm: "Se você mudar seu Nome de Usuário, todas as citações das suas respostas e as menções ao seu @nome vão quebrar. Você tem certeza?" @@ -393,6 +423,7 @@ pt_BR: change_avatar: title: "Mudar sua imagem de perfil" gravatar: "Gravatar, baseado em" + gravatar_title: "Alterar seu avatar no site do Gravatar" refresh_gravatar_title: "Atualizar o Gravatar" letter_based: "Imagem de perfil dada pelo sistema" uploaded_avatar: "Foto pessoal" @@ -400,7 +431,6 @@ pt_BR: upload_title: "Enviar sua foto" upload_picture: "Enviar imagem" image_is_not_a_square: "Aviso: nós cortamos sua imagem; largura e altura não eram iguais." - cache_notice: "Seu avatar foi alterado com sucesso mas pode levar algum tempo para aparecer devido ao cache do navegador." change_profile_background: title: "Fundo do perfil" instructions: "Fundos do perfil será centralizado e tera uma largura padrão de 850px." @@ -460,34 +490,20 @@ pt_BR: every_two_weeks: "a cada duas semanas" email_direct: "Me envie um email quando alguém me citar, responder minhas mensagens, mencionar meu @usuário, ou me convidar para um tópico" email_private_messages: "Me envie um email quando alguém me enviar mensagem particular" - email_always: "Não suprimir notificações de email quando eu estiver ativo no site" other_settings: "Outros" categories_settings: "Categorias" new_topic_duration: label: "Considerar tópicos como novos quando" not_viewed: "Eu ainda não os vi" last_here: "criado desde de que eu estava aqui pela última vez" - after_n_days: - one: "criados no último dia" - other: "criados nos últimos {{count}} dias" - after_n_weeks: - one: "criados na última semana" - other: "criados nas últimas {{count}} semanas" auto_track_topics: "Seguir automaticamente tópicos que eu entro" auto_track_options: never: "nunca" immediately: "imediatamente" - after_n_seconds: - one: "passado 1 segundo" - other: "passado {{count}} segundos" - after_n_minutes: - one: "passado 1 minuto" - other: "passado {{count}} minutos" invited: search: "digite para pesquisar convites..." title: "Convites" user: "Usuários convidados" - none: "Você ainda não convidou ninguém." truncated: "Exibindo os primeiros {{count}} convites." redeemed: "Convites usados" redeemed_at: "Usado" @@ -524,6 +540,7 @@ pt_BR: title: "Endereço IP de Registro" avatar: title: "Imagem de Perfil" + header_title: "perfil, mensagens, favoritos e preferências" title: title: "Título" filters: @@ -558,7 +575,6 @@ pt_BR: read_only_mode: enabled: "O modo somente-leitura está habilitado. Você pode navegador mas as interações podem não funcionar." login_disabled: "Login é desativado enquanto o site está em modo de somente leitura." - too_few_topics_notice: "Crie ao menos 5 tópicos e %{posts} respostas públicas para que a discussão seja iniciada. Novos usuários não poderão obter níveis de confiança ao menos que exista conteúdo para que eles leiam. Esta mensagem é apenas para os moderadores." learn_more: "aprenda mais..." year: 'ano' year_desc: 'tópicos criados nos últimos 365 dias' @@ -618,6 +634,7 @@ pt_BR: email_placeholder: "e-mail ou Nome de Usuário" caps_lock_warning: "CAIXA ALTA está ligado" error: "Erro desconhecido" + rate_limit: "Por favor aguarde antes de tentar logar novamente." blank_username_or_password: "Por favor, coloque seu email ou Nome de Usuário, e senha." reset_password: 'Recuperar senha' logging_in: "Entrando..." @@ -682,7 +699,6 @@ pt_BR: title_placeholder: "Sobre o que é esta discussão em uma pequena frase?" edit_reason_placeholder: "por que você está editando?" show_edit_reason: "(adicione motivo da edição)" - reply_placeholder: "Escreva aqui. Use Markdown, BBCode ou HTML para formatar. Arraste ou cole uma imagem para carregá-la." view_new_post: "Ver sua nova resposta." saving: "Salvando..." saved: "Salvo!" @@ -757,11 +773,10 @@ pt_BR: from_the_web: "Da internet" remote_tip: "link da imagem" remote_tip_with_attachments: "link da imagem ou arquivo ({{authorized_extensions}})" - local_tip: "clique para selecionar um arquivo do seu dispositivo" - local_tip_with_attachments: "clique para selecionar uma imagem ou arquivo do seu dispositivo ({{authorized_extensions}})" + local_tip: "selecione imagens a partir do seu dispositivo" hint: "(Você também pode arrastar e soltar para o editor para carregá-las)" - hint_for_supported_browsers: "(você também pode arrastar e soltar ou colar imagens no editor para carregá-las)" uploading: "Enviando" + select_file: "Selecionar Arquivo" image_link: "link da sua imagem" search: title: "procurar em tópicos, respostas, usuários ou categorias" @@ -773,7 +788,6 @@ pt_BR: category: "Procurar a categoria \"{{category}}\"" topic: "Procurar nesse tópico" private_messages: "Procurar mensagens" - site_map: "ir para outra lista de tópicos ou categorias" go_back: 'voltar' not_logged_in_user: 'página do usuário com resumo de atividades correntes e preferencias' current_user: 'ir para a sua página de usuário' @@ -881,6 +895,7 @@ pt_BR: go_top: "topo" go_bottom: "último" go: "ir" + jump_bottom: "ir para a última mensagem" jump_bottom_with_number: "ir para a mensagem %{post_number}" total: total de mensagens current: resposta atual @@ -896,29 +911,27 @@ pt_BR: '2_4': 'Você receberá notificações porque postou uma resposta neste tópico.' '2_2': 'Você receberá notificações porque está monitorando este tópico.' '2': 'Você receberá notificações porque você leu este tópico.' - '1_2': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua postagem.' - '1': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua postagem.' + '1_2': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.' + '1': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.' '0_7': 'Você está ignorando todas as notificações nessa categoria.' '0_2': 'Você está ignorando todas as notificações deste tópico.' '0': 'Você está ignorando todas as notificações deste tópico.' watching_pm: title: "Acompanhando" - description: "Você será notificado de cada nova postagem nesta mensagem. Um contador de posts novos e não lidos também aparecerá próximo ao tópico." + description: "Você será notificado de cada mensagem nova neste tópico. Um contador de mensagens novas e não lidas também aparecerá próximo ao tópico." watching: title: "Observar" - description: "Você será notificado de cada post novo neste tópico. Um contador de posts novos e não lidos também aparecerá próximo ao tópico." + description: "Você será notificado de cada mensagem nova neste tópico. Um contador de mensagens novas e não lidas também aparecerá próximo ao tópico." tracking_pm: title: "Monitorando" - description: "Um contador de postagens novas e não lidas aparecerá perto das mensagens privadas. Você será notificado se alguém mencionar seu @nome ou responder à sua postagem." + description: "Um contador de novas respostas será mostrado para esta mensagem. Você será notificado se alguém mencionar seu @nome ou responder à sua mensagem." tracking: title: "Monitorar" - description: "Um contador de postagens novas e não lidas aparecerá perto do tópico. Você será notificado se alguém mencionar seu @nome ou responder à sua postagem." + description: "Um contador de novas respostas será mostrado para este tópico. Você será notificado se alguém mencionar seu @nome ou responder à sua mensagem." regular: - title: "Normal" - description: "Você será notificado se alguém mencionar seu @nome ou responder à sua postagem." + description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." regular_pm: - title: "Regular" - description: "Você será notificado se alguém mencionar seu @nome ou responder à sua postagem em mensagem privada." + description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." muted_pm: title: "Silenciado" description: "Você nunca será notificado de qualquer coisa sobre essa mensagem privada." @@ -960,7 +973,6 @@ pt_BR: success_message: 'Você sinalizou com sucesso este tópico.' feature_topic: title: "Destacar este tópico" - pin: "Fazer este tópico aparecer no inicio da {{categoryLink}} categoria." confirm_pin: "Você já tem {{count}} tópicos fixos. Muitos tópicos fixados podem atrapalhar usuários novos e anônimos. Tem certeza que quer fixar outro tópico nesta categoria?" unpin: "Remover este tópico do inicio da {{categoryLink}} categoria." pin_note: "Usuários podem desafixar o tópico individualmente para si." @@ -968,7 +980,6 @@ pt_BR: zero: "Não existem tópicos fixados em {{categoryLink}}." one: "Tópicos atualmente fixados em {{categoryLink}}: 1." other: "Tópicos atualmente fixados {{categoryLink}}: {{count}}." - pin_globally: "Fazer este tópico aparecer no inicio de todas as listas de tópicos, até um membro da equipe desafixar ele. " confirm_pin_globally: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?" unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos." global_pin_note: "Usuários podem desafixar o tópico individualmente para si." @@ -1002,8 +1013,8 @@ pt_BR: sso_enabled: "Entrar o nome de usuário da pessoa que você gostaria de convidar para este tópico." to_topic_blank: "Entrar o nome de usuário ou endereço de email da pessoa que você gostaria de convidar para este tópico." to_topic_email: "Você digitou um endereço de email. Nós enviaremos um convite por email que permite seu amigo responder imediatamente a este tópico." - to_topic_username: "Você entrou um nome de usuário. Nós enviaremos uma notificação para esse usuário com um link convidando-o a esse tópico." - to_username: "Entrar com nome do usuário da pessoa a ser convidada. Enviaremos uma notificação para o usuário com um link convidando para este tópico." + to_topic_username: "Você inseriu um nome de usuário. Nós vamos enviar uma notificação com um link convidando-o para este tópico." + to_username: "Insira o nome de usuário da pessoa que você gostaria de convidas. Nós vamos enviar uma notificação com um link convidando-o para este tópico." email_placeholder: 'nome@exemplo.com' success_email: "Enviamos um convite para {{emailOrUsername}}. Nós notificaremos você quando este convite for resgatado. Verifique a aba de convites na página de seu usuário para acompanhar seus convites." success_username: "Nós convidamos o usuário para participar neste tópico." @@ -1051,8 +1062,6 @@ pt_BR: one: 1 resposta selecionada. other: {{count}} respostas selecionadas. post: - reply: "Em resposta a {{link}} por {{replyAvatar}} {{username}}" - reply_topic: "Responder a {{link}}" quote_reply: "citar resposta" edit: "Em resposta a {{link}} por {{replyAvatar}} {{username}}" edit_reason: "Motivo:" @@ -1067,11 +1076,24 @@ pt_BR: one: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)" other: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)" expand_collapse: "expandir/encolher" + gap: + one: "ver 1 resposta oculta" + other: "ver {{count}} respostas ocultas" more_links: "{{count}} mais..." unread: "Resposta não lida" has_replies: - one: "Resposta" - other: "Respostas" + one: "{{count}} Resposta" + other: "{{count}} Respostas" + has_likes: + one: "{{count}} Curtida" + other: "{{count}} Curtidas" + has_likes_title: + one: "{{count}} pessoa curtiu esta mensagem" + other: "{{count}} pessoas curtiram esta mensagem" + has_likes_title_you: + zero: "você curtiu esta mensagem" + one: "você e 1 outra pessoa curtiu esta mensagem" + other: "Você e mais {{count}} pessoas curtiram esta mensagem" errors: create: "Desculpe, houve um erro ao criar sua resposta. Por favor, tente outra vez." edit: "Desculpe, houve um erro ao editar sua resposta. Por favor, tente outra vez." @@ -1225,6 +1247,7 @@ pt_BR: last: "Última revisão" hide: "Esconder revisão" show: "Exibir revisão" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Exibir a saída renderizada com adições e remoções em linha" @@ -1238,12 +1261,14 @@ pt_BR: category: can: 'pode… ' none: '(sem categoria)' + all: 'Todas as categorias' choose: 'Selecionar categoria…' edit: 'editar' edit_long: "Editar" view: 'Ver tópicos na categoria' general: 'Geral' settings: 'Configurações' + topic_template: "Modelo de Tópico" delete: 'Apagar categoria' create: 'Nova categoria' save: 'Salvar categoria' @@ -1287,13 +1312,13 @@ pt_BR: notifications: watching: title: "Observar" - description: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos. Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado a lista do tópico." + description: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos. Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado do tópico." tracking: title: "Monitorar" description: "Automaticamente monitora todos novos tópicos nestas categorias. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico." regular: title: "Normal" - description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua postagem." + description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." muted: title: "Silenciar" description: "Você não será notificado sobre novos tópicos dessas categorias e eles não vão aparecer na guia de mensagens não lidas." @@ -1327,6 +1352,8 @@ pt_BR: notify_action: "Mensagem" topic_map: title: "Resumo do Tópico" + participants_title: "Principais Participantes" + links_title: "Links Populares" links_shown: "exibir todos os {{totalLinks}} links..." clicks: one: "1 clique" @@ -1338,6 +1365,8 @@ pt_BR: help: "Você adicionou este tópico aos favoritos" locked: help: "Este tópico está fechado; não serão aceitas mais respostas" + archived: + help: "Este tópico está arquivado; está congelado e não pode ser alterado" unpinned: title: "Não fixo" help: "Este tópico está desfixado para você; ele será mostrado em ordem normal" @@ -1347,8 +1376,6 @@ pt_BR: pinned: title: "Fixo" help: "Este tópico está fixado para você; ele será mostrado no topo de sua categoria" - archived: - help: "Este tópico está arquivado; está congelado e não pode ser alterado" invisible: help: "Este tópico está invisível; não aparecerá na listagem dos tópicos, e pode apenas ser acessado por link direto" posts: "Mensagens" @@ -1388,7 +1415,10 @@ pt_BR: with_topics: "%{filter} tópicos" with_category: "%{filter} %{category} tópicos" latest: - title: "Recente" + title: + zero: "Recentes" + one: "Recentes (1)" + other: "Recentes ({{count}})" help: "tópicos com mensagens recentes" hot: title: "Quente" @@ -1448,11 +1478,11 @@ pt_BR: daily: title: "Diariamente" all_time: "Tempo Todo" - this_year: "Neste ano" - this_month: "Neste mes" - this_week: "Nesta semana" + this_year: "Ano" + this_month: "Mês" + this_week: "Semana" today: "Hoje" - other_periods: "veja mais tópicos em alta" + other_periods: "Veja o topo" browser_update: 'Infelizmente, seu navegador é muito antigo para ser utilizado neste site. Por favor atualize seu navegador.' permission_types: full: "Criar / Responder / Ver" @@ -1486,6 +1516,7 @@ pt_BR: suspended: 'Suspenso:' private_messages_short: "Msgs" private_messages_title: "Mensagens" + mobile_title: "Mobile" space_free: "{{size}} livre" uploads: "uploads" backups: "backups" @@ -1617,7 +1648,11 @@ pt_BR: name: "Nome" none_installed: "Você não tem quaisquer plugins instalados." version: "Versão" + enabled: "Habilitado?" + is_enabled: "S" + not_enabled: "N" change_settings: "Mudar Configurações" + change_settings_short: "Configurações" howto: "Como eu instalo plugins?" backups: title: "Backups" @@ -1683,6 +1718,8 @@ pt_BR: screened_email: "Exportar lista completa de emails filtrados em formato CSV." screened_ip: "Exportar lista completa de IPs filtrados em formato CSV." screened_url: "Exportar lista completa de URLs filtradas em formato CSV." + export_json: + button_text: "Exportar" invite: button_text: "Enviar Convites" button_title: "Enviar Convites" @@ -1710,6 +1747,8 @@ pt_BR: save: "Guardar" new: "Novo" new_style: "Novo Estilo" + import: "Importar" + import_title: "Selecione um arquivo ou cole texto" delete: "Apagar" delete_confirm: "Apagar esta personalização?" about: "Modificar o CSS e HTML do cabeçalho do site. Adicione uma customização para começar." @@ -1782,7 +1821,6 @@ pt_BR: sent_test: "enviado!" delivery_method: "Delivery Method" preview_digest: "Preview Digest" - preview_digest_desc: "Prever o conteúdo do email de resumo semanal enviado para usuários inativos." refresh: "Atualizar" format: "Formato" html: "html" @@ -1847,6 +1885,7 @@ pt_BR: delete_post: "apagar mensagem" impersonate: "personificar" anonymize_user: "tornar usuário anônimo" + roll_up: "Agrupar bloco de IP" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de email serão verificados e o registro será bloqueado, ou outra ação será executada." @@ -1882,6 +1921,8 @@ pt_BR: impersonate: title: "Personificar" help: "Utilize esta ferramenta para personificar uma conta de usuário para efeitos de depuração. Você terá que sair dela assim que terminar." + not_found: "Esse usuário não pode ser encontrado." + invalid: "Desculpe, não é possível personificar esse usuário." users: title: 'Usuários' create: 'Adicionar Usuário Admin' @@ -2066,6 +2107,7 @@ pt_BR: delete: "Apagar" cancel: "Cancelar" delete_confirm: "Tem certeza que quer apagar este campo de usuário?" + options: "Opções" required: title: "Necessário para cadastro?" enabled: "necessário" @@ -2092,6 +2134,7 @@ pt_BR: no_results: "Nenhum resultado encontrado." clear_filter: "Limpar" add_url: "adicionar URL" + add_host: "adicionar host" categories: all_results: 'Todas' required: 'Requerido' @@ -2186,6 +2229,15 @@ pt_BR: name: "Nome" image: "Imagem" delete_confirm: "Tem certeza que deseja excluir o emoji :%{name}: ?" + permalink: + url: "URL" + topic_title: "Tópico" + post_title: "Mensagem" + category_title: "Categoria" + external_url: "URL externa" + form: + label: "Novo:" + add: "Adicionar" lightbox: download: "download" search_help: @@ -2212,7 +2264,6 @@ pt_BR: title: 'Aplicação' create: 'c Criar um tópico novo' notifications: 'n Abre notificações' - site_map_menu: '= Abrir menu do site' user_profile_menu: 'p Abrir menu do usuário' show_incoming_updated_topics: '. Exibir tópicos atualizados' search: '/ Pesquisa' @@ -2327,10 +2378,10 @@ pt_BR: description: Convidou um usuário campaigner: name: Veterano - description: Convidou 3 membros + description: Convidou 3 usuários básicos (nível de confiança 1) champion: name: Campeão - description: Convidou 10 membros + description: Convidou 5 usuários básicos (nível de confiança 2) first_share: name: Primeiro Compartilhamento description: Compartilhar uma resposta @@ -2346,12 +2397,3 @@ pt_BR: reader: name: Leitor description: Leia cada resposta em um tópico com mais de 100 respostas - google_search: | -

      Procurar com Google

      -

      - - - - - -

      diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index a6001e4712..7e3e9f054a 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -121,7 +121,6 @@ ro: admin_title: "Admin" flags_title: "Semnalare" show_more: "Detaliază" - show_help: "ajutor" links: "Adrese" links_lowercase: one: "adresă" @@ -209,7 +208,6 @@ ro: revert: "Rescrie acțiunea precedentă" failed: "Eșuat" switch_to_anon: "Mod anonim" - switch_from_anon: "Ieşire din mod anonim" banner: close: "Ignoră acest banner." choose_topic: @@ -227,9 +225,6 @@ ro: edit: "Editează" cancel: "Anulează" view_pending: "vezi postările în aşteptare" - has_pending_posts: - one: "Această discuţie are 1 postare în aşteptare." - many: "Această discuţie are {{count}} postări în aşteptare." confirm: "Salvează Schimbările" delete_prompt: "Sunteţi sigur că vreţi să ştergeţi %{username}? Această operaţiune va şterge toate postările, va bloca adresa de email şi adresa de IP." approval: @@ -373,9 +368,7 @@ ro: github_profile: "Github" mailing_list_mode: "Trimite un email pentru fiecare postare (dacă nu am setat modul tăcut pentru discuţie sau categorie)" watched_categories: "Văzut" - watched_categories_instructions: "Vezi automat toate postările noi din aceste categorii. Veți fi notificat pentru toate postările și discuțiile nou apărute, plus numărul mesajelor necitite și al postărilor noi va fi afișat lânga listarea discuției." tracked_categories: "Tracked" - tracked_categories_instructions: "Veți urmării automat toate discuțiile noi din aceaste categorii. Numărul postărilor noi va fi afișat langă listarea discuției." muted_categories: "Muted" muted_categories_instructions: "Nu vei fii notificat de dicuțiile apărute în aceste categorii și ele nu vor apărea în tabul necitite." delete_account: "Șterge-mi contul" @@ -428,7 +421,6 @@ ro: upload_title: "Încarcă poza personală" upload_picture: "Încarcă poza" image_is_not_a_square: "Atenţie: poză este decupată, dar înălţimea şi lăţimea nu sunt egale." - cache_notice: "Aţi schimbat cu success avatarul, dar poate dura ceva până la afişare datorită tehnologiilor cache ale navigatorului." change_profile_background: title: "Datele Profilului" instructions: "Fundalul profilului va fi centrat şi va avea o dimensiune standard de 850px." @@ -488,38 +480,20 @@ ro: every_two_weeks: "la fiecare două săptămâni" email_direct: "Trimite un email când cineva mă citează, îmi răspunde la un post, menţionează @username meu, sau mă invită la o discuţie." email_private_messages: "Trimite-mi un mesaj când cineva îmi răspunde." - email_always: "Primești notificări și email-rezumat chiar dacă ești activ pe forum." other_settings: "Altele" categories_settings: "Categorii" new_topic_duration: label: "Consideră discuțiile ca fiind noi" not_viewed: "Nu le-am văzut încă " last_here: "Create de la ultima vizită " - after_n_days: - one: "create în ultima zi" - few: "create în ultimele {{count}} zile" - other: "create în ultimele {{count}} zile" - after_n_weeks: - one: "create în ultima săptămână" - few: "create în ultimele {{count}} săptămâni" - other: "create în ultimele {{count}} săptămâni" auto_track_topics: "Urmăreşte automat discuţiile pe care le vizitez " auto_track_options: never: "niciodată" immediately: "imediat" - after_n_seconds: - one: "după o secundă" - few: "după {{count}} secunde" - other: "după {{count}} secunde" - after_n_minutes: - one: "după un minut" - few: "după {{count}} minute" - other: "după {{count}} minute" invited: search: "Scrie pentru a căuta invitații..." title: "Invitații" user: "Utilizatori invitați" - none: "Nu ai invitat înca pe nimeni." truncated: "Afișeaza primele {{count}} invitații." redeemed: "Invitații rascumpărate" redeemed_at: "Răscumpărate" @@ -556,6 +530,7 @@ ro: title: "Înregistrarea adresei de IP" avatar: title: "Poză de profil" + header_title: "profil, mesaje, favorite si preferințe" title: title: "Titlu" filters: @@ -590,7 +565,6 @@ ro: read_only_mode: enabled: "Modul doar citire a fost activat. Puteţi continuă să vizitaţi acest site dar anumite acţiuni vor fi limitate." login_disabled: "Autentificarea este dezactivată când siteul este în modul doar pentru citit." - too_few_topics_notice: "Creaţi cel puţin 5 discuţii publice şi %{posts} răspunsuri publice pentru a începe discuţia. Noii utilizatori nu pot câştigă nivele de încredere dacă nu există conţinut pe care să îl citească. Acest mesaj apare numai membrilor personalului." learn_more: "află mai multe..." year: 'an' year_desc: 'discuții create în ultimile 365 de zile' @@ -715,7 +689,6 @@ ro: title_placeholder: "Care este tema discuției într-o singură propoziție?" edit_reason_placeholder: "de ce editați?" show_edit_reason: "(adaugă motivul editării)" - reply_placeholder: "Scrie aici. Folosește Markdown sau BBCode pentru format. Trage sau lipește o imagine ca să o încarci." view_new_post: "Vizualizează noua postare." saving: "Salvează..." saved: "Salvat!" @@ -790,10 +763,7 @@ ro: from_the_web: "De pe web" remote_tip: "adresă către imagine http://example.com/image.jpg" remote_tip_with_attachments: "adresă către imagine sau fișier http://example.com/file.ext (extensii permise: {{authorized_extensions}})." - local_tip: "click pentru a selecta o imagine din dispozitivul dvs" - local_tip_with_attachments: "click pentru a selecta o imagine sau fișier din dispozitivul dvs (extensii permise: {{authorized_extensions}})" hint: "(puteți să trageți și să aruncați în editor pentru a le încărca)" - hint_for_supported_browsers: "(puteți să trageți și să aruncați, sau să le lipiți în editor pentru a le încărca)" uploading: "Încarcă" image_link: "Adresa din imagine va duce la" search: @@ -806,7 +776,6 @@ ro: category: "Caută în categoria\"{{category}}\" " topic: "Caută în această discuție" private_messages: "Caută mesaje" - site_map: "mergi la o altă listă de discuții sau categorii" go_back: 'înapoi' not_logged_in_user: 'pagina utilizatorului cu sumarul activităților și preferințelor' current_user: 'mergi la pagina proprie de utilizator' @@ -935,29 +904,17 @@ ro: '2_4': 'Veți primii notificări fiindcă ați postat un răspuns în această discuție.' '2_2': 'Veți primii notificări fiindcă urmariți această discuție.' '2': 'Veți primii notificări fiindcă citiți această discuție.' - '1_2': 'Veți primii notificare dacă cineva vă menționează @numele sau răspunde la postarea dvs.' - '1': 'Veți primii notificare dacă cineva vă menționează @numele sau răspunde la postarea dvs.' '0_7': 'Ignorați toate notificările din această categorie.' '0_2': 'Ignorați toate notificările din această discuție.' '0': 'Ignorați toate notificările din această discuție.' watching_pm: title: "Privind" - description: "Veți fi notificat de fiecare postare în acest mesaj privat.Numărul de postări necitite va apărea lânga lista discuției." watching: title: "Privind" - description: "Veți fi notificat de fiecare postare nouă din această discuție. Numărul de postări noi necitite va apărea lânga lista discuției.." tracking_pm: title: "Urmărind" - description: "Numărul postărilor noi și necitite va apărea langă mesaj. Veți fi notificat doar dacă cineva vă menționează @numele sau răspunde la postare." tracking: title: "Urmărind" - description: "Numărul postărilor noi și necitite va apărea langă lista de discuții. Veți fi notificat doar dacă cineva vă menționează @numele sau răspunde la postare " - regular: - title: "Normal" - description: "Veți fi notificat doar dacă cineva vă menționează @numele sau răspunde la postare" - regular_pm: - title: "Normal" - description: "Veți fi notificat dacă cineva va menționeaza @numele sau răspunde postărilor dvs." muted_pm: title: "Silențios" description: "Nu veţi fi niciodată notificat despre acest mesaj." @@ -999,7 +956,6 @@ ro: success_message: 'Ai marcat cu succes această discuție.' feature_topic: title: "Promovează această discuţia" - pin: "Seateaza că această discuţie să apară la începutul categoriei {{categoryLink}} ." confirm_pin: "Aveţi deja {{count}} discuţii promovate. Prea multe discuţii promovate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Sunteţi sigur că vrei să promovaţi o altă discuţie în această categorie?" unpin: "Îndepărtează aceast mesaje din top-ul categoriei {{categoryLink}}" pin_note: "Utilizatorii pot anula fixarea unui subiect individual pentru ei înșiși." @@ -1007,7 +963,6 @@ ro: zero: "Nu există subiecte fixate în {{categoryLink}}." one: "Subiecte fixate în acest moment în {{categoryLink}}: 1." other: "Subiecte fixate în acest moment în {{categoryLink}}: {{count}}." - pin_globally: "Fă ca acest subiect să apară în partea de sus a tuturor listelor de discuţii, până când un membru al personalului anulează fixarea." confirm_pin_globally: "Aveţi deja {{count}} discuţii promovate la nivel global. Prea multe discuţii promovate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Sunteţi sigur că vrei să promovaţi o altă discuţie la nivel global?" unpin_globally: "Eliminați acest subiect din partea de sus a tuturor listelor de discuţii." global_pin_note: "Utilizatorii pot anula fixarea unui subiect individual pentru ei înșiși." @@ -1040,8 +995,6 @@ ro: sso_enabled: "Introduceţi numele de utilizator al persoanei pe care doriţi să o invitaţi la acesta discuţie." to_topic_blank: "Introduceţi numele de utilizator sau adresa de email a persoanei pe care doriţi să o invitaţi la acesta discuţie." to_topic_email: "Aţi introdus o adresa de e-mail. Vom trimite via email o invitaţie, care permite prietenul dvs. să răspundă imediat la această discuţie." - to_topic_username: "Aţi introdus un nume de utilizator. Vom trimite o notificare către acest utilizator cu o invitaţie la discuţie." - to_username: "Introduceţi numele de utilizator al persoanei pe care doriţi să o invitaţi. Vom trimite o notificare către acest utilizator cu o invitaţie la discuţie." email_placeholder: 'exemplu@nume.com' success_email: "Am trimis o invitaţie către {{emailOrUsername}}.. Va vom anunţă când invitaţia este folosită. Verificaţi fila invitaţii pe pagină dvs. de utilizator pentru a monitoriza invitaţiile. " success_username: "Am invitat acest utilizator să participe la această discuţie." @@ -1094,8 +1047,6 @@ ro: few: Aţi selectat {{count}} mesaje. other: Aţi selectat {{count}} mesaje. post: - reply: "Răspunde la {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Răspunde la {{link}}" quote_reply: "răspunde prin citat" edit: "Editează {{link}} {{replyAvatar}} {{username}}" edit_reason: "Motivul: " @@ -1117,10 +1068,6 @@ ro: other: "vedeţi {{count}} răspunsuri ascunse" more_links: "{{count}} mai multe..." unread: "postarea nu a fost citită" - has_replies: - one: "Răspuns" - few: "Răspunsuri" - other: "Răspunsuri" errors: create: "Ne pare rău , s-a semnalat o eroare în creerea postării dumneavoastră.Vă rugăm încercati iar." edit: "Ne pare rău , s-a semnalat o eroare în editarea postării dumneavoastră . Vă rugăm încercati iar." @@ -1356,13 +1303,10 @@ ro: notifications: watching: title: "Vizualizare" - description: "Veți vizualiza automat toate discuțiile noi din aceste categorii. Veți fi notificat cu privire la toate postările și discuțiile noi, plus numarul de postări necitite va fi afișat langă listarea discuțiilor." tracking: title: "Urmărire" - description: "Veți urmării automat toate discuțiile noi din aceste categorii. Numărul postărilor necitite va fi afișat langă listarea discuțiilor." regular: title: "Normal" - description: "Veți fi notificat dacă cineva va menționeaza @numele sau răspunde postărilor dvs." muted: title: "Silențios" description: "Nu veți fi niotificat de discuțiile noi din aceste categorii, ele nu vor apărea în tabul necitite." @@ -1410,6 +1354,8 @@ ro: help: "Aţi pus un semn de carte pentru această discuţie" locked: help: "Această discuție este închisă; nu mai acceptă răspunsuri noi" + archived: + help: "Această discuție a fost arhivată; Este închetată și nu poate fi editată" unpinned: title: "Desprinde" help: "Această discuţie va fi afişată în ordinea iniţială, nici un mesaj nu este promovat la inceputul listei." @@ -1419,8 +1365,6 @@ ro: pinned: title: "Fixată" help: "Aceast mesaj va fi promovat. Va fi afişat la începutul discuţiei." - archived: - help: "Această discuție a fost arhivată; Este închetată și nu poate fi editată" invisible: help: "Această discuție este invizibilă; nu va fi afișată în listele de discuții și va fi accesată numai prin adresa directă" posts: "Postări" @@ -1457,7 +1401,6 @@ ro: with_topics: "%{filter} Discuții" with_category: "%{filter} %{category} discuții" latest: - title: "Ultimele" help: "Discuții cu postări recente" hot: title: "Interesant" @@ -1517,11 +1460,7 @@ ro: daily: title: "Zilnic" all_time: "Dintotdeauna" - this_year: "Anul acesta" - this_month: "Luna aceasta" - this_week: "Săptămâna aceasta" today: "Astăzi" - other_periods: "vezi mai multe discuții" browser_update: 'Din nefericire, browserul dumneavoastră este prea vechi pentru a funcționa pe acest forum . Va rugăm reânoiți browserul.' permission_types: full: "Crează / Răspunde / Vizualizează" @@ -1856,7 +1795,6 @@ ro: sent_test: "trimis!" delivery_method: "Metoda de livrare" preview_digest: "Previzualizează rezumat" - preview_digest_desc: "Acesta este o unealtă de previzualizat contentul emailurilor-rezumat trimise de pe forum." refresh: "Reîmprospătează" format: "Format" html: "html" @@ -2290,7 +2228,6 @@ ro: title: 'Applicația' create: 'c Crează discuție nouă' notifications: 'n Deschide notificare' - site_map_menu: '= Deschide meniu sit' user_profile_menu: 'p Deschide meniu utilizator' show_incoming_updated_topics: '. Arată discuţiile actualizate' search: '/ Caută' @@ -2407,10 +2344,8 @@ ro: description: A invitat un utilizator campaigner: name: Combatant - description: A invitat 3 utilizatori champion: name: Campion - description: A invitat 10 membri first_share: name: Primul description: A distribuit un mesaj @@ -2426,12 +2361,3 @@ ro: reader: name: Cititorul description: Citeşte fiecare mesaj dintr-o discuție cu mai mult de 100 de mesaje - google_search: | -

      Căutare cu Google

      -

      - - - - - -

      diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index f8225b3a52..902f5de2b2 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -8,6 +8,9 @@ ru: js: number: + format: + separator: "," + delimiter: " " human: storage_units: format: '%n %u' @@ -21,12 +24,17 @@ ru: kb: КБ mb: МБ tb: ТБ + short: + thousands: "{{number}} тыс." + millions: "{{number}} млн" dates: time: "HH:mm" long_no_year: "D MMM HH:mm" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM YYYY, HH:mm" long_with_year_no_time: "D MMM, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM YY, LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM YYYY" @@ -114,14 +122,30 @@ ru: few: "%{count} дня назад" many: "%{count} дней назад" other: "%{count} дней назад" + later: + x_days: + one: "1 день спустя" + few: "%{count} дня спустя" + many: "%{count} дней спустя" + other: "%{count} дней спустя" + x_months: + one: "1 месяц спустя" + few: "%{count} месяца спустя" + many: "%{count} месяцев спустя" + other: "%{count} месяцев спустя" + x_years: + one: "1 год спустя" + few: "%{count} года спустя" + many: "%{count} лет спустя" + other: "%{count} лет спустя" share: - topic: 'поделиться ссылкой на тему' - post: 'ссылка на сообщение #%{postNumber}' - close: 'закрыть' - twitter: 'поделиться ссылкой через Twitter' - facebook: 'поделиться ссылкой через Facebook' - google+: 'поделиться ссылкой через Google+' - email: 'поделиться ссылкой по почте' + topic: 'Поделиться ссылкой на эту тему' + post: 'Ссылка на сообщение №%{postNumber}' + close: 'Закрыть' + twitter: 'Поделиться ссылкой через Twitter' + facebook: 'Поделиться ссылкой через Facebook' + google+: 'Поделиться ссылкой через Google+' + email: 'Поделиться ссылкой по электронной почте' topic_admin_menu: "действия администратора над темой" emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту." edit: 'отредактировать название и раздел темы' @@ -137,7 +161,6 @@ ru: admin_title: "Админка" flags_title: "Жалобы" show_more: "показать дальше" - show_help: "справка" links: "Ссылки" links_lowercase: one: "ссылка" @@ -146,7 +169,7 @@ ru: faq: "Вопрос-ответ" guidelines: "Руководство" privacy_policy: "Политика конфиденциальности" - privacy: "Конфиденциальность" + privacy: "Политика конфиденциальности" terms_of_service: "Условия предоставления услуг" mobile_view: "Для мобильных устройств" desktop_view: "Для настольных устройств" @@ -162,6 +185,7 @@ ru: every_two_weeks: "каждые две недели" every_three_days: "каждые 3 дня" max_of_count: "{{count}} макс." + alternation: "или" character_count: one: "{{count}} буква" few: "{{count}} буквы" @@ -178,7 +202,7 @@ ru: stat: all_time: "За все время" last_7_days: "Последние 7 дней" - last_30_days: "30 дней" + last_30_days: "Последние 30 дней" like_count: "Симпатии" topic_count: "Темы" post_count: "Сообщения" @@ -229,9 +253,9 @@ ru: revert: "Вернуть" failed: "Проблема" switch_to_anon: "Анонимный режим" - switch_from_anon: "Выйти из анонимного режима" banner: close: "Больше не показывать это объявление." + edit: "Редактировать это объявление >>" choose_topic: none_found: "Не найдено ни одной темы." title: @@ -248,13 +272,20 @@ ru: cancel: "Отменить" view_pending: "Просмотреть сообщения в очереди" has_pending_posts: - one: "В этой теме 1 сообщение ожидает проверки" - many: "В этой теме {{count}} сообщений ожидают проверки" + one: "В этой теме 1 сообщение, ожидающее проверки" + few: "В этой теме {{count}} сообщения, ожидающих проверки" + many: "В этой теме {{count}} сообщений, ожидающих проверки" + other: "В этой теме {{count}} сообщений, ожидающих проверки" confirm: "Сохранить" delete_prompt: "Вы уверены, что хотите удалить пользователя %{username}? Это приведет к удалению всех его сообщений, а также заблокирует email и ip адрес." approval: title: "Сообщения для проверки" description: "Ваше сообщение отправлено, но требует проверки и утверждения модератором. Пожалуйста, будьте терпеливы." + pending_posts: + one: "1 сообщение ожидает одобрения." + few: "{{count}} сообщений ожидают одобрения." + many: "{{count}} сообщений ожидают одобрения." + other: "{{count}} сообщений ожидают одобрения." ok: "ОК" user_action: user_posted_topic: "{{user}} создал тему" @@ -323,9 +354,9 @@ ru: '13': "Входящие" '14': "Ожидает одобрения" categories: - all: "все разделы" - all_subcategories: "все" - no_subcategory: "(нет)" + all: "Все разделы" + all_subcategories: "Все подкатегории" + no_subcategory: "Вне подкатегорий" category: "Раздел" posts: "Сообщения" topics: "Темы" @@ -393,9 +424,9 @@ ru: github_profile: "Github" mailing_list_mode: "Получать письмо каждый раз, когда появляется новое сообщение (кроме тех случаев, когда тема или раздел отключены)" watched_categories: "Наблюдение" - watched_categories_instructions: "Вы будете автоматически отслеживать новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, плюс рядом со списком тем будет отображено количество непрочитанных и новых сообщений." + watched_categories_instructions: "Вы будете автоматически отслеживать все новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, плюс рядом со списком тем будет отображено количество новых сообщений." tracked_categories: "Отслеживаемые разделы" - tracked_categories_instructions: "Автоматически включать режим слежения за новыми темами в этих разделах и показывать счетчик непрочитанных и новых сообщений напротив названий тем." + tracked_categories_instructions: "Автоматически следить за всеми новыми темами из следующих разделов. Счетчик новых и непрочитанных сообщений будет появляться рядом с названием темы." muted_categories: "Выключенные разделы" muted_categories_instructions: "Вы не будете получать уведомления о новых темах в этих разделах. Также, они не будут показываться во вкладке Непрочитанное." delete_account: "Удалить мою учётную запись" @@ -425,6 +456,7 @@ ru: set_password: "Установить пароль" change_about: title: "Изменить информацию обо мне" + error: "При изменении значения произошла ошибка." change_username: title: "Изменить псевдоним" confirm: "Если вы измените свой псевдоним, то все существующие цитаты ваших сообщений и упоминания вас по @псевдониму в чужих сообщениях перестанут ссылаться на вас. Вы точно хотите изменить псевадоним?" @@ -439,6 +471,7 @@ ru: change_avatar: title: "Изменить фон профиля" gravatar: "На основе Gravatar" + gravatar_title: "Измените свой аватар на сайте Gravatar" refresh_gravatar_title: "Обновить ваш Gravatar" letter_based: "Фон профиля по умолчанию" uploaded_avatar: "Собственный аватар" @@ -446,7 +479,6 @@ ru: upload_title: "Загрузка собственного аватара" upload_picture: "Загрузить изображение" image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и высота не равны друг другу." - cache_notice: "Вы успешно изменили свой аватар, но для его отображения может потребоваться некоторое время из-за кеширования в браузере." change_profile_background: title: "Фон профиля" instructions: "Картинки фона профилей будут отцентрированы и по-умолчанию имеют ширину 850 пикселей." @@ -506,46 +538,26 @@ ru: every_two_weeks: "каждые 2 недели" email_direct: "Присылать почтовое уведомление, когда кто-то цитирует меня, отвечает на мой пост, упоминает мой @псевдоним или приглашает меня в тему" email_private_messages: "Присылать почтовое уведомление, когда кто-то оставляет мне сообщение" - email_always: "Отправлять оповещения по e-mail даже когда я нахожусь на сайте." other_settings: "Прочее" categories_settings: "Разделы" new_topic_duration: label: "Считать темы новыми, если" not_viewed: "Еще не просмотрены" last_here: "создано после вашего последнего визита" - after_n_days: - one: "созданы за последний день" - few: "созданы за последние {{count}} дня" - many: "созданы за последние {{count}} дней" - other: "созданы за последние {{count}} дней" - after_n_weeks: - one: "созданы за последнюю неделю" - few: "созданы за последние {{count}} недели" - many: "созданы за последние {{count}} недель" - other: "созданы за последние {{count}} недель" auto_track_topics: "Автоматически отслеживать темы, которые я просматриваю" auto_track_options: never: "никогда" immediately: "немедленно" - after_n_seconds: - one: "через 1 секунду" - few: "через несколько секунд" - many: "через {{count}} секунд" - other: "через {{count}} секунд" - after_n_minutes: - one: "через 1 минуту" - few: "через несколько минут" - many: "через {{count}} минут" - other: "через {{count}} минут" invited: search: "введите текст для поиска приглашений..." title: "Приглашения" user: "Приглашенный пользователь" - none: "Пока вы еще никого не пригласили." truncated: "Отображаются первые {{count}} приглашений." redeemed: "Принятые приглашения" + redeemed_tab: "Принято" redeemed_at: "Принято" pending: "Еще не принятые приглашения" + pending_tab: "Ожидает одобрения" topics_entered: "Просмотрено тем" posts_read_count: "Прочитано сообщений" expired: "Это истёкшее приглашение." @@ -578,6 +590,7 @@ ru: title: "IP адрес регистрации" avatar: title: "Аватар" + header_title: "профиль, сообщения, закладки и настройки" title: title: "Заголовок" filters: @@ -612,7 +625,6 @@ ru: read_only_mode: enabled: "Администратор включил режим сайта ТОЛЬКО ДЛЯ ЧТЕНИЯ. Вы можете продолжать просматривать сайт. В данном режиме Ваши посты не будут сохранятся и публиковаться на сайте." login_disabled: "Вход отключён, пока сайт в режиме «только для чтения»" - too_few_topics_notice: "Создайте как минимум 5 общедоступных тем и %{posts} сообщений, чтобы дискуссия началась. Новые пользователи не смогут получать уровни доверия если для них не будет ничего, что можно прочитать. Это сообщение показывается только персоналу." learn_more: "подробнее..." year: 'год' year_desc: 'темы, созданные за последние 365 дней' @@ -673,6 +685,7 @@ ru: email_placeholder: "E-mail или псевдоним" caps_lock_warning: "Caps Lock включен" error: "Непредвиденная ошибка" + rate_limit: "Пожалуйста, сделайте перерыв перед очередной попыткой войти." blank_username_or_password: "Введите ваш e-mail (или псевдоним) и пароль." reset_password: 'Сброс пароля' logging_in: "Проверка..." @@ -723,7 +736,7 @@ ru: title_too_long: "Заголовок не может быть длиннее {{max}} символов" post_missing: "Сообщение не может быть пустым" post_length: "Сообщение должно содержать минимум {{min}} символов" - try_like: 'А вы пробовали лайкнуть собощение с помощью кнопки ?' + try_like: 'А вы пробовали лайкнуть сообщение с помощью кнопки ?' category_missing: "Нужно выбрать раздел" save_edit: "Сохранить" reply_original: "Ответ в первоначальной теме" @@ -737,7 +750,6 @@ ru: title_placeholder: "Название: суть обсуждения коротким предложением" edit_reason_placeholder: "почему вы хотите изменить?" show_edit_reason: "(добавить причину редактирования)" - reply_placeholder: "Для форматирования текста используйте Markdown и BBCode. Перетяните или вставьте изображение, чтобы загрузить его на сервер." view_new_post: "Посмотреть созданное вами сообщение." saving: "Сохранение..." saved: "Сохранено!" @@ -812,11 +824,9 @@ ru: from_the_web: "From the web" remote_tip: "ссылка на изображение" remote_tip_with_attachments: "ссылка на изображение или файл ({{authorized_extensions}})" - local_tip: "кликните для выбора изображения с вашего устройства" - local_tip_with_attachments: "кликните для выбора изображения с вашего устройства ({{authorized_extensions}})" hint: "(вы так же можете перетащить объект в редактор для его загрузки)" - hint_for_supported_browsers: "(вы так же можете перетащить или вставить изображения в редактор для загрузки их на сервер)" uploading: "Загрузка" + select_file: "Выбрать файл" image_link: "ссылка, на которую будет указывать ваше изображение" search: title: "поиск по темам, сообщениям, пользователям или разделам" @@ -828,7 +838,6 @@ ru: category: "Искать в разделе \"{{category}}\"" topic: "Искать в этой теме" private_messages: "Поиск в сообщениях" - site_map: "перейти к другому списку тем или другому разделу" go_back: 'вернуться' not_logged_in_user: 'страница пользователя с историей его последней активности и настроек' current_user: 'перейти на вашу страницу пользователя' @@ -950,6 +959,7 @@ ru: go_top: "перейти наверх" go_bottom: "перейти вниз" go: "перейти" + jump_bottom: "перейти к последнему сообщению" jump_bottom_with_number: "перейти к сообщению %{post_number}" total: всего сообщений current: текущее сообщение @@ -965,32 +975,30 @@ ru: '2_4': 'Вы будете получать уведомления, т.к. ответили в теме.' '2_2': 'Вы будете получать уведомления, т.к. следите за этой темой.' '2': 'Вы будете получать уведомления, т.к. читали эту тему.' - '1_2': 'Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение.' - '1': 'Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение.' + '1_2': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.' + '1': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.' '0_7': 'Не получать уведомлений из этого раздела.' '0_2': 'Не получать уведомлений по этой теме.' '0': 'Не получать уведомлений по этой теме.' watching_pm: title: "Наблюдать" - description: "Уведомлять о каждом новом сообщении в этой беседе и показывать счетчик непрочитанных и новых сообщений напротив названия темы." + description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов." watching: title: "Наблюдать" - description: "Уведомлять о каждом новом сообщении в этой теме и показывать счетчик непрочитанных и новых сообщений напротив названия темы." + description: "Уведомлять по каждому новому сообщению в этой теме и показывать счетчик новых непрочитанных ответов." tracking_pm: title: "Следить" - description: "Количество непрочитанных и новых сообщений появится рядом с беседой. Вам придет уведомление, если кто-нибудь упомянет ваше @имя или ответит на ваше сообщение." + description: "Количество непрочитанных сообщений появится рядом с этим сообщением. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." tracking: title: "Следить" - description: "Количество непрочитанных сообщений появится рядом с названием темы. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." + description: "Количество непрочитанных сообщений появится рядом с названием этой темы. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." regular: - title: "Уведомлять" - description: "Вам придет уведомление, только когда вас упоминают по @псевдониму или ответят на ваше сообщенияе" + description: "Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." regular_pm: - title: "Уведомлять" - description: "Вам придет уведомление, если кто-нибудь упомянет ваше @имя или ответит на ваше сообщение приватно." + description: "Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." muted_pm: title: "Без уведомлений" - description: "Вы не будете получать уведомлений, связанных с этой беседой." + description: "Никогда не получать уведомлений, связанных с этой беседой." muted: title: "Без уведомлений" description: "Никогда не получать уведомлений, связанных с этой темой, и не показывать ее во вкладке «Непрочитанные»." @@ -1029,7 +1037,6 @@ ru: success_message: 'Вы пожаловались на тему.' feature_topic: title: "Выделить эту тему" - pin: "Закрепить эту тему вверху раздела {{categoryLink}}." confirm_pin: "У вас уже есть {{count}} закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите закрепить еще одну тему в этом разделе?" unpin: "Убрать эту тему из верха раздела {{categoryLink}}." pin_note: "Пользователи могут открепить тему для себя." @@ -1037,7 +1044,6 @@ ru: zero: "В разделе {{categoryLink}} нет закрепленных тем." one: "Закрепленные темы в разделе {{categoryLink}}: 1." other: "Закрепленные темы в разделе {{categoryLink}}: {{count}}." - pin_globally: "Закрепить эту тему вверху всех списков тем, пока кто-нибудь из персонала не открепит ее." confirm_pin_globally: "У вас уже есть {{count}} глобально закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите глобально закрепить еще одну тему?" unpin_globally: "Убарть эту тему из верха всех списков тем." global_pin_note: "Пользователи могут открепить тему для себя." @@ -1071,8 +1077,8 @@ ru: sso_enabled: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему." to_topic_blank: "Введите псевдоним или email пользователя, которого вы хотите пригласить в эту тему." to_topic_email: "Вы указали адрес электронной почты. Мы отправим приглашение, которое позволит вашему другу немедленно ответить в этой теме." - to_topic_username: "Вы указали псевдоним пользователя. Мы отправим ему уведомление со ссылкой, приглашающей его в эту тему." - to_username: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему. Мы отправим ему уведомление о том что вы приглашаете его присоединиться к теме." + to_topic_username: "Вы указали псевдоним пользователя. Мы отправим ему уведомление со ссылкой, чтобы пригласить его в эту тему." + to_username: "Введите псевдоним пользователя, которого вы хотите пригласить в эту тему. Мы отправим ему уведомление о том что вы приглашаете его присоединиться к этой теме." email_placeholder: 'name@example.com' success_email: "Приглашение отправлено по адресу {{emailOrUsername}}. Мы уведомим Вас, когда этим приглашением воспользуются. Проверьте вкладку Приглашения на вашей странице пользователя, чтобы узнать состояние всех ваших приглашений." success_username: "Мы пригласили этого пользователя принять участие в теме." @@ -1130,8 +1136,6 @@ ru: many: Вы выбрали {{count}} сообщений. other: Вы выбрали {{count}} сообщений. post: - reply: "Ответить на {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Ответить на {{link}}" quote_reply: "ответить цитированием" edit: "Изменить {{link}} {{replyAvatar}} {{username}}" edit_reason: "Причина:" @@ -1148,13 +1152,32 @@ ru: many: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)" other: "(сообщение отозвано автором и будет автоматически удалено в течение %{count} часов, если только на сообщение не поступит жалоба)" expand_collapse: "развернуть/свернуть" + gap: + one: "просмотреть 1 скрытый ответ" + few: "просмотреть {{count}} скрытых ответов" + many: "просмотреть {{count}} скрытых ответов" + other: "просмотреть {{count}} скрытых ответов" more_links: "еще {{count}}..." unread: "Сообщение не прочитано" has_replies: - one: "Ответ" - few: "Ответа" - many: "Ответов" - other: "Ответов" + one: "{{count}} Ответ" + few: "{{count}} Ответа" + many: "{{count}} Ответов" + other: "{{count}} Ответов" + has_likes: + one: "{{count}} симпатия" + few: "{{count}} симпатии" + many: "{{count}} симпатий" + other: "{{count}} симпатий" + has_likes_title: + one: "Это сообщение понравилось {{count}} человеку" + few: "Это сообщение понравилось {{count}} людям" + many: "Это сообщение понравилось {{count}} людям" + other: "Это сообщение понравилось {{count}} людям" + has_likes_title_you: + zero: "Вам понравилось это сообщение" + one: "Вам еще 1 человеку понравилось это сообщение" + other: "Вам и еще {{count}} людям понравилось это сообщение" errors: create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте еще раз." edit: "К сожалению, не удалось изменить сообщение. Попробуйте еще раз." @@ -1179,7 +1202,7 @@ ru: controls: reply: "начать составление ответа на сообщение" like: "мне нравится" - has_liked: "вам понравилось это сообщение" + has_liked: "Вам понравилось это сообщение" undo_like: "больше не нравится" edit: "Изменить сообщение" edit_anonymous: "Войдите, чтобы отредактировать это сообщение." @@ -1235,7 +1258,7 @@ ru: notify_user: "{{icons}} отправил(и) сообщение" notify_user_with_url: "{{icons}} отправил(и) сообщение" bookmark: "{{icons}} добавили в закладки" - like: "{{icons}} выразили симпатию" + like: "Выразили симпатию: {{icons}}" vote: "{{icons}} проголосовали за" by_you: off_topic: "Помечена вами как оффтопик" @@ -1344,6 +1367,7 @@ ru: last: "Последняя версия" hide: "Скрыть редакцию" show: "Показать редакцию" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Отобразить сообщение с включенными добавлениями и удалениями." @@ -1357,12 +1381,14 @@ ru: category: can: 'может… ' none: '(вне раздела)' + all: 'Все категории' choose: 'Выберете раздел…' edit: 'изменить' edit_long: "Изменить" view: 'Просмотр тем по разделам' general: 'Общие' settings: 'Настройки' + topic_template: "Шаблон темы" delete: 'Удалить раздел' create: 'Создать Раздел' save: 'Сохранить раздел' @@ -1406,18 +1432,18 @@ ru: notifications: watching: title: "Наблюдать" - description: "Автоматически наблюдать за всеми новыми темами из этих разделов и получать уведомления обо всех новых сообщениях и темах. Дополнительно, счетчики новых и непрочитанных сообщений будут появляться рядом с названиями тем." + description: "Автоматически наблюдать за всеми новыми темами в этих разделах и уведомлять меня о новых сообщениях в них. Счетчик новых сообщений будет появляться рядом с названием темы." tracking: title: "Следить" - description: "Автоматически следить за всеми новыми темами из этих разделов. Счетчики новых и непрочитанных сообщений будут появляться рядом с названиями тем." + description: "Автоматически следить за всеми новыми темами в этих разделах. Счетчик новых сообщений будет появляться рядом с названием темы." regular: title: "Уведомлять" - description: "Уведомлять, только если кто-нибудь упомянет меня по @псевдониму или ответит на мое сообщение." + description: "Уведомлять, если кто-нибудь упомянет мой @псевдоним или ответит на мое сообщение." muted: title: "Без уведомлений" - description: "Не получать уведомлений о новых темах из этих разделов и не показывать новые темы во вкладке «Непрочитанные»." + description: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»." flagging: - title: 'Спасибо за вашу помощь!' + title: 'Спасибо за вашу помощь в поддержании порядка!' private_reminder: 'жалобы анонимны и видны только персоналу' action: 'Пожаловаться' take_action: "Принять меры" @@ -1438,14 +1464,16 @@ ru: custom_placeholder_notify_moderators: "Сообщите нам, чем конкретно вы обеспокоены и предоставьте соответствующие ссылки, если это возможно." custom_message: at_least: "введите как минимум {{n}} символов" - more: "ещё {{n}} символов..." - left: "осталось {{n}} символов" + more: "Нужно ещё {{n}} cимволов..." + left: "Осталось {{n}} символов" flagging_topic: title: "Спасибо за вашу помощь!" action: "Пометить тему" notify_action: "Сообщение" topic_map: title: "Сводка по теме" + participants_title: "Частые авторы" + links_title: "Популярные ссылки" links_shown: "показать все {{totalLinks}} ссылок..." clicks: one: "1 клик" @@ -1459,6 +1487,8 @@ ru: help: "Вы добавили тему в Избранное " locked: help: "Тема закрыта; в ней больше нельзя отвечать" + archived: + help: "Тема заархивирована и не может быть изменена" unpinned: title: "Откреплена" help: "Эта тема не закреплена; она будет отображаться в обычном порядке" @@ -1468,8 +1498,6 @@ ru: pinned: title: "Закреплена" help: "Тема закреплена; она будет показана вверху соответствующего раздела" - archived: - help: "Тема заархивирована и не может быть изменена" invisible: help: "Тема исключена из всех списков тем и доступна только по прямой ссылке" posts: "Сообщ." @@ -1512,7 +1540,10 @@ ru: with_topics: "%{filter} темы" with_category: "%{filter} %{category} темы" latest: - title: "Последние" + title: + zero: "Последние" + one: "Последние (1)" + other: "Последние ({{count}})" help: "темы с недавними сообщениями" hot: title: "Популярные" @@ -1572,11 +1603,11 @@ ru: daily: title: "За день" all_time: "За все время" - this_year: "За год" - this_month: "За месяц" - this_week: "За неделю" + this_year: "Год" + this_month: "Месяц" + this_week: "Неделя" today: "Сегодня" - other_periods: "смотреть больше обсуждаемых сообщений" + other_periods: "просмотреть выше" browser_update: 'К сожалению, ваш браузер устарел и не поддерживается этим сайтом. Пожалуйста, обновите браузер (нажмите на ссылку, чтобы узнать больше).' permission_types: full: "Создавать / Отвечать / Просматривать" @@ -1588,47 +1619,48 @@ ru: title: 'Discourse Admin' moderator: 'Модератор' dashboard: - title: "Панель" + title: "Админка" last_updated: "Последнее обновление статистики:" version: "Версия" - up_to_date: "Вы используете самую свежую версию!" + up_to_date: "Обновлений нет" critical_available: "Доступно критическое обновление." updates_available: "Доступны обновления." please_upgrade: "Пожалуйста, обновитесь!" no_check_performed: "Проверка обновлений не производится. Убедитесь, что запущен процесс sidekiq." stale_data: "Проверка обновлений не в последнее время не производилась. Убедитесь, что запущен процесс sidekiq." - version_check_pending: "Похоже, вы недавно обновились. Замечательно!" - installed_version: "Установленная" - latest_version: "Текущая" - problems_found: "Мы обнаружили некоторые проблемы в вашей установке Discourse:" + version_check_pending: "Вы недавно обновились. Замечательно!" + installed_version: "У вас" + latest_version: "Последняя" + problems_found: "Обнаружены некоторые проблемы в вашей установке:" last_checked: "Последняя проверка" refresh_problems: "Обновить" - no_problems: "Проблемы не обнаружены." + no_problems: "Проблем не обнаружено." moderators: 'Модераторы:' admins: 'Администраторы:' blocked: 'Заблокированы:' suspended: 'Заморожены:' private_messages_short: "Сообщ." private_messages_title: "Сообщений" - space_free: "{{size}} свободно" - uploads: "загрузки" - backups: "резервные копии" + mobile_title: "Мобильный" + space_free: "свободно {{size}}" + uploads: "Загрузки" + backups: "Резервные копии" traffic_short: "Трафик" - traffic: "Трафик" + traffic: "Трафик (веб-запросы)" page_views: "Запросы API" page_views_short: "Запросы API" - show_traffic_report: "Раширенный отчет" + show_traffic_report: "Раширенный отчет по трафику" reports: today: "Сегодня" yesterday: "Вчера" last_7_days: "7 дней" last_30_days: "30 дней" all_time: "За все время" - 7_days_ago: "7 дней" - 30_days_ago: "30 дней" - all: "Все" - view_table: "таблица" - view_chart: "гистограмма" + 7_days_ago: "7 дней назад" + 30_days_ago: "30 дней назад" + all: "Всего" + view_table: "Таблица" + view_chart: "Диаграмма" refresh_report: "Обновить отчет" start_date: "Дата от" end_date: "Дата до" @@ -1751,7 +1783,11 @@ ru: name: "Название" none_installed: "Нет ни одного установленного плагина." version: "Версия" + enabled: "Включен?" + is_enabled: "Y" + not_enabled: "N" change_settings: "Настроить" + change_settings_short: "Настройки" howto: "Как установить плагин?" backups: title: "Резервные копии" @@ -1817,6 +1853,8 @@ ru: screened_email: "Экспортировать список email-адресов в CSV формате." screened_ip: "Экспортировать список IP в CSV формате." screened_url: "Экспортировать список URL-адресов в CSV формате." + export_json: + button_text: "Экспорт" invite: button_text: "Отправить приглашения" button_title: "Отправить приглашения" @@ -1844,6 +1882,8 @@ ru: save: "Сохранить" new: "Новое" new_style: "Новый стиль" + import: "Импорт" + import_title: "Выберите файл или вставьте текст" delete: "Удалить" delete_confirm: "Удалить настройки?" about: "Измените CSS стили и HTML заголовки на сайте. Чтобы начать, внесите правки." @@ -1916,7 +1956,6 @@ ru: sent_test: "отправлено!" delivery_method: "Метод отправки" preview_digest: "Просмотр сводки" - preview_digest_desc: "Предпросмотр содержимого сводки, отсылаемой форумом по электронной почте пользователям." refresh: "Обновить" format: "Формат" html: "html" @@ -1981,6 +2020,7 @@ ru: delete_post: "удаление сообщения" impersonate: "выдать себя за" anonymize_user: "анонимизировать пользователя" + roll_up: "Сгруппировать IP адреса в подсети" screened_emails: title: "Почтовые адреса" description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия." @@ -1994,28 +2034,30 @@ ru: domain: "Домен" screened_ips: title: "IP адреса" - description: 'IP адреса за которыми вести наблюдение. Используйте "Разрешить" для добавления IP адреса в белый список.' - delete_confirm: "Вы уверены, что хотите удалить правило для %{ip_address}?" - roll_up_confirm: "Вы уверены, что хотите сконвертировать часто встречающиеся IP в подсети?" - rolled_up_some_subnets: "Заблокированные IP сконвертированы в подсети: %{subnets}." - rolled_up_no_subnet: "Нечего конвертировать" + description: 'Список правил для IP адресов. Чтобы добавить IP адрес в белый список, используйте правило "Разрешить".' + delete_confirm: "Удалить правило для IP адреса %{ip_address}?" + roll_up_confirm: "Сгруппировать отдельные экранированные IP адреса в подсети?" + rolled_up_some_subnets: "Заблокированные IP адреса сгруппированы в следующие подсети: %{subnets}." + rolled_up_no_subnet: "Ничего не найдено для группирования" actions: block: "Заблокировать" do_nothing: "Разрешить" allow_admin: "Разрешить админов" form: - label: "Новые:" + label: "Новое правило:" ip_address: "IP адрес" add: "Добавить" filter: "Поиск" roll_up: - text: "Конвертация" - title: "Создает новую запись бана подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей." + text: "Группировка" + title: "Создание новой записи бана целой подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей отдельных IP адресов." logster: title: "Журнаш ошибок" impersonate: title: "Войти от имени пользователя" help: "Используйте этот инструмент, чтобы войти от имени пользователя. Может быть полезно для отладки. После этого необходимо выйти и зайти под своей учетной записью снова." + not_found: "Пользователь не найден." + invalid: "Извините, но вы не можете представиться этим пользователем." users: title: 'Пользователи' create: 'Добавить администратора' @@ -2240,6 +2282,7 @@ ru: no_results: "Ничего не найдено." clear_filter: "Очистить" add_url: "Добавить URL" + add_host: "добавить хост" categories: all_results: 'Все настройки' required: 'Обязательное' @@ -2360,7 +2403,6 @@ ru: title: 'Приложение' create: 'c Создать новую тему' notifications: 'n Открыть уведомления' - site_map_menu: '= Открыть меню сайта' user_profile_menu: 'p Открыть меню моего профиля' show_incoming_updated_topics: '. Показать обновленные темы' search: '/ Поиск' @@ -2477,14 +2519,14 @@ ru: name: Первая жалоба description: Помог модератору, обратив его внимание на проблемное сообщение promoter: - name: Покровитель - description: Приглашенный пользователь + name: Промоутер + description: Пригласил нового пользователя campaigner: - name: участник кампании - description: Приглашено 3 участника + name: Активист + description: Пригласил троих пользователей, достигших 1-го уровня доверия champion: name: Чемпион - description: Приглашено 10 участников + description: Пригласил пятерых пользователей, достигших 2-го уровня доверия first_share: name: Первый вклад в популярность description: Впервые поделился ссылкой на сообщение @@ -2495,17 +2537,14 @@ ru: name: Первая цитата description: Процитировал другого пользователя read_guidelines: - name: Прочитавший руководство - description: Прочитал руководство сообщества + name: Руководство пользователя + description: Прочитал руководство пользователя reader: name: Читатель description: Прочитал каждое сообщение в теме с более чем 100 сообщениями - google_search: | -

      Искать с помощью Google

      -

      - - - - - -

      + popular_link: + name: Популярная ссылка + description: Оставил внешнюю ссылку с более чем 50 кликов + hot_link: + name: Горячая ссылка + description: Оставил внешнюю ссылку с более чем 300 кликов diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 3a500de298..caed2c2f49 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -8,6 +8,9 @@ sq: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +22,17 @@ sq: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -82,6 +90,16 @@ sq: x_days: one: "1 ditë më parë" other: "%{count} ditë më parë" + later: + x_days: + one: "1 day later" + other: "%{count} days later" + x_months: + one: "1 month later" + other: "%{count} months later" + x_years: + one: "1 year later" + other: "%{count} years later" share: topic: 'shpërnda një lidhje tek kjo temë' post: 'postim #%{postNumber}' @@ -105,7 +123,6 @@ sq: admin_title: "Admin" flags_title: "Flags" show_more: "trego më shumë" - show_help: "ndihmë" links: "Lidhjet" links_lowercase: one: "lidhje" @@ -129,6 +146,7 @@ sq: every_two_weeks: "çdo dy javë" every_three_days: "çdo 3 ditë" max_of_count: "max i {{count}}" + alternation: "ose" character_count: one: "{{count}} karakter" other: "{{count}} karakterë" @@ -188,9 +206,9 @@ sq: revert: "Rikthe" failed: "Dështojë" switch_to_anon: "Mënyrë Anonime" - switch_from_anon: "Dil nga Mënyra Anonime" banner: close: "Hiq këtë reklamë." + edit: "Edit this banner >>" choose_topic: none_found: "Asnjë temë u gjet." title: @@ -208,7 +226,7 @@ sq: view_pending: "shiko postimet pezull" has_pending_posts: one: "This topic has 1 post awaiting approval" - many: "This topic has {{count}} posts awaiting approval" + other: "This topic has {{count}} posts awaiting approval" confirm: "Ruaj ndryshimet" delete_prompt: "Are you sure you want to delete %{username}? This will remove all of their posts and block their email and ip address." approval: @@ -314,6 +332,8 @@ sq: topics_entered: "topics entered" post_count: "# postimeve" confirm_delete_other_accounts: "Are you sure you want to delete these accounts?" + user_fields: + none: "(select an option)" user: said: "{{username}}:" profile: "Profili" @@ -330,6 +350,17 @@ sq: invited_by: "Të ftuar nga unë" trust_level: "Niveli Besimit" notifications: "Njoftimet" + desktop_notifications: + label: "Desktop Notifications" + not_supported: "Notifications are not supported on this browser. Sorry." + perm_default: "Turn On Notifications" + perm_denied_btn: "Permission Denied" + perm_denied_expl: "You have denied permission for notifications. Use your browser to enable notifications, then click the button when done. (Desktop: The leftmost icon in the address bar. Mobile: 'Site Info'.)" + disable: "Disable Notifications" + currently_enabled: "(currently enabled)" + enable: "Enable Notifications" + currently_disabled: "(currently disabled)" + each_browser_note: "Note: You have to change this setting on every browser you use." dismiss_notifications: "Shënoj të gjitha si të lexuara" dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara" disable_jump_reply: "Don't jump to my post after I reply" @@ -342,14 +373,15 @@ sq: admin: "{{user}} është një admin" moderator_tooltip: "Ky anëtar është një moderator" admin_tooltip: "Ky anëtar është administrator" + blocked_tooltip: "This user is blocked" suspended_notice: "Ky anëtarë është përjashtuar deri më {{date}}." suspended_reason: "Arsyeja:" github_profile: "Github" mailing_list_mode: "Send me an email for every new post (unless I mute the topic or category)" watched_categories: "Shikuar" - watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic's listing." + watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic." tracked_categories: "Gjurmuar" - tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." + tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of new posts will appear next to the topic." muted_categories: "Heshtur" muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." delete_account: "Fshi Llogarin Time" @@ -402,7 +434,7 @@ sq: upload_title: "Ngarni foton tuaj" upload_picture: "Ngarko Foto" image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal." - cache_notice: "You've successfully changed your avatar but it might take some time to appear due to browser caching." + cache_notice: "You've successfully changed your profile picture but it might take some time to appear due to browser caching." change_profile_background: title: "Sfondi Profilit" instructions: "Sfondi profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 850px." @@ -462,38 +494,27 @@ sq: every_two_weeks: "çdo 2 javë" email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" email_private_messages: "Send me an email when someone messages me" - email_always: "Do not suppress email notifications when I am active on the site" + email_always: "Send me email notifications even when I am active on the site" other_settings: "Tjetër" categories_settings: "Kategoritë" new_topic_duration: label: "Konsidero diskutim te ri kur" not_viewed: "I haven't viewed them yet" last_here: "created since I was here last" - after_n_days: - one: "krijuar në ditën e fundit" - other: "krijuar në {{count}} ditët e fundit" - after_n_weeks: - one: "created in the last week" - other: "created in the last {{count}} weeks" auto_track_topics: "Automatically track topics I enter" auto_track_options: never: "asnjëherë" immediately: "menjëherë" - after_n_seconds: - one: "pas 1 sekonde" - other: "pas {{count}} sekonda" - after_n_minutes: - one: "pas 1 minute" - other: "pas {{count}} minutash" invited: search: "shkruaj për të kërkuar ftesat..." title: "Ftesa" user: "Anëtarët e Ftuar" - none: "Nuk keni ftuar asnjë deri më tani." truncated: "Shfaq {{count}} ftesat e para." redeemed: "Ridërgo ftesat" + redeemed_tab: "Redeemed" redeemed_at: "Redeemed" pending: "Ftesat e Pezulluara" + pending_tab: "Pending" topics_entered: "Diskutimet e Para" posts_read_count: "Postimet e Lexuara" expired: "Kjo ftesa ka skaduar." @@ -526,6 +547,7 @@ sq: title: "Adresa IP e rregjistrimit" avatar: title: "Foto Profilit" + header_title: "profile, messages, bookmarks and preferences" title: title: "Titulli" filters: @@ -619,6 +641,7 @@ sq: email_placeholder: "email ose emri" caps_lock_warning: "Caps Lock është aktive" error: "Gabim i panjohur" + rate_limit: "Please wait before trying to log in again." blank_username_or_password: "Ju lutem, shkruani adresën email ose pseudonim dhe fjalëkalimin." reset_password: 'Rivendos Fjalëkalimin' logging_in: "Duke u Identifikuar..." @@ -683,7 +706,6 @@ sq: title_placeholder: "What is this discussion about in one brief sentence?" edit_reason_placeholder: "pse jeni duke e redaktuar?" show_edit_reason: "(arsye redaktimit)" - reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste an image to upload it." view_new_post: "Shikoni postimin tuaj te ri." saving: "Duke ruajtur..." saved: "U Ruajt!" @@ -744,6 +766,13 @@ sq: moved_post: "

      {{username}} moved {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Earned '{{description}}'

      " + popup: + mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}' + quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}' + replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}' + posted: '{{username}} posted in "{{topic}}" - {{site_title}}' + private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}' + linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}' upload_selector: title: "Shto një imazh" title_with_attachments: "Shto një imazh ose një skedarë" @@ -751,15 +780,17 @@ sq: from_the_web: "Nga web" remote_tip: "lidhje tek imazhi" remote_tip_with_attachments: "lidhje për tek imazhi ose skedari ({{authorized_extensions}})" - local_tip: "kliko për të zgjedhur një file nga paisja juaj" - local_tip_with_attachments: "kliko për të zgjedhur një imazh ose një skedar ({{authorized_extensions}})" + local_tip: "select images from your device" + local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" hint: "(you can also drag & drop into the editor to upload them)" - hint_for_supported_browsers: "(you can also drag and drop or paste images into the editor to upload them)" uploading: "Duke ngarkaur" + select_file: "Select File" image_link: "link your image will point to" search: title: "search topics, posts, users, or categories" no_results: "Nuk i gjet asnjë rezultat." + no_more_results: "No more results found." + search_help: Search help searching: "Duke kërkuar..." post_format: "#{{post_number}} by {{username}}" context: @@ -767,7 +798,6 @@ sq: category: "Kërko tek kategoria \"{{category}}\"" topic: "Kërko tek kjo temë" private_messages: "Search messages" - site_map: "go to another topic list or category" go_back: 'kthehu mbrapa' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: 'go to your user page' @@ -875,6 +905,7 @@ sq: go_top: "sipër" go_bottom: "poshtë" go: "shko" + jump_bottom: "jump to last post" jump_bottom_with_number: "jump to post %{post_number}" total: totali postimeve current: postimi aktual @@ -890,29 +921,27 @@ sq: '2_4': 'You will receive notifications because you posted a reply to this topic.' '2_2': 'You will receive notifications because you are tracking this topic.' '2': 'You will receive notifications because you read this topic.' - '1_2': 'You will be notified if someone mentions your @name or replies to your post.' - '1': 'You will be notified if someone mentions your @name or replies to your post.' + '1_2': 'You will be notified if someone mentions your @name or replies to you.' + '1': 'You will be notified if someone mentions your @name or replies to you.' '0_7': 'You are ignoring all notifications in this category.' '0_2': 'You are ignoring all notifications on this topic.' '0': 'You are ignoring all notifications on this topic.' watching_pm: title: "Watching" - description: "You will be notified of every new post in this message. A count of unread and new posts will also appear next to the topic." + description: "You will be notified of every new reply in this message, and a count of new replies will be shown." watching: title: "Në vëzhgim" - description: "You will be notified of every new post in this topic. A count of unread and new posts will also appear next to the topic." + description: "You will be notified of every new reply in this topic, and a count of new replies will be shown." tracking_pm: title: "Tracking" - description: "A count of unread and new posts will appear next to the message. You will be notified if someone mentions your @name or replies to your post." + description: "A count of new replies will be shown for this message. You will be notified if someone mentions your @name or replies to you." tracking: title: "Tracking" - description: "A count of unread and new posts will appear next to the topic. You will be notified if someone mentions your @name or replies to your post. " + description: "A count of new replies will be shown for this topic. You will be notified if someone mentions your @name or replies to you. " regular: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post." + description: "You will be notified if someone mentions your @name or replies to you." regular_pm: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post in the message." + description: "You will be notified if someone mentions your @name or replies to you." muted_pm: title: "Muted" description: "You will never be notified of anything about this message." @@ -954,17 +983,19 @@ sq: success_message: 'You successfully flagged this topic.' feature_topic: title: "Feature this topic" - pin: "Make this topic appear at the top of the {{categoryLink}} category." + pin: "Make this topic appear at the top of the {{categoryLink}} category until" confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?" unpin: "Remove this topic from the top of the {{categoryLink}} category." + unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until %{until}." pin_note: "Users can unpin the topic individually for themselves." already_pinned: zero: "There are no topics pinned in {{categoryLink}}." one: "Topics currently pinned in {{categoryLink}}: 1." other: "Topics currently pinned in {{categoryLink}}: {{count}}." - pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it." + pin_globally: "Make this topic appear at the top of all topic lists until" confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" unpin_globally: "Remove this topic from the top of all topic lists." + unpin_globally_until: "Remove this topic from the top of all topic lists or wait until %{until}." global_pin_note: "Users can unpin the topic individually for themselves." already_pinned_globally: zero: "There are no topics pinned globally." @@ -986,18 +1017,18 @@ sq: action: "Fto" success: "We've invited that user to participate in this message." error: "Sorry, there was an error inviting that user." - group_name: "group name" + group_name: "emri grupit" invite_reply: - title: 'Invite' + title: 'Ftesa' username_placeholder: "username" - action: 'Send Invite' + action: 'Dërgo Ftesa' help: 'invite others to this topic via email or notifications' to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link, no login required." sso_enabled: "Enter the username of the person you'd like to invite to this topic." to_topic_blank: "Enter the username or email address of the person you'd like to invite to this topic." to_topic_email: "You've entered an email address. We'll email an invitation that allows your friend to immediately reply to this topic." - to_topic_username: "You've entered a username. We'll send a notification to that user with a link inviting them to this topic." - to_username: "Enter the username of the person you'd like to invite. We'll send a notification to that user with a link inviting them to this topic." + to_topic_username: "You've entered a username. We'll send a notification with a link inviting them to this topic." + to_username: "Enter the username of the person you'd like to invite. We'll send a notification with a link inviting them to this topic." email_placeholder: 'name@example.com' success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." success_username: "We've invited that user to participate in this topic." @@ -1007,7 +1038,7 @@ sq: n_posts: one: "1 postim" other: "{{count}} postime" - cancel: "Remove filter" + cancel: "Hiq filtërin" split_topic: title: "Move to New Topic" action: "move to new topic" @@ -1025,7 +1056,7 @@ sq: other: "Please choose the topic you'd like to move those {{count}} posts to." change_owner: title: "Change Owner of Posts" - action: "change ownership" + action: "ndrysho zotëruesin" error: "There was an error changing the ownership of the posts." label: "New Owner of Posts" placeholder: "username of new owner" @@ -1034,7 +1065,7 @@ sq: other: "Please choose the new owner of the {{count}} posts by {{old_user}}." instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively.
      Warning: Currently, no post-dependent data is transferred over to the new user. Use with caution." multi_select: - select: 'select' + select: 'zgjidh' selected: 'selected ({{count}})' select_replies: 'select +replies' delete: fshij të zgjedhurin @@ -1045,8 +1076,8 @@ sq: one: You have selected 1 post. other: You have selected {{count}} posts. post: - reply: "Replying to {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Përgjigju tek {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "cito përgjigjen" edit: "Editing {{link}} {{replyAvatar}} {{username}}" edit_reason: "Arsyeja:" @@ -1061,11 +1092,24 @@ sq: one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)" other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" expand_collapse: "expand/collapse" + gap: + one: "view 1 hidden reply" + other: "view {{count}} hidden replies" more_links: "{{count}} më shumë..." unread: "Postimi është i palexuar" has_replies: - one: "Përgjigju" - other: "Përgjigje" + one: "{{count}} Përgjigje" + other: "{{count}} Përgjigje" + has_likes: + one: "{{count}} Pëlqim" + other: "{{count}} Pëlqime" + has_likes_title: + one: "1 person liked this post" + other: "{{count}} people liked this post" + has_likes_title_you: + zero: "ju pëlqeni këtë post" + one: "ju dhe 1 person tjetër pëlqeni këtë post" + other: "you and {{count}} other people liked this post" errors: create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri." edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri." @@ -1219,6 +1263,7 @@ sq: last: "Last revision" hide: "Hide revision" show: "Show revision" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Show the rendered output with additions and removals inline" @@ -1231,13 +1276,15 @@ sq: button: ' Raw' category: can: 'can… ' - none: '(no category)' + none: '(pa kategori)' + all: 'Gjitha kategoritë' choose: 'Select a category…' edit: 'redakto' edit_long: "Redakto" view: 'View Topics in Category' - general: 'General' - settings: 'Settings' + general: 'I përgjithshëm' + settings: 'Rregullimet' + topic_template: "Topic Template" delete: 'Fshi Kategori' create: 'Kategori e Re' save: 'Ruaj Kategori' @@ -1245,8 +1292,8 @@ sq: slug_placeholder: '(Optional) dashed-words for url' creation_error: There has been an error during the creation of the category. save_error: There was an error saving the category. - name: "Category Name" - description: "Description" + name: "Emri Kategorisë" + description: "Përshkrimi" topic: "category topic" logo: "Category Logo Image" background_image: "Category Background Image" @@ -1254,26 +1301,26 @@ sq: background_color: " Ngjyra e sfondit" foreground_color: "Foreground color" name_placeholder: "One or two words maximum" - color_placeholder: "Any web color" + color_placeholder: "Çdo ngjyrë web" delete_confirm: "Are you sure you want to delete this category?" delete_error: "There was an error deleting the category." - list: "List Categories" + list: "Shfaq Kategoritë" no_description: "Please add a description for this category." - change_in_category_topic: "Edit Description" + change_in_category_topic: "Redakto Përshkrimin" already_used: 'This color has been used by another category' - security: "Security" - images: "Images" + security: "Siguria" + images: "Imazhe" auto_close_label: "Auto-close topics after:" - auto_close_units: "hours" + auto_close_units: "orë" email_in: "Custom incoming email address:" email_in_allow_strangers: "Accept emails from anonymous users with no accounts" email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, " email_in_disabled_click: 'enable the "email in" setting.' allow_badges_label: "Allow badges to be awarded in this category" - edit_permissions: "Edit Permissions" - add_permission: "Add Permission" + edit_permissions: "Ndrysho autorizimin" + add_permission: "Shto autorizim" this_year: "këtë vit" - position: "position" + position: "pozicion" default_position: "Default Position" position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, " position_disabled_click: 'enable the "fixed category positions" setting.' @@ -1281,13 +1328,13 @@ sq: notifications: watching: title: "Watching" - description: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." + description: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new replies will appear for these topics." tracking: title: "Tracking" - description: "You will automatically track all new topics in these categories. A count of unread and new posts will appear next to the topic." + description: "You will automatically track all new topics in these categories. A count of new replies will appear for these topics." regular: title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post." + description: "You will be notified if someone mentions your @name or replies to you." muted: title: "Muted" description: "You will not be notified of anything about new topics in these categories, and they will not appear on your unread tab." @@ -1296,19 +1343,19 @@ sq: private_reminder: 'flags are private, only visible to staff' action: 'Flag Post' take_action: "Take Action" - notify_action: 'Message' - delete_spammer: "Delete Spammer" + notify_action: 'Mesazh' + delete_spammer: "Elimino Spammer" delete_confirm: "You are about to delete %{posts} posts and %{topics} topics from this user, remove their account, block signups from their IP address %{ip_address}, and add their email address %{email} to a permanent block list. Are you sure this user is really a spammer?" - yes_delete_spammer: "Yes, Delete Spammer" + yes_delete_spammer: "Po, Elimino Spammer" ip_address_missing: "(N/A)" - hidden_email_address: "(hidden)" + hidden_email_address: "(fshehur)" submit_tooltip: "Submit the private flag" take_action_tooltip: "Reach the flag threshold immediately, rather than waiting for more community flags" cant: "Sorry, you can't flag this post at this time." formatted_name: - off_topic: "It's Off-Topic" - inappropriate: "It's Inappropriate" - spam: "It's Spam" + off_topic: "Është Jashtë teme" + inappropriate: "Është e papërshtatshme" + spam: "Është Spam" custom_placeholder_notify_user: "Të jeni specifik, konstruktiv dhe gjithmonë të sjellshëm." custom_placeholder_notify_moderators: "Let us know specifically what you are concerned about, and provide relevant links and examples where possible." custom_message: @@ -1321,6 +1368,8 @@ sq: notify_action: "Message" topic_map: title: "Përmbledhja e Temës" + participants_title: "Frequent Posters" + links_title: "Popular Links" links_shown: "show all {{totalLinks}} links..." clicks: one: "1 klik" @@ -1332,6 +1381,8 @@ sq: help: "You bookmarked this topic" locked: help: "This topic is closed; it no longer accepts new replies" + archived: + help: "This topic is archived; it is frozen and cannot be changed" unpinned: title: "Unpinned" help: "This topic is unpinned for you; it will display in regular order" @@ -1341,8 +1392,6 @@ sq: pinned: title: "Pinned" help: "This topic is pinned for you; it will display at the top of its category" - archived: - help: "This topic is archived; it is frozen and cannot be changed" invisible: help: "This topic is unlisted; it will not be displayed in topic lists, and can only be accessed via a direct link" posts: "Postime" @@ -1365,12 +1414,12 @@ sq: likes: "Pëlqimet" likes_lowercase: one: "like" - other: "likes" + other: "pëlqime" likes_long: "there are {{number}} likes in this topic" users: "Anëtarët" users_lowercase: - one: "user" - other: "users" + one: "anëtar" + other: "anëtarët" category_title: "Kategori" history: "Historia" changed_by: "nga {{author}}" @@ -1382,7 +1431,10 @@ sq: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: - title: "Të Fundit" + title: + zero: "Latest" + one: "Të fundit (1)" + other: "Të fundit ({{count}})" help: "temat me postime të fundit" hot: title: "Kryesoret" @@ -1391,7 +1443,7 @@ sq: title: "Lexo" help: "topics you've read, in the order that you last read them" search: - title: "Search" + title: "Kërko" help: "search all topics" categories: title: "Kategoritë" @@ -1414,7 +1466,7 @@ sq: title: zero: "Tema të Reja" one: "Tema të Reja (1)" - other: "Tema të Reja ({{count}})" + other: "Të Reja ({{count}})" help: "topics created in the last few days" posted: title: "Postimet e Mia" @@ -1432,21 +1484,24 @@ sq: title: "Kryesoret" help: "the most active topics in the last year, month, week or day" all: - title: "All Time" + title: "Gjithë Kohës" yearly: - title: "Yearly" + title: "Vjetore" + quarterly: + title: "Quarterly" monthly: - title: "Monthly" + title: "Mujore" weekly: - title: "Weekly" + title: "Javore" daily: - title: "Daily" - all_time: "All Time" - this_year: "Këtë vit" - this_month: "Këtë muaj" - this_week: "Këtë javë" + title: "Ditore" + all_time: "Gjithë Kohës" + this_year: "Vit" + this_quarter: "Quarter" + this_month: "Month" + this_week: "javë" today: "Sot" - other_periods: "shiko më shumë tema" + other_periods: "see top" browser_update: 'Unfortunately, your browser is too old to work on this site. Please upgrade your browser.' permission_types: full: "Krijo / Përgjigju / Shiko" @@ -1479,11 +1534,12 @@ sq: blocked: 'Bllokuar:' suspended: 'Përjashtuar:' private_messages_short: "Msgs" - private_messages_title: "Messages" - space_free: "{{size}} free" + private_messages_title: "Mesazhet" + mobile_title: "Mobile" + space_free: "{{size}} lirë" uploads: "uploads" backups: "backups" - traffic_short: "Traffic" + traffic_short: "Trafik" traffic: "Application web requests" page_views: "API Requests" page_views_short: "API Requests" @@ -1537,7 +1593,7 @@ sq: clear_topic_flags_title: "The topic has been investigated and issues have been resolved. Click Done to remove the flags." more: "(më shumë përgjigje...)" dispositions: - agreed: "agreed" + agreed: "dakort" disagreed: "disagreed" deferred: "deferred" flagged_by: "Flagged by" @@ -1586,13 +1642,13 @@ sq: add: "Shto" add_members: "Shto Anëtar" custom: "Custom" - automatic: "Automatic" + automatic: "Automatik" automatic_membership_email_domains: "Users who register with an email domain that exactly matches one in this list will be automatically added to this group:" automatic_membership_retroactive: "Apply the same email domain rule to add existing registered users" default_title: "Default title for all users in this group" primary_group: "Automatically set as primary group" api: - generate_master: "Generate Master API Key" + generate_master: "Gjenero Master API Key" none: "There are no active API keys right now." user: "Anëtarë" title: "API" @@ -1603,7 +1659,7 @@ sq: confirm_regen: "Are you sure you want to replace that API Key with a new one?" confirm_revoke: "Are you sure you want to revoke that key?" info_html: "Your API key will allow you to create and update topics using JSON calls." - all_users: "All Users" + all_users: "Gjithë Anëtarët" note_html: "Keep this key secret, all users that have it may create arbitrary posts as any user." plugins: title: "Shtojca" @@ -1611,7 +1667,11 @@ sq: name: "Emri" none_installed: "You don't have any plugins installed." version: "Versioni" - change_settings: "Change Settings" + enabled: "Aktivizuar?" + is_enabled: "Y" + not_enabled: "N" + change_settings: "Ndrysho Rregullimet" + change_settings_short: "Rregullimet" howto: "How do I install plugins?" backups: title: "Backups" @@ -1642,7 +1702,7 @@ sq: is_running: "An operation is currently running..." failed: "The {{operation}} failed. Please check the logs." cancel: - label: "Cancel" + label: "Anulo" title: "Cancel the current operation" confirm: "Are you sure you want to cancel the current operation?" backup: @@ -1651,14 +1711,14 @@ sq: confirm: "Do you want to start a new backup?" without_uploads: "Yes (do not include files)" download: - label: "Download" + label: "Shkarko" title: "Download the backup" destroy: title: "Remove the backup" confirm: "Are you sure you want to destroy this backup?" restore: is_disabled: "Restore is disabled in the site settings." - label: "Restore" + label: "Rikthe" title: "Restore the backup" confirm: "Are your sure you want to restore this backup?" rollback: @@ -1670,13 +1730,15 @@ sq: success: "Export initiated, you will be notified via message when the process is complete." failed: "Export failed. Please check the logs." rate_limit_error: "Posts can be downloaded once per day, please try again tomorrow." - button_text: "Export" + button_text: "Eksport" button_title: user: "Export full user list in CSV format." staff_action: "Export full staff action log in CSV format." screened_email: "Export full screened email list in CSV format." screened_ip: "Export full screened IP list in CSV format." screened_url: "Export full screened URL list in CSV format." + export_json: + button_text: "Eksport" invite: button_text: "Dërgo ftesa" button_title: "Dërgo ftesa" @@ -1704,6 +1766,8 @@ sq: save: "Ruaj" new: "E Re" new_style: "Veshje e Re" + import: "Import" + import_title: "Select a file or paste text" delete: "Fshij" delete_confirm: "Delete this customization?" about: "Modify CSS stylesheets and HTML headers on the site. Add a customization to start." @@ -1746,7 +1810,7 @@ sq: name: 'highlight' description: 'The background color of highlighted elements on the page, such as posts and topics.' danger: - name: 'danger' + name: 'rrezik' description: 'Highlight color for actions like deleting posts and topics.' success: name: 'sukses' @@ -1759,7 +1823,7 @@ sq: description: "Base color used for the background of wiki posts." email: title: "Email" - settings: "Settings" + settings: "Rregullimet" all: "Të gjithë" sending_test: "Sending test Email..." error: "ERROR - %{server_error}" @@ -1776,7 +1840,6 @@ sq: sent_test: "u dërgua!" delivery_method: "Delivery Method" preview_digest: "Preview Digest" - preview_digest_desc: "Shqyrto materialin javor që dërgohet në email anëtarëve jo aktivë." refresh: "Rifresko" format: "Formati" html: "html" @@ -1841,6 +1904,7 @@ sq: delete_post: "delete post" impersonate: "impersonate" anonymize_user: "anonymize user" + roll_up: "roll up IP blocks" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -1876,6 +1940,8 @@ sq: impersonate: title: "Impersonate" help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished." + not_found: "That user can't be found." + invalid: "Sorry, you may not impersonate that user." users: title: 'Users' create: 'Add Admin User' @@ -2060,6 +2126,7 @@ sq: delete: "Fshij" cancel: "Anulo" delete_confirm: "Are you sure you want to delete that user field?" + options: "Opsione" required: title: "Required at signup?" enabled: "i nevojshëm" @@ -2075,6 +2142,7 @@ sq: field_types: text: 'Text Field' confirm: 'Confirmation' + dropdown: "Dropdown" site_text: none: "Choose a type of content to begin editing." title: 'Text Content' @@ -2086,6 +2154,7 @@ sq: no_results: "Nuk u gjet asnjë rezultat." clear_filter: "Pastro" add_url: "add URL" + add_host: "add host" categories: all_results: 'All' required: 'Required' @@ -2180,6 +2249,21 @@ sq: name: "Name" image: "Imazh" delete_confirm: "Are you sure you want to delete the :%{name}: emoji?" + permalink: + title: "Permalinks" + url: "URL" + topic_id: "Topic ID" + topic_title: "Topic" + post_id: "Post ID" + post_title: "Post" + category_id: "Category ID" + category_title: "Category" + external_url: "External URL" + delete_confirm: Are you sure you want to delete this permalink? + form: + label: "New:" + add: "Add" + filter: "Search (URL or External URL)" lightbox: download: "shkarko" search_help: @@ -2188,11 +2272,13 @@ sq: title: 'Shkurtimet e Tastierës ' jump_to: title: 'Kalo tek' + home: 'g, h Home' latest: 'g, l Latest' new: 'g, n New' unread: 'g, u Unread' categories: 'g, c Kategoritë' top: 'g, t Top' + bookmarks: 'g, b Bookmarks' navigation: title: 'Shfletimi' jump: '# Shko tek postimi #' @@ -2204,7 +2290,6 @@ sq: title: 'Aplikacion' create: 'c Filloni një diskutim të ri' notifications: 'n Open notifications' - site_map_menu: '= Open site menu' user_profile_menu: 'p Open user menu' show_incoming_updated_topics: '. Show updated topics' search: '/ Kërko' @@ -2314,6 +2399,15 @@ sq: first_flag: name: First Flag description: Flagged a post + promoter: + name: Promoter + description: Invited a user + campaigner: + name: Campaigner + description: Invited 3 basic users (trust level 1) + champion: + name: Champion + description: Invited 5 members (trust level 2) first_share: name: First Share description: Shared a post @@ -2329,12 +2423,3 @@ sq: reader: name: Lexues description: Read every post in a topic with more than 100 posts - google_search: | -

      Search with Google

      -

      - - - - - -

      diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index d0cc75fab5..b2608010ce 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -82,6 +82,16 @@ sv: x_days: one: "1 dag sedan" other: "%{count} dagar sedan" + later: + x_days: + one: "1 dag senare" + other: "%{count} dagar senare" + x_months: + one: "1 månad senare" + other: "%{count} månader senare" + x_years: + one: "1 år senare" + other: "%{count} år senare" share: topic: 'dela en länk till denna tråd' post: 'inlägg #%{postNumber}' @@ -90,8 +100,20 @@ sv: facebook: 'dela denna länk på Facebook' google+: 'dela denna länk på Google+' email: 'skicka denna länk i ett email' + action_codes: + autoclosed: + enabled: 'stängdes %{when}' + disabled: 'öppnades %{when}' + closed: + enabled: 'stängdes %{when}' + disabled: 'öppnades %{when}' + archived: + enabled: 'arkiverades %{when}' + disabled: 'avarkiverades %{when}' + pinned: + enabled: 'klistrades %{when}' topic_admin_menu: "ämne admin åtgärder" - emails_are_disabled: "Alla utgående email har blivit deaktiverad av en administratör. Inga kungörelser av någon sort kommer att bli skickad." + emails_are_disabled: "All utgående e-post har blivit globalt deaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut." edit: 'redigera titel och kategori för denna tråd' not_implemented: "Denna funktion har inte implementerats än, vi beklagar!" no_value: "Nej" @@ -105,7 +127,6 @@ sv: admin_title: "Admin" flags_title: "Flaggningar" show_more: "visa mer" - show_help: "hjälp" links: "Länkar" links_lowercase: one: "länk" @@ -114,7 +135,7 @@ sv: guidelines: "Riktlinjer" privacy_policy: "Integritetspolicy" privacy: "Integritet" - terms_of_service: "Villkor" + terms_of_service: "Användarvillkor" mobile_view: "Mobilvy" desktop_view: "Desktop-vy" you: "Du" @@ -129,6 +150,7 @@ sv: every_two_weeks: "varannan vecka" every_three_days: "var tredje dag" max_of_count: "max av {{count}}" + alternation: "eller" character_count: one: "{{count}} tecken" other: "{{count}} tecken" @@ -188,9 +210,9 @@ sv: revert: "Återställ" failed: "Misslyckades" switch_to_anon: "Anonymt läge" - switch_from_anon: "Avsluta anonymt läge" banner: close: "Stäng denna banner" + edit: "Redigera denna banner >>" choose_topic: none_found: "Inga ämnen hittades." title: @@ -207,8 +229,8 @@ sv: cancel: "Avbryt" view_pending: "visa väntande inlägg" has_pending_posts: - one: "Detta ämne har 1 inlägg som inväntar godkännande" - many: "Detta ämne har {{count}} inlägg som inväntar godkännande" + one: "Detta ämne har 1 ämne som inväntar godkännande" + other: "Detta ämne har {{count}} inlägg som inväntar godkännande" confirm: "Spara ändringar" delete_prompt: "Är du säker på att du vill ta bort %{username}? Detta kommer ta bort all deras poster och blockera deras epostadresser samt IP-adresser." approval: @@ -223,8 +245,8 @@ sv: you_posted_topic: "Du postade titeln" user_replied_to_post: "{{user}} svarade på {{post_number}}" you_replied_to_post: "Du svarade på {{post_number}}" - user_replied_to_topic: "{{user}} svarade på tråden" - you_replied_to_topic: "Du svarade på tråden" + user_replied_to_topic: "{{user}} svarade på ämnet" + you_replied_to_topic: "Du svarade på ämnet" user_mentioned_user: "{{user}} nämnde {{another_user}}" user_mentioned_you: "{{user}} nämnde dig" you_mentioned_user: "Du nämnde {{another_user}}" @@ -246,8 +268,9 @@ sv: post_count_long: "Svar postade" no_results: "Inga resultat hittades." days_visited: "Besök" + days_visited_long: "Dagar Besökta" posts_read: "Läst" - posts_read_long: "Lästa trådar" + posts_read_long: "Lästa ämnen" total_rows: one: "1 användare" other: "%{count} användare" @@ -256,15 +279,17 @@ sv: title: one: "grupp" other: "grupper" - members: "medlemmar" - posts: "inlägg" + members: "Medlemmar" + posts: "Inlägg" alias_levels: title: "Vem kan använda denna grupp som ett alias?" - nobody: "ingen" - only_admins: "bara admins" - mods_and_admins: "bara moderatorer och admins" - members_mods_and_admins: "bara gruppmedlemmar, moderatorer och admins" - everyone: "alla" + nobody: "Ingen" + only_admins: "Bara administratörer" + mods_and_admins: "Bara moderatorer och administratörer" + members_mods_and_admins: "Bara gruppmedlemmar, moderatorer och administratörer" + everyone: "Alla" + trust_levels: + none: "Inga" user_action_groups: '1': "Gillningar givna" '2': "Gillningar mottagna" @@ -284,16 +309,21 @@ sv: all_subcategories: "alla" no_subcategory: "ingen" category: "Kategori" + reorder: + title: "Sortera kategorier" + title_long: "Sortera litan av katergorier" + apply_all: "Tillämpa" + position: "Position" posts: "Inlägg" - topics: "Diskussioner" + topics: "Ämnen" latest: "Senaste" latest_by: "senast av" toggle_ordering: "slå av/på sorteringskontroll" - subcategories: "Underkategorier:" - topic_stats: "Antal nya trådar" + subcategories: "Underkategorier" + topic_stats: "Antalet nya ämnen." topic_stat_sentence: - one: "%{count} ny tråd under den senaste %{unit}." - other: "%{count} nya trådar under den senaste %{unit}." + one: "%{count} nytt ämne under den senaste %{unit}." + other: "%{count} nya ämnen under den senaste %{unit}." post_stats: "Antalet nya inlägg." post_stat_sentence: one: "%{count} nytt inlägg under den senaste %{unit}." @@ -310,15 +340,15 @@ sv: username: "användarnamn" trust_level: "TL" read_time: "lästid" - topics_entered: "ämnen skapade" + topics_entered: "besökta ämnen" post_count: "# inlägg" confirm_delete_other_accounts: "Är du säker på att du vill ta bort dessa här konton?" user: - said: "{{användarnamn}}:" + said: "{{username}}:" profile: "Profil" mute: "Dämpa" edit: "Redigera inställningar" - download_archive: "Ladda ner Mina Bilder" + download_archive: "Ladda ned mina inlägg" new_private_message: "Nytt meddelande" private_message: "Meddelande" private_messages: "Meddelanden" @@ -332,6 +362,7 @@ sv: dismiss_notifications: "Markera alla som lästa" dismiss_notifications_tooltip: "Markera alla olästa aviseringar som lästa" disable_jump_reply: "Hoppa inte till mitt inlägg efter att jag har svarat" + dynamic_favicon: "Visa antal nya / uppdaterade ämnen på webbläsarikon" edit_history_public: "Låt andra användare se mina ändringar" external_links_in_new_tab: "Öppna alla externa länkar i en ny flik" enable_quoting: "Aktivera citatsvar för markerad text" @@ -340,16 +371,17 @@ sv: admin: "{{user}} är en admin" moderator_tooltip: "Den här användaren är moderator" admin_tooltip: "Den här användaren är administrator" + blocked_tooltip: "Den här användaren är blockerad" suspended_notice: "Den här användaren är avstängd till {{date}}." suspended_reason: "Anledning:" github_profile: "Github" mailing_list_mode: "Skicka mig e-post för varje nytt inlägg (om jag inte tystat ämnet eller kategorin)" watched_categories: "Tittade på" - watched_categories_instructions: "Du kommer automatiskt att följa alla nya trådar inom dessa kategorier. Du kommer att få notifieringar om alla nya inlägg och trådar; antalet olästa och nya inlägg kommer även att visas vid sidan av trådens namn." - tracked_categories: "Följd" - tracked_categories_instructions: "Du kommer automatiskt att följa alla nya trådar inom dessa kategorier. Antalet olästa och nya inlägg kommer att visas vid sidan av trådens namn." + watched_categories_instructions: "Du kommer automatiskt att bevaka alla nya ämnen i dessa kategorier. Du blir notifierad om alla nya inlägg och ämnen, och en räknare över antalet nya inlägg visas bredvid ämnet." + tracked_categories: "Bevakade" + tracked_categories_instructions: "Du kommer automatiskt att följa alla nya ämnen i dessa kategorier. Antalet nya inlägg visas bredvid ämnet." muted_categories: "Tystad" - muted_categories_instructions: "Du kommer inte att få notifieringar om nya trådar inom dessa kategorier, och de kommer inte att visas under din \"oläst\"-tab." + muted_categories_instructions: "Du kommer inte att få notifieringar om nya ämnen inom dessa kategorier, och de kommer inte att visas under din \"oläst\"-flik." delete_account: "Radera mitt konto" delete_account_confirm: "Är du säker på att du vill ta bort ditt konto permanent? Denna åtgärd kan inte ångras!" deleted_yourself: "Ditt konto har tagits bort." @@ -374,13 +406,14 @@ sv: in_progress: "(skickar e-brev)" error: "(fel)" action: "Skicka email för att återställa lösenord" - set_password: "välj lösenord" + set_password: "Ange lösenord" change_about: title: "Ändra Om Mig" + error: "Ett fel inträffade när beskrivningen skulle sparas. " change_username: - title: "Byt Användarnamn" - confirm: "Det kan finnas konsekvenser till att byta ditt användarnamn. Är du helt säker på att du vill?" - taken: "Tyvärr det användarnamnet är taget." + title: "Byt användarnamn" + confirm: "Om du byter ditt användarnamn, kommer alla tidigare citeringar av dina inlägg och @namn-omnämningar att bli trasiga. Är du helt säker på att du vill?" + taken: "Tyvärr, det användarnamnet är taget." error: "Det uppstod ett problem under bytet av ditt användarnamn." invalid: "Det användarnamnet är ogiltigt. Det får bara innehålla siffror och bokstäver" change_email: @@ -391,6 +424,7 @@ sv: change_avatar: title: "Ändra din profilbild" gravatar: "Gravatar, baserat på" + gravatar_title: "Byt din avatar på Gravatars hemsida" refresh_gravatar_title: "Uppdatera din Gravatar" letter_based: "Profilbild tilldelad av systemet" uploaded_avatar: "Anpassad bild" @@ -398,7 +432,6 @@ sv: upload_title: "Ladda upp din bild" upload_picture: "Ladda upp bild" image_is_not_a_square: "Varning: vi beskar din bild; bredd och höjd var inte samma." - cache_notice: "Du har bytt profilbild men det kan ta lite tid innan den visas." change_profile_background: title: "Profilbakgrund" instructions: "Bakgrunderna är centrerade och har en förinställd bredd på 850px" @@ -408,8 +441,8 @@ sv: email: title: "E-post" instructions: "Visas aldrig publikt" - ok: "Vi skickar e-post till dig för bekräftelse." - invalid: "Vänligen ange en giltig e-postadress." + ok: "Vi skickar e-post till dig för bekräftelse" + invalid: "Vänligen ange en giltig e-postadress" authenticated: "Din e-postadress har blivit verifierad av {{provider}}" frequency: zero: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om." @@ -435,7 +468,7 @@ sv: enter_email: 'Annvändarnamn hittat; ange matchande e-postadress' prefilled: "E-postadressen matchar det här registrerade användarnamnet" locale: - title: "gränssnittsspråk" + title: "Gränssnittsspråk" instructions: "Språket som används av forumsgränssnittet. Det kommer att ändras när du laddar om sidan." default: "(förvalt värde)" password_confirmation: @@ -458,39 +491,28 @@ sv: every_two_weeks: "varannan vecka" email_direct: "Sänd mig e-post när någon citerar mig, besvarar mitt inlägg, nämner mitt @användarnamn eller bjuder in mig till ett ämne." email_private_messages: "Sänd mig e-post när någon skickar mig ett meddelande" - email_always: "Ta emot notifieringar via mail även om jag är aktiv på forumet" other_settings: "Övrigt" categories_settings: "Kategorier" new_topic_duration: - label: "Betrakta trådar som nya när" + label: "Betrakta ämnen som nya när" not_viewed: "Jag har inte tittat dom än" last_here: "skapade sen mitt senaste besök" - after_n_days: - one: "skapad det senaste dygnet" - other: "skapad de senaste {{count}} dagarna" - after_n_weeks: - one: "skapad den senaste veckan" - other: "skapad de senaste {{count}} veckorna" - auto_track_topics: "Följ automatiskt nya trådar jag går in i" + after_1_day: "skapade de senaste dagarna" + after_2_days: "skapade de senaste 2 dagarna" + after_1_week: "skapade den senaste veckan" + auto_track_topics: "Följ automatiskt nya ämnen jag går in i" auto_track_options: never: "aldrig" immediately: "genast" - after_n_seconds: - one: "efter 1 sekund" - other: "efter {{count}} sekunder" - after_n_minutes: - one: "efter 1 minut" - other: "efter {{count}} minuter" invited: search: "sök efter inbjudningar..." title: "Inbjudningar" user: "Inbjuden Användare" - none: "Du har inte bjudit in någon här ännu." truncated: "Visar de första {{count}} inbjudningarna." redeemed: "Inlösta Inbjudnignar" redeemed_at: "Inlöst" pending: "Avvaktande Inbjudningar" - topics_entered: "Besökta trådar" + topics_entered: "Besökta ämnen" posts_read_count: "Inlägg Lästa" expired: "Denna inbjudan har gått ut." rescind: "Ta bort" @@ -522,6 +544,7 @@ sv: title: "IP-adress vid registrering" avatar: title: "Profil Bild" + header_title: "profil, meddelanden, bokmärken och inställningar" title: title: "Titel" filters: @@ -530,7 +553,7 @@ sv: posted_by: "Postat av" sent_by: "Skickat av" private_message: "meddelande" - the_topic: "tråden" + the_topic: "ämnet" loading: "Laddar..." errors: prev_page: "medan vi försökte ladda" @@ -576,7 +599,7 @@ sv: enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta." description: "Det finns {{count}} svar." description_time: "Det finns {{count}} svar med en uppskattad lästid på {{readingTime}} minuter." - enable: 'Sammanfatta denna tråd' + enable: 'Sammanfatta detta ämne' disable: 'Visa alla inlägg' deleted_filter: enabled_description: "Den här diskussionen innehåller borttagna inlägg som har dolts." @@ -649,13 +672,15 @@ sv: apple_international: "Apple/International" google: "Google" twitter: "Twitter" + emoji_one: "Emoji Ett" composer: + emoji: "Emoji :smile:" add_warning: "Det här är en officiell varning" - posting_not_on_topic: "Du svarar på tråden \"{{title}}\", men du besöker just nu en annan tråd." + posting_not_on_topic: "Vilket ämne vill du svara på?" saving_draft_tip: "sparar…" saved_draft_tip: "sparat" saved_local_draft_tip: "sparat lokalt" - similar_topics: "Din tråd liknar..." + similar_topics: "Ditt ämne liknar..." drafts_offline: "utkast offline" error: title_missing: "Du måste ange en rubrik" @@ -666,7 +691,7 @@ sv: try_like: 'Har du provat -knappen?' category_missing: "Du måste välja en kategori" save_edit: "Spara Ändring" - reply_original: "Svara på Ursprungstråd" + reply_original: "Svara på ursprungsämnet" reply_here: "Svara Här" reply: "Svara" cancel: "Avbryt" @@ -677,7 +702,6 @@ sv: title_placeholder: "Vad handlar denna diskussion om i en kort mening?" edit_reason_placeholder: "varför redigerar du?" show_edit_reason: "(lägg till anledningar för redigering)" - reply_placeholder: "Skriv här. Använd Markdown, BBCode eller HTML för formatering. Dra och släpp en bild här för att ladda upp den." view_new_post: "Visa ditt nya inlägg." saving: "Sparar..." saved: "Sparat!" @@ -710,11 +734,11 @@ sv: redo_title: "Återställ" help: "Markdown Redigeringshjälp" toggler: "Dölj eller visa composer-panelen" - admin_options_title: "Valfria personalinställningar för den här tråden" + admin_options_title: "Valfria personalinställningar för detta ämne" auto_close: - label: "Stäng automatiskt tråden efter:" + label: "Stäng automatiskt ämnet efter:" error: "Vänligen ange ett giltigt värde." - based_on_last_post: "Stäng inte förrän det sista inlägget i tråden är åtminstone så här gammalt." + based_on_last_post: "Stäng inte förrän det sista inlägget i ämnet är åtminstone så här gammalt." all: examples: 'Ange antalet timmar (24), klockslag (17:30) eller tidstämpel (2013-11-22 14:00).' limited: @@ -738,6 +762,13 @@ sv: moved_post: "

      {{username}} flyttade {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      Fötjänade '{{description}}'

      " + popup: + mentioned: '{{username}} nämnde dig i "{{topic}}" - {{site_title}}' + quoted: '{{username}} citerade dig i "{{topic}}" - {{site_title}}' + replied: '{{username}} svarade dig i "{{topic}}" - {{site_title}}' + posted: '{{username}} skrev i "{{topic}}" - {{site_title}}' + private_message: '{{username}} skickade dig ett privat meddelande i "{{topic}}" - {{site_title}}' + linked: '{{username}} länkade till ett inlägg du gjort från "{{topic}}" - {{site_title}}' upload_selector: title: "Lägg till en bild" title_with_attachments: "Lägg till en bild eller en fil" @@ -745,14 +776,12 @@ sv: from_the_web: "Från webben" remote_tip: "länk till bild" remote_tip_with_attachments: "länk till bild eller fil ({{authorized_extensions}})" - local_tip: "klicka för att välja en bild från din enhet." - local_tip_with_attachments: "klicka för att välja en bild eller fil från din enhet ({{authorized_extensions}})" hint: "(du kan också dra & släppa in i redigeraren för att ladda upp dem)" - hint_for_supported_browsers: "(du kan också dra och släppa eller klistra in bilder i redigeraren för att ladda upp dem)" uploading: "Laddar upp bild" + select_file: "Välj fil" image_link: "länk dit din bild ska peka" search: - title: "sök efter trådar, inlägg, användare, eller kategorier" + title: "sök efter ämnen, inlägg, användare, eller kategorier" no_results: "Inga resultat hittades." searching: "Söker ..." post_format: "#{{post_number}} av {{username}}" @@ -761,7 +790,6 @@ sv: category: "Sök i kategorin \"{{category}}\"" topic: "Sök i denna diskussion" private_messages: "Sök meddelanden" - site_map: "gå till en annan trådlista eller kategori" go_back: 'gå tillbaka' not_logged_in_user: 'användarsida med sammanställning av aktuell aktivitet och inställningar' current_user: 'gå till din användarsida' @@ -774,99 +802,102 @@ sv: dismiss_topics: "Avfärda Diskussioner" dismiss_topics_tooltip: "Sluta visa mig dessa diskussioner i min olästalista när nya inlägg har gjorts" dismiss_new: "Avfärda Nya" - toggle: "toggla val av multipla trådar" + toggle: "toggla val av multipla ämnen" actions: "Massändringar" change_category: "Ändra kategori" - close_topics: "Stäng trådar" - archive_topics: "Arkivera trådar" + close_topics: "Stäng ämnen" + archive_topics: "Arkivera ämnen" notification_level: "ändra notifieringsnivå" choose_new_category: "Välj den nya kategorin för ämnena:" selected: one: "Du har markerat 1 diskussion." other: "Du har markerat {{count}} diskussioner." none: - unread: "Du har inga olästa trådar att läsa." - new: "Du har inga nya trådar att läsa." - read: "Du har inte läst några trådar än." - posted: "Du har inte postat i några trådar än." - latest: "Det finns inga senaste trådar. Det är lite sorgligt." - hot: "Det finns inga heta trådar." + unread: "Du har inga olästa ämnen." + new: "Du har inga nya ämnen." + read: "Du har inte läst några ämnen ännu." + posted: "Du har inte postat i några ämnen ännu." + latest: "Det finns inga senaste ämnen, tråkigt nog." + hot: "Det finns inga heta ämnen." bookmarks: "Du har inga bokmärkta ämnen ännu." - category: "Det finns inga {{category}}-trådar." - top: "Det finns inga topptrådar." + category: "Det finns inga ämnen i {{category}}." + top: "Det finns inga toppämnen." search: "Inga sökresultat hittades." educate: - new: '

      Dina nya trådar hamnar här.

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

      Du kan ändra detta i dina inställningar.

      ' - unread: '

      Dina olästa trådar hamnar här

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

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

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

      Du kan ändra detta i dina inställningar.

      ' + new: '

      Dina nya ämnen hamnar här.

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

      Du kan ändra detta i dina inställningar.

      ' + unread: '

      Dina olästa ämnen hamnar här

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

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

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

      Du kan ändra detta i dina inställningar.

      ' bottom: - latest: "Det finns inga fler senaste trådar att läsa." - hot: "Det finns inga fler heta trådar att läsa." - posted: "Det finns inga fler postade trådar att läsa" - read: "Det finns inga fler lästa trådar att läsa." - new: "Det finns inga fler nya trådar att läsa." - unread: "Det finns inga fler oläsa trådar att läsa." - category: "Det finns inga fler {{category}}-trådar." - top: "Det finns inga fler topptrådar." + latest: "Det finns inga fler senaste ämnen." + hot: "Det finns inga fler heta ämnen." + posted: "Det finns inga fler postade ämnen." + read: "Det finns inga fler lästa ämnen." + new: "Det finns inga fler nya ämnen." + unread: "Det finns inga fler olästa ämnen." + category: "Det finns inga fler ämnen i {{category}}." + top: "Det finns inga fler toppämnen." bookmarks: "Inga fler bokmärkta ämnen hittades." search: "Inga fler sökresultat hittades." topic: - filter_to: "{{post_count}} inlägg i tråd" - create: 'Ny tråd' - create_long: 'Skapa en ny tråd' - list: 'Trådar' - new: 'ny tråd' + filter_to: "{{post_count}} inlägg i ämne" + create: 'Nytt ämne' + create_long: 'Skapa ett nytt ämne' + private_message: 'Skriv meddelande' + list: 'Ämnen' + new: 'nytt ämne' unread: 'oläst' new_topics: - one: '1 ny tråd' - other: '{{count}} nya trådar' + one: '1 nytt ämne' + other: '{{count}} nya ämnen' unread_topics: - one: '1 oläst tråd' - other: '{{count}} olästa trådar' - title: 'Tråd' + one: '1 oläst ämne' + other: '{{count}} olästa ämnen' + title: 'Ämne' invalid_access: - title: "Tråden är privat" - description: "Tyvärr, du har inte behörighet till den tråden." + title: "Ämnet är privat" + description: "Tyvärr, du har inte behörighet till det ämnet!" login_required: "Du måste logga in för att se den här diskussionen." server_error: - title: "Tråden misslyckades med att ladda" - description: "Tyvärr, vi kunde inte ladda den tråden, troligen p.g.a. ett anslutningsproblem. Var go försök igen. Om problemet kvarstår, låt oss gärna veta det!" + title: "Ämnet misslyckades med att ladda" + description: "Tyvärr, vi kunde inte ladda det ämnet, möjligtvis på grund av ett anslutningsproblem. Var god och försök igen. Om problemet kvarstår, hör av dig till oss." not_found: - title: "Tråden hittades inte" - description: "Tyvärr, vi kunde inte hitta den tråden. Kanske har den tagits bort av en moderator?" + title: "Ämnet hittades inte" + description: "Tyvärr, vi kunde inte hitta det ämnet. Kanske har den tagits bort av en moderator?" total_unread_posts: one: "du har 1 oläst inlägg i den här diskussionen" other: "du har {{count}} olästa inlägg i den här diskussionen" unread_posts: one: "du har 1 oläst gammalt inlägg i den här tråden" - other: "du har {{count}} olästa gamla inlägg i den här tråden" + other: "du har {{count}} olästa gamla inlägg i det här ämnet" new_posts: one: "det finns 1 nytt inlägg i den här tråden sedan du senast läste den" - other: "det finns {{count}} nya inlägg i den här tråden sedan du senast läste den" + other: "det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det" likes: one: "det finns 1 gillning i den här tråden" - other: "det finns {{count}} gillningar i den här tråden" - back_to_list: "Tillbaka till Trådlistan" - options: "Trådinställningar" - show_links: "visa länkar som finns i den här tråden" - toggle_information: "slå av/på tråddetaljer" - read_more_in_category: "Vill du läsa mer? Bläddra bland andra trådar i {{catLink}} eller {{latestLink}}." + other: "det finns {{count}} gillningar i det här ämnet" + back_to_list: "Tillbaka till ämneslistan" + options: "Ämnesinställningar" + show_links: "visa länkar som finns i det här ämnet" + toggle_information: "slå av/på ämnesdetaljer" + read_more_in_category: "Vill du läsa mer? Bläddra bland andra ämnen i {{catLink}} eller {{latestLink}}." read_more: "Vill du läsa mer? {{catLink}} eller {{latestLink}}." + read_more_MF: "Det finns { UNREAD, plural, =0 {} one { 1 oläst } other { # olästa } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} 1 nytt ämne} other { {BOTH, select, true{och } false {} other{}} # nya ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}" browse_all_categories: Bläddra bland alla kategorier - view_latest_topics: se de senaste trådarna - suggest_create_topic: Varför inte skapa en tråd? + view_latest_topics: visa senaste ämnen + suggest_create_topic: Varför inte skapa ett ämne? jump_reply_up: hoppa till tidigare svar jump_reply_down: hoppa till senare svar - deleted: "Tråden har raderats" - auto_close_notice: "Den här tråden kommer att stängas automatiskt %{timeLeft}." + deleted: "Ämnet har raderats" + auto_close_notice: "Det här ämnet kommer att stängas automatiskt %{timeLeft}." auto_close_notice_based_on_last_post: "Ämnet stängs %{duration} efter sista svaret." auto_close_title: 'Stäng Inställningar automatiskt' auto_close_save: "Spara" - auto_close_remove: "Stäng inte den här tråden automatiskt" + auto_close_remove: "Stäng inte det här ämnet automatiskt" progress: - title: trådplacering + title: ämnesframsteg go_top: "toppen" go_bottom: "botten" go: "gå" + jump_bottom: "hoppa till sista inlägget" jump_bottom_with_number: "hoppa till inlägg %{post_number}" total: antal inlägg current: nuvarande inlägg @@ -874,62 +905,96 @@ sv: notifications: reasons: '3_6': 'Du kommer att få notifikationer eftersom du bevakar denna kategori.' - '3_5': 'Du kommer att få notifikationer eftersom du började följa den här tråden automatiskt.' - '3_2': 'Du kommer ta emot notifikationer för att du kollar in denna tråd.' - '3_1': 'Du kommer ta emot notifikationer för att du skapade denna tråd.' - '3': 'Du kommer ta emot notifikationer för att du kollar in denna tråd.' + '3_5': 'Du kommer att ta emot notifikationer eftersom du började följa det här ämnet automatiskt.' + '3_2': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.' + '3_1': 'Du kommer ta emot notifikationer för att du skapade detta ämne.' + '3': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.' '2_8': 'Du kommer att få notifikationer eftersom du följer denna kategori.' - '2_4': 'Du kommer ta emot notifikationer för att du postade ett svar till denna tråd.' - '2_2': 'Du kommer ta emot notifikationer för att du följer denna tråd.' - '2': 'Du kommer ta emot notifikationer för att du läser denna tråd.' - '1_2': 'Du kommer att få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' - '1': 'Du kommer att få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' + '2_4': 'Du kommer att ta emot notifikationer för att du postade ett svar till detta ämne.' + '2_2': 'Du kommer att ta emot notifikationer för att du följer detta ämne.' + '2': 'Du kommer att ta emot notifikationer för att du läser detta ämne.' + '1_2': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' + '1': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' '0_7': 'Du ignorerar alla notifikationer i den här kategorin.' - '0_2': 'Du ignorerar alla notifikationer för denna tråd.' - '0': 'Du ignorerar alla notifikationer för denna tråd.' + '0_2': 'Du ignorerar alla notifikationer för detta ämne.' + '0': 'Du ignorerar alla notifikationer för detta ämne.' watching_pm: title: "följda" + description: "Du kommer att få en notifiering för varje nytt svar i detta meddelande, samt en räknare med antalet nya svar." watching: title: "Kollar" - description: "Du kommer att notifieras om varje nytt inlägg i det här ämnet. En räknare över olästa och nya inlägg kommer också att visas brevid ämnet." + description: "Du kommer att notifieras om varje nytt svar i detta ämne, och ett räknare över nya svar visas." tracking_pm: title: "bevakade" + description: "En räknare över antal nya svar visas för detta meddelande. Du notifieras om någon nämner ditt @namn eller svarar dig." tracking: title: "Följer" - description: "En räknare över olästa och nya inlägg kommer att visas brevid ämnet. Du kommer att notifieras om någon nämner ditt @namn eller svarar på ditt inlägg." + description: "En räknare över antal nya svar visas för detta ämne. Du notifieras om någon nämner ditt @namn eller svarar dig." regular: - title: "Vanlig" - description: "Du kommer att notifieras om någon nämner ditt @namn eller svarar på ditt inlägg." + description: "Du kommer att få en notifiering om någon nämner ditt @namn eller svarar dig." regular_pm: - title: "Vanlig(t)" + description: "Du kommer att notifieras om någon nämner ditt @namn eller svarar dig." muted_pm: title: "tystade" + description: "Du kommer aldrig bli notifierad om något gällande detta meddelande." muted: title: "Dämpad" - description: "Du kommer aldrig meddelas om denna tråd alls, och den kommer inte visas i din flik med olästa." + description: "Du kommer aldrig meddelas om detta ämne alls, och den kommer inte visas i din \"oläst\"-flik." actions: - recover: "Återställ tråd" - delete: "Radera Tråd" - open: "Öppna Tråd" - close: "Stäng Tråd" - unarchive: "Dearkivera Tråd" - archive: "Arkivera Tråd" + recover: "Återställ ämne" + delete: "Radera ämne" + open: "Öppna ämne" + close: "Stäng ämne" + multi_select: "Välj inlägg..." + auto_close: "Stäng automatiskt..." + pin: "Klistra ämne..." + unpin: "Avklistra ämne..." + unarchive: "Dearkivera ämne" + archive: "Arkivera ämne" invisible: "Markera Olistad" visible: "Markera Listad" reset_read: "Återställ Läsdata" + feature: + pin: "Klistra ämne" + unpin: "Avklistra ämne" + pin_globally: "Klistra ämne globalt" + make_banner: "Gör ämne till banner" + remove_banner: "Ta bort banner som ämne" reply: title: 'Svara' - help: 'börja komponera ett svar till denna tråd' + help: 'börja komponera ett svar till detta ämne' clear_pin: title: "Ta bort nål" - help: "Ta bort den nålade statusen från denna tråd så den inte längre hamnar i toppen av din trådlista" + help: "Ta bort den klistrade statusen från detta ämne så den inte längre hamnar i toppen av din ämneslista" share: title: 'Dela' - help: 'dela en länk till denna tråd' + help: 'dela en länk till detta ämne' flag_topic: title: 'Flagga' - help: 'flagga privat denna tråd för uppmärksamhet eller skicka en privat notifiering om den' - success_message: 'Du flaggade framgångsrikt denna tråd.' + help: 'flagga privat detta ämne för uppmärksamhet eller skicka en privat notifiering om den' + success_message: 'Du flaggade framgångsrikt detta ämne.' + feature_topic: + title: "Gör till utvalt ämne" + confirm_pin: "Du har redan {{count}} klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne i denna kategori?" + unpin: "Ta bort detta ämne från toppen av kategorin {{categoryLink}}." + pin_note: "Användare kan avklistra ämnet individuellt för sig själva." + already_pinned: + zero: "Det finns inga klistrade ämnen i {{categoryLink}}." + one: "Klistrade ämnen i {{categoryLink}} just nu: 1." + other: "Klistrade ämnen i {{categoryLink}} just nu: {{count}}." + confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?" + unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor." + global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva." + already_pinned_globally: + zero: "Det finns inga globalt klistrade ämnen." + one: "Globalt klistrade ämnen just nu: 1." + other: "Globalt klistrade ämnen just nu: {{count}}." + make_banner: "Gör detta ämne till en banner som dyker upp i toppen av alla sidor." + remove_banner: "Ta bort bannern som dyker upp i toppen av alla sidor." + banner_note: "Användare kan avfärda bannern genom att stänga det. Endast ett ämne kan agera banner åt gången." + already_banner: + zero: "Inget ämne är banner." + one: "Det är förnärvarande ett ämne som banner." inviting: "Bjuder in..." automatically_add_to_groups_optional: "Denna inbjudan inkluderar även tillgång till dessa grupper: (valfritt, enbart för administratörer)" automatically_add_to_groups_required: "Denna inbjudan inkluderar även tillgång till dessa grupper: (Krävs, enbart för admninistörer)" @@ -937,13 +1002,24 @@ sv: email_or_username: "Den Inbjudnas E-post eller Användarnamn" email_or_username_placeholder: "e-postadress eller användarnamn" action: "Bjud In" + success: "Vi har bjudit in användaren att delta i detta meddelande." error: "Tyvärr det uppstod ett fel under inbjudandet av den användaren." group_name: "gruppnamn" invite_reply: title: 'Bjud in' + username_placeholder: "användarnamn" + action: 'Skicka inbjudan' + help: 'bjud in andra till detta ämne via e-post eller notifieringar' to_forum: "Vi skickar ett kort e-postmeddelande som tillåter din vän att omedelbart delta genom att klicka på en länk, ingen inloggning krävs." + sso_enabled: "Ange användarnamnet för personen du vill bjuda in till detta ämne." + to_topic_blank: "Ange användarnamnet eller e-postadressen för personen som du vill bjuda in till detta ämne." to_topic_email: "Du har angett en e-postadress. Vi skickar en inbjudan som ger din vän möjlighet att svara på detta ämne direkt." + to_topic_username: "Du har angett ett användarnamn. Vi skickar en notifiering med en länk som bjuder in de till detta ämne." + to_username: "Ange användarnamnet för personen du vill bjuda in. Vi skicka en notifiering med en länk som bjuder in de till detta ämne." email_placeholder: 'namn@exampel.se' + success_email: "Vi mailade ut en inbjudan till {{emailOrUsername}}. Vi meddelar dig när inbjudan lösts in. Kolla in inbjudningsfliken på din användarsida för att hålla koll på dina inbjudningar." + success_username: "Vi har bjudit in användaren att delta i detta ämne." + error: "Tyvärr, vi kunde inte bjuda in den personen. Personen kanske redan har blivit inbjuden? (Invites are rate limited)" login_reply: 'Logga in för att svara' filters: n_posts: @@ -951,20 +1027,20 @@ sv: other: "{{count}} inlägg" cancel: "Ta bort filter" split_topic: - title: "Flytta till nyn tråd" - action: "flytta till ny tråd" - topic_name: "Namn på ny tråd" - error: "Ett fel inträffade då inläggen skulle flyttas till den nya tråden." + title: "Flytta till nytt ämne" + action: "flytta till nytt ämne" + topic_name: "Nytt ämnesnamn" + error: "Ett fel inträffade då inläggen skulle flyttas till det nya ämnet." instructions: one: "Du är påväg att skapa en ny tråd och lägga inlägget du har valt i den." - other: "Du är påväg att skapa en ny tråd och lägga de {{count}} inlägg du har valt i den." + other: "Du är påväg att skapa en nytt ämne och lägga de {{count}} inlägg du har valt i den." merge_topic: - title: "Flytta till befintlig tråd" - action: "flytta till befintlig tråd" - error: "Ett fel inträffade då inlägg skulle flyttas till den tråden." + title: "Flytta till befintligt ämne" + action: "flytta till befintligt ämne" + error: "Ett fel inträffade då inlägg skulle flyttas till det ämnet." instructions: - one: "Välj vilken tråd du vill flytta det inlägget till." - other: "Välj vilken tråd du vill flytta de
      {{count}}       inläggen till." + one: "Välj vilket ämne du vill flytta det inlägget till." + other: "Välj vilket ämne du vill flytta de
      {{count}}       inläggen till." change_owner: title: "Ändra ägare av inlägg" action: "ändra ägare" @@ -987,14 +1063,12 @@ sv: one: Du har markerat 1 inlägg. other: Du har markerat {{count}} inlägg. post: - reply: "Svarar {{link}} {{replyAvatar}} {{username}}" - reply_topic: "Svar på {{link}}" quote_reply: "citatsvar" edit: "Redigerar {{link}} {{replyAvatar}} {{username}}" edit_reason: "Anledning:" post_number: "inlägg {{number}}" last_edited_on: "inlägg senast ändrat den" - reply_as_new_topic: "Svara i ny tråd" + reply_as_new_topic: "Svara som länkat ämne" continue_discussion: "Fortsätter diskussionen från {{postLink}}:" follow_quote: "gå till det citerade inlägget" show_full: "Via hela inlägget" @@ -1003,11 +1077,24 @@ sv: one: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om 1 timme om det inte flaggas)" other: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)" expand_collapse: "expandera/förminska" + gap: + one: "visa 1 dolt svar" + other: "visa {{count}} dolda svar" more_links: "{{count}} till..." unread: "Inlägget är oläst" has_replies: - one: "Svara" - other: "Svar" + one: "{{count}} svar" + other: "{{count}} svar" + has_likes: + one: "{{count}} gillning" + other: "{{count}} gillningar" + has_likes_title: + one: "1 person gillade detta inlägg" + other: "{{count}} personer gillade detta inlägg" + has_likes_title_you: + zero: "Du gillade detta inlägg" + one: "du och 1 annan person gillade detta inlägg" + other: "du och {{count}} andra personer gillade detta inlägg" errors: create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen." edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen." @@ -1015,6 +1102,7 @@ sv: attachment_too_large: "Tyvärr, filen du försöker ladda upp är för stor (maximal storlek är {{max_size_kb}} kb)." file_too_large: "Tyvärr, filen du försöker ladda upp är för stor (maximal filstorlek är {{max_size_kb}}kb)" too_many_uploads: "Tyvärr, du kan bara ladda upp en bild i taget." + too_many_dragged_and_dropped_files: "Tyvärr, du kan bara dra och släppa upp till 10 filer åt gången." upload_not_authorized: "Tyvärr, filen du försökte ladda upp är inte tillåten (tillåtna filtyper: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte ladda upp bilder." attachment_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte bifoga filer." @@ -1076,9 +1164,12 @@ sv: people: off_topic: "{{icons}} flaggade det här som off-topic" spam: "{{icons}} flaggade det här som spam" + spam_with_url: "{{icons}} flaggade detta som skräp" inappropriate: "{{icons}} flaggade det här som olämpligt" notify_moderators: "{{icons}} notifierade moderatorer" notify_moderators_with_url: "{{icons}} notifierade moderatorer" + notify_user: "{{icons}} skickade ett meddelande" + notify_user_with_url: "{{icons}} skickade ett meddelande" bookmark: "{{icons}} bokmärkte detta" like: "{{icons}} gillade detta" vote: "{{icons}} röstade för detta" @@ -1087,6 +1178,7 @@ sv: spam: "Du flaggade detta som spam" inappropriate: "Du flaggade detta som olämpligt" notify_moderators: "Du flaggade det för moderation." + notify_user: "Du skickade ett meddelande till denna användare" bookmark: "Du bokmärkte detta inlägg" like: "Du gillade detta" vote: "Du röstade för detta inlägg" @@ -1103,6 +1195,9 @@ sv: notify_moderators: one: "Du och 1 annan person har flaggat detta för moderation" other: "Du och {{count}} andra personer har flaggat detta för moderation" + notify_user: + one: "Du och 1 person till skickade ett meddelande till denna användare" + other: "Du och {{count}} andra personer skickade ett meddelande till denna användare" bookmark: one: "Du och 1 annan bokmärkte detta inlägg" other: "Du och {{count}} andra personer bokmärkte detta inlägg" @@ -1125,6 +1220,9 @@ sv: notify_moderators: one: "1 person flaggade detta för granskning" other: "{{count}} personer flaggade detta för granskning" + notify_user: + one: "1 person skickade ett meddelande till denna användare" + other: "{{count}} skickade ett meddelande till denna användare" bookmark: one: "1 person bokmärkte detta inlägg" other: "{{count}} personer bokmärkte detta inlägg" @@ -1150,6 +1248,7 @@ sv: last: "Senaste revisionen" hide: "Göm version" show: "Visa version" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Visa resultat med tillägg och borttagningar inline" @@ -1166,17 +1265,19 @@ sv: choose: 'Välj en kategori…' edit: 'ändra' edit_long: "Redigera" - view: 'Visa Trådar i Kategori' + view: 'Visa ämnen i kategori' general: 'Allmänt' settings: 'Inställningar' + topic_template: "Ämnesmall" delete: 'Radera Kategori' create: 'Ny Kategori' save: 'Spara kategori' + slug_placeholder: '(Valfritt) streckade ord för url' creation_error: Det uppstod ett fel när kategorin skulle skapas. save_error: Ett fel inträffade då kategorin skulle sparas. name: "Kategorinamn" description: "Beskrivning" - topic: "Kategoritråd" + topic: "kategoriämne" logo: "Kategori Logotypbild" background_image: "Kategori Bakgrundsbild" badge_colors: "Emblemsfärg" @@ -1188,11 +1289,11 @@ sv: delete_error: "Ett fel inträffade vid borttagning av kategorin." list: "Lista Kategorier" no_description: "Lägg till en beskrivning för den här kategorin." - change_in_category_topic: "besök kategorins tråd för att ändra beskrivning" + change_in_category_topic: "Redigera beskrivning" already_used: 'Den här färgen används redan av en annan kategori' security: "Säkerhet" images: "Bilder" - auto_close_label: "Stäng automatiskt tråden efter:" + auto_close_label: "Stäng automatiskt ämnet efter:" auto_close_units: "timmar" email_in: "Egenvald inkommande e-postadress:" email_in_allow_strangers: "Acceptera e-post från anonyma användare utan konton" @@ -1210,13 +1311,13 @@ sv: notifications: watching: title: "Bevakar" - description: "Du kommer automatiskt att bevaka alla nya ämnen i de här kategorierna. Du kommer att få notifieringar om alla nya inlägg och ämnen, och en räknare över olästa och nya inlägg kommer att visas brevid ämnen." + description: "Du kommer automatiskt bevaka alla nya ämnen i dessa kategorier. Du notifieras om alla nya inlägg och ämnen, och en räknare över antalet nya svar visas för dessa ämnen." tracking: title: "Följer" - description: "Du kommer automatiskt följa alla nya ämnen i de här kategorierna. En räknare över olästa och nya inlägg kommer att visas brevid ämnen." + description: "Du kommer automatiskt att följa alla nya ämnen i dessa kategorier. Antalet olästa inlägg kommer att synas för dessa ämnen." regular: title: "Vanlig" - description: "Du kommer att notifieras om någon nämner ditt @namn eller svarar på ditt inlägg." + description: "Du notifieras om någon nämner ditt @namn eller svarar på ditt inlägg." muted: title: "Tystad" description: "Du kommer inte att notifieras om något som rör nya ämnen i de här kategorierna, och de kommer inte att dyka upp i din olästa tabb." @@ -1225,8 +1326,9 @@ sv: private_reminder: 'flaggor är privata, endast synliga för funktionärer' action: 'Flagga Inlägg' take_action: "Åtgärda" + notify_action: 'Meddelande' delete_spammer: "Radera spammare" - delete_confirm: "Du håller på att radera %{posts} inlägg och %{topics} trådar från den här användaren, radera hans/hennes konto, blockera IP-adressen %{ip_address}, och lägga till email-adressen %{email} till en permanent blockeringslista. Är du säker på att den här användaren verkligen är en spammare?" + delete_confirm: "Du håller på att radera %{posts} inlägg och %{topics} ämnen från denna användare, radera hans/hennes konto, blockera IP-adressen %{ip_address}, och lägga till email-adressen %{email} till en permanent blockeringslista. Är du säker på att denna användare verkligen är en spammare?" yes_delete_spammer: "Ja, radera spammare" ip_address_missing: "(N/A)" hidden_email_address: "(gömd)" @@ -1245,9 +1347,12 @@ sv: left: "{{n}} kvar" flagging_topic: title: "Tack för att du hjälper oss hålla gemenskapen civiliserad!" - action: "Flagga tråd" + action: "Flagga ämne" + notify_action: "Meddelande" topic_map: - title: "Sammanfattning av tråd" + title: "Sammanfattning av ämne" + participants_title: "Flitiga skribenter" + links_title: "Populära länkar" links_shown: "visa alla {{totalLinks}} länkar..." clicks: one: "1 klick" @@ -1259,33 +1364,41 @@ sv: help: "Du bokmärkte nu detta ämnet." locked: help: "Det här ämnet är stängt; det går inte längre att svara på inlägg" + archived: + help: "Det här ämnet är arkiverat; det är fryst och kan inte ändras" unpinned: title: "Avklistrat" + help: "Detta ämne är oklistrat för dig. Det visas i vanlig ordning" pinned_globally: title: "Klistrat Globalt" help: "Det här ämnet är klistrat globalt; det kommer att visas högst upp i alla listor" pinned: title: "Klistrat" - archived: - help: "Det här ämnet är arkiverat; det är fryst och kan inte ändras" + help: "Detta ämne är klistrat för dig. Det visas i toppen av dess kategori" invisible: help: "Det här ämnet är olistat; det kommer inte visas i ämneslistorna och kan bara nås via en direktlänk" posts: "Inlägg" posts_lowercase: "inlägg" - posts_long: "{{number}} inlägg i den här tråden" + posts_long: "det finns {{number}} inlägg i detta ämne" + posts_likes_MF: | + Detta ämne har {count, plural, one {1 svar} other {# svar}} {ratio, select, + low {med ett högt förhållande mellan gilla och inlägg} + med {med ett väldigt högt förhållande mellan gilla och inlägg} + high {med ett extremt högt förhållande mellan gilla och inlägg} + other {}} original_post: "Originalinlägg" views: "Visningar" views_lowercase: one: "visning" other: "visningar" replies: "Svar" - views_long: "denna tråd har visats {{number}} gånger" + views_long: "detta ämne har visats {{number}} gånger" activity: "Aktivitet" likes: "Gillningar" likes_lowercase: one: "gillar" other: "gillar" - likes_long: "det finns {{number}} gillningar i den här tråden" + likes_long: "det finns {{number}} gillningar i detta ämne" users: "Användare" users_lowercase: one: "användare" @@ -1301,27 +1414,30 @@ sv: with_topics: "%{filter} ämnen" with_category: "%{filter} %{category} ämnen" latest: - title: "Senaste" - help: "Trådar med nya inlägg" + title: + zero: "Senaste" + one: "Senaste (1)" + other: "Senaste ({{count}})" + help: "ämnen med nya inlägg" hot: title: "Hett" - help: "ett urval av de hetaste trådarna" + help: "ett urval av de hetaste ämnena" read: title: "Lästa" - help: "trådar du har läst, i den ordningen du senast läste dem" + help: "ämnen du har läst, i den ordningen du senast läste dem" search: title: "Sök" help: "sök alla ämnen" categories: title: "Kategorier" title_in: "Kategori - {{categoryName}}" - help: "alla trådar grupperade efter kategori" + help: "alla ämnen grupperade efter kategori" unread: title: zero: "Olästa" one: "Olästa (1)" other: "Olästa ({{count}})" - help: "Trådar du tittar på eller följer med olästa inlägg" + help: "ämnen som du bevakar eller följer med olästa inlägg" lower_title_with_count: one: "1 oläst" other: "{{count}} olästa" @@ -1337,7 +1453,7 @@ sv: help: "ämnen skapade de senaste dagarna" posted: title: "Mina Inlägg" - help: "trådar som du har postat i" + help: "ämnen som du har postat i" bookmarks: title: "Bokmärken" help: "Ämnen du har bokmärkt" @@ -1346,15 +1462,26 @@ sv: zero: "{{categoryName}}" one: "{{categoryName}} (1)" other: "{{categoryName}} ({{count}})" - help: "senaste trådarna i {{categoryName}}-kategorin" + help: "senaste ämnena i kategorin {{categoryName}}" top: title: "Topp" help: "de mest aktiva ämnena det senaste året, månaden, veckan och dagen" - this_year: "I år" - this_month: "Den här månaden" - this_week: "Den här veckan" + all: + title: "All tid" + yearly: + title: "Årsvis" + monthly: + title: "Månadsvis" + weekly: + title: "Veckovis" + daily: + title: "Dagligen" + all_time: "All tid" + this_year: "År" + this_month: "Månad" + this_week: "Vecka" today: "Idag" - other_periods: "se fler topptrådar" + other_periods: "se toppen" browser_update: 'Tyvärr, din webbläsare är för gammal för att fungera på den här sidan. Vänligenuppgradera din webbläsare.' permission_types: full: "Skapa / svara / se" @@ -1387,6 +1514,7 @@ sv: blocked: 'Blockerad:' suspended: 'Avstängd:' private_messages_title: "Meddelanden" + mobile_title: "Mobil" space_free: "{{size}} ledigt" uploads: "uppladningar" backups: "säkerhetskopior" @@ -1434,13 +1562,13 @@ sv: delete_post_agree_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet" delete_flag_modal_title: "Ta bort och..." delete_spammer: "Radera spammare" - delete_spammer_title: "Radera användaren och alla hens inlägg och trådar." + delete_spammer_title: "Radera användaren och alla hans/hennes inlägg och ämnen." disagree_flag_unhide_post: "Håll inte med (avgöm inlägg)" disagree_flag_unhide_post_title: "Ta bort alla flaggor från detta inlägg och gör det synligt igen" disagree_flag: "Håll inte med" disagree_flag_title: "Neka den här flaggningen som ogiltig eller inkorrekt" clear_topic_flags: "Klar" - clear_topic_flags_title: "Tråden har undersökts och eventuella problem har lösts. Klicka på klar för att ta bort flaggorna." + clear_topic_flags_title: "Ämnet har undersökts och eventuella problem har lösts. Klicka på klar för att ta bort flaggorna." more: "(mer svar...)" dispositions: agreed: "Godkände" @@ -1453,7 +1581,7 @@ sv: error: "Någonting gick snett" reply_message: "Svara" no_results: "Det finns inga flaggor." - topic_flagged: "Denna tråd har blivit flaggad." + topic_flagged: "Detta ämne har blivit flaggad." visit_topic: "Besök ämnet för att vidta åtgärder" was_edited: "Inlägget redigerades efter den första flaggningen" previous_flags_count: "Det här inlägget har redan flaggats {{count}} gånger." @@ -1495,6 +1623,8 @@ sv: automatic: "Automatisk" automatic_membership_email_domains: "Användare som registrerar sig med en email där domänen liknar exact en av dom ovanstående domänerna kommer automatiskt att bli tillagd i den här gruppen:" automatic_membership_retroactive: "Avänd samma email domän regel för att lägga till nya avändare" + default_title: "Standardtitel för alla användare i denna grupp" + primary_group: "Automatiskt inställd som primär grupp" api: generate_master: "Generera API-huvudnyckel" none: "Det finns inga aktiva API-nycklar just nu." @@ -1581,6 +1711,8 @@ sv: screened_email: "Exportera hela e-postlistan i CSV-format." screened_ip: "Exportera hela IP-listan i CSV-format." screened_url: "Exportera hela URL-listan i CSV-format." + export_json: + button_text: "Exportera" invite: button_text: "Skicka inbjudningar" button_title: "Skicka inbjudan" @@ -1589,6 +1721,7 @@ sv: long_title: "Sidanpassningar" css: "CSS" header: "Sidhuvud" + top: "Toppen" footer: "Footer" head_tag: text: "" @@ -1607,6 +1740,8 @@ sv: save: "Spara" new: "Ny" new_style: "Ny Stil" + import: "Importera" + import_title: "Välj en fil eller klistra in text" delete: "Radera" delete_confirm: "Radera denna anpassning?" about: "Modifiera CSS stilmallar och HTML sidhuvuden på sidan. Lägg till en anpassning för att börja." @@ -1679,7 +1814,6 @@ sv: sent_test: "skickat!" delivery_method: "Leveransmetod" preview_digest: "Sammandrag" - preview_digest_desc: "Förhandsgrandska innehållet i sammanfattningen som veckovis skickas till inaktiva användare." refresh: "Uppdatera" format: "Format" html: "html" @@ -1703,7 +1837,7 @@ sv: last_match_at: "Senast matchad" match_count: "Träffar" ip_address: "IP" - topic_id: "Tråd ID" + topic_id: "Ämnes-ID" post_id: "Inlägg ID" delete: 'Radera' edit: 'Redigera' @@ -1740,7 +1874,7 @@ sv: grant_badge: "ge utmärkelse" revoke_badge: "upphäv utmärkelse" check_email: "kolla epost" - delete_topic: "ta bort tråd" + delete_topic: "ta bort ämne" delete_post: "ta bort inlägg" impersonate: "imitera" anonymize_user: "Anonymisera användare" @@ -1776,6 +1910,7 @@ sv: impersonate: title: "Imitera" help: "Använd det här verktyget för att imitera ett användarkonto för avlusningssyften. Du kommer behöva logga ut när du är klar." + not_found: "Användaren kan ej hittas." users: title: 'Användare' create: 'Lägg till Administratör' @@ -1833,7 +1968,7 @@ sv: suspend_reason: "Anledning" suspended_by: "Avstängd av" delete_all_posts: "Radera alla inlägg" - delete_all_posts_confirm: "Du är påväg att radera %{posts} inlägg och %{topics} trådar. Är du säker?" + delete_all_posts_confirm: "Du är påväg att radera %{posts} inlägg och %{topics} ämnen. Är du säker?" suspend: "Stäng av användare" unsuspend: "Lås upp användare" suspended: "Avstängd?" @@ -1861,10 +1996,10 @@ sv: activity: Aktivitet like_count: Gillningar Gedda / Mottagna last_100_days: 'de senaste 100 dagarna' - private_topics_count: Antal Privata Trådar + private_topics_count: Privata ämnen posts_read_count: Inlägg Lästa post_count: Inlägg Skapade - topics_entered: Besökta trådar + topics_entered: Besökta ämnen flags_given_count: Givna Flaggnignar flags_received_count: Mottagna Flaggningar warnings_received_count: Varningar Mottagningar @@ -1906,11 +2041,15 @@ sv: block_failed: 'Ett problem uppstod då användaren skulle blockeras.' deactivate_explanation: "En avaktiverad användare måste bekräfta sin emailadress igen." suspended_explanation: "En avstängd användare kan inte logga in." - block_explanation: "En blockerad användare kan inte posta inlägg eller starta trådar." + block_explanation: "En blockerad användare kan inte posta inlägg eller starta ämnen." trust_level_change_failed: "Ett problem uppstod då användarens förtroendenivå skulle ändras." suspend_modal_title: "Stäng av användare" trust_level_2_users: "Användare med Förtroendenivå 2" trust_level_3_requirements: "Krav för Förtroendenivå 3" + trust_level_locked_tip: "förtroendenivå är låst, systemet kommer ej att befordra eller degradera användare" + trust_level_unlocked_tip: "förtroendenivå är olåst, systemet kan komma att befordra eller degradera användare" + lock_trust_level: "Lås förtroendenivå" + unlock_trust_level: "Lås upp förtroendenivå" tl3_requirements: title: "Krav för Förtroendenivå 3" table_title: "Under de senaste 100 dagarna:" @@ -1918,7 +2057,7 @@ sv: requirement_heading: "krav" visits: "besök" days: "dagar" - topics_replied_to: "Trådar svarade på" + topics_replied_to: "Ämnen svarade på" topics_viewed: "Besökta Ämnen" topics_viewed_all_time: "Besökta Ämnen (totalt)" posts_read: "Lästa Inlägg" @@ -1929,15 +2068,26 @@ sv: likes_received: "Mottagna Gillningar" likes_received_days: "Mottagna Gillningar: unika dagar" likes_received_users: "Mottagna Gillningar: unika användare" + qualifies: "Kvalificerad för förtroendenivå 3." + does_not_qualify: "Ej kvalificerad för förtroendenivå 3." + will_be_promoted: "Blir befordrad snart." + will_be_demoted: "Blir degraderad snart." + locked_will_not_be_promoted: "Förtroendenivå låst. Kommer aldrig bli befordrad." + locked_will_not_be_demoted: "Förtroendenivå låst. Kommer aldrig degraderas." sso: external_id: "Externt ID" external_username: "Användarnamn" external_name: "Namn" external_email: "Epost" + external_avatar_url: "URL till profilbild" user_fields: title: "Användarfält" + help: "Lägg till fält som dina användare kan fylla i." create: "Skapa ett användarfält" untitled: "Namnlös" + name: "Fältnamn" + type: "Fälttyp" + description: "Fältbeskrivning" save: "Spara" edit: "Redigera" delete: "Ta bort" @@ -1947,12 +2097,29 @@ sv: title: "Krävs vid registrering?" enabled: "krävs" disabled: "krävs ej" + editable: + title: "Redigerbar efter registrering?" + enabled: "redigerbar" + disabled: "ej redigerbar" + show_on_profile: + title: "Visa på offentlig profil?" + enabled: "visas på profil" + disabled: "visas ej på profil" + field_types: + text: 'Textfält' + confirm: 'Bekräftelse' + site_text: + none: "Välj typ av innehåll för att börja redigera." + title: 'Textinnehåll' site_settings: show_overriden: 'Visa bara överskrivna' title: 'Webbplatsinställningar' + reset: 'återställ' none: 'inget' no_results: "Inga resultat hittades." clear_filter: "Rensa" + add_url: "lägg till URL" + add_host: "lägg till värd" categories: all_results: 'Alla' required: 'Krävs' @@ -1968,6 +2135,9 @@ sv: rate_limits: 'Begränsningar' developer: 'Utvecklare' embedding: "Inbäddning" + uncategorized: 'Övrigt' + backups: "Säkerhetskopior" + login: "Inloggning" plugins: "Tillägg" badges: title: Utmärkelser @@ -1975,17 +2145,21 @@ sv: new: Ny name: Namn badge: Utmärkelse - description: beskrivning + display_name: Visa namn + description: Beskrivning badge_type: Utmärkelsetyp badge_grouping: Grupp badge_groupings: modal_title: Utmärkelsegrupper granted_by: Utfärdad av granted_at: Utfärdad vid - save: spara - delete: ta bort + reason_help: (En länk till ett inlägg eller ämne) + save: Spara + delete: Ta bort delete_confirm: Är du säker på att du vill ta bort den utmärkelsen? revoke: Upphäv + reason: Anledning + expand: Expandera … revoke_confirm: Är du säker på att du vill upphäva den utmärkelsen? edit_badges: Redigera utmärkelser grant_badge: Ge utmärkelse @@ -1993,44 +2167,121 @@ sv: grant: Utfärda no_user_badges: "%{name} har inte beviljats några utmärkelser." no_badges: Det finns inga utmärkelser som kan utfärdas. + none_selected: "Välj en utmärkelse för att komma igång" allow_title: Tillåt att utmärkelse används som titel multiple_grant: Kan utfärdas flera gånger listable: Visa utmärkelse på den offentliga utmärkelsesidan enabled: Aktivera utmärkelse icon: Ikon image: Bild + icon_help: "Använd antingen en Font Awesome-klass eller en URL till en bild" + trigger: Trigger + trigger_type: + none: "Uppdatera dagligen" + post_revision: "När en användare redigerar eller skapar ett inlägg" + trust_level_change: "När en användare byter förtroendenivå" + user_change: "När en användare redigeras eller skapas" + preview: + link_text: "Förhandsvisa utfärdade utmärkelser" + bad_count_warning: + header: "VARNING!" + grant_count: + zero: "Inga utmärkelser som ska tilldelas." + one: "1 utmärkelse som ska tilldelas." + other: "%{count} utmärkelser som ska tilldelas." + sample: "Exempel:" + grant: + with: %{username} + with_post: %{username} för inlägg i %{link} + with_post_time: %{username} för inlägg i %{link} vid kl. %{time} + with_time: %{username} vid kl. %{time} + emoji: + title: "Emoji" + help: "Lägg till en ny emoji för andra att använda. (TIPS: dra och släpp flera filer på en och samma gång)" + add: "Lägg till ny emoji" + name: "Namn" + image: "Bild" + delete_confirm: "Är du säker på att du vill radera emoji-ikonen :%{name}:?" lightbox: download: "ladda ned" + search_help: + title: 'Sökhjälp' keyboard_shortcuts_help: title: 'Snabbkommandon' jump_to: title: 'Hoppa till' + home: 'g, h Hem' + latest: 'g, l Senaste' + new: 'g, n Ny' + unread: 'g, u Olästa' + categories: 'g, c Kategorier' + top: 'g, t Upp till toppen' + bookmarks: 'g, b Bokmärken' navigation: title: 'Navigering' + jump: '# Gå till inlägg #' back: 'Tillbaka' - open: 'ö eller Välj Öppna vald tråd' + up_down: 'k/j Flytta markering ↑ ↓' + open: 'ö eller Välj Öppna valt ämne' + next_prev: 'shift+j/shift+k Nästa/föregående avsnitt' application: - create: 's Skapa en ny tråd' + create: 's Skapa ett nytt ämne' notifications: 'n Öppna notifikationer' + user_profile_menu: 'p Öppna användarmeny' + show_incoming_updated_topics: '. Visa uppdaterade ämnen' search: 'Sök' help: '? Öppna tangentbordshjälp' + dismiss_new_posts: 'x, r Avfärda nya/inlägg' + dismiss_topics: 'x, t Avfärda ämnen' actions: + title: 'Åtgärder' + pin_unpin_topic: 'shift+p Klistra/oklistra ämne' + share_topic: 'shift+s Dela ämne' + share_post: 's Dela inlägg' reply_as_new_topic: 't Svara med länkat ämne' reply_topic: 'shift+r Svara på ämne' reply_post: 'r Svara på inlägg' + quote_post: 'q Citera inlägg' like: 'Gilla inlägg' - flag: '! flagga inlägg' - bookmark: 'b bokmärk inlägg' - edit: 'e redigera inlägg' - delete: 'd radera inlägg' + flag: '! Flagga inlägg' + bookmark: 'b Bokmärk inlägg' + edit: 'e Redigera inlägg' + delete: 'd Radera inlägg' + mark_muted: 'm, m Tysta ämne' + mark_regular: 'm, r Vanligt (standard) ämne' mark_tracking: 'm, t Följd diskussion' + mark_watching: 'm, w Bevaka ämne' badges: title: Utmärkelser + allow_title: "kan användas som titel" + multiple_grant: "kan tilldelas flera gånger" + badge_count: + one: "1 Utmärkelse" + other: "%{count} Utmärkelser" + more_badges: + one: "+1 till" + other: "+%{count} till" + granted: + one: "1 utfärdad" + other: "%{count} utfärdade" + select_badge_for_title: Välj en utmärkelse som används som din titel + none: "" + badge_grouping: + getting_started: + name: Komma igång + trust_level: + name: Förtroendenivå + other: + name: Övrigt + posting: + name: Inlägg badge: basic_user: name: Grundläggande member: name: Medlem + regular: + name: Vanligt leader: name: Ledare welcome: @@ -2052,14 +2303,14 @@ sv: name: Fantastiskt inlägg description: Fick 50 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger. nice_topic: - name: Bra tråd - description: Fick 10 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Bra ämne + description: Fick 10 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. good_topic: - name: Jättebra tråd - description: Fick 25 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Jättebra ämne + description: Fick 25 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. great_topic: - name: Fantastisk tråd - description: Fick 50 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Fantastiskt ämne + description: Fick 50 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. nice_share: name: Bra delning description: Delade ett inlägg med 25 unika besökare @@ -2075,12 +2326,14 @@ sv: first_flag: name: Första flaggning description: Flaggade ett inlägg + promoter: + description: Bjöd in en användare first_share: name: Första delning description: Delade ett inlägg first_link: name: Första länk - description: Länkade internt till en annan tråd + description: Länkade internt till ett annat ämne first_quote: name: Första citation description: Citerade en användare @@ -2090,12 +2343,7 @@ sv: reader: name: Läsare description: Läs varje inlägg i en diskussion med över 100 inlägg - google_search: | -

      Sök med Google

      -

      - - - - - -

      + popular_link: + name: Populär länk + hot_link: + name: Het länk diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index bb715389fc..e9726bc6b3 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -105,7 +105,6 @@ te: admin_title: "అధికారి" flags_title: "కేతనాలు" show_more: "మరింత చూపు" - show_help: "సహాయం" links: "లంకెలు" links_lowercase: one: "లంకె" @@ -302,9 +301,7 @@ te: github_profile: "గిట్ హబ్" mailing_list_mode: "ప్రతి కొత్త టపాకూ నాకో ఈమెయిల్ పంపు (నేనా విషయాన్ని లేదా వర్గాన్ని నిశ్శబ్దించేంతవరకూ)" watched_categories: "ఒకకన్నేసారు" - watched_categories_instructions: "ఈ వర్గాలలోని అన్ని విషయాలపై మీరు ఒకకన్నేసారు. మీకు అన్ని కొత్త టపాలు మరియు విషయాలు గురించి ప్రకటన వస్తుంది. ఇంకా కొత్త టపాలు మరియు చదవని టపాల సంఖ్య విషయపు జాబితా పక్కన వస్తుంది" tracked_categories: "గమనించారు" - tracked_categories_instructions: "ఈ వర్గాలలోని అన్ని విషయాలూ మీరు గమనిస్తారు. చదవని మరియు కొత్త టపాల సంఖ్య విషయం పక్కన వస్తుంది." muted_categories: "నిశ్శబ్దం" muted_categories_instructions: "ఈ వర్గాలలోని ఏ కొత్త విషయాల గురించీ మీకు ప్రకటనలు రావు. ఇంకా అవి చదవని ట్యాబులో కనిపించవు." delete_account: "నా ఖాతా తొలగించు" @@ -408,33 +405,19 @@ te: every_three_days: "ప్రతి మూడు రోజులకీ" weekly: "ప్రతీవారం" every_two_weeks: "ప్రతి రెండు వారాలకీ" - email_always: "నేను ఈసైటుపై క్రియాశీలంగా ఉన్నా నాకు ఈమెయిల్ పంపుట ఆపవద్దు" other_settings: "ఇతర" categories_settings: "వర్గాలు" new_topic_duration: label: "విషయాలు కొత్తగా భావించు, ఎప్పుడంటే" not_viewed: "నేను వాటిని ఇంకా చూడనప్పుడు" last_here: "నేను చివరిసారి ఇక్కడికి వచ్చిన తర్వాత సృష్టించినవి" - after_n_days: - one: "గత ఒక రోజులో సృష్టించినవి" - other: "గత {{count}} రోజులలో సృష్టించినవి" - after_n_weeks: - one: "గత వారంలో సృష్టించినవి" - other: "గత {{count}} వారాలలో సృష్టించినవి " auto_track_topics: "నేను రాసే విషయాలు ఆటోమేటిగ్గా గమనించు" auto_track_options: never: "ఎప్పటికీ వద్దు" - after_n_seconds: - one: "ఒక సెకన్ తర్వాత" - other: "{{count}} సెకన్ల తర్వాత" - after_n_minutes: - one: "ఒక నిమిషం తర్వాత" - other: "{{count}} నిమిషాల తర్వాత " invited: search: "ఆహ్వానాలను వెతకడానికి రాయండి ... " title: "ఆహ్వానాలు" user: "ఆహ్వానించిన సభ్యుడు" - none: "మీరు ఇక్కడ ఇంకా ఎవరినీ ఆహ్వానించలేదు." truncated: "తొలి {{count}} ఆహ్వానాలను చూపుతున్నాము." redeemed: "మన్నించిన ఆహ్వానాలు" redeemed_at: "మన్నించిన" @@ -678,10 +661,7 @@ te: from_the_web: "జాలం నుండి" remote_tip: "బొమ్మకు లంకె" remote_tip_with_attachments: "బొమ్మకు లేదా దస్త్రానికి లంకె ({{authorized_extensions}})" - local_tip: "మీ పరికరం నుండి బొమ్మను ఎంచుకోటానికి ఇక్కడన నొక్కండి" - local_tip_with_attachments: "మీ పరికరం నుండి బొమ్మను లేదా దస్త్రాన్ని ఎంచుకోవటానికి ఇక్కడ నొక్కండి ({{authorized_extensions}})" hint: "(మీరు వాటిని ఎడిటరులోకి లాగి వదిలెయ్యటు ద్వారా కూడా ఎగుమతించవచ్చు)" - hint_for_supported_browsers: "(మీరు వాటిని ఎడిటరులోకి లాగి వదిలెయ్యటు ద్వారా కూడా ఎగుమతించవచ్చు)" uploading: "ఎగుమతవుతోంది" image_link: "మీ బొమ్మ చూపే లంకె" search: @@ -693,7 +673,6 @@ te: user: "@{{username}} యొక్క విషయాలు వెతుకు" category: "\"{{category}}\" వర్గంలో వెతుకు" topic: "ఈ విషయంలో వెతుకు" - site_map: "మరో విషయాల జాబితాకు లేదా వర్గానికి వెళ్లు" go_back: 'వెనక్కు మరలు' not_logged_in_user: 'సభ్యుని ప్రస్తుత కలాపాల మరియు అభిరూపాల సారాంశ పుట' current_user: 'మీ సభ్యపుటకు వెళ్లు' @@ -812,8 +791,6 @@ te: '2_4': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయానికి జవాబిచ్చారు.' '2_2': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని గమనిస్తున్నారు.' '2': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయాన్ని చదివారు.' - '1_2': 'ఎవరన్నా మీ టపాకు జవాబిచ్చినా లేదా @పేరు తో మిమ్ము ప్రస్తావించినా మీకు ప్రకటన వస్తుంది.' - '1': 'ఎవరన్నా మీ టపాకు జవాబిచ్చినా లేదా @పేరు తో మిమ్ము ప్రస్తావించినా మీకు ప్రకటన వస్తుంది.' '0_7': 'ఈ వర్గంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.' '0_2': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.' '0': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.' @@ -821,17 +798,10 @@ te: title: "కన్నేసారు" watching: title: "కన్నేసారు" - description: "ఈ విషయంలోని ప్రతి కొత్త టపాకు మీకు ప్రకటన వస్తుంది. ఇంకా చదవని మరియు కొత్త టపాల సంఖ్య విషయం పక్కన వస్తుంది." tracking_pm: title: "గమనిస్తున్నారు" tracking: title: "గమనిస్తున్నారు" - description: "ప్రైవేటు సందేశం పక్కన కొత్త మరియు చదవని టపాల సంఖ్య వస్తుంది. ఎవరన్నా మీకు జవాబిచ్చినా లేదా @మీ పేరు ప్రస్తావించినా మీకు ప్రకటన వస్తుంది. " - regular: - title: "రెగ్యులరు" - description: "ఎవరన్నా మీ @పేరు ప్రస్తావించినా లేదా జవాబిచ్చినా మీకు ప్రకటన వస్తుంది" - regular_pm: - title: "రెగ్యులరు" muted_pm: title: "నిశ్శబ్దం" muted: @@ -917,7 +887,6 @@ te: one: మీరు 1 టపా ఎంచుకున్నారు other: మీరు {{count}} టపాలు ఎంచుకున్నారు post: - reply_topic: " {{link}} కు జవాబివ్వు" quote_reply: "కోట్ జవాబు" edit_reason: "కారణం:" post_number: "టపా {{number}}" @@ -933,9 +902,6 @@ te: expand_collapse: "పెంచు/తుంచు" more_links: "{{count}} ఇంకా..." unread: "టపా చదవనిది" - has_replies: - one: "జవాబు" - other: "జవాబులు" errors: create: "క్షమించాలి. మీ టపా సృష్టించుటలో దోషం. దయచేసి మరలా ప్రయత్నించండి. " edit: "క్షమించాలి. మీ టపా సవరించుటలో దోషం. మరలా ప్రయత్నించండి" @@ -1142,13 +1108,10 @@ te: notifications: watching: title: "కన్నేసారు" - description: "మీరు స్వయంచాలకంగా ఈ వర్గాల లోని అన్ని విషయాలను చూడగలరు.మీకు అన్ని కొత్త టపాలు మరియు విషయాలు తెలియజేయబడతాయి,చదవని మరియు కొత్త టపాల లెక్క కలిపి విషయం ప్రక్కన కనిపిస్తుంది." tracking: title: "గమనిస్తున్నారు" - description: "ఈ వర్గాల లోని అన్ని విషయాలను మీరు స్వయంచాలకంగా కనిపెట్టగలరు.చదవని మరియు కొత్త టపాల సంఖ్య విషయం పక్కన కనిపిస్తుంది." regular: title: "రెగ్యులర్" - description: "ఎవరన్నా @మీపేరు ప్రస్తావిస్తే లేదా మీ టపాకు జవాబిస్తే మీకు ప్రకటన అందుతుంది." muted: title: "నిశ్శబ్దం" description: "ఈ వర్గాల్లో కొత్త విషయాల గురించి మీకు ప్రకటన రాదు. ఇంకా చదవి సంఖ్యలు కనిపించవు." @@ -1191,6 +1154,8 @@ te: help: "ఈ విషయానికి పేజీక ఉంచారు" locked: help: "ఈ విషయం ముగిసింది. కొత్త జవాబులు అంగీకరించదు. " + archived: + help: "ఈ విషయం కట్టకట్టబడింది. ఇది గడ్డకట్టుకుంది ఇహ మార్చయిత కాదు" unpinned: title: "అగ్గుచ్చిన" help: "ఈ విషయం మీకు అగ్గుచ్చబడింది. ఇది ఇహ క్రమ వరుసలోనే కనిపిస్తుంది" @@ -1200,8 +1165,6 @@ te: pinned: title: "గుచ్చారు" help: "ఈ విషయం మీకు గుచ్చబడింది. దాని వర్గంలో అది అగ్రభాగాన కనిపిస్తుంది." - archived: - help: "ఈ విషయం కట్టకట్టబడింది. ఇది గడ్డకట్టుకుంది ఇహ మార్చయిత కాదు" invisible: help: "ఈ విషయం జాబితాలనుండి తొలగించబడింది. ఇహ కేవలం నేరు లంకె ద్వారా మాత్రమే చూడగలరు." posts: "టపాలు" @@ -1226,7 +1189,6 @@ te: with_topics: "%{filter} విషయాలు" with_category: "%{filter} %{category} విషయాలు" latest: - title: "తాజా" help: "ఇటీవలి టపాలతోని విషయాలు" hot: title: "వేడివేడి" @@ -1272,11 +1234,7 @@ te: top: title: "అగ్ర" help: "గత సంవత్సరం, నెల, వారం లేదా రోజులోని అత్యంత క్రియాశీల విషయాలు" - this_year: "ఈ సంవత్సరం" - this_month: "ఈ నెల" - this_week: "ఈ వారం" today: "ఈ రోజు" - other_periods: "మరిన్ని అగ్ర విషయాలు చూడు" browser_update: 'దురదృష్టవశాత్తు, ఈ సైట్ లో పనిచేయడానికి మీ బ్రౌజర్ చాలా పాతది . దయచేసి మీ బ్రౌజర్ ని నవీకరించండి.' permission_types: full: "సృష్టించి / జవాబివ్వు / చూడు" @@ -1589,7 +1547,6 @@ te: sent_test: "పంపారు!" delivery_method: "డెలివరీ పద్దతి" preview_digest: "డైజెస్టు మునుజూపు" - preview_digest_desc: "క్రియారహిత వినియోగదారులకు పంపిన వార సారాంశ ఈ-మెయిల్ యొక్క విషయాన్ని ముందుగా చూడండి." refresh: "తాజాపరుచు" format: "రూపు" html: "హెచ్ టీయంయల్" @@ -1989,7 +1946,6 @@ te: title: 'అనువర్తనం' create: 'c కొత్త టపా సృష్టించు' notifications: 'n తెరచిన ప్రకటనలు' - site_map_menu: '= సైట్ మెనూ తెరువు' user_profile_menu: 'p యూజర్ మెనూ తెరువు' show_incoming_updated_topics: '. నవీకరించిన విషయాలను చూపించండి' search: '/ వెతుకు' @@ -2107,12 +2063,3 @@ te: reader: name: చదువరి description: 100 టపాల కన్నా ఎక్కువ ఉన్న అంశంలో ప్రతి టపా చదవండి - google_search: | -

      గూగుల్ తో వెతుకు

      -

      - - - - - -

      diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 534de90325..7089f54029 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -8,6 +8,9 @@ tr_TR: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,12 +21,17 @@ tr_TR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}b" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM, YYYY h:mm a" long_with_year_no_time: "D MMM, YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM, 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM, 'YY" @@ -66,6 +74,13 @@ tr_TR: other: "%{count} saat önce" x_days: other: "%{count} gün önce" + later: + x_days: + other: "%{count} gün sonra" + x_months: + other: "%{count} ay sonra" + x_years: + other: "%{count} yıl sonra" share: topic: 'bu konunun bağlantısını paylaşın' post: '#%{postNumber} nolu gönderiyi paylaşın' @@ -74,8 +89,27 @@ tr_TR: facebook: 'bu bağlantıyı Facebook''da paylaşın' google+: 'bu bağlantıyı Google+''da paylaşın' email: 'bu bağlantıyı e-posta ile gönderin' - topic_admin_menu: "konuyla alakalı admin aksiyonları" - emails_are_disabled: "Tüm giden e-postalar admin tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi yollanmayacak." + action_codes: + autoclosed: + enabled: '%{when} kapatıldı' + disabled: '%{when} açıldı' + closed: + enabled: '%{when} kapatıldı' + disabled: '%{when} açıldı' + archived: + enabled: '%{when} arşivlendi' + disabled: '%{when} arşivden çıkarıldı' + pinned: + enabled: '%{when} sabitlendi' + disabled: '%{when} sabitlikten çıkarıldı' + pinned_globally: + enabled: '%{when} genel olarak sabitlendi' + disabled: '%{when} genel olarak sabitleme kaldırıldı' + visible: + enabled: '%{when} listelendi' + disabled: '%{when} listelenmedi' + topic_admin_menu: "konuyla alakalı yönetici işlemleri" + 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." edit: 'bu konunun başlığını ve kategorisini düzenleyin' not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!" no_value: "Hayır" @@ -86,22 +120,22 @@ tr_TR: log_in: "Giriş Yap" age: "Yaş" joined: "Katıldı" - admin_title: "Admin" + admin_title: "Yönetici" flags_title: "Bayraklar" show_more: "devamını göster" - show_help: "yardım" + show_help: "seçenekler" links: "Bağlantılar" links_lowercase: other: "bağlantılar" - faq: "SSS/Yönergeler" + faq: "Sıkça Sorulan Sorular" guidelines: "Yönergeler" - privacy_policy: "Gizlilik İlkeleri" - privacy: "Gizlilik İlkeleri" - terms_of_service: "Üyelik Sözleşmesi" - mobile_view: "Mobil Görüntüleme" - desktop_view: "Masaüstü Görüntüleme" + privacy_policy: "Gizlilik Sözleşmesi" + privacy: "Gizlilik" + terms_of_service: "Kullanım Koşulları" + mobile_view: "Mobil Görünüm" + desktop_view: "Masaüstü Görünüm" you: "Siz" - or: "veya" + or: "ya da" now: "hemen şimdi" read_more: 'devamını oku' more: "Daha fazla" @@ -112,6 +146,7 @@ tr_TR: every_two_weeks: "her iki haftada bir" every_three_days: "her üç günde bir" max_of_count: "azami {{count}}" + alternation: "ya da" character_count: other: "{{count}} karakter" suggested_topics: @@ -120,60 +155,61 @@ tr_TR: simple_title: "Hakkında" title: "%{title} Hakkında" stats: "Site İstatistikleri" - our_admins: "Adminlerimiz" + our_admins: "Yöneticilerimiz" our_moderators: "Moderatörlerimiz" stat: all_time: "Tüm Zamanlar" - last_7_days: "Son 7 Gün" - last_30_days: "Son 30 Gün" - like_count: "Beğeniler" + last_7_days: "Son 7 gün" + last_30_days: "Son 30 gün" + like_count: "Beğeni" topic_count: "Konular" post_count: "Gönderiler" user_count: "Yeni Kullanıcılar" active_user_count: "Aktif Kullanıcılar" - contact: "İletişim" + contact: "Bize Ulaşın" contact_info: "Bu siteyi etkileyen kritik bir problem ya da acil bir durum oluştuğunda, lütfen %{contact_info} adresi üzerinden bizimle iletişime geçin." bookmarked: title: "İşaretle" - clear_bookmarks: "İşaretleri Temizle" + clear_bookmarks: "İşaretlenenleri Temizle" help: bookmark: "Bu konudaki ilk gönderiyi işaretlemek için tıklayın" unbookmark: "Bu konudaki bütün işaretleri kaldırmak için tıklayın" bookmarks: - not_logged_in: "üzgünüz, gönderileri işaretleyebilmek için giriş yapmanız gerekiyor" + not_logged_in: "üzgünüz, gönderileri işaretleyebilmeniz için oturum açmanız gerekiyor." created: "bu gönderiyi işaretlediniz" - not_bookmarked: "bu gönderiyi okudunuz; işaretlemek için tıklayın" - last_read: "bu okuduğunuz son gönderi; işaretlemek için tıklayın" + not_bookmarked: "bu gönderiyi okudunuz; yer imlerinize eklemek için tıklayın" + last_read: "bu okuduğunuz son gönderi; yer imlerinize eklemek için tıklayın" remove: "İşareti Kaldır" confirm_clear: "Bu konuya ait tüm işaretleri kaldırmak istediğinize emin misiniz?" topic_count_latest: - other: "{{count}} yeni ya da güncellenmiş konular." + other: "{{count}} yeni ya da güncellenmiş konu." topic_count_unread: - other: "{{count}} okunmamış konular." + other: "{{count}} okunmamış konu." topic_count_new: - other: "{{count}} yeni konular." + other: "{{count}} yeni konu." click_to_show: "Görüntülemek için tıklayın." preview: "önizleme" - cancel: "iptal" + cancel: "İptal" save: "Değişiklikleri Kaydet" saving: "Kaydediliyor..." saved: "Kaydedildi!" upload: "Yükle" uploading: "Yükleniyor..." + uploading_filename: "{{filemame}} yükleniyor..." uploaded: "Yüklendi!" enable: "Etkinleştir" - disable: "Devre Dışı Bırak" + disable: "Devredışı Bırak" undo: "Geri Al" revert: "Eski Haline Getir" - failed: "Başarısız Oldu" - switch_to_anon: "Anonim Modu" - switch_from_anon: "Anonim Modundan Çıkın" + failed: "Başarısız oldu" + switch_to_anon: "Anonim Ol" banner: close: "Bu manşeti yoksay." + edit: "Bu manşeti düzenle >>" choose_topic: none_found: "Hiç bir konu bulunamadı." title: - search: "İsim, url ya da id ile Başlık arayın:" + search: "İsim, url ya da id ile başlık arayın:" placeholder: "konu başlığını buraya yazın" queue: topic: "Konu:" @@ -186,8 +222,7 @@ tr_TR: cancel: "İptal" view_pending: "bekleyen yazıları görüntüleyin" has_pending_posts: - one: "Onay bekleyen 1 yazı var" - many: "Onay bekleyen {{count}} yazı var" + other: "Bu konuda {{count}} sayıda onay bekleyen gönderi var" confirm: "Düzenlemeleri Kaydet" delete_prompt: "%{username} kullanıcısını silmek istediğinize emin misiniz? Bu işlem kullanıcının tüm gönderilerini silecek, e-posta ve ip adresini engelleyecek." approval: @@ -195,7 +230,7 @@ tr_TR: description: "Gönderinizi aldık fakat gösterilmeden önce bir moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun." pending_posts: other: "Bekleyen {{count}} yazınız bulunmaktadır." - ok: "OK" + ok: "Tamam" user_action: user_posted_topic: "{{user}} konuyu açtı" you_posted_topic: "konuyu sen açtın" @@ -220,11 +255,11 @@ tr_TR: time_read: "Okuma Zamanı" topic_count: "Konular" topic_count_long: "Oluşturulan Konular" - post_count: "Cevaplar" + post_count: "Cevap" post_count_long: "Gönderilen Cevaplar" no_results: "Sonuç bulunamadı." days_visited: "Ziyaretler" - days_visited_long: "Ziyaret Günleri" + days_visited_long: "Ziyaret Günü" posts_read: "Okunmuşlar" posts_read_long: "Okunmuş Gönderiler" total_rows: @@ -238,17 +273,20 @@ tr_TR: alias_levels: title: "Kimler bu grubu ikinci adı olarak kullanabilir?" nobody: " Hiç Kimse" - only_admins: "Sadece adminler" - mods_and_admins: "Sadece moderatörler ve adminler" - members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Adminler" + only_admins: "Sadece Yöneticiler" + mods_and_admins: "Sadece Moderatörler ve Yöneticiler" + members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Yöneticiler" everyone: "Herkes" + trust_levels: + title: "Eklendiklerinde üyelere otomatik olarak güven seviyesi verilir:" + none: "Hiç" user_action_groups: '1': "Verilen Beğeniler" '2': "Alınan Beğeniler" '3': "İşaretlenenler" '4': "Konular" '5': "Cevaplar" - '6': "Cevaplar" + '6': "Yanıtlar" '7': "Bahsedenler" '9': "Alıntılar" '10': "Yıldızlılar" @@ -257,20 +295,28 @@ tr_TR: '13': "Gelen Kutusu" '14': "Bekleyen" categories: - all: "Bütün Kategoriler" + all: "Tüm Kategoriler" all_subcategories: "hepsi" no_subcategory: "hiçbiri" category: "Kategori" + reorder: + title: "Kategorileri Yeniden Sırala" + title_long: "Kategori listesini yeniden yapılandır" + fix_order: "Konumları Onar" + fix_order_tooltip: "Bütün kategoriler eşsiz bir konum numarasına sabit değil, bu beklenmedik sonuçlara neden olabilir." + save: "Sıralamayı Kaydet" + apply_all: "Uygula" + position: "Konum" posts: "Gönderiler" topics: "Konular" latest: "En Son" latest_by: "son gönderen" toggle_ordering: "sıralama kontrolünü aç/kapa" subcategories: "Alt kategoriler" - topic_stats: "Yeni konu sayısı" + topic_stats: "Yeni konuların sayısı." topic_stat_sentence: other: "%{unit} beri %{count} yeni konu." - post_stats: "Yeni gönderi sayısı" + post_stats: "Yeni gönderilerin sayısı." post_stat_sentence: other: "%{unit} beri %{count} yeni gönderi." ip_lookup: @@ -288,6 +334,8 @@ tr_TR: topics_entered: "açılan konular" post_count: "# gönderi" confirm_delete_other_accounts: "Bu hesapları silmek isteğinize emin misiniz?" + user_fields: + none: "(bir seçenek seçin)" user: said: "{{username}}:" profile: "Profil" @@ -298,12 +346,24 @@ tr_TR: private_message: "Mesaj" private_messages: "Mesajlar" activity_stream: "Aktivite" - preferences: "Ayarlar" + preferences: "Seçenekler" + expand_profile: "Genişlet" bookmarks: "İşaretlenenler" bio: "Hakkımda" invited_by: "Tarafından Davet Edildi" trust_level: "Güven Seviyesi" notifications: "Bildirimler" + desktop_notifications: + label: "Masaüstü Bildirimleri" + not_supported: "Bildirimler bu tarayıcıda desteklenmiyor. Üzgünüz." + perm_default: "Bildirimleri Etkinleştirin" + perm_denied_btn: "Erişim İzni Reddedildi" + perm_denied_expl: "Bildirimler için gerekli izne sahip değilsiniz. Bildirimleri etkinleştirmek için tarayıcınızı kullanın, işlem tamamlandığında tuşa basın. (Masaüstü: Adres çubuğunda en soldaki simge. Mobil: 'Site Bilgisi'.)" + disable: "Bildirimleri Devre Dışı Bırakın" + currently_enabled: "(şu anda etkin)" + enable: "Bildirimleri Etkinleştirin" + currently_disabled: "(şu anda devre dışı)" + each_browser_note: "Not: Bu ayarı kullandığınız her tarayıcıda değiştirmelisiniz." dismiss_notifications: "Hepsini okunmuş olarak işaretle" dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle" disable_jump_reply: "Cevapladıktan sonra gönderime atlama" @@ -313,15 +373,16 @@ tr_TR: enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir" change: "değiştir" moderator: "{{user}} bir moderatördür" - admin: "{{user}} bir admindir" + admin: "{{user}} bir yöneticidir" moderator_tooltip: "Bu kullanıcı bir moderatör" - admin_tooltip: "Bu kullanıcı bir admin." + admin_tooltip: "Bu kullanıcı bir yönetici." + blocked_tooltip: "Bu kullanıcı engellendi" suspended_notice: "Bu kullanıcı {{tarih}} tarihine kadar uzaklaştırıldı." suspended_reason: "Neden:" github_profile: "Github" mailing_list_mode: "(Konuyu veya kategoriyi susturmadığım takdirde) her yeni gönderi için bana bir e-posta yolla" watched_categories: "Gözlendi" - watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konu yanında belirecek. " + watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." tracked_categories: "Takip edildi" tracked_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." muted_categories: "Susturuldu" @@ -329,7 +390,7 @@ tr_TR: delete_account: "Hesabımı Sil" delete_account_confirm: "Hesabınızı kalıcı olarak silmek istediğinize emin misiniz? Bu işlemi geri alamazsınız!" deleted_yourself: "Hesabınız başarıyla silindi." - delete_yourself_not_allowed: "Hesabınızı şu an silemezsiniz. Hesabınızı silmesi için bir admin ile iletişime geçin." + delete_yourself_not_allowed: "Hesabınızı şu an silemezsiniz. Hesabınızı silmesi için bir yönetici ile iletişime geçin." unread_message_count: "Mesajlar" admin_delete: "Sil" users: "Kullanıcılar" @@ -349,7 +410,7 @@ tr_TR: success: "(e-posta gönderildi)" in_progress: "(e-posta yollanıyor)" error: "(hata)" - action: "Parola Sıfırlama E-postası Yolla" + action: "Parola Sıfırlama E-postası Gönder" set_password: "Parola Belirle" change_about: title: "Hakkımda'yı Değiştir" @@ -361,22 +422,22 @@ tr_TR: error: "Kullanıcı adınızı değiştirirken bir hata oluştu." invalid: "Bu kullanıcı adı geçersiz. Sadece sayı ve harf içermelidir." change_email: - title: "E-posta Adresinizi Değiştirin" - taken: "Üzgünüz, bu e-posta müsait değil." + title: "E-posta Adresini Değiştirin" + taken: "Üzgünüz, bu e-posta kullanılabilir değil." error: "E-posta adresinizi değiştirirken bir hata oluştu. Belki bu adres zaten kullanımdadır?" success: "Adresinize bir e-posta gönderdik. Lütfen onaylama talimatlarını uygulayınız." change_avatar: - title: "Profil resminizi değiştirin" + title: "Profil görselinizi değiştirin" gravatar: "Gravatar, baz alındı" - gravatar_title: "Avatarınızı Gravatar sitesinde değiştirin" - refresh_gravatar_title: "Avatarınızı Yenileyin" - letter_based: "Sistem tarafından verilen profil resmi" + gravatar_title: "Profil görselinizi Gravatar sitesinde değiştirin" + refresh_gravatar_title: "Profil görselinizi yenileyin" + letter_based: "Sistem tarafından verilen profil görseli" uploaded_avatar: "Özel resim" uploaded_avatar_empty: "Özel resim ekleyin" upload_title: "Resminizi yükleyin" upload_picture: "Resim Yükle" image_is_not_a_square: "Uyarı: resminizi kırptık; genişlik ve yükseklik eşit değildi." - cache_notice: "Avatarınızı başarıyla değiştirdiniz, fakat tarayıcınızın önbelleklemesinden ötürü gözükmesi biraz zaman alabilir." + cache_notice: "Profil resminizi başarıyla değiştirdiniz fakat tarayıcı önbelleklemesi nedeniyle görünür olması biraz zaman alabilir." change_profile_background: title: "Profil Arkaplanı" instructions: "Profil arkaplanları ortalanacak ve genişlikleri 850px olacak. " @@ -385,14 +446,14 @@ tr_TR: instructions: "Profil arkaplanları ortalanacak ve genişlikleri 590px olacak. " email: title: "E-posta" - instructions: "Kimseye gösterilmeyecek" + instructions: "Kimseye gösterilmeyecek." ok: "Onay için size e-posta atacağız" invalid: "Lütfen geçerli bir e-posta adresini giriniz" authenticated: "E-posta adresiniz {{provider}} tarafından doğrulanmıştır" frequency: zero: "Eğer yollamak üzere olduğumuz şeyi okumadıysanız size direk e-posta yollayacağız." - one: "Sadece sizi son bir dakika içinde görmediysek size e-posta yollayacağız." - other: "Sadece sizi son {{count}} dakika içerisinde görmediysek size e-posta yollayacağız." + one: "Sadece son bir dakika içinde sizi görmediysek e-posta yollayacağız." + other: "Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız." name: title: "İsim" instructions: "Tam adınız (zorunlu değil)" @@ -402,7 +463,7 @@ tr_TR: username: title: "Kullanıcı adı" instructions: "Özgün, boşluksuz ve kısa" - short_instructions: "Kişiler sizden @{{username}} olarak bahsedebilirler" + short_instructions: "Kullanıcılar sizden @{{username}} olarak bahsedebilirler." available: "Kullanıcı adınız müsait" global_match: "E-posta kayıtlı kullanıcı adıyla eşleşiyor" global_mismatch: "Zaten mevcut. {{suggestion}} deneyin?" @@ -420,9 +481,9 @@ tr_TR: title: "Tekrar Parola" last_posted: "Son Gönderi" last_emailed: "Son E-posta Atılan" - last_seen: "Görülmüş" + last_seen: "Son Görülme" created: "Katıldı" - log_out: "Çıkış Yap" + log_out: "Oturumu Kapat" location: "Yer" card_badge: title: "Kullanıcı Kartı Rozeti" @@ -436,34 +497,42 @@ tr_TR: every_two_weeks: "her iki haftada bir" email_direct: "Birisi gönderime cevap verdiğinde, benden alıntı yaptığında, @username şeklinde bahsettiğinde ya da beni bir konuya davet ettiğinde bana bir email at" email_private_messages: "Biri bana mesaj yazdığında bana bir email at" - email_always: "Sayfada etkin olduğum anlarda da e-posta bildirimleri yollamaya devam et" + email_always: "Sitede aktif olduğum sıralarda bile bana e-posta bildirimleri gönder" other_settings: "Diğer" categories_settings: "Kategoriler" new_topic_duration: 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_n_days: - other: "son {{count}} günde oluşturulanlar" - after_n_weeks: - other: "son {{count}} haftada oluşturulanlar" + after_1_day: "son 1 gün içinde oluşturuldu" + after_2_days: "son 2 gün içinde oluşturuldu" + after_1_week: "son 1 hafta içinde oluşturuldu" + after_2_weeks: "son 2 hafta içinde oluşturuldu" auto_track_topics: "Girdiğim konuları otomatik olarak takip et" auto_track_options: never: "asla" immediately: "hemen" - after_n_seconds: - other: "{{count}} saniye sonra" - after_n_minutes: - other: "{{count}} dakika sonra" + after_30_seconds: "30 saniye sonra" + after_1_minute: "1 dakika sonra" + after_2_minutes: "2 dakika sonra" + after_3_minutes: "3 dakika sonra" + after_4_minutes: "4 dakika sonra" + after_5_minutes: "5 dakika sonra" + after_10_minutes: "10 dakika sonra" invited: - search: "davetler arasında aramak için yazın..." + search: "davetiye aramak için yazın..." title: "Davetler" user: "Davet Edilen Kullanıcı" - none: "Henüz buraya kimseyi davet etmediniz." + sent: "Gönderildi" + none: "Bekleyen davet yok." truncated: "İlk {{count}} davetler gösteriliyor." redeemed: "Kabul Edilen Davetler" + redeemed_tab: "Kabul Edildi" + redeemed_tab_with_count: "İtfa edilmiş ({{count}})" redeemed_at: "Kabul Edildi" pending: "Bekleyen Davetler" + pending_tab: "Bekleyen" + pending_tab_with_count: "Beklemede ({{count}})" topics_entered: "Görüntülenmiş Konular" posts_read_count: "Okunmuş Yazılar" expired: "Bu davetin süresi doldu." @@ -475,6 +544,8 @@ tr_TR: days_visited: "Ziyaret Edilen Günler" account_age_days: "Gün içinde Hesap yaş" create: "Davet Yolla" + generate_link: "Davet bağlantısını kopyala" + generated_link_message: '

      Davet bağlantısı başarılı bir şekilde oluşturuldu!

      Davet bağlantısı sadece bu e-posta adresi için geçerlidir: %{invitedEmail}

      ' bulk_invite: none: "Henüz kimseyi buraya davet etmediniz. Tek tek davetiye gönderebilirsiniz, ya da toplu bir davetiye dosyası yükleyerek birçok kişiyi aynı anda davet edebilirsiniz. " text: "Dosyadan Toplu Davet Gönder" @@ -495,7 +566,8 @@ tr_TR: registration_ip_address: title: "Kayıt Anındaki IP Adresi" avatar: - title: "Profil Resmi" + title: "Profil Görseli" + header_title: "profil, mesajlar, işaretliler ve seçenekler" title: title: "Başlık" filters: @@ -524,13 +596,12 @@ tr_TR: again: "Tekrar Deneyin" fixed: "Sayfayı Yükle" close: "Kapat" - assets_changed_confirm: "Bu site yeni güncellendi. Son hali için sayfayı yenileyin?" - logout: "Oturumunuz kapatılmış." + assets_changed_confirm: "Bu site yeni versiyona güncellendi. Son hali için sayfayı yenilemek ister misiniz?" + logout: "Çıkış yapıldı." refresh: "Yenile" read_only_mode: enabled: "Salt-okunur modu etkin. Siteyi gezmeye devam edebilirsiniz fakat etkileşimler çalışmayabilir." - login_disabled: "Site salt-okunur modda iken giriş yapma devre dışı bırakılır ." - too_few_topics_notice: "Tartışmayı başlatmak için herkese açık en az 5 konu oluşturun ve %{posts} cevap yazın. Yeni kullanıcıların güven seviyelerini artırabilmeleri için okuyabilecekleri içerik olması gerekli. Bu mesaj sadece görevlilere görünür." + login_disabled: "Site salt-okunur modda iken oturum açma devre dışı bırakılır ." learn_more: "daha fazlasını öğren..." year: 'yıl' year_desc: 'son 365 günde oluşturulan konular' @@ -548,8 +619,8 @@ tr_TR: other: cevap summary: enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler" - description: "{{count}} sayıdacevap var." - description_time: "Tahmini okunma süresi {{readingTime}} minutes olan {{count}} sayıda cevap var." + description: "{{count}} sayıda cevap var." + description_time: "Tahmini okunma süresi {{readingTime}} dakika olan {{count}} sayıda cevap var." enable: 'Bu Konuyu Özetle.' disable: 'Tüm Gönderileri Göster' deleted_filter: @@ -563,7 +634,7 @@ tr_TR: remove_allowed_user: "Bu mesajlaşmadan {{name}} isimli kullanıcıyı çıkarmak istediğinize emin misiniz?" email: 'E-posta' username: 'Kullanıcı Adı' - last_seen: 'Görülmüş' + last_seen: 'Son Görülme' created: 'Oluşturuldu' created_lowercase: 'oluşturuldu' trust_level: 'Güven Seviyesi' @@ -589,17 +660,18 @@ tr_TR: email_placeholder: "e-posta veya kullanıcı adı" caps_lock_warning: "Caps Lock açık" error: "Bilinmeyen hata" + rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekleyin." blank_username_or_password: "Lütfen e-posta adresinizi ya da kullanıcı adınızı, ve parolanızı girin." reset_password: 'Parola Sıfırlama' - logging_in: "Giriş yapılıyor..." - or: "Veya" - authenticating: "Kimlik doğrulanıyor ..." + logging_in: "Oturum açılıyor..." + or: "ya da" + authenticating: "Kimliğiniz doğrulanıyor..." awaiting_confirmation: "Hesabınız etkinleştirilmemiş. Yeni bir etkinleştirme e-postası almak için parolamı unuttum bağlantısını kullanabilirsiniz. " awaiting_approval: "Hesabınız henüz bir görevli tarafından onaylanmadı. Onaylandığında e-posta ile haberdar edileceksiniz." requires_invite: "Üzgünüz, bu foruma sadece davetliler erişebilir." - not_activated: "Henüz giriş yapamazsınız. Hesabınızı etkinleştirmek için lütfen daha önceden {{sentTo}} adresine yollanan etkinleştirme e-postasındaki açıklamaları okuyun." - not_allowed_from_ip_address: "Bu IP adresiyle giriş yapamazsınız." - admin_not_allowed_from_ip_address: "Bu IP adresinden admin olarak giriş yapamazsınız." + not_activated: "Henüz oturum açamazsınız. Hesabınızı etkinleştirmek için lütfen daha önceden {{sentTo}} adresine yollanan etkinleştirme e-postasındaki açıklamaları okuyun." + not_allowed_from_ip_address: "Bu IP adresiyle oturum açamazsınız." + admin_not_allowed_from_ip_address: "Bu IP adresinden yönetici olarak oturum açamazsınız." resend_activation_email: "Etkinleştirme e-postasını tekrar yollamak için buraya tıklayın. " sent_activation_email_again: "{{currentEmail}} adresine yeni bir etkinleştirme e-postası yolladık. Bu e-postanın size ulaşması bir kaç dakika sürebilir; spam klasörüzü kontrol etmeyi unutmayın." google: @@ -631,7 +703,7 @@ tr_TR: saving_draft_tip: "kaydediliyor..." saved_draft_tip: "kaydedildi" saved_local_draft_tip: "yerele kaydedildi" - similar_topics: "Konunuz bu konuya benziyor..." + similar_topics: "Konunuz şunlara çok benziyor..." drafts_offline: "çevrimdışı taslaklar" error: title_missing: "Başlık gerekli" @@ -650,10 +722,10 @@ tr_TR: create_pm: "Mesaj" title: "Ya da Ctrl+Enter'a bas" users_placeholder: "Kullanıcı ekle" - title_placeholder: "Kısa bir cümlede açılamak gerekirse bu tartışmanın konusu nedir?" + title_placeholder: "Bir cümlede açıklamak gerekirse bu tartışmanın konusu nedir?" edit_reason_placeholder: "neden düzenleme yapıyorsunuz?" show_edit_reason: "(düzenleme sebebi ekle)" - reply_placeholder: "Buraya yazın. Markdown, BBCode veya HTML kullanarak biçimlendirin. Resim yüklemek için sürükleyip bırakın ya da yapıştırın." + reply_placeholder: "Buraya yazın. Biçimlendirmek için Markdown, BBCode ya da HTML kullanabilirsin. Resimleri sürükleyebilir ya da yapıştırabilirsin." view_new_post: "Yeni gönderinizi görüntüleyin." saving: "Kaydediliyor..." saved: "Kaydedildi!" @@ -700,7 +772,7 @@ tr_TR: title: "@isim bahsedilişleri, gönderileriniz ve konularınıza verilen cevaplar, mesajlarla vb. ilgili bildiriler" none: "Şu an için bildirimler yüklenemiyor." more: "daha eski bildirimleri görüntüle" - total_flagged: "tüm bayraklı gönderiler" + total_flagged: "tüm bayraklanan gönderiler" mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " @@ -710,10 +782,24 @@ tr_TR: private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " invited_to_topic: "

      {{username}} {{description}}

      " - invitee_accepted: "

      {{username}} davetiyeni kabul etti

      " + invitee_accepted: "

      {{username}} davetini kabul etti!

      " moved_post: "

      {{username}} taşıdı {{description}}

      " linked: "

      {{username}} {{description}}

      " - granted_badge: "

      Kazanıldı'{{description}}'

      " + granted_badge: "

      {{description}} rozeti kazandınız!

      " + alt: + mentioned: "Bahsedildi, şu kişi tarafından" + quoted: "Alıntılandı, şu kişi tarafından" + replied: "Cevaplandı" + posted: "Gönderildi, şu kişi tarafından" + edited: "Gönderiniz düzenlendi, şu kişi tarafından" + liked: "Gönderiniz beğenildi" + private_message: "Özel mesaj, şu kişiden" + invited_to_private_message: "Bir özel mesaja davet edildiniz, şu kişi tarafından" + invited_to_topic: "Bir konuya davet edildiniz, şu kişi tarafından" + invitee_accepted: "Davet kabul edildi, şu kişi tarafından" + moved_post: "Gönderiniz taşındı, şu kişi tarafından" + linked: "Gönderinize bağlantı" + granted_badge: "Rozet alındı" popup: mentioned: '{{username}}, "{{topic}}" başlıklı konuda sizden bahsetti - {{site_title}}' quoted: '{{username}}, "{{topic}}" başlıklı konuda sizden alıntı yaptı - {{site_title}}' @@ -728,23 +814,29 @@ tr_TR: from_the_web: "Webden" remote_tip: "resme bağlantı ver" remote_tip_with_attachments: "resme ya da dosyaya ({{authorized_extensions}}) bağlantı ver" - local_tip: "cihazınızda bulunan bir resmi seçmek için tıklayın" - local_tip_with_attachments: "cihazınızdan resim ya da dosya seçmek için tıklayın ({{authorized_extensions}})" + local_tip: "cihazınızdan resimler seçin" + local_tip_with_attachments: "cihazınızdan resim veya dosyalar seçin ({{authorized_extensions}})" hint: "(editöre sürekle & bırak yaparak da yükleyebilirsiniz)" - hint_for_supported_browsers: "(resimleri, editöre sürükle & bırak yaparak ya da yapıştırarak da yükleyebilirsiniz)" + hint_for_supported_browsers: "ayrıca resimleri düzenleyiciye sürükleyip bırakabilir ya da yapıştırabilirsiniz" uploading: "Yükleniyor" + select_file: "Dosya seçin" image_link: "resminizin yönleneceği bağlantı" search: - title: "konular, gönderiler, kullanıcılar, veya kategoriler arasında ara" + select_all: "Tümünü Seç" + clear_all: "Tümünü Temizle" + title: "konu, gönderi, kullanıcı veya kategori ara" no_results: "Hiç bir sonuç bulunamadı." + no_more_results: "Başka sonuç yok." + search_help: Arama yardımı searching: "Aranıyor..." post_format: "{{username}} tarafından #{{post_number}}" context: - user: "@{{username}} kullancısına ait gönderiler arasında ara" + user: "@{{username}} kullancısına ait gönderilerde ara" category: "\"{{category}}\" kategorisinde ara" topic: "Bu konuda ara" private_messages: "Mesajlarda ara" - site_map: "başka bir konu listesine veya kategoriye git" + hamburger_menu: "bir diğer konu ya da kategoriye git" + new_item: "yeni" go_back: 'geri dön' not_logged_in_user: 'güncel aktivitelerin ve ayarların özetinin bulunduğu kullanıcı sayfası' current_user: 'kendi kullanıcı sayfana git' @@ -758,7 +850,7 @@ tr_TR: dismiss_topics_tooltip: "Bu konularda yeni gönderiler oluşturulunca okunmamış listemde gösterme" dismiss_new: "Yenileri Yoksay" toggle: "konuların toplu seçimini aç/kapa" - actions: "Toplu Aksiyonlar" + actions: "Toplu İşlemler" change_category: "Kategoriyi Değiştir" close_topics: "Konuları Kapat" archive_topics: "Konuları Arşivle" @@ -768,7 +860,7 @@ tr_TR: other: "{{count}} konu seçtiniz." none: unread: "Okunmamış konunuz yok." - new: "Yeni konunuz yok" + new: "Yeni konunuz yok." read: "Henüz herhangi bir konu okumadınız." posted: "Henüz herhangi bir konuda gönderi oluşturmadınız." latest: "Son bir konu yok. Bu üzücü." @@ -778,7 +870,7 @@ tr_TR: top: "Popüler bir konu yok." search: "Arama sonuçları yok." educate: - new: '

      Yeni konularınız burada belirir.

      Varsayılan ayarlarda, son 2 gün içerisinde yaratılan konular yeni sayılır ve yeni işaretiyle gösterilir.

      Dilerseniz bu ayarları ayarlarsayfanızdan düzenleyebilirsiniz.

      ' + new: '

      Yeni konularınız burada belirir.

      Varsayılan ayarlarda, son 2 gün içerisinde açılan konular yeni sayılır ve yeni işaretiyle gösterilir.

      Dilerseniz bu seçeneği ayarlar sayfanızdan düzenleyebilirsiniz.

      ' unread: '

      Okunmamış konularınız burada belirecek.

      Varsayılan ayarlarda, şu durumlarda konular okunmamış sayılır ve okunmamışların sayısı 1 gösterilir:

      • Konuyu oluşturduysanız
      • Konuyu cevapladıysanız
      • Konuyu 4 dakikadan uzun bir süre okuduysanız

      Ya da, konunun altında bulunan bildirim kontrol bölümünden, konuyu Takip Edildi veya Gözlendi diye işaretlediyseniz.

      Bu ayarları ayarlar sayfasından değiştirebilirsiniz.

      ' bottom: latest: "Daha fazla son konu yok." @@ -792,6 +884,9 @@ tr_TR: bookmarks: "Daha fazla işaretlenmiş konu yok." search: "Daha fazla arama sonucu yok." topic: + unsubscribe: + stop_notifications: "Artık {{title}} için daha az bildirim alacaksınız." + change_notification_state: "Geçerli bildirim durumunuz" filter_to: "Bu konuda {{post_count}} gönderi" create: 'Yeni Konu' create_long: 'Yeni bir konu oluştur' @@ -807,7 +902,7 @@ tr_TR: invalid_access: title: "Bu konu özel" description: "Üzgünüz, bu konuya erişiminiz yok!" - login_required: "Bu konuya bakabilmek için giriş yapmanız gerekir." + login_required: "Bu konuyu görüntülemek için oturum açmanız gerekiyor." server_error: title: "Konu yüklenemedi." description: "Üzgünüz, muhtemelen bir bağlantı sorunundan ötürü bu konuyu yükleyemedik. Lütfen tekrar deneyin. Eğer sorun devam ederse, bizimle iletişime geçin. " @@ -822,7 +917,7 @@ tr_TR: other: "bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var" likes: other: "bu konuda {{count}} beğeni var" - back_to_list: "Konu Listesine Geri Dön" + back_to_list: "Konu listesine geri dön" options: "Konu Seçenekleri" show_links: "Bu konunun içindeki bağlantıları göster. " toggle_information: "konu ayrıntılarını aç/kapa" @@ -837,7 +932,7 @@ tr_TR: deleted: "Konu silindi " auto_close_notice: "Bu konu otomatik olarak kapanacak %{timeLeft}." auto_close_notice_based_on_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak." - auto_close_title: 'Otomatik-Kapatma Ayarları' + auto_close_title: 'Otomatik Kapatma Ayarları' auto_close_save: "Kaydet" auto_close_remove: "Bu Konuyu Otomatik Olarak Kapatma" progress: @@ -861,29 +956,29 @@ tr_TR: '2_4': 'Bu konuya cevap yazdığınız için bildirimlerini alacaksınız.' '2_2': 'Bu konuyu takip ettiğiniz için bildirimlerini alacaksınız.' '2': 'Bu konuyu okuduğunuz için bildirimlerini alacaksınız.' - '1_2': 'Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.' - '1': 'Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.' + '1_2': 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.' + '1': 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.' '0_7': 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.' '0_2': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.' '0': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.' watching_pm: title: "Gözleniyor" - description: "Bu mesajlaşmadaki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." + description: "Bu mesajlaşmada ki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." watching: title: "Gözleniyor" description: "Bu konudaki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." tracking_pm: title: "Takip Ediliyor" - description: "Okunmamış ve yeni gönderi sayısı mesajın yanında belirecek. Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + description: "Okunmamış ve yeni gönderi sayısı mesajın yanında belirecek. Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." tracking: title: "Takip Ediliyor" - description: "Okunmamış ve yeni gönderi sayısı başlığın yanında belirecek. Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + description: "Okunmamış ve yeni gönderi sayısı başlığın yanında belirecek. Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." regular: - title: "Standart" - description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + title: "Olağan" + description: "Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." regular_pm: - title: "Standart" - description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize mesajla cevap verirse bildirim alacaksınız." + title: "Olağan" + description: "Birisi @isim şeklinde sizden bahsederse ya da gönderinize mesajla cevap verirse bildirim alacaksınız." muted_pm: title: "Susturuldu" description: "Bu mesajlaşmayla ilgili hiç bir bildirim almayacaksınız." @@ -897,19 +992,19 @@ tr_TR: close: "Konuyu Kapat" multi_select: "Gönderileri Seç..." auto_close: "Otomatik Kapat..." - pin: "Konuyu Başa Tuttur..." - unpin: "Konuyu Başa Tutturma..." + pin: "Başa Tuttur..." + unpin: "Baştan Kaldır..." unarchive: "Konuyu Arşivden Kaldır" archive: "Konuyu Arşivle" - invisible: "Listelenmemiş Yap" - visible: "Listelenmiş Yap" + invisible: "Gizle" + visible: "Görünür Yap" reset_read: "Görüntüleme Verilerini Sıfırla" feature: - pin: "Konuyu Başa Tuttur" - unpin: "Konuyu Başa Tutturma" - pin_globally: "Konuyu Her Yerde Başa Tuttur" + pin: "Başa Tuttur" + unpin: "Baştan Kaldır" + pin_globally: "Her Yerde Başa Tuttur" make_banner: "Manşet Konusu" - remove_banner: "Manşey Konusunu Kaldır" + remove_banner: "Manşet Konusunu Kaldır" reply: title: 'Cevapla' help: 'bu konuya bir cevap oluşturmaya başlayın' @@ -925,17 +1020,20 @@ tr_TR: success_message: 'Bu konuyu başarıyla bayrakladınız.' feature_topic: title: "Bu konuyu ön plana çıkar" - pin: "Bu konu {{categoryLink}} kategorinin en üstünde görünsün." + pin: "Şu zamana kadar bu konunun {{categoryLink}} kategorisinin başında görünmesini sağla" confirm_pin: "Zaten başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bu kategoride bir konuyu başa tutturmak istediğinize emin misiniz?" unpin: "Bu konuyu {{categoryLink}} kategorisinin en üstünden kaldır." + unpin_until: "Bu konuyu {{categoryLink}} kategorisinin başından kaldır ya da şu zamana kadar bekle: %{until}." pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir." + pin_validation: "Bu konuyu sabitlemek için bir tarih gerekli." already_pinned: zero: " {{categoryLink}} kategorisinde başa tutturulan herhangi bir konu yok." one: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: 1." other: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: {{count}}." - pin_globally: "Bu konu, bir görevli kaldırana kadar, tüm konu listelerinin en üstünde görünsün" + pin_globally: "Şu zamana kadar bu konunun bütün konu listelerinin başında yer almasını sağla" confirm_pin_globally: "Zaten her yerde başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bir konuyu daha her yerde başa tutturmak istediğinizden emin misiniz?" unpin_globally: "Bu konuyu tüm konu listelerinin en üstünden kaldır." + unpin_globally_until: "Bu konuyu bütün konu listelerinin başından kaldır ya da şu zamana kadar bekle: %{until}." global_pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir." already_pinned_globally: zero: "Her yerde başa tutturulan herhangi bir konu yok." @@ -948,22 +1046,22 @@ tr_TR: zero: "Manşet konusu yok." one: "Şu an bir manşet konusu var." inviting: "Davet Ediliyor..." - automatically_add_to_groups_optional: "Bu davet şu gruplara erişimi de içerir: (opsiyonel, sadece adminler için)" - automatically_add_to_groups_required: "Bu davet şu gruplara erişimi de içerir: (Gerekli, sadece adminler için)" + automatically_add_to_groups_optional: "Bu davet şu gruplara erişimi de içerir: (opsiyonel, sadece yöneticiler için)" + automatically_add_to_groups_required: "Bu davet şu gruplara erişimi de içerir: (Gerekli, sadece yöneticiler için)" invite_private: title: 'Mesajlaşmaya Davet Et' - email_or_username: "Davet edilenin E-postası veya Kullanıcı Adı" - email_or_username_placeholder: "e-posta veya kullanıcı adı" + email_or_username: "Davet edilenin e-postası ya da kullanıcı adı" + email_or_username_placeholder: "e-posta ya da kullanıcı adı" action: "Davet et" success: "O kullanıcıyı bu mesajlaşmaya davet ettik." error: "Üzgünüz, kullanıcı davet edilirken bir hata oluştu." group_name: "grup adı" invite_reply: - title: 'Davet et' + title: 'Davet Et' username_placeholder: "kullanıcıadı" - action: 'Davet Yolla' + action: 'Davet Gönder' help: 'e-posta veya bildiri aracılığıyla başkalarını bu konuya davet edin' - to_forum: "Arkadaşınıza, giriş yapması gerekmeden, bir linke tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. " + to_forum: "Arkadaşınıza, oturum açması gerekmeden, bir bağlantıya tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. " sso_enabled: "Bu konuya davet etmek istediğiniz kişinin kullanıcı adını girin." to_topic_blank: "Bu konuya davet etmek istediğiniz kişinin kullanıcı adını veya e-posta adresini girin." to_topic_email: "Bir email adresi girdiniz. Arkadaşınızın konuya hemen cevap verebilmesini sağlayacak bir davetiye e-postalayacağız." @@ -973,7 +1071,7 @@ tr_TR: success_email: "{{emailOrUsername}} kullanıcısına davet e-postalandı. Davet kabul edildiğinde size bir bildiri göndereceğiz. Davetlerinizi takip etmek için kullanıcı sayfanızdaki davetler sekmesine göz atın." success_username: "Kullanıcıyı bu konuya katılması için davet ettik." error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)" - login_reply: 'Cevaplamak için Giriş Yap' + login_reply: 'Cevaplamak için oturum açın' filters: n_posts: other: "{{count}} gönderi" @@ -988,7 +1086,7 @@ tr_TR: merge_topic: title: "Var Olan Bir Konuya Taşı" action: "var olan bir konuya taşı" - error: "Gönderiler o konuya taşınırken bir hata oluştu." + error: "Gönderiler konuya aşınırken bir hata oluştu." instructions: other: "Lütfen bu {{count}} gönderiyi taşımak istediğiniz konuyu seçin. " change_owner: @@ -1000,6 +1098,12 @@ tr_TR: instructions: other: "Lütfen {{old_user}} kullanıcısına ait {{count}} gönderinin yeni sahibini seçin." instructions_warn: "Bu gönderi ile ilgili geriye dönük biriken bildirimler yeni kullanıcıya aktarılmayacak.
      Uyarı: Şu an, yeni kullanıcıya hiç bir gönderi-tabanlı ek bilgi aktarılmıyor. Dikkatli olun." + change_timestamp: + title: "Değişiklik Zaman Bilgisi" + action: "değişiklik zaman bilgisi" + invalid_timestamp: "Zaman bilgisi gelecekte olamaz." + error: "Konunun zaman bilgisini değiştirirken bir hata oluştu." + instructions: "Lütfen konunun yeni zaman bilgisini seçiniz. Konudaki gönderiler aynı zaman farkına sahip olmaları için güncellenecekler." multi_select: select: 'seç' selected: '({{count}}) seçildi' @@ -1011,27 +1115,35 @@ tr_TR: description: other: {{count}} gönderi seçtiniz. post: - reply: "{{link}} {{replyAvatar}} {{username}} cevaplanıyor" - reply_topic: "Cevapla {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "alıntıyla cevapla" edit: "{{link}} {{replyAvatar}} {{username}} düzenleniyor" edit_reason: "Neden: " post_number: "gönderi {{number}}" last_edited_on: "gönderinin en son düzenlenme tarihi" - reply_as_new_topic: "Bağlantılı Konu Oluşturarak Cevapla" + reply_as_new_topic: "Bağlantılı Konu Olarak Cevapla" continue_discussion: "{{postLink}} Gönderisinden tartışmaya devam ediliyor:" follow_quote: "alıntılanan mesaja git" show_full: "Gönderinin Tamamını Göster" show_hidden: 'Gizlenmiş içeriği görüntüle.' deleted_by_author: - other: "(yazarı tarafından geri alınan gönderi, %{count} saat içinde otomatik olarak silinecek.)" + other: "(yazarı tarafından geri alınan gönderi, bayraklanmadığı takdirde %{count} saat içinde otomatik olarak silinecek.)" expand_collapse: "aç/kapat" gap: other: "gizlenen {{count}} yorumu gör" - more_links: "{{count}} daha..." + more_links: "{{count}} tane daha..." unread: "Gönderi okunmamış" has_replies: - other: "Cevaplar" + other: "{{count}} Yanıt" + has_likes: + other: "{{count}} Beğeni" + has_likes_title: + other: "{{count}} kişi bu gönderiyi beğendi" + has_likes_title_you: + zero: "bu gönderiyi beğendiniz" + one: "siz ve diğer 1 kişi bu gönderiyi beğendi" + other: "siz ve {{count}} diğer kişi bu gönderiyi beğendi" errors: create: "Üzgünüz, gönderiniz oluşturulurken bir hata oluştu. Lütfen tekrar deneyin." edit: "Üzgünüz, gönderiniz düzenlenirken bir hata oluştu. Lütfen tekrar deneyin. " @@ -1043,23 +1155,24 @@ tr_TR: upload_not_authorized: "Üzgünüz, yüklemeye çalıştığınız dosya tipine izin verilmiyor. (izin verilen uzantılar: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemiyorlar." attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya ekleyemiyorlar." - attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için sisteme giriş yapmış olmanız gerekiyor." + attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için oturum açmanız gerekiyor." abandon: confirm: "Gönderinizden vazgeçtiğinize emin misiniz?" no_value: "Hayır, kalsın" yes_value: "Evet, vazgeç" via_email: "bu gönderi e-posta ile iletildi" + whisper: "bu gönderi yöneticiler için özel bir fısıltıdır" wiki: about: "bu gönderi bir wiki; acemi kullanıcılar düzenleyebilir" archetypes: - save: 'Seçenekleri Kaydet' + save: 'Seçenekleri kaydet' controls: reply: "bu gönderiye bir cevap oluşturmaya başlayın" like: "bu gönderiyi beğen" has_liked: "bu gönderiyi beğendiniz" undo_like: "beğenmekten vazgeç" edit: "bu gönderiyi düzenle" - edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için sisteme giriş yapmalısınız." + edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için oturum açmalısınız." flag: "bu gönderiyi kontrol edilmesi için özel olarak bayraklayın ya da bununla ilgili özel bir bildirim yollayın" delete: "bu gönderiyi sil" undelete: "bu gönderinin silinmesini geri al" @@ -1070,12 +1183,12 @@ tr_TR: other: "Bu gönderiye verilen {{count}} direk cevabı da silmek istiyor musunuz?" yes_value: "Evet, cevapları da sil" no_value: "Hayır, sadece bu gönderiyi" - admin: "gönderiyle alakalı admin aksiyonları" + admin: "gönderiyle alakalı yönetici işlemleri" wiki: "Wiki Yap" unwiki: "Wiki'yi Kaldır" convert_to_moderator: "Görevli Rengi Ekle" revert_to_regular: "Görevli Rengini Kaldır" - rebake: "HTML'i yeniden kur" + rebake: "HTML'i Yeniden Yapılandır" unhide: "Gizleme" actions: flag: 'Bayrakla' @@ -1083,8 +1196,8 @@ tr_TR: other: "Bayrağı ertele" it_too: off_topic: "Bir de bayrakla" - spam: "Bir de bayrakla" - inappropriate: "Bir de bayrakla" + spam: "Bir de rapor et" + inappropriate: "Bir de rapor et" custom_flag: "Bir de bayrakla" bookmark: "Bir de işaretle" like: "Sen de beğen" @@ -1097,10 +1210,10 @@ tr_TR: like: "Beğenini geri al" vote: "Oyunu geri al" people: - off_topic: "{{icons}} konu dışı olarak bayraklandı" - spam: "{{icons}} spam olarak bayraklandı" - spam_with_url: "{{icons}} bu linki spam olarak işaretledi" - inappropriate: "{{icons}} uygunsuz olarak bayraklandı" + off_topic: "{{icons}} konu dışı olarak bayrakladı" + spam: "{{icons}} spam olarak bayrakladı" + spam_with_url: "{{icons}} bu linki spam olarak bayrakladı" + inappropriate: "{{icons}} uygunsuz olarak bayrakladı" notify_moderators: "{{icons}} bildirim gönderilen moderatörler" notify_moderators_with_url: "{{icons}} bildirim gönderilen moderatörler" notify_user: "{{icons}} mesaj yolladı" @@ -1180,23 +1293,26 @@ tr_TR: category: can: 'yapabilir…' none: '(kategori yok)' + all: 'Tüm kategoriler' choose: 'Kategori seç…' edit: 'düzenle' edit_long: "Düzenle" view: 'Bu Kategorideki Konuları Görüntüle' general: 'Genel' settings: 'Ayarlar' + topic_template: "Konu Şablonu" delete: 'Kategoriyi Sil' create: 'Yeni Kategori' + create_long: 'Yeni bir kategori oluştur' save: 'Kategoriyi Kaydet' - slug: 'Kategori Anahtarı' - slug_placeholder: '(Opsiyonel) url için tire ile ayırılmış kelimeler' + slug: 'Kategori Kalıcı Bağlantısı' + slug_placeholder: '(Opsiyonel) bağlantı için tire ile ayırılmış kelimeler' creation_error: Kategori oluşturulurken hata oluştu. save_error: Kategori kaydedilirken hata oluştu. name: "Kategori Adı" description: "Açıklama" topic: "kategori konusu" - logo: "Kategori Logosu Resmi" + logo: "Kategori Logosu Görseli" background_image: "Kategori Arka Planı Görseli" badge_colors: "Rozet renkleri" background_color: "Arka plan rengi" @@ -1210,6 +1326,7 @@ tr_TR: change_in_category_topic: "Açıklamayı Düzenle" already_used: 'Bu renk başka bir kategori için kullanıldı' security: "Güvenlik" + special_warning: "Uyarı: Bu kategori önceden ayarlanmış bir kategoridir ve güvenlik ayarları değiştirilemez. Eğer bu kategoriyi kullanmak istemiyorsanız, başka bir amaçla kullanmak yerine silin." images: "Resimler" auto_close_label: "Şu kadar süreden sonra konuları otomatik olarak kapat: " auto_close_units: "saat" @@ -1217,6 +1334,7 @@ tr_TR: email_in_allow_strangers: "Hesabı olmayan, anonim kullanıcılardan e-posta kabul et" email_in_disabled: "E-posta üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. E-posta üzerinden yeni konu oluşturma özelliğini etkinleştirmek için," email_in_disabled_click: '"e-postala" ayarını etkinleştir' + suppress_from_homepage: "Bu kategoriyi ana sayfadan gizle" allow_badges_label: "Bu kategoride rozet verilmesine izin ver" edit_permissions: "İzinleri Düzenle" add_permission: "İzin Ekle" @@ -1229,13 +1347,13 @@ tr_TR: notifications: watching: title: "Gözleniyor" - description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konularla ilgili bildiri alacaksınız, ayrıca okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek. " + description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konularla ilgili bildiri alacaksınız, ayrıca okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." tracking: title: "Takip Ediliyor" description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." regular: title: "Standart" - description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + description: "Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." muted: title: "Susturuldu" description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve okunmamışlar sekmenizde belirmeyecek. " @@ -1243,25 +1361,25 @@ tr_TR: title: 'Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!' private_reminder: 'bayraklar özeldir, sadece görevlilere gözükür' action: 'Gönderiyi Bayrakla' - take_action: "Aksiyon Al" + take_action: "Harekete Geç" notify_action: 'Mesaj' - delete_spammer: "Spamciyi Sil" + delete_spammer: "Spamcıyı Sil" delete_confirm: "Bu kullanıcının %{posts} gönderisini ve %{topics} konusunu silmek, hesabını kapatmak, kullandığı IP Adresi %{ip_address} üzerinden hesap açılmasını engellemek, ve %{email} e-posta adresini kalıcı engellenenler listesine eklemek üzeresiniz. Bu kullanıcının gerçekten spamci olduğuna emin misiniz?" - yes_delete_spammer: "Evet, Spamciyi Sil" + yes_delete_spammer: "Evet, spamcıyı sil" ip_address_missing: "(uygulanamaz)" hidden_email_address: "(gizli)" - submit_tooltip: "Bayrağı gönder" - take_action_tooltip: "Topluluktan daha fazla bayrak beklemek yerine hızlıca bayrak eşiğine erişin" + submit_tooltip: "Özel bayrağı gönder" + take_action_tooltip: "Topluluğunuzdan daha fazla bayrak beklemek yerine bunu siz hızlıca yaparak eşiğe erişebilirsiniz" cant: "Üzgünüz, şu an bu gönderiyi bayraklayamazsınız." formatted_name: off_topic: "Konu Dışı" inappropriate: "Uygunsuz" spam: "Spam" - custom_placeholder_notify_user: "Açıklayıcı, yapıcı, ve her zaman nazik olun." - custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin, ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın." + custom_placeholder_notify_user: "Açıklayıcı, yapıcı ve her zaman nazik olun." + custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın." custom_message: at_least: "en az {{n}} karakter girin" - more: "{{n}} daha var.." + more: "{{n}} tane daha var.." left: "{{n}} kaldı" flagging_topic: title: "Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!" @@ -1269,7 +1387,7 @@ tr_TR: notify_action: "Mesaj" topic_map: title: "Konu Özeti" - participants_title: "Yoğun konular" + participants_title: "Sıkça Yazanlar" links_title: "Popüler bağlantılar" links_shown: "tüm {{totalLinks}} bağlantıları göster..." clicks: @@ -1281,6 +1399,10 @@ tr_TR: help: "Bu konuyu işaretlediniz" locked: help: "Bu konu kapatıldı; artık yeni cevaplar kabul edilmiyor" + archived: + help: "Bu başlık arşive kaldırıldı; donduruldu ve değiştirilemez" + locked_and_archived: + help: "Bu konu kapatıldı ve arşivlendi; yeni cevaplar kabul edemez ve değiştirilemez." unpinned: title: "Başa tutturma kaldırıldı" help: "Bu konu sizin için başa tutturulmuyor; normal sıralama içerisinde görünecek" @@ -1290,10 +1412,8 @@ tr_TR: pinned: title: "Başa Tutturuldu" help: "Bu konu sizin için başa tutturuldu; kendi kategorisinin en üstünde görünecek" - archived: - help: "Bu başlık arşive kaldırıldı; donduruldu ve değiştirilemez" invisible: - help: "Bu konu listelenmemiş; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek" + help: "Bu konu gizli; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek" posts: "Gönderi" posts_lowercase: "gönderi" posts_long: "bu konuda {{number}} gönderi var" @@ -1303,10 +1423,10 @@ tr_TR: med {beğeni/gönderi oranı çok yüksek cevap} high {beğeni/gönderi oranı aşırı yüksek cevap} other {}} var - original_post: "Ana Gönderi" - views: "Görüntüleme" + original_post: "Orijinal Gönderi" + views: "Gösterim" views_lowercase: - other: "görüntüleme" + other: "gösterim" replies: "Cevap" views_long: "bu konu {{number}} defa görüntülendi" activity: "Aktivite" @@ -1328,7 +1448,10 @@ tr_TR: with_topics: "%{filter} konular" with_category: "%{filter} %{category} konular" latest: - title: "En Son" + title: + zero: "En Son" + one: "En Son (1)" + other: "En Son ({{count}})" help: "yakın zamanda gönderi alan konular" hot: title: "Sıcak" @@ -1337,7 +1460,7 @@ tr_TR: title: "Okunmuş" help: "okuduğunuz başlıklar, okunma sırasına göre" search: - title: "Ara" + title: "Arama" help: "tüm konularda ara" categories: title: "Kategoriler" @@ -1381,6 +1504,8 @@ tr_TR: title: "Tüm Zamanlar" yearly: title: "Yıllık" + quarterly: + title: "Üç aylık" monthly: title: "Aylı" weekly: @@ -1388,11 +1513,12 @@ tr_TR: daily: title: "Günlük" all_time: "Tüm Zamanlar" - this_year: "Bu yıl" - this_month: "Bu ay" - this_week: "Bu hafta" + this_year: "Yıl" + this_quarter: "Çeyrek" + this_month: "Ay" + this_week: "Hafta" today: "Bugün" - other_periods: "daha fazla konuya bak" + other_periods: "yukarı bak" browser_update: 'Malesef, tarayıcınız bu site için çok eski. Lütfen tarayıcınızı güncelleyin.' permission_types: full: "Oluştur / Cevapla / Bak" @@ -1401,38 +1527,39 @@ tr_TR: admin_js: type_to_filter: "filtre girin..." admin: - title: 'Discourse Admin' + title: 'Discourse Yönetici Paneli' moderator: 'Moderatör' dashboard: - title: "Gösterge Paneli" - last_updated: "Gösterge panelinin son güncellenmesi:" + title: "Yönetici Paneli" + last_updated: "Yönetici panelinin son güncellenmesi:" version: "Versiyon" - up_to_date: "Sistem güncel durumda!" + up_to_date: "Sisteminiz güncel durumda!" critical_available: "Önemli bir güncelleme var." updates_available: "Yeni güncellemeler var." - please_upgrade: "Lütfen güncelle!" + please_upgrade: "Lütfen güncelleyin!" no_check_performed: "Güncelleme kontrolü gerçekleşmedi, lütfen sidekiq'in çalışır durumda olduğundan emin olun." stale_data: "Güncelleme kontrolü bir süredir gerçekleşmiyor, lütfen sidekiq'in çalışır durumda olduğundan emin olun." - version_check_pending: "Görünüşe daha yeni güncelleme yaptınız. Harika!" + version_check_pending: "Sanırım yeni güncelleme yaptınız. Harika!" installed_version: "Yüklendi" - latest_version: "En Son" + latest_version: "En son" problems_found: "Discourse kurulumuyla ilgili bazı sorunlar bulundu: " last_checked: "Son kontrol" refresh_problems: "Yenile" no_problems: "Herhangi bir sorun bulunamadı." moderators: 'Moderatörler:' - admins: 'Adminler:' + admins: 'Yöneticiler:' blocked: 'Engellenmiş:' suspended: 'Uzaklaştırılmışlar:' private_messages_short: "Mesajlar" private_messages_title: "Mesajlar" + mobile_title: "Mobil" space_free: "{{size}} serbest" uploads: "yüklemeler" - backups: "yedeklemeler" + backups: "Yedekler" traffic_short: "Trafik" traffic: "Uygulama web istekleri" - page_views: "API İstekleri" - page_views_short: "API İstekleri" + page_views: "API istekleri" + page_views_short: "API istekleri" show_traffic_report: "Detaylı Trafik Raporunu Görüntüle" reports: today: "Bugün" @@ -1446,7 +1573,7 @@ tr_TR: view_table: "tablo" view_chart: "sütunlu grafik" refresh_report: "Raporu Yenile" - start_date: "Başlangıç Tarihi" + start_date: "Başlangıç tarihi" end_date: "Bitiş Tarihi" commits: latest_changes: "En son değişiklikler: lütfen sık güncelleyin!" @@ -1465,15 +1592,15 @@ tr_TR: agree_flag: "Bayrağı onayla" agree_flag_title: "Bayrağı onayla ve gönderide değişiklik yapma" defer_flag: "Ertele" - defer_flag_title: "Bu bayrağı kaldır; şu an için bir aksiyon almak gerekmiyor." + defer_flag_title: "Bu bayrağı kaldır; şu an için bir seçeneği uygulamak gerekmiyor." delete: "Sil" delete_title: "Bu bayrağın ait olduğu gönderiyi sil." - delete_post_defer_flag: "Gönderiyi sil ve bayrağı Ertele" + delete_post_defer_flag: "Gönderiyi sil ve bayrağı ertele" delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil." - delete_post_agree_flag: "Gönderiyi sil ve bayrağı Onayla" + delete_post_agree_flag: "Gönderiyi sil ve bayrağı onayla" delete_post_agree_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil." delete_flag_modal_title: "Sil ve..." - delete_spammer: "Spamciyi Sil" + delete_spammer: "Spamcıyı Sil" delete_spammer_title: "Kullanıcıyı ve kullanıcıya ait tüm konu ve gönderileri kaldır. " disagree_flag_unhide_post: "Onaylama (gönderiyi gizleme)" disagree_flag_unhide_post_title: "Bu gönderiye ait tüm bayrakları kaldır ve gönderiyi tekrar görünür hale getir" @@ -1488,14 +1615,14 @@ tr_TR: deferred: "ertelendi" flagged_by: "Bayraklayan" resolved_by: "Çözen" - took_action: "Aksiyon aldı" + took_action: "İşlem uygulandı" system: "Sistem" error: "Bir şeyler ters gitti" reply_message: "Yanıtla" - no_results: "Bayrak yok. " + no_results: "Bayraklanan içerik yok." topic_flagged: "Bu konu bayraklandı." visit_topic: "Aksiyon almak için konuyu ziyaret edin" - was_edited: "İlk bayraktan sonra gönderi düzenlendi" + was_edited: "İlk bayraktan edilmesinden sonra gönderi düzenlendi" previous_flags_count: "Bu gönderi daha önce {{count}} defa bayraklanmış." summary: action_type_3: @@ -1533,18 +1660,18 @@ tr_TR: default_title: "Bu gruptaki tüm kullanıcılar için varsayılan başlık" primary_group: "Otomatik olarak ana grup yap" api: - generate_master: "Master API Anahtarı üret" - none: "Şu etkin API anahtarı bulunmuyor." + generate_master: "Ana API Anahtarı Üret" + none: "Şu an etkin API anahtarı bulunmuyor." user: "Kullanıcı" title: "API" key: "API Anahtarı" generate: "Oluştur" regenerate: "Tekrar Oluştur" revoke: "İptal Et" - confirm_regen: "API Anahtarını yenisi ile değiştirmek istediğinize emin misiniz?" + confirm_regen: "API anahtarını yenisi ile değiştirmek istediğinize emin misiniz?" confirm_revoke: "Anahtarı iptal etmek istediğinize emin misiniz?" info_html: "API anahtarınız JSON çağrıları kullanarak konu oluşturup güncelleyebilmenize olanak sağlayacaktır." - all_users: "Tüm kullanıcılar" + all_users: "Tüm Kullanıcılar" note_html: "Bu anahtarı gizli tutun, anahtara sahip kullanıcılar her hangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler." plugins: title: "Eklentiler" @@ -1552,8 +1679,12 @@ tr_TR: name: "İsim" none_installed: "Yüklenmiş herhangi bir eklentiniz yok." version: "Versiyon" + enabled: "Etkinleştirildi mi?" + is_enabled: "E" + not_enabled: "H" change_settings: "Ayarları Değiştir" - howto: "Nasıl eklenti yüklerim?" + change_settings_short: "Ayarlar" + howto: "Nasıl eklenti yükleyebilirim?" backups: title: "Yedekler" menu: @@ -1574,7 +1705,7 @@ tr_TR: filename: "Dosya adı" size: "Boyut" upload: - label: "Yükle" + label: "Yedek Yükle" title: "Bu oluşuma bir yedekleme yükle" uploading: "Yükleniyor..." success: "'{{filename}}' başarıyla yüklendi." @@ -1587,7 +1718,7 @@ tr_TR: title: "Devam eden işlemi iptal et" confirm: "Devam eden işlemi iptal etmek istediğinize emin misiniz?" backup: - label: "Yedekleme" + label: "Yedek Oluştur" title: "Yedek oluştur" confirm: "Yeni bir yedekleme başlatmak istiyor musunuz?" without_uploads: "Evet (dosya eklemeyin)" @@ -1599,7 +1730,7 @@ tr_TR: confirm: "Bu yedeği yok etmek istediğinize emin misiniz?" restore: is_disabled: "Geri getirme site ayarlarında devredışı bırakılmış." - label: "Geri getir" + label: "Geri Yükle" title: "Yedeği geri getir" confirm: "Yedeği geri getirmek istediğinize emin misiniz?" rollback: @@ -1618,6 +1749,8 @@ tr_TR: screened_email: "Tüm taranmış e-postalar listesini CSV formatında dışa aktar." screened_ip: "Tüm taranmış IPler listesini CSV formatında dışa aktar." screened_url: "Tüm taranmış URLler listesini CSV formatında dışa aktar." + export_json: + button_text: "Dışarı Aktar" invite: button_text: "Davetleri Gönder" button_title: "Davetleri Gönder" @@ -1626,8 +1759,9 @@ tr_TR: long_title: "Site Özelleştirmeleri" css: "CSS" header: "Başlık" - top: "En Popüler" - footer: "Altbilgi" + top: "En Kısım" + footer: "Alt Kısım" + embedded_css: "Gömülü CSS" head_tag: text: "" title: " etiketinden önce eklenecek HTML" @@ -1645,6 +1779,8 @@ tr_TR: save: "Kaydet" new: "Yeni" new_style: "Yeni Stil" + import: "İçeri Aktar" + import_title: "Bir dosya seçin ya da kopyalayıp yapıştırın" delete: "Sil" delete_confirm: "Bu özelleştirmeyi sil?" about: "Websitesindeki CSS stil sayfalarını ve HTML başlıklarını değiştir. Özelleştirme ekleyerek başla." @@ -1691,7 +1827,7 @@ tr_TR: description: 'Gönderi ve konu silme gibi aksiyonlar için vurgulama rengi.' success: name: 'başarı' - description: 'Aksiyonun başarılı olduğunu göstermek için kullanılır.' + description: 'Seçeneğin başarılı olduğunu göstermek için kullanılır.' love: name: 'sevgi' description: "Beğen butonunun rengi." @@ -1710,14 +1846,14 @@ tr_TR: sent_at: "Gönderildiği Zaman" time: "Zaman" user: "Kullanıcı" - email_type: "E-posta Tipi" + email_type: "E-posta Türü" to_address: "Gönderi Adresi" test_email_address: "test için e-posta adresi" send_test: "Test E-postası Gönder" sent_test: "gönderildi!" delivery_method: "Gönderme Metodu" preview_digest: "Özeti Önizle" - preview_digest_desc: "Etkin olmayan kullanıcılara gönderilen haftalık özet e-postalarının içeriğini özleyin" + preview_digest_desc: "Durgun kullanıcılara gönderilen özet e-postaların içeriğini önizle." refresh: "Yenile" format: "Format" html: "html" @@ -1736,7 +1872,7 @@ tr_TR: skipped_reason_placeholder: "neden" logs: title: "Kayıtlar" - action: "Aksiyon" + action: "İşlem" created_at: "Oluşturuldu" last_match_at: "En Son Eşlenen" match_count: "Eşleşmeler" @@ -1750,7 +1886,7 @@ tr_TR: block: "engelle" do_nothing: "hiçbir şey yapma" staff_actions: - title: "Görevli Aksiyonları" + title: "Görevli Seçenekleri" instructions: "Kullanıcı adları ve aksiyonlara tıklayarak listeyi filtrele. Profil resimlerine tıklayarak kullanıcı sayfalarına git." clear_filters: "Hepsini Göster" staff_user: "Görevli Kullanıcı" @@ -1782,16 +1918,17 @@ tr_TR: delete_post: "gönderiyi sil" impersonate: "rolüne gir" anonymize_user: "kullanıcıyı anonimleştir" + roll_up: "IP bloklarını topla" 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 aksiyon alınacak." email: "E-posta Adresi" actions: - allow: "İzin ver" + allow: "İzin Ver" screened_urls: - title: "Taranmış URLler" + title: "Taranmış Bağlantılar" description: "Burada listenen URLler spamci olduğu tespit edilmiş kullanıcılar tarafından gönderilerde kullanılmış." - url: "URL" + url: "Bağlantı" domain: "Alan Adı" screened_ips: title: "Taranmış IPler" @@ -1803,7 +1940,7 @@ tr_TR: actions: block: "Engelle" do_nothing: "İzin Ver" - allow_admin: "Admine izin ver" + allow_admin: "Yöneticiye İzin Ver" form: label: "Yeni:" ip_address: "IP adresi" @@ -1818,13 +1955,13 @@ tr_TR: title: "Rolüne gir" help: "Hata bulma ve giderme amaçları için, bu aracı kullanarak kullanıcının rolüne girin. İşiniz bitince sistemdne çıkış yapmanız gerekecek." not_found: "Bu kullanıcı bulunamadı." - invalid: "Üzgünüz, o kullanıcının rolüne giremezsiniz." + invalid: "Üzgünüz, bu kullanıcının rolüne giremezsiniz." users: title: 'Kullanıcılar' - create: 'Admin Kullanıcısı Ekle' - last_emailed: "Son E-posta Gönderilen" - not_found: "Üzgünüz, o kullanıcıadı sistemde yok." - id_not_found: "Üzgünüz, o kullanıcı adı sistemimizde bulunmuyor." + create: 'Yönetici Kullanıcı Ekle' + last_emailed: "Son E-posta Gönderimi" + not_found: "Üzgünüz, bu kullanıcı adı sistemde yok." + id_not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor." active: "Etkin" show_emails: "E-postaları Göster" nav: @@ -1834,31 +1971,31 @@ tr_TR: staff: 'Görevli' suspended: 'Uzaklaştırılmış' blocked: 'Engellenmiş' - suspect: 'Kuşkulan' - approved: "Onaylanmış?" + suspect: 'Kuşkulanılan' + approved: "Onaylanmış mı?" approved_selected: - other: "kullanıcıları ({{count}}) onayla " + other: "({{count}}) kullanıcıyı onayla " reject_selected: - other: "kullanıcıları ({{count}}) reddet" + other: "({{count}}) kullanıcıyı reddet" titles: active: 'Etkin Kullanıcılar' new: 'Yeni Kullanıcılar' pending: 'Gözden Geçirilmeyi Bekleyen Kullanıcılar' - newuser: 'Güven Seviyesi 0 (Yeni Kullanıcı) olan Kullanıcılar' - basic: 'Güven Seviyesi 1 (Acemi Kullanıcı) olan Kullanıcılar' - regular: 'Güven Seviyesi 2 (Üye) olan Kullanıcılar' - leader: 'Güven Seviyesi 3 (Müdavim) olan Kullanıcılar' - elder: 'Güven Seviyesi 4 (Lider) olan Kullanıcılar' + newuser: 'Güven seviyesi 0 (Yeni kullanıcı) olan kullanıcılar' + basic: 'Güven seviyesi 1 (Acemi kullanıcı) olan kullanıcılar' + regular: 'Güven seviyesi 2 (Üye) olan kullanıcılar' + leader: 'Güven seviyesi 3 (Müdavim) olan kullanıcılar' + elder: 'Güven seviyesi 4 (Lider) olan kullanıcılar' staff: "Görevli" - admins: 'Admin Kullanıcılar' + admins: 'Yöneticiler' moderators: 'Moderatörler' blocked: 'Engellenen Kullanıcılar' suspended: 'Uzaklaştırılmış Kullanıcılar' suspect: 'Kuşkulanılan Kullanıcılar' reject_successful: - other: "Başarıyla reddedilmiş %{count} kullanıcılar." + other: "Başarıyla reddedilmiş %{count} kullanıcı." reject_failures: - other: "Reddedilemeyen %{count} kullanıcılar." + other: "Reddedilemeyen %{count} kullanıcı." not_verified: "Onaylanmayan" check_email: title: "Bu kullanıcının e-posta adresini ortaya çıkar" @@ -1868,29 +2005,29 @@ tr_TR: unsuspend_failed: "Bu kullanıcının uzaklaştırması kaldırılırken bir şeyler ters gitti {{error}}" suspend_duration: "Kullanıcı ne kadar uzun bir süre için uzaklaştırılacak?" suspend_duration_units: "(günler)" - suspend_reason_label: "Neden uzaklaştırıyorsunuz? Buraya yazdıklarınız bu kullanıcının profil sayfasında herkese gözükecek ve sisteme giriş yaptığı anda kullanıcıya gösterilecek. Lütfen yazıyı kısa tutun." + suspend_reason_label: "Neden uzaklaştırıyorsunuz? Buraya yazdıklarınız bu kullanıcının profil sayfasında herkese gözükecek ve sistemde oturum açtığı anda kullanıcıya gösterilecek. Lütfen yazıyı kısa tutun." suspend_reason: "Neden" suspended_by: "Uzaklaştıran" delete_all_posts: "Tüm gönderileri sil" delete_all_posts_confirm: "%{posts} gönderi ve %{topics} konu silmek üzeresiniz. Emin misiniz?" suspend: "Uzaklaştır" unsuspend: "Uzaklaştırmayı geri al" - suspended: "Uzaklaştırıldı?" - moderator: "Moderatör?" - admin: "Admin?" - blocked: "Engellendi?" - show_admin_profile: "Admin" - edit_title: "Konuyu Düzenle" - save_title: "Konuyu Kaydet" + suspended: "Uzaklaştırıldı mı?" + moderator: "Moderatör mü?" + admin: "Yönetici mi?" + blocked: "Engellendi mi?" + show_admin_profile: "Yönetici" + edit_title: "Başlığı Düzenle" + save_title: "Başlığı Kaydet" refresh_browsers: "Tarayıcıyı sayfa yenilemesine zorla" refresh_browsers_message: "Mesaj tüm kullanıcılara gönderildi!" - show_public_profile: "Herkese Açık Profili Göster" + show_public_profile: "Herkese Açık Profili Görüntüle" impersonate: 'Rolüne gir' ip_lookup: "IP Arama" log_out: "Çıkış Yap" logged_out: "Kullanıcının tüm cihazlarda oturumu kapatılmış" - revoke_admin: 'Adminliğini İptal Et' - grant_admin: 'Adminlik Yetkisi Ver' + revoke_admin: 'Yöneticiliğini İptal Et' + grant_admin: 'Yönetici Yetkisi Ver' revoke_moderation: 'Moderasyonu İptal Et' grant_moderation: 'Moderasyon Yetkisi Ver' unblock: 'Engeli Kaldır' @@ -1898,12 +2035,12 @@ tr_TR: reputation: İtibar permissions: İzinler activity: Aktivite - like_count: Alınan / Verilen Beğeniler + like_count: Beğenileri / Beğendikleri last_100_days: 'son 100 günde' private_topics_count: Özel Konular - posts_read_count: Okunmuş Gönderiler - post_count: Oluşturulmuş Gönderiler - topics_entered: Görüntülenmiş Konular + posts_read_count: Okuduğu Gönderiler + post_count: Oluşturduğu Gönderiler + topics_entered: Görüntülediği Konular flags_given_count: Verilen Bayraklar flags_received_count: Alınan Bayraklar warnings_received_count: Uyarılar Alındı @@ -1912,36 +2049,36 @@ tr_TR: approved_by: "onaylayan" approve_success: "Kullanıcı onaylandı ve etkinleştirme bilgilerini içeren bir e-posta yollandı." approve_bulk_success: "Tebrikler! Seçilen tüm kullanıcılar onaylandı ve bilgilendirildi." - time_read: "Okunma Zamanı" + time_read: "Okunma Süresi" anonymize: "Kullanıcıyı Anonimleştir" anonymize_confirm: "Bu hesabı anonimleştirmek istediğinize EMİN misiniz? Kullanıcı adı ve e-posta değiştirilecek, ve tüm profil bilgileri sıfırlanacak." anonymize_yes: "Evet, bu hesap anonimleştir" anonymize_failed: "Hesap anonimleştirilirken bir hata oluştu." delete: "Kullanıcıyı Sil" - delete_forbidden_because_staff: "Adminler ve moderatörler silinemez." - delete_posts_forbidden_because_staff: "Admin ve moderatörlerin tüm gönderileri silinemez." + delete_forbidden_because_staff: "Yöneticiler ve moderatörler silinemez." + delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin tüm gönderileri silinemez." delete_forbidden: other: "Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)" cant_delete_all_posts: other: "Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski. (delete_user_max_post_age ayarı.)" cant_delete_all_too_many_posts: other: "Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)" - delete_confirm: "Bu kullanıcıyı silmek istediğinize EMİN misiniz? İşlem geri alınamaz!" + delete_confirm: "Bu kullanıcıyı silmek istediğinize EMİN misiniz? Bu işlem geri alınamaz!" delete_and_block: "Sil ve bu e-posta ve IP adresini engelle" delete_dont_block: "Sadece sil" deleted: "Kullanıcı silinmiş." delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin olun. " - send_activation_email: "Etkinleştirme E-postası Yolla" - activation_email_sent: "Etkinleştirme e-postası yollandı." + send_activation_email: "Etkinleştirme E-postası Gönder" + activation_email_sent: "Etkinleştirme e-postası gönderildi." send_activation_email_failed: "Tekrar etkinleştirme e-postası gönderilirken bir sorun yaşandı. %{error}" - activate: "Hesabı Etkinleştir" + activate: "Hesabı aktifleştir" activate_failed: "Kullanıcı etkinleştirilirken bir sorun yaşandı." - deactivate_account: "Hesabı Deaktive Et" + deactivate_account: "Hesabı Pasifleştir" deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı." unblock_failed: 'Kullanıcının engeli kaldırılırken bir sorun yaşandı.' block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.' deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı." - suspended_explanation: "Uzaklaştırılmış kullanıcılar sisteme giriş yapamaz." + suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz." block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz." trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı." suspend_modal_title: "Kullanıcıyı Uzaklaştır" @@ -1960,9 +2097,9 @@ tr_TR: days: "gün" topics_replied_to: "Cevaplanan Konular" topics_viewed: "Görüntülenmiş Konular" - topics_viewed_all_time: "Görüntülenmiş Konular (tüm zamanlar)" + topics_viewed_all_time: "Görüntülenmiş Konular (Tüm zamanlar)" posts_read: "Okunmuş Gönderiler" - posts_read_all_time: "(Tüm Zamanlarda) Okunmuş Gönderiler" + posts_read_all_time: "Okunmuş Gönderiler (Tüm zamanlarda)" flagged_posts: "Bayraklanan Gönderiler" flagged_by_users: "Bayraklayan Kullanıcılar" likes_given: "Verilen Beğeniler" @@ -1982,7 +2119,7 @@ tr_TR: external_username: "Kullanıcı adı" external_name: "İsim" external_email: "E-posta" - external_avatar_url: "Profil Resmi URLsi" + external_avatar_url: "Profil Görseli Bağlantısı" user_fields: title: "Kullanıcı Alanları" help: "Kullanıcıların doldurabileceği alanlar ekleyin." @@ -1996,12 +2133,13 @@ tr_TR: delete: "Sil" cancel: "İptal et" delete_confirm: "Bu kullanıcı alanını silmek istediğinize emin misiniz?" + options: "Seçenekler" required: - title: "Kayıt olurken zorunlu?" + title: "Kayıt olurken zorunlu mu?" enabled: "gerekli" disabled: "isteğe bağlı" editable: - title: "Üyelik sonrası düzenlenebilir?" + title: "Üyelik sonrası düzenlenebilir mi?" enabled: "düzenlenebilir" disabled: "düzenlenemez" show_on_profile: @@ -2011,23 +2149,25 @@ tr_TR: field_types: text: 'Yazı Alanı' confirm: 'Onay' + dropdown: "Açılır liste" site_text: none: "Düzenlemeye başlamak için içerik tipi seçin." title: 'Yazı İçeriği' site_settings: - show_overriden: 'Sadece iptal edilenleri göster' + show_overriden: 'Sadece değiştirdiklerimi göster' title: 'Ayarlar' reset: 'sıfırla' none: 'Hiçbiri' no_results: "Hiç sonuç bulunamadı." clear_filter: "Temizle" add_url: "URL ekle" + add_host: "sunucu ekle" categories: all_results: 'Hepsi' - required: 'Gerekli' - basic: 'Basit Kurulum' + required: 'Gerekli Ayarlar' + basic: 'Genel Ayarlar' users: 'Kullanıcılar' - posting: 'Gönderiliyor' + posting: 'Gönderiler' email: 'E-posta' files: 'Dosyalar' trust: 'Güven Seviyeleri' @@ -2036,13 +2176,14 @@ tr_TR: seo: 'SEO' spam: 'Spam' rate_limits: 'Oran Sınırları' - developer: 'Yazılımcı' + developer: 'Geliştirici' embedding: "Yerleştirme" legal: "Yasal" uncategorized: 'Diğer' backups: "Yedekler" - login: "Giriş Yap" + login: "Oturum Açma" plugins: "Eklentiler" + user_preferences: "Kullanıcı Tercihleri" badges: title: Rozetler new_badge: Yeni Rozet @@ -2051,7 +2192,7 @@ tr_TR: badge: Rozet display_name: Görünen Ad description: Açıklama - badge_type: Rozet Tipi + badge_type: Rozet Türü badge_grouping: Grup badge_groupings: modal_title: Rozet Gruplamaları @@ -2077,7 +2218,7 @@ tr_TR: listable: Rozeti herkese gözüken rozetler sayfasında göster enabled: Rozeti etkinleştir icon: İkon - image: Resim + image: Görsel icon_help: "Font Awesome sınıfı veya görsel URL'i kullanın" query: Rozet Sorgusu (SQL) target_posts: Sorgu gönderileri hedefliyor @@ -2108,14 +2249,52 @@ tr_TR: with: %{username} with_post: '%{username} buradaki gönderi için %{link} ' with_post_time: %{username} %{link} gönderisi için %{time} zamanında - with_time: %{username} at %{time} + with_time: %{username}, %{time} emoji: title: "Emoji" help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsiniz)" add: "Yeni Emoji Ekle" name: "İsim" - image: "Resim" + image: "Görsel" delete_confirm: ":%{name}: emojisini silmek istediğinize emin misiniz?" + embedding: + get_started: "Eğer Discourse'u bir başka web sitesine gömmek istiyorsanız, bu sitenin hostunu ekleyerek başlayın." + confirm_delete: "Bu hostu silmek istediğinize emin misiniz?" + sample: "Discourse konuları oluşturmak ve gömmek için aşağıdaki HTML kodunu sitenizde kullanın. REPLACE_ME'yi Discourse'u gömdüğünüz sayfanın tam URL'i ile değiştirin." + title: "Gömme" + host: "İzin Verilen Hostlar" + edit: "düzenle" + category: "Kategoriye Gönder" + add_host: "Host Ekle" + settings: "Ayarları Gömmek" + feed_settings: "Ayarları Besle" + feed_description: "Siteniz için bir RSS/ATOM beslemesi sağlamanız Discourse'un içeriğinizi içe aktarma yeteneğini geliştirebilir." + crawling_settings: "Böcek Ayarları" + crawling_description: "Discourse gönderileriniz için konular oluşturduğu zaman, eğer bir RSS/ATOM beslemesi yoksa içeriğinizi HTML'inizden ayrıştırmaya çalışacaktır. Bazen içeriğinizi çıkartmak çok zor olabilir, bu yüzden ayrıştırmayı kolaylaştırmak için CSS kuralları belirtme yeteneği sağlıyoruz." + 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_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" + 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" + permalink: + title: "Kalıcı Bağlantılar" + url: "Bağlantı" + topic_id: "Konu ID" + topic_title: "Konu" + post_id: "Gönderi ID" + post_title: "Gönderi" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Harici Bağlantı" + delete_confirm: Bu kalıcı bağlantıyı silmek istediğinize emin misiniz? + form: + label: "Yeni:" + add: "Ekle" + filter: "Ara (Bağlantı veya Harici Bağlantı)" lightbox: download: "indir" search_help: @@ -2126,11 +2305,13 @@ tr_TR: title: 'Şuraya Geç' home: 'g, h Anasayfa' latest: 'g, l En Son' - new: 'g, n Yeni' + new: 'g, n Yeniler' unread: 'g, u Okunmamış' categories: 'g, c Kategoriler' top: 'g, t En Popüler' bookmarks: 'g, b İşaretliler' + profile: 'g, p Profil' + messages: 'g, m İletiler' navigation: title: 'Navigasyon' jump: '# # numaralı gönderiye git' @@ -2142,15 +2323,16 @@ tr_TR: title: 'Uygulama' create: 'c Yeni konu aç' notifications: 'n Bildirileri aç' - site_map_menu: '= Site menüsünü aç' + hamburger_menu: '= Hamburger menüsünü aç' user_profile_menu: 'p Kullanıcı menüsünü aç' show_incoming_updated_topics: '. Güncellenmiş konuları göster' search: '/ Arama' help: '? Klavye yardımını göster' - dismiss_new_posts: 'x, r Yeni/Gönderleri Yoksay' + dismiss_new_posts: 'x, r Yeni Konuları/Gönderleri Yoksay' dismiss_topics: 'x, t Konuları Yoksay' + log_out: 'shift+z shift+z Çıkış Yapın' actions: - title: 'Aksiyonlar' + title: 'Seçenekler' bookmark_topic: 'f Konu işaretlenmesini aç/kapa' pin_unpin_topic: 'shift+p Konuyu başa tuttur / tutturma' share_topic: 'shift+s Konuyu paylaş' @@ -2160,7 +2342,7 @@ tr_TR: reply_post: 'r Gönderiyi cevapla' quote_post: 'q Gönderiyi alıntıla' like: 'l Gönderiyi beğen' - flag: '! Gönderiyi bayrakla' + flag: '! Gönderiyi Bayrakla' bookmark: 'b Gönderiyi işaretle' edit: 'e Gönderiyi düzenle' delete: 'd Gönderiyi sil' @@ -2182,7 +2364,7 @@ tr_TR: none: "" badge_grouping: getting_started: - name: Başlıyoruz + name: Başlarken community: name: Topluluk trust_level: @@ -2190,13 +2372,13 @@ tr_TR: other: name: Diğer posting: - name: Gönderiliyor + name: Gönderiler badge: editor: name: Editör description: İlk gönderi düzenleme basic_user: - name: Basit + name: Acemi description: Tüm temel topluluk işlevleri için hak verildi member: name: Üye @@ -2208,56 +2390,56 @@ tr_TR: name: Lider description: 'Tüm gönderileri düzenleyebilme, konuları başa tutturabilme, kapatabilme, arşivleyebilme, bölebilme ve birleştirebilme hakları verildi ' welcome: - name: Hoşgeldiniz + name: Hoş geldiniz description: Bir beğeni aldı autobiographer: name: Otobiyografi Yazarı description: Kullanıcı profil bilgilerini doldurmuş anniversary: name: Yıldönümü - description: Bir yıldır aktif kullanıcı, en az bir kere gönderi oluşturmuş + description: Bir yıldır aktif kullanıcı, en az bir kere gönderi oluşturmuş. nice_post: - name: İyi Gönderi - description: Bir gönderiden 10 beğeni alındı. Bu rozet birden fazla defa verilebilir + name: Güzel Gönderi + description: Bir gönderiden 10 beğeni alındı. Bu rozet birden fazla defa verilebilir. good_post: - name: Çok İyi Gönderi - description: Bir gönderiden 25 beğeni alındı. Bu rozet birden fazla defa verilebilir + name: İyi Gönderi + description: Bir gönderiden 25 beğeni alındı. Bu rozet birden fazla defa verilebilir. great_post: - name: Çok Çok İyi Gönderi - description: Bir gönderiden 50 beğeni alındı. Bu rozet birden fazla defa verilebilir + name: Harika Gönderi + description: Bir gönderiden 50 beğeni alındı. Bu rozet birden fazla defa verilebilir. nice_topic: - name: İyi Konu - description: Bir konuda 10 beğeni almış. Bu rozet birden çok kez kazanılabilir + name: Güzel Konu + description: Bir konuda 10 beğeni almış. Bu rozet birden çok kez kazanılabilir. good_topic: - name: Çok İyi Konu - description: Bir konuda 25 beğeni almış. Bu rozet birden çok kez kazanılabilir + name: İyi Konu + description: Bir konuda 25 beğeni almış. Bu rozet birden çok kez kazanılabilir. great_topic: - name: Çok Çok İyi Konu - description: Bir konuda 50 beğeni almış. Bu rozet birden çok kez kazanılabilir + name: Harika Konu + description: Bir konuda 50 beğeni almış. Bu rozet birden çok kez kazanılabilir. nice_share: - name: İyi Paylaşım + name: Güzel Paylaşım description: 25 tekil kullanıcı ile bir gönderiyi paylaşmış good_share: - name: Çok İyi Paylaşım + name: İyi Paylaşım description: 300 tekil kullanıcı ile bir gönderiyi paylaşmış great_share: - name: Çok Çok İyi Paylaşım + name: Harika Paylaşım description: 1000 tekil kullanıcı ile bir gönderiyi paylaşmış first_like: name: İlk beğeni description: Bir gönderi beğendi first_flag: name: İlk Bayrak - description: Bır gönderiyi bayrakladı + description: Bir gönderiyi bayrakladı promoter: name: Destekçi - description: Kullanıcı davet edin + description: Kullanıcı davet etti campaigner: name: Katılanlar - description: 3 üye davetlidir + description: 3 normal kullanıcı davet etti (Güven seviyesi 1) champion: name: Şampiyon - description: 10 üye davetlidir + description: 5 kullanıcı davet etti (Güven seviyesi 2) first_share: name: İlk paylaşım description: Bir gönderi paylaştı @@ -2273,8 +2455,17 @@ tr_TR: reader: name: Okuyucu description: 100'den fazla gönderiye sahip bir konudaki tüm gönderileri oku + popular_link: + name: Gözde Bağlantı + description: En az 50 kere tıklanmış harici bir bağlantı gönderildi + hot_link: + name: Sıcak Bağlantı + description: En az 300 kere tıklanmış harici bir bağlantı gönderildi + famous_link: + name: Ünlü Bağlantı + description: En az 1000 kere tıklanmış harici bir bağlantı gönderildi google_search: | -

      Google ile ara

      +

      Google'la Ara

      diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index dbaefcd022..1c30b78273 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -8,6 +8,9 @@ uk: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -20,11 +23,27 @@ uk: kb: КБ mb: МБ tb: ТБ + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "HH:mm" tiny: half_a_minute: "< 1 хв" date_year: "MMM 'YY" + medium: + x_minutes: + one: "1 хвилина" + few: "%{count} хвилини" + other: "%{count} хвилин" + x_hours: + one: "1 година" + few: "%{count} години" + other: "%{count} годин" + x_days: + one: "1 день" + few: "%{count} дні" + other: "%{count} днів" medium_with_ago: x_hours: one: "1 годину тому" @@ -57,7 +76,6 @@ uk: admin_title: "Адмін" flags_title: "Скарги" show_more: "показати більше" - show_help: "Допомога" links: "Посилання" faq: "Часті запитання" guidelines: "Інструкції" @@ -78,6 +96,7 @@ uk: every_two_weeks: "кожні два тижні" every_three_days: "Кожні три дня" max_of_count: "Не більше {{count}}" + alternation: "або" character_count: one: "{{count}} символ" few: "{{count}} символи" @@ -113,6 +132,7 @@ uk: not_bookmarked: "ви прочитали цей допис; натисніть, щоб додати його до закладок" last_read: "це останній допис, що ви прочитали; натисніть, щоб додати його до закладок" remove: "Видалити закладку" + confirm_clear: "Ви впевнені, що хочете видалити всі закладки з цієї теми?" topic_count_latest: one: "{{count}} нова чи оновлена тема." few: "нових чи оновлених тем: {{count}}." @@ -140,7 +160,6 @@ uk: revert: "Повернути" failed: "Помилка" switch_to_anon: "Потайливий перегляд" - switch_from_anon: "Полишити потайливий перегляд" banner: close: "Сховати" choose_topic: @@ -154,9 +173,12 @@ uk: reject: 'Відхилити' delete_user: 'Видалити користувача' title: "Потребує схвалення" + edit: "Редагувати" + cancel: "Скасувати" confirm: "Зберегти зміни" approval: title: "Допис потребує схвалення" + ok: "OK" user_action: user_posted_topic: "{{user}} написав(ла) тему" you_posted_topic: "Ви написали тему" @@ -172,6 +194,11 @@ uk: sent_by_user: "Надіслано користувачем {{user}}" sent_by_you: "Надіслано Вами" directory: + title: "Користувачі" + topic_count: "Теми" + topic_count_long: "Тем створено" + post_count: "Відповіді" + no_results: "Нічого не знайдено." total_rows: one: "%{count} користувач" few: "%{count} користувачі" @@ -196,6 +223,7 @@ uk: '2': "Отримані вподобання" '3': "Закладки" '4': "Теми" + '5': "Відповіді" '7': "Згадки" '9': "Цитати" '10': "Позначені зірочкою" @@ -235,6 +263,8 @@ uk: mute: "Mute" edit: "Редагувати налаштування" download_archive: "Завантажити мої дописи" + new_private_message: "Нове повідомлення" + private_message: "Повідомлення" private_messages: "Повідомлення" activity_stream: "Активність" preferences: "Налаштування" @@ -243,6 +273,13 @@ uk: invited_by: "Запрошений(а)" trust_level: "Рівень довіри" notifications: "Сповіщення" + desktop_notifications: + perm_default: "Ввімкнути сповіщення" + perm_denied_btn: "Немає доступу" + disable: "Вимкнути сповіщення" + currently_enabled: "(зараз увімкнено)" + enable: "Увімкнути сповіщення" + currently_disabled: "(зараз вимкнено)" dismiss_notifications: "Позначити все як прочитане" dismiss_notifications_tooltip: "Позначити всі сповіщення як прочитані" disable_jump_reply: "Не перескакувати до мого допису коли я відповім" @@ -254,13 +291,13 @@ uk: admin: "{{user}} є адміном" moderator_tooltip: "Цей користувач є модератором" admin_tooltip: "Цей користувач є адміністратором" + blocked_tooltip: "Цього користувача заблоковано" suspended_notice: "Цього користувача призупинено до {{date}}." suspended_reason: "Причина: " + github_profile: "Github" mailing_list_mode: "Надсилати всі нові дописи мені електронною поштою (доки я це не вимкну)" watched_categories: "Відслідковувані" - watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic's listing." tracked_categories: "Відстежувані" - tracked_categories_instructions: "Ви будете автоматично відстежувати всі нові теми у цих категоріях. Число непрочитаних та нових дописів з'являтиметься навпроти теми." muted_categories: "Ігноровані" muted_categories_instructions: "Ви не будете отримувати жодних сповіщень про нові теми у цих категоріях, і вони не з'являтимуться у вкладці Непрочитані." delete_account: "Delete My Account" @@ -313,8 +350,13 @@ uk: title: "Фон вашої візитки" email: title: "Електронна пошта" + invalid: "Будь ласка, введіть вірний email" name: title: "Ім'я" + instructions: "Ваше повне ім’я (необов’язково)" + instructions_required: "Ваше повне ім’я" + too_short: "Ваше ім’я надто коротке" + ok: "Ваше ім’я виглядає добре" username: title: "Ім'я користувача" global_mismatch: "Вже зареєстровано. Спробуєте {{suggestion}}?" @@ -339,11 +381,15 @@ uk: email_settings: "Електронна пошта" email_digests: daily: "щодня" + every_three_days: "кожні 3 дні" weekly: "щотижня" + every_two_weeks: "кожні 2 тижні" other_settings: "Інше" categories_settings: "Категорії" new_topic_duration: label: "Вважати теми новими, якщо" + not_viewed: "я їх ще не переглянув" + auto_track_topics: "Автоматично слідкувати за темами, що я відвідав" auto_track_options: never: "ніколи" invited: @@ -365,10 +411,13 @@ uk: create: "Надіслати Запрошення" bulk_invite: text: "Масове Запрошення з Файлу" + error: "Під час завантаження '{{filename}}' сталася помилка: {{message}}" password: title: "Пароль" too_short: "Ваш пароль надто короткий." common: "Цей пароль надто простий." + same_as_username: "Ваш пароль ідентичний імені користувача" + same_as_email: "Ваш пароль ідентичний Вашому email" ok: "Ваш пароль добрий." ip_address: title: "Остання IP-адреса" @@ -388,15 +437,20 @@ uk: errors: reasons: network: "Помилка Мережі" + server: "Серверна помилка" + forbidden: "Немає доступу" unknown: "Помилка" desc: network: "Будь ласка, перевірте з'єднання." + server: "Код помилки: {{status}}" + forbidden: "Вам не дозволено це переглядати." unknown: "Щось пішло не так." buttons: back: "Повернутися" again: "Спробувати ще раз" fixed: "Завантаження Сторінки" close: "Закрити" + refresh: "Оновити" read_only_mode: login_disabled: "Login is disabled while the site is in read only mode." learn_more: "дізнатися більше..." @@ -419,8 +473,10 @@ uk: enabled_description: "Ця тема містить видалені дописи, які були сховані." disabled_description: "Видалені дописи в цій темі показано." enable: "Сховати Видалені Дописи" + disable: "Показати видалені дописи" private_message_info: invite: "Запросити інших..." + remove_allowed_user: "Ви впевнені, що хочете видалити {{name}} з цього повідомлення?" email: 'Електронна пошта' username: 'Ім''я користувача' last_seen: 'Помічено востаннє' @@ -532,7 +588,6 @@ uk: title_with_attachments: "Додати зображення або файл" from_my_computer: "З мого пристрою" from_the_web: "З інтернету" - local_tip: "натисніть, щоб обрати зображення з Вашого пристрою" hint: "(Ви також можете перетягувати зображення в редактор, щоб їх завантажити)" uploading: "Завантаження" search: @@ -540,7 +595,6 @@ uk: searching: "Пошук ..." context: topic: "Пошук в цій темі" - site_map: "перейти до іншого переліку або категорії тем" go_back: 'повернутися назад' not_logged_in_user: 'сторінка користувача з підсумком поточної діяльності та налаштуваннями' current_user: 'перейти до Вашої сторінки користувача' @@ -632,8 +686,6 @@ uk: title: "Стежити" tracking: title: "Стежити" - regular: - title: "Звичайно" muted_pm: title: "Ігнорувати" muted: @@ -702,7 +754,6 @@ uk: few: 'Ви обрали дописів: {{count}}.' other: 'Ви обрали дописів: {{count}}.' post: - reply_topic: "Відповідь на {{link}}" quote_reply: "відповісти на цитату" edit_reason: "Причина: " post_number: "допис {{number}}" @@ -714,10 +765,6 @@ uk: expand_collapse: "розгорнути/згорнути" more_links: "{{count}} ще..." unread: "Допис не прочитаний" - has_replies: - one: "Відповідь" - few: "Відповідей" - other: "Відповідей" errors: create: "Даруйте, під час створення допису трапилася помилка. Будь ласка, спробуйте ще раз." edit: "Даруйте, під час редагування допису трапилася помилка. Будь ласка, спробуйте ще раз." @@ -865,13 +912,14 @@ uk: topic_statuses: locked: help: "цю тему закрито; нові відповіді більше не приймаються" + archived: + help: "цю тему заархівовано; вона заморожена і її не можна змінити" unpinned: title: "Не закріплені" pinned: title: "Закріплені" - archived: - help: "цю тему заархівовано; вона заморожена і її не можна змінити" posts: "Дописи" + posts_lowercase: "дописи" posts_long: "тема містить {{number}} дописів" original_post: "Перший допис" views: "Перегляди" @@ -887,7 +935,6 @@ uk: categories_list: "Список категорій" filters: latest: - title: "Останні" help: "теми з найсвіжішими дописами" hot: title: "Гарячі" @@ -914,6 +961,8 @@ uk: posted: title: "Мої дописи" help: "теми, в які Ви дописували" + bookmarks: + title: "Закладки" category: title: zero: "{{categoryName}}" @@ -922,11 +971,7 @@ uk: help: "Останні теми в категорії {{categoryName}}" top: title: "Top" - this_year: "This year" - this_month: "This month" - this_week: "This week" today: "Today" - other_periods: "see more top topics" permission_types: full: "Створювати / Відповідати / Бачити" create_post: "Відповідати / Бачити" @@ -957,6 +1002,7 @@ uk: admins: 'Адміни:' blocked: 'Заблоковані:' suspended: 'Призупинені:' + private_messages_title: "Повідомлення" reports: today: "Сьогодні" yesterday: "Вчора" @@ -1012,6 +1058,8 @@ uk: delete: "Видалити" delete_confirm: "Видалити цю групу?" delete_failed: "Не вдалося видалити групу. Якщо це - автоматична група, її неможливо знищити." + add: "Додати" + add_members: "Додати учасників" api: generate_master: "Згенерувати Головний ключ API" none: "Наразі немає жодного активного ключа API." @@ -1068,6 +1116,7 @@ uk: customize: title: "Customize" long_title: "Site Customizations" + css: "CSS" header: "Header" override_default: "Do not include standard style sheet" enabled: "Enabled?" @@ -1296,6 +1345,11 @@ uk: posts_read: "Прочитано Дописів" posts_read_all_time: "Прочитано дописів (весь час)" flagged_posts: "Оскаржені дописи" + user_fields: + save: "Зберегти" + edit: "Редагувати" + delete: "Видалити" + cancel: "Скасувати" site_settings: show_overriden: 'Показувати тільки перевизначені' title: 'Налаштування' @@ -1332,6 +1386,7 @@ uk: no_badges: Тут немає значків, які можуть бути надані. allow_title: Дозволити використання значків як звань multiple_grant: Можуть бути надані декілька разів + image: Зображення trigger_type: post_action: "Коли користувач щось робить у допису" post_revision: "Коли користувач редагує або створює допис" @@ -1339,9 +1394,23 @@ uk: user_change: "Коли користувач змінений або створений" preview: sample: "Зразок:" + permalink: + title: "Постійні посилання" + url: "Посилання" + topic_id: "ID теми" + topic_title: "Тема" + post_id: "ID допису" + post_title: "Допис" + category_id: "ID категорії" + category_title: "Категорія" + external_url: "Зовнішнє посилання" + delete_confirm: Ви впевнені, що хочете видалити це постійне посилання? + form: + add: "Додати" lightbox: download: "звантажити" keyboard_shortcuts_help: + title: 'Поєднання клавіш' jump_to: title: 'Перейти до' categories: 'g, c Категорії' @@ -1383,3 +1452,23 @@ uk: name: Редактор basic_user: description: Надані всі основні функції спільноти + welcome: + name: Ласкаво просимо + autobiographer: + name: Автобіографіст + anniversary: + name: Річниця + nice_topic: + name: Непогана тема + good_topic: + name: Хороша тема + great_topic: + name: Чудова тема + first_link: + name: Перше посилання + first_quote: + name: Перша цитата + read_guidelines: + name: Читати інструкції + reader: + name: Читач diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 023658020f..540d6654c5 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -8,6 +8,9 @@ zh_CN: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,12 +21,17 @@ zh_CN: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}K" + millions: "{{number}}M" dates: time: "ah:mm" long_no_year: "MMMDoah:mm" long_no_year_no_time: "MMMDo" + full_no_year_no_time: "MMMDo" long_with_year: "lll" long_with_year_no_time: "ll" + full_with_year_no_time: "YYYY年MMMDo" long_date_with_year: "YY年MMMDoLT" long_date_without_year: "MMMDoLT" long_date_with_year_without_time: "YY年MMMDo" @@ -66,6 +74,13 @@ zh_CN: other: "%{count}小时前" x_days: other: "%{count}日前" + later: + x_days: + other: "%{count}天后" + x_months: + other: "%{count}月后" + x_years: + other: "%{count}年后" share: topic: '分享本主题的链接' post: '#%{postNumber} 楼' @@ -74,6 +89,26 @@ zh_CN: facebook: '分享这个链接到 Facebook' google+: '分享这个链接到 Google+' email: '用电子邮件发送这个链接' + action_codes: + split_topic: "于%{when}分割了该主题" + autoclosed: + enabled: '于%{when}关闭' + disabled: '于%{when}开启' + closed: + enabled: '于%{when}关闭' + disabled: '于%{when}开启' + archived: + enabled: '于%{when}存档' + disabled: '于%{when}解除存档' + pinned: + enabled: '于%{when}置顶' + disabled: '于%{when}解除置顶' + pinned_globally: + enabled: '于%{when}全局置顶' + disabled: '于%{when}解除全局置顶' + visible: + enabled: '于%{when}置于列表中' + disabled: '于%{when}移除出列表' topic_admin_menu: "主题管理操作" emails_are_disabled: "所有的出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。" edit: '编辑本主题的标题和分类' @@ -89,7 +124,7 @@ zh_CN: admin_title: "管理" flags_title: "标记" show_more: "显示更多" - show_help: "帮助" + show_help: "选项" links: "链接" links_lowercase: other: "链接" @@ -112,6 +147,7 @@ zh_CN: every_two_weeks: "每两周" every_three_days: "每三天" max_of_count: "最多 {{count}}" + alternation: "或" character_count: other: "%{count} 个字符" suggested_topics: @@ -147,7 +183,7 @@ zh_CN: remove: "删除书签" confirm_clear: "你确定要删除该主题的所有书签吗？" topic_count_latest: - other: "{{count}} 个新的或更新的主题。" + other: "{{count}} 个新主题或更新的主题。" topic_count_unread: other: "{{count}} 未读主题。" topic_count_new: @@ -160,6 +196,7 @@ zh_CN: saved: "已保存！" upload: "上传" uploading: "上传中..." + uploading_filename: "上传“{{filename}}”中……" uploaded: "上传完成！" enable: "启用" disable: "禁用" @@ -170,6 +207,7 @@ zh_CN: switch_from_anon: "退出匿名模式" banner: close: "隐藏横幅。" + edit: "编辑横幅>>" choose_topic: none_found: "没有找到主题。" title: @@ -177,17 +215,16 @@ zh_CN: placeholder: "在此输入主题标题" queue: topic: "主题：" - approve: '许可' - reject: '拒绝' + approve: '通过' + reject: '否决' delete_user: '删除用户' - title: "需要许可" + title: "需要审核" none: "没有帖子可以审核。" edit: "编辑" cancel: "取消" view_pending: "查看待审核帖子" has_pending_posts: - one: "这个主题有 1 个帖子等待审核" - many: "这个主题有 {{count}} 个帖子等待审核" + other: "这个主题有 {{count}} 个帖子等待审核" confirm: "保存修改" delete_prompt: "你确定要删除%{username}？这将删除他们的所有帖子并封禁这个邮箱和 IP 地址。" approval: @@ -242,6 +279,9 @@ zh_CN: mods_and_admins: "仅版主与管理员" members_mods_and_admins: "仅组员、版主与管理员" everyone: "任何人" + trust_levels: + title: "当这些用户加入时，信任等级将自动赋予给他们：" + none: "无" user_action_groups: '1': "给赞" '2': "被赞" @@ -261,6 +301,14 @@ zh_CN: all_subcategories: "全部" no_subcategory: "无" category: "分类" + reorder: + title: "重排序分类" + title_long: "重新排序分类列表" + fix_order: "固定位置" + fix_order_tooltip: "不是所有的分类都有不同的位置数字，这可能导致一些问题。" + save: "保存顺序" + apply_all: "应用" + position: "位置" posts: "新帖子" topics: "近期" latest: "最新" @@ -288,6 +336,8 @@ zh_CN: topics_entered: "进入的主题" post_count: "# 帖子" confirm_delete_other_accounts: "你确定你想要删除这些账户吗？" + user_fields: + none: "（选择一个选项）" user: said: "{{username}}：" profile: "个人资料" @@ -299,11 +349,23 @@ zh_CN: private_messages: "消息" activity_stream: "活动" preferences: "设置" + expand_profile: "展开" bookmarks: "书签" bio: "关于我" invited_by: "邀请者为" trust_level: "用户级别" notifications: "通知" + desktop_notifications: + label: "桌面通知" + not_supported: "通知功能暂不支持该浏览器。抱歉。" + perm_default: "启用通知" + perm_denied_btn: "拒绝授权" + perm_denied_expl: "你拒绝了通知权限。在你的浏览器中允许启用通知，然后再点击按钮。（桌面：点击最左边的图标。移动设备：“站点设置”。）" + disable: "禁用通知" + currently_enabled: "（目前已启用）" + enable: "启用通知" + currently_disabled: "（目前已禁用）" + each_browser_note: "注意：你必须在任何你使用的浏览器中更改这项设置。" dismiss_notifications: "标记所有为已读" dismiss_notifications_tooltip: "标记所有未读通知为已读" disable_jump_reply: "不要在回复后跳转到我的新帖子" @@ -316,14 +378,15 @@ zh_CN: admin: "{{user}} 是管理员" moderator_tooltip: "用户是版主" admin_tooltip: "用户是管理员" + blocked_tooltip: "这个用户已被封禁" suspended_notice: "该用户将被禁止登录，直至 {{date}}。" suspended_reason: "原因：" github_profile: "Github" mailing_list_mode: "每有一个新帖就发送一封邮件给我（除非我屏蔽了主题或者分类）" watched_categories: "已关注" - watched_categories_instructions: "你将自动关注这些分类的所有新主题。你将收到新的帖子和主题的通知，并且会在靠近话题列表的地方增加一个关于未读和新帖子的数字。" + watched_categories_instructions: "你将会自动监视这些分类中的所有新主题。你会收到新帖子或新主题的通知，并且新帖数量也将在每个主题后显示。" tracked_categories: "已追踪" - tracked_categories_instructions: "你将会自动追踪这些分类中的所有新主题。未读和新帖子数量将出现在每个主题后。" + tracked_categories_instructions: "你将会自动追踪这些分类中的所有新主题。新帖数量将在每个主题后显示。" muted_categories: "已屏蔽" muted_categories_instructions: "你不会收到这些分类的新主题的任何通知，他们也不会出现在你的未读标签中。" delete_account: "删除我的帐号" @@ -376,7 +439,7 @@ zh_CN: upload_title: "上传图片" upload_picture: "上传图片" image_is_not_a_square: "注意：我们已经裁剪了你的图片；它不是正方形的。" - cache_notice: "你已经成功地修改了头像，但是由于浏览器缓存，你可能要等待新头像生效。" + cache_notice: "你已经成功地改变了你的个人头像，但是鉴于浏览器缓存可能要一段时间才能生效。" change_profile_background: title: "个人资料背景" instructions: "个人资料背景将被居中，且默认宽度为 850px。" @@ -436,34 +499,42 @@ zh_CN: every_two_weeks: "每两周" email_direct: "当有人引用我、回复我的帖子，@提及你或邀请你至主题时发送一封邮件给我" email_private_messages: "当有人给发消息给我时发送一封邮件给我" - email_always: "即使在论坛中活跃时也接收电子邮件提醒" + email_always: "即使我在论坛中活跃时也发送电子邮件提醒给我" other_settings: "其它" categories_settings: "分类" new_topic_duration: label: "近期主题的条件：" not_viewed: "我还没有浏览它们" last_here: "在你最近一次访问之后创建的" - after_n_days: - other: "最近 {{count}} 天内创建" - after_n_weeks: - other: "最近 {{count}} 星期内创建" + after_1_day: "在昨天创建" + after_2_days: "在这 2 天创建" + after_1_week: "在上周创建" + after_2_weeks: "在这 2 周创建" auto_track_topics: "自动追踪我进入的主题" auto_track_options: never: "从不" immediately: "立刻" - after_n_seconds: - other: "{{count}} 秒之后" - after_n_minutes: - other: "{{count}} 分钟之后" + after_30_seconds: "30 秒之后" + after_1_minute: "1 分钟之后" + after_2_minutes: "2 分钟之后" + after_3_minutes: "3 分钟之后" + after_4_minutes: "4 分钟之后" + after_5_minutes: "5 分钟之后" + after_10_minutes: "10 分钟之后" invited: search: "输入以搜索邀请..." title: "邀请" user: "邀请用户" - none: "你还没有邀请过任何人。" + sent: "已发送" + none: "没有未接受状态的邀请。" truncated: "只显示前 {{count}} 个邀请。" redeemed: "确认邀请" + redeemed_tab: "已确认" + redeemed_tab_with_count: "已确认（{{count}}）" redeemed_at: "已确认" pending: "待验证邀请" + pending_tab: "等待中" + pending_tab_with_count: "等待确认（{{count}}）" topics_entered: "已查看的主题" posts_read_count: "已读的帖子" expired: "该邀请已过期。" @@ -475,6 +546,8 @@ zh_CN: days_visited: "访问天数" account_age_days: "账号建立天数" create: "发送邀请" + generate_link: "复制邀请链接" + generated_link_message: '

      邀请链接成功生成！

      邀请链接仅对下列邮件地址有效：%{invitedEmail}

      ' bulk_invite: none: "你没有邀请过任何人。你可以发送个人邀请，或者上传一个批量邀请文件一次性邀请一批人。" text: "通过文件批量邀请" @@ -496,6 +569,7 @@ zh_CN: title: "注册 IP 地址" avatar: title: "头像" + header_title: "个人页面、消息、书签和设置" title: title: "头衔" filters: @@ -530,7 +604,9 @@ zh_CN: read_only_mode: enabled: "只读模式已启用。你可以继续浏览这个站点但是无法进行交互操作。" login_disabled: "只读模式下不允许登录。" - too_few_topics_notice: "创建至少 5 个公共主题和 %{posts} 公开的回复活跃论坛。新用户无法在无内容可读的情况下提高用户等级。这个消息只显示给职员。" + too_few_topics_and_posts_notice: "让我们开始讨论！目前有 %{currentTopics} / %{requiredTopics} 个主题和 %{currentPosts} / %{requiredPosts} 个帖子。新访客需要能够阅读和回复一些讨论。" + too_few_topics_notice: "让我们开始讨论！目前有 %{currentTopics} / %{requiredTopics} 个主题。新访客需要能够阅读和回复一些讨论。" + too_few_posts_notice: "让我们开始讨论！目前有 %{currentPosts} / %{requiredPosts} 个帖子。新访客需要能够阅读和回复一些讨论。" learn_more: "了解更多..." year: '年' year_desc: '365 天以前创建的主题' @@ -546,6 +622,21 @@ zh_CN: last_reply_lowercase: 最后回复 replies_lowercase: other: 回复 + signup_cta: + sign_up: "注册" + hide_session: "明天提醒我" + hide_forever: "不，谢谢" + hidden_for_session: "好的，我会在明天提醒你。不过你任何时候都可以使用“登录”来创建账户。" + intro: "你好！:heart_eyes: 看起来你挺喜欢这个讨论，但是你还没有注册账户。" + value_prop: "当你创建了账户，我们能准确地追踪你的阅读进度，所以你能够在下一次访问时知道你读过了什么。你也可以收到网页和邮件通知，特别是有新帖子的时候。并且你可以赞任何帖子来分享你的感谢。:heartbeat:" + methods: + sso: "注册很容易：你只要在主站点建立一个账户。" + only_email: "注册很容易：只需要一个邮箱和密码。" + only_other: "使用%{provider}的账号注册。" + one_and_email: "使用%{provider}的账号，或者邮箱和密码来注册。" + multiple_no_email: "注册很容易：使用我们提供的 %{count} 种第三方登录方式。" + multiple: "注册很容易：使用我们提供的 %{count} 种第三方登录方式，或是邮箱和密码。" + unknown: "不支持的登录方法" summary: enabled_description: "你正在查看这个主题的概括版本：由社群认定的最有意思的帖子。" description: "有 {{count}} 个回复。" @@ -589,6 +680,7 @@ zh_CN: email_placeholder: "电子邮箱地址或用户名" caps_lock_warning: "大小写锁定开启" error: "未知错误" + rate_limit: "请等待一会再尝试登录。" blank_username_or_password: "请输入你的邮件地址或用户名，以及密码。" reset_password: '重置密码' logging_in: "登录中..." @@ -626,7 +718,10 @@ zh_CN: emoji_one: "Emoji One" composer: emoji: "Emoji :smile:" + options: "选项" + whisper: "密语" add_warning: "这是一个正式的警告。" + toggle_whisper: "折叠或展开密语" posting_not_on_topic: "你想回复哪一个主题？" saving_draft_tip: "保存中……" saved_draft_tip: "已保存" @@ -650,10 +745,10 @@ zh_CN: create_pm: "消息" title: "或者按下 Ctrl + 回车" users_placeholder: "添加一个用户" - title_placeholder: "简述此讨论内容是关于什么？" + title_placeholder: "用简要的一句话解释要讨论什么" edit_reason_placeholder: "编辑理由" show_edit_reason: "（添加编辑理由）" - reply_placeholder: "在这输入。可使用 Markdown、BBCode 或 HTML 格式化内容。拖拽或粘贴图片即可上传。" + reply_placeholder: "正文。使用 Markdown、BBCode 或 HTML 格式化内容。拖拽或粘贴图片。" view_new_post: "浏览你的新帖子。" saving: "保存中..." saved: "已保存！" @@ -714,6 +809,20 @@ zh_CN: moved_post: "

      {{username}} 移动了 {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      获得“{{description}}”

      " + alt: + mentioned: "被提及" + quoted: "被引用" + replied: "回复" + posted: "发自" + edited: "编辑你的帖子" + liked: "赞了你的帖子" + private_message: "私信来自" + invited_to_private_message: "私信邀请自" + invited_to_topic: "主题邀请自" + invitee_accepted: "介绍邀请自" + moved_post: "你的帖子被移动自" + linked: "链接至你的帖子" + granted_badge: "勋章授予" popup: mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}' quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}' @@ -728,15 +837,27 @@ zh_CN: from_the_web: "来自网络" remote_tip: "图片链接" remote_tip_with_attachments: "图片或文件链接（{{authorized_extensions}}）" - local_tip: "点击从你的设备中选择一张图片。" - local_tip_with_attachments: "点击从你的设备中选择图片或文件（支持的格式： {{authorized_extensions}}）。" + local_tip: "从你的设备中选择图片" + local_tip_with_attachments: "从你的设备中选择图片或文件（{{authorized_extensions}}）" hint: "（你也可以通过拖放至编辑器的方式来上传）" - hint_for_supported_browsers: "（你也可以通过拖放或粘帖图片至编辑器的方式来上传）" + hint_for_supported_browsers: "你也可以通过拖放或复制粘帖至编辑器" uploading: "上传中" + select_file: "选择文件" image_link: "链接你的图片到" search: + sort_by: "排序按" + relevance: "相关性" + latest_post: "最后发帖时间" + most_viewed: "最多阅读" + most_liked: "最多赞" + select_all: "全选" + clear_all: "清除所有" + result_count: + other: "搜索“{{term}}”有 {{count}} 条结果" title: "搜索主题、帖子、用户或分类" no_results: "没有找到结果。" + no_more_results: "没有找到更多结果。" + search_help: 搜索帮助 searching: "搜索中..." post_format: "#{{post_number}} 来自于 {{username}}" context: @@ -744,7 +865,8 @@ zh_CN: category: "搜索“{{category}}”分类" topic: "只搜索本主题" private_messages: "搜索消息" - site_map: "去另一个主题列表或分类" + hamburger_menu: "去另一个主题列表或分类" + new_item: "新" go_back: '返回' not_logged_in_user: '显示当前活动和设置的用户页面' current_user: '去你的用户页面' @@ -778,20 +900,23 @@ zh_CN: top: "没有最佳主题。" search: "没有搜索结果。" educate: - new: '

      近期的主题将在这里显示。

      默认情况下，近两天创建的主题是近期主题，并会显示一个 新 的标识。

      你可以在你的 设置中改变这一行为。

      ' - unread: '

      这里是你的未读主题。

      默认情况下，下述主题将被认为是未读的，并会显示未读数目： 1 如果你：

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

      或者你在主题底部的通知控制中选择了追踪或监视。

      你可以改变你的用户设置.

      ' + new: '

      近期的主题将在这里显示。

      默认情况下，近两天创建的主题是近期主题，并会显示一个新的标识。

      你可以在你的设置中改变这一行为。

      ' + unread: '

      这里是你的未读主题。

      默认情况下，下述主题将被认为是未读的，并会显示未读数目：1 如果你：

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

      或者你在主题底部的通知控制中选择了追踪或监视。

      你可以改变你的用户设置。

      ' bottom: latest: "没有更多主题可看了。" hot: "没有更多热门主题可看了。" posted: "没有更多已发布主题可看了。" read: "没有更多已阅主题可看了。" new: "没有更多新主题可看了。" - unread: "没有更多未阅主题可看了。" + unread: "没有更多未读主题了。" category: "没有更多{{category}}分类的主题了。" top: "没有更多最佳主题了。" bookmarks: "没有更多书签主题了。" search: "没有更多搜索结果。" topic: + unsubscribe: + stop_notifications: "你将收到更少的关于{{title}}的通知" + change_notification_state: "您现在的提醒状态是" filter_to: "本主题中的 {{post_count}} 帖" create: '新主题' create_long: '创建一个新主题' @@ -835,7 +960,7 @@ zh_CN: jump_reply_up: 跳转至更早的回复 jump_reply_down: 跳转至更晚的回复 deleted: "此主题已被删除" - auto_close_notice: "本主题将在 %{timeLeft} 后自动关闭" + auto_close_notice: "本主题将在%{timeLeft}后自动关闭。" auto_close_notice_based_on_last_post: "在最后一个帖子 %{duration} 无人回复关闭帖子的时间。" auto_close_title: '自动关闭设置' auto_close_save: "保存" @@ -861,29 +986,29 @@ zh_CN: '2_4': '因为你在此主题内发表了回复，所以你将收到相关通知。' '2_2': '因为你在追踪此主题，所以你将收到相关通知。' '2': '因为你阅读了此主题，所以你将收到相关通知。' - '1_2': '只有当有人@你或者回复你的帖子时，你才会收到通知。' - '1': '只有当有人@你或者回复你的帖子时，你才会收到通知。' + '1_2': '如果某人@你或者回复你，你将收到通知。' + '1': '如果某人@你或者回复你，你将收到通知。' '0_7': '你将忽略关于此分类的所有通知。' '0_2': '你将忽略关于此主题的所有通知。' '0': '你将忽略关于此主题的所有通知。' watching_pm: title: "关注" - description: "一旦消息中有新消息，你都会收到通知。未读和新帖子的数量将显示在主题列表的每个主题后。" + description: "你将会在该消息的每个新回复发布后收到通知，并且会显示新回复数量。" watching: title: "关注" - description: "一旦有关于这个主题的新帖子发表，你都会收到通知。未读贴的数量将出现在主题列表中每个主题的标题后。" + description: "你将会在该主题的每个新回复发布后收到通知，并且会显示新回复数量。" tracking_pm: title: "追踪" - description: "未读和新帖子的数量将出现在消息旁。你只会在别人@你或回复你的主题时才会被提醒。" + description: "该消息标题后将显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。" tracking: title: "追踪" - description: "未读贴和新帖的数量将出现在主题列表中每个主题的标题后。你只会在别人@你或有人回复了你的帖子时才会收到通知。" + description: "该主题标题后将显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。" regular: - title: "常规" - description: "当有人@你或者回复你的帖子时，你才会收到通知。" + title: "普通" + description: "如果某人@你或者回复你，你将收到通知。" regular_pm: - title: "常规" - description: "当有人@你或者回复你的消息时，你才会收到通知。" + title: "普通" + description: "如果某人@你或者回复你，你将收到通知。" muted_pm: title: "防打扰" description: "你不会收到关于此消息的任何通知。" @@ -925,17 +1050,20 @@ zh_CN: success_message: '你已成功报告本帖。' feature_topic: title: "设为精华主题" - pin: "将主题置于{{categoryLink}}分类最上方。" + pin: "将该主题置于{{categoryLink}}分类最上方至" confirm_pin: "你已经有了{{count}}个置顶主题。太多的置顶主题可能会困扰新用户和访客。你确定想要在该分类再置顶一个主题么？" unpin: "从{{categoryLink}}分类最上方移除主题。" + unpin_until: "从{{categoryLink}}分类最上方移除主题或者延迟至%{until}。" pin_note: "用户可以给自己解除置顶主题。" + pin_validation: "置顶该主题需要一个日期。" already_pinned: zero: "{{categoryLink}}没有置顶主题。" one: "现在置顶在{{categoryLink}}分类的主题：1。" other: "现在置顶在{{categoryLink}}分类的主题：{{count}}。" - pin_globally: "将主题置顶在所有主题列表的最上方，直到职员解除置顶。" + pin_globally: "将主题置于所有主题列表最上方至" confirm_pin_globally: "你已经有了{{count}}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。你确定想要再全局置顶一个主题么？" unpin_globally: "将主题从所有主题列表的最上方移除。" + unpin_globally_until: "从所有主题列表最上方移除主题或者延迟至%{until}。" global_pin_note: "用户可以自己解除主题状态。" already_pinned_globally: zero: "没有全局置顶的主题。" @@ -967,8 +1095,8 @@ zh_CN: sso_enabled: "输入你想邀请的用户的用户名至该主题。" to_topic_blank: "输入你想邀请的用户的用户名或邮箱地址至该主题" to_topic_email: "你已经输入了邮箱地址。我们将发送一封邮件邀请让你的朋友可直接回复该主题。" - to_topic_username: "你已经输入了用户名。我们将发送提醒至该用户，其中将包含一个邀请他们至该主题的链接。" - to_username: "输入你想邀请的用户的用户名。我们将发送一个包含了到这个主题的链接的通知给用户。" + to_topic_username: "你已经输入了用户名。我们将发送一封邀请邮件，其中包含了一个链接可以让你的朋友参与该主题的讨论。" + to_username: "输入你想邀请的人的用户名。我们将发送一个邀请，其中包含了一个链接可以让你他们直接参与该主题。" email_placeholder: '电子邮箱地址' success_email: "我们发了一封邀请邮件给 {{emailOrUsername}}。我们将在邀请被接受后通知你。检查你的用户中的邀请标签页来追踪你的邀请。" success_username: "我们已经邀请了该用户参与该主题。" @@ -1000,6 +1128,12 @@ zh_CN: instructions: other: "请选择{{old_user}}创建的这 {{count}} 个帖子的新所有者。" instructions_warn: "注意所有的关于这个帖子的通知不会被发送到新用户。
      警告：目前，没有任何与帖子关联的数据会被传递给新用户。谨慎使用。" + change_timestamp: + title: "修改时间戳" + action: "修改时间戳" + invalid_timestamp: "时间戳不能是未来的时间。" + error: "更改主题时间戳时发生错误。" + instructions: "请为主题选择新的时间戳。主题中的所有帖子将按照相同的时间差更新。" multi_select: select: '选择' selected: '已选择（{{count}}）' @@ -1011,8 +1145,8 @@ zh_CN: description: other: 你已经选择了 {{count}} 个帖子。 post: - reply: "回复 {{replyAvatar}} {{username}} 发表的 {{link}}" - reply_topic: "回复 {{link}}" + reply: " {{replyAvatar}} {{usernameLink}}" + reply_topic: " {{link}}" quote_reply: "引用回复" edit: "编辑 {{replyAvatar}} {{username}} 发表的 {{link}}" edit_reason: "理由：" @@ -1031,16 +1165,24 @@ zh_CN: more_links: "{{count}} 更多..." unread: "主题是未读的" has_replies: - other: "回复" + other: "{{count}} 回复" + has_likes: + other: "{{count}} 赞" + has_likes_title: + other: "{{count}} 人赞了该贴" + has_likes_title_you: + zero: "你赞了该贴" + one: "你和其他 1 人赞了该贴" + other: "你和其他 {{count}} 人赞了该贴" errors: create: "抱歉，在创建你的帖子时发生了错误。请重试。" edit: "抱歉，在编辑你的帖子时发生了错误。请重试。" upload: "抱歉，在上传文件时发生了错误。请重试。" attachment_too_large: "抱歉，你上传的附件太大了（最大不能超过 {{max_size_kb}}kb）。" file_too_large: "抱歉，你上传的附件太大了（最大限制 {{max_size_kb}}kb）。" - too_many_uploads: "抱歉, 你只能一次上传一张图片。" + too_many_uploads: "抱歉，你只能一次上传一张图片。" too_many_dragged_and_dropped_files: "抱歉，你一次只能拖放最多 10 个文件。" - upload_not_authorized: "抱歉, 你不能上传此类型文件（可上传的文件类型有: {{authorized_extensions}}）。" + upload_not_authorized: "抱歉，你不能上传此类型文件（可上传的文件类型有: {{authorized_extensions}}）。" image_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传图片。" attachment_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传附件。" attachment_download_requires_login: "抱歉，但是你需要登录后才能下载附件。" @@ -1049,6 +1191,7 @@ zh_CN: no_value: "否" yes_value: "是" via_email: "通过电子邮件发送的帖子" + whisper: "这个帖子是只对版主可见的密语" wiki: about: "这个帖子是维基；基础用户能编辑它" archetypes: @@ -1180,14 +1323,17 @@ zh_CN: category: can: '能够… ' none: '（未分类）' + all: '所有分类' choose: '选择分类…' edit: '编辑' edit_long: "编辑" view: '浏览分类下的主题' - general: '通常' + general: '常规' settings: '设置' + topic_template: "主题模板" delete: '删除分类' create: '新分类' + create_long: '创建新的分类' save: '保存分类' slug: '分类 Slug' slug_placeholder: '（可选）用于分类的 URL' @@ -1210,13 +1356,15 @@ zh_CN: change_in_category_topic: "访问分类主题来编辑描述信息" already_used: '此色彩已经被另一个分类使用' security: "安全性" + special_warning: "警告：这个分类是已经自动建立好的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。" images: "图片" auto_close_label: "该时间段后自动关闭主题：" auto_close_units: "小时" - email_in: "自定义外来电子邮件地址:" + email_in: "自定义进站电子邮件地址：" email_in_allow_strangers: "接受无账号的匿名用户的邮件" email_in_disabled: "站点设置中已经禁用通过邮件发表新主题。欲启用通过邮件发表新主题，" email_in_disabled_click: '启用“邮件发表”设置。' + suppress_from_homepage: "不在主页中显示这个分类。" allow_badges_label: "允许在这个分类中授予徽章" edit_permissions: "编辑权限" add_permission: "添加权限" @@ -1229,13 +1377,13 @@ zh_CN: notifications: watching: title: "关注" - description: "你将会自动监视这些分类中的所有新主题。你会收到新帖子或新主题的通知，未读和新帖数量将出现在每个主题后。" + description: "你将会自动监视这些分类中的所有新主题。你将会收到新帖子和新主题发布的通知，并且新帖数量也将在这些主题后显示。" tracking: title: "追踪" - description: "你将会自动追踪这些分类中的所有新主题。未读和新帖子数量将出现在每个主题后。" + description: "你将会自动追踪这些分类中的所有新主题。新帖数量将在这些主题后显示。" regular: title: "常规" - description: "当有人@你或者回复你的帖子时，你才会收到通知。" + description: "如果某人@你或者回复你，你将收到通知。" muted: title: "免打扰" description: "你不会收到这些分类中的任何新主题通知，并且他们将不会出现在你的未读列表中。" @@ -1251,7 +1399,7 @@ zh_CN: ip_address_missing: "（N/A）" hidden_email_address: "（隐藏）" submit_tooltip: "提交私有标记" - take_action_tooltip: "与其等待更多的社区的标志, 不如立刻到达标志." + take_action_tooltip: "立即采取标记到达限制值时的措施，而不是等待更多的社群标记" cant: "抱歉，当前你不能报告本帖。" formatted_name: off_topic: "偏题" @@ -1281,6 +1429,10 @@ zh_CN: help: "你已经收藏了此主题" locked: help: "本主题已关闭；不再接受新的回复" + archived: + help: "本主题已归档；即已经冻结，无法修改" + locked_and_archived: + help: "本主题已经关闭并且存档；不再接受新回复且无法修改" unpinned: title: "解除置顶" help: "主题已经解除置顶；它将以默认顺序显示" @@ -1290,8 +1442,6 @@ zh_CN: pinned: title: "置顶" help: "本主题已置顶；它将始终显示在它所属分类的顶部" - archived: - help: "本主题已归档；即已经冻结，无法修改" invisible: help: "本主题被设置为不显示在主题列表中，并且只能通过直达链接来访问" posts: "帖子" @@ -1328,7 +1478,10 @@ zh_CN: with_topics: "%{filter}主题" with_category: "%{category}的%{filter}主题" latest: - title: "最新" + title: + zero: "最新" + one: "最新（1）" + other: "最新（{{count}}）" help: "最新发布的帖子" hot: title: "热门" @@ -1354,13 +1507,13 @@ zh_CN: other: "{{count}} 条未读" new: lower_title_with_count: - one: "1 个近期主题" - other: "{{count}} 个近期主题" - lower_title: "近期主题" + one: "1 近期" + other: "{{count}} 近期" + lower_title: "近期" title: - zero: "近期主题" - one: "近期主题（1）" - other: "近期主题（{{count}}）" + zero: "近期" + one: "近期（1）" + other: "近期（{{count}}）" help: "最近几天创建的主题" posted: title: "我的帖子" @@ -1381,6 +1534,8 @@ zh_CN: title: "不限时间" yearly: title: "年度" + quarterly: + title: "季度的" monthly: title: "月度" weekly: @@ -1388,11 +1543,12 @@ zh_CN: daily: title: "每天" all_time: "不限时间" - this_year: "今年" - this_month: "本月" - this_week: "本周" + this_year: "年" + this_quarter: "季度" + this_month: "月" + this_week: "周" today: "今天" - other_periods: "查看更多热门主题" + other_periods: "跳转到顶部" browser_update: '抱歉，你的浏览器版本太低，无法正常访问该站点。。请升级你的浏览器。' permission_types: full: "创建 / 回复 / 阅读" @@ -1426,6 +1582,7 @@ zh_CN: suspended: '禁止登录' private_messages_short: "消息" private_messages_title: "消息" + mobile_title: "移动" space_free: "{{size}} 空闲" uploads: "上传" backups: "备份" @@ -1534,7 +1691,7 @@ zh_CN: primary_group: "自动设置为主要群组" api: generate_master: "生成主 API 密钥" - none: "当前没有活动的 API 密钥。" + none: "当前没有可用的 API 密钥。" user: "用户" title: "API" key: "API 密钥" @@ -1552,7 +1709,11 @@ zh_CN: name: "名字" none_installed: "你没有安装任何插件。" version: "版本" + enabled: "启用？" + is_enabled: "是" + not_enabled: "否" change_settings: "更改设置" + change_settings_short: "设置" howto: "如何安装插件？" backups: title: "备份" @@ -1618,6 +1779,8 @@ zh_CN: screened_email: "以 CSV 格式导出所有已显示的电子邮件列表。" screened_ip: "以 CSV 格式导出所有已显示的IP地址列表。" screened_url: "以 CSV 格式导出所有已显示的URL列表。" + export_json: + button_text: "导出" invite: button_text: "发送邀请" button_title: "发送邀请" @@ -1628,6 +1791,7 @@ zh_CN: header: "头部" top: "顶部" footer: "底部" + embedded_css: "嵌入的 CSS" head_tag: text: "" title: "将在 标签前插入的 HTML" @@ -1645,6 +1809,8 @@ zh_CN: save: "保存" new: "新建" new_style: "新样式" + import: "导入" + import_title: "选择一个文件或者粘贴文本" delete: "删除" delete_confirm: "删除本定制内容？" about: "修改站点的 CSS 样式表和 HTML 头部。添加一个自定义方案开始。" @@ -1717,7 +1883,7 @@ zh_CN: sent_test: "已发送！" delivery_method: "发送方式" preview_digest: "预览" - preview_digest_desc: "预览每周投递给不活跃用户的摘要邮件内容。" + preview_digest_desc: "预览发送给不活跃用户的摘要邮件内容。" refresh: "刷新" format: "格式" html: "html" @@ -1731,7 +1897,7 @@ zh_CN: title: "过滤器" user_placeholder: "username" address_placeholder: "name@example.com" - type_placeholder: "digest, signup..." + type_placeholder: "摘要、注册…" reply_key_placeholder: "回复键" skipped_reason_placeholder: "原因" logs: @@ -1782,6 +1948,7 @@ zh_CN: delete_post: "删除帖子" impersonate: "检视" anonymize_user: "匿名用户" + roll_up: "回退 IP 封禁" screened_emails: title: "被屏蔽的邮件地址" description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。" @@ -1996,6 +2163,7 @@ zh_CN: delete: "删除" cancel: "取消" delete_confirm: "你确定要删除这个用户字段么？" + options: "选项" required: title: "在注册时需要填写？" enabled: "必填" @@ -2011,6 +2179,7 @@ zh_CN: field_types: text: '文本字段' confirm: '确认' + dropdown: "下拉菜单" site_text: none: "选择一个内容类型开始编辑。" title: '文本内容' @@ -2022,6 +2191,7 @@ zh_CN: no_results: "找不到结果。" clear_filter: "清除" add_url: "增加链接" + add_host: "添加主机" categories: all_results: '全部' required: '必填' @@ -2043,6 +2213,7 @@ zh_CN: backups: "备份" login: "登录" plugins: "插件" + user_preferences: "用户设置" badges: title: 徽章 new_badge: 新徽章 @@ -2116,6 +2287,44 @@ zh_CN: name: "姓名" image: "图片" delete_confirm: "你确定要删除 :%{name}: emoji 么？" + embedding: + get_started: "如果你想要将 Discourse 嵌入至其他网站，添加他们的主机地址。" + confirm_delete: "你确定要删除这个主机吗？" + sample: "使用下列 HTML 代码至你的站点创建和嵌入 Discourse 主题。把REPLACE_ME 替换成你将嵌入至的网址。" + title: "嵌入" + host: "允许的主机" + edit: "编辑" + category: "发布到分类" + add_host: "增加主机" + settings: "嵌入设置" + feed_settings: "源设置" + feed_description: "为你的站点提供一份 RSS/ATOM 源能改善 Discourse 导入你的内容的能力" + crawling_settings: "爬虫设置" + crawling_description: "当 Discourse 为你的帖子创建了主题时，如果没有 RSS/ATOM 流存在，它将尝试从 HTML 中解析内容。有时分离其中的内容时可能是很有挑战性的，所以我们提供了指定 CSS 规则的能力来帮助分离过程。" + embed_by_username: "主题创建者的用户名" + embed_post_limit: "嵌入的最大帖子数量。" + embed_username_key_from_feed: "从流中拉取 Discourse 用户名的 Key " + embed_truncate: "截断嵌入的帖子" + embed_whitelist_selector: "使用 CSS 选择器选择允许的嵌入元素" + embed_blacklist_selector: "使用 CSS 选择器移除嵌入元素" + feed_polling_enabled: "通过RSS/ATOM导入帖子" + feed_polling_url: "用于抓取的 RSS/ATOM 流的 URL" + save: "保存嵌入设置" + permalink: + title: "永久链接" + url: "URL" + topic_id: "主题 ID" + topic_title: "主题" + post_id: "帖子 ID" + post_title: "帖子" + category_id: "分类 ID" + category_title: "分类" + external_url: "外部 URL" + delete_confirm: 你确定要删除该永久链接？ + form: + label: "新：" + add: "添加" + filter: "搜索（URL 或外部 URL）" lightbox: download: "下载" search_help: @@ -2129,26 +2338,29 @@ zh_CN: new: 'g 然后 n 近期主题' unread: 'g 然后 u 未读主题' categories: 'g 然后 c 分类列表' - top: 'g, t 顶部' + top: 'g 然后 t 顶部' bookmarks: 'g 然后 b 书签' + profile: 'g 然后 p 个人页面' + messages: 'g 然后 m 消息' navigation: title: '导航' jump: '# 跳转到帖子 #' back: 'u 返回' - up_down: 'k 和 j 移动选择焦点 ↑ ↓' + up_down: 'k 或 j 移动选择焦点 ↑ ↓' open: 'o 或者 Enter 打开选中的主题' - next_prev: 'shift+j/shift+k 下一个/前一个段落' + next_prev: 'shift+j 或 shift+k 下一个/前一个段落' application: title: '应用' create: 'c 创建一个新主题' notifications: 'n 打开通知菜单' - site_map_menu: '= 打开站点菜单' + hamburger_menu: '= 打开汉堡菜单' user_profile_menu: 'p 打开用户菜单' show_incoming_updated_topics: '. 显示更新过的主题' search: '/ 搜索' help: '? 打开键盘快捷键帮助' - dismiss_new_posts: 'x, r 解除新/帖子提示' - dismiss_topics: 'x, t 解除主题提示' + dismiss_new_posts: 'x 然后 r 解除新/帖子提示' + dismiss_topics: 'x 然后 t 解除主题提示' + log_out: 'shift+z shift+z 登出' actions: title: '动作' bookmark_topic: 'f 切换主题收藏状态' @@ -2254,10 +2466,10 @@ zh_CN: description: 已邀请了 1 个用户 campaigner: name: 资深推广 - description: 已邀请了 3 个用户 + description: 邀请3个基础用户（信任等级1） champion: name: 元老推广 - description: 已邀请了 10 个用户 + description: 邀请5个会员（信任等级2） first_share: name: 首次分享 description: 已分享了一个帖子 @@ -2273,12 +2485,21 @@ zh_CN: reader: name: 读者 description: 阅读一个超过 100 个帖子的主题中的每一个帖子 + popular_link: + name: 流行链接 + description: 发布了超过 50 次点击的外部链接 + hot_link: + name: 热门链接 + description: 发布了超过 300 次点击的外部链接 + famous_link: + name: 著名链接 + description: 发布了超过 1000 次点击的外部链接 google_search: | -

      用 Google 搜索

      +

      用 Google 搜索

      - - - - - + + + + +

      diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 7827550ab5..092068234b 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -66,6 +66,13 @@ zh_TW: other: "%{count} 小時前" x_days: other: "%{count} 天前" + later: + x_days: + other: "%{count} 天後" + x_months: + other: "%{count} 個月後" + x_years: + other: "%{count} 年後" share: topic: '在此話題內分享連結' post: '文章 #%{postNumber}' @@ -89,7 +96,6 @@ zh_TW: admin_title: "管理員" flags_title: "投訴" show_more: "顯示更多" - show_help: "幫助" links: "連結" links_lowercase: other: "鏈結" @@ -112,6 +118,7 @@ zh_TW: every_two_weeks: "每兩週" every_three_days: "每三天" max_of_count: "（最大 {{count}}）" + alternation: "或者" character_count: other: "{{count}} 個字" suggested_topics: @@ -167,7 +174,6 @@ zh_TW: revert: "回復" failed: "失敗" switch_to_anon: "匿名模式" - switch_from_anon: "退出匿名模式" banner: close: "關閉此橫幅" choose_topic: @@ -184,8 +190,14 @@ zh_TW: none: "沒有要回顧的文章。" edit: "編輯" cancel: "取消" + view_pending: "觀看等待審核的貼文" confirm: "儲存變更" + delete_prompt: "您確定要刪除 %{username} 這個帳號嗎？這會同時將該帳號的所有貼文一併刪除，並封鎖他的電子郵件與 IP。" approval: + title: "貼文需等待審核" + description: "貼文已經送出，但必須等待管理者審核過後才會出現在板上，請耐心等候。" + pending_posts: + other: "你有 {{count}} 篇貼文在等待審核中" ok: "確定" user_action: user_posted_topic: "{{user}} 建立了 此討論話題" @@ -233,6 +245,8 @@ zh_TW: mods_and_admins: "只有板主以及管理員" members_mods_and_admins: "只有群組成員、板主以及管理員" everyone: "所有人" + trust_levels: + none: "無" user_action_groups: '1': "已按讚" '2': "已收到的讚" @@ -246,6 +260,7 @@ zh_TW: '11': "編輯" '12': "送出的項目" '13': "收件匣" + '14': "等待中" categories: all: "所有分類" all_subcategories: "所有" @@ -289,14 +304,25 @@ zh_TW: private_messages: "訊息" activity_stream: "活動" preferences: "偏好設定" + expand_profile: "展開" bookmarks: "書籤" bio: "關於我" invited_by: "邀請人" trust_level: "信任等級" notifications: "通知" + desktop_notifications: + label: "桌面通知" + not_supported: "非常遺憾，你的瀏覽器不支持桌面通知。" + perm_default: "啟用桌面通知" + perm_denied_btn: "權限被拒絕" + disable: "停用通知" + currently_enabled: "(當前已啟用)" + enable: "啟用通知" + currently_disabled: "(當前已關閉)" dismiss_notifications: "全部標記為已讀" dismiss_notifications_tooltip: "標記所有未讀通知為已讀" disable_jump_reply: "不要在回覆之後直接跳到我的文章" + dynamic_favicon: "在瀏覽器小圖示上顯示新主題/更新的主題數" edit_history_public: "讓其他用戶檢視我的文章修訂紀錄" external_links_in_new_tab: "以新分頁開啟所有外部連結" enable_quoting: "允許引用已標註的文字" @@ -305,14 +331,13 @@ zh_TW: admin: "{{user}} 是管理員" moderator_tooltip: "此用戶為板主" admin_tooltip: "此用戶為管理員" + blocked_tooltip: "此用戶被屏蔽" suspended_notice: "此用戶已被停權至 {{date}}。" suspended_reason: "原因: " github_profile: "Github" mailing_list_mode: "每當有新文章時，寄給我郵件通知。(除非我將該討論話題或分類設為靜音)" watched_categories: "關注" - watched_categories_instructions: "你將會自動關注在此分類的新討論話題。你將收到所有新文章和討論話題的通知，未讀和新討論話題的數量也將出現在討論話題的列表旁。" tracked_categories: "追蹤" - tracked_categories_instructions: "你將自動追蹤這些分類的新話題，未讀和新文章的數量會出現在話題的列表旁。" muted_categories: "靜音" muted_categories_instructions: "你將不會收到此分類的新討論話題通知，以及不會出現在未讀欄內。" delete_account: "刪除我的帳號" @@ -356,12 +381,14 @@ zh_TW: change_avatar: title: "設定個人資料圖片" gravatar: "Gravatar, based on" + gravatar_title: "在 Gravatar 網站修改你的頭像" refresh_gravatar_title: "重新整理你的 Gravatar 頭像" letter_based: "系統分配的個人資料圖片" uploaded_avatar: "自訂圖片" uploaded_avatar_empty: "新增一張自訂圖片" upload_title: "上傳你的圖片" upload_picture: "上傳圖片" + image_is_not_a_square: "警告：我們裁切了你的圖片，因為該圖片不是正方形的。" change_profile_background: title: "基本資料背景圖案" instructions: "個人資料背景會被置中，且默認寬度為850px。" @@ -419,29 +446,34 @@ zh_TW: every_three_days: "每三天" weekly: "每週" every_two_weeks: "每兩星期" - email_always: "不要因為我在網站上活動而不寄信通知。" + email_direct: "當有人引用、回覆我的發文，或以 @用戶名稱 提到我時，請以電子郵件通知我。" + email_private_messages: "當有人寄給我私人訊息時，以電子郵件通知我。" other_settings: "其它" categories_settings: "分類" new_topic_duration: label: "視為新討論話題的條件" not_viewed: "我未看過的討論" last_here: "我上次到訪後的討論" - after_n_days: - other: "建立於最近 {{count}} 天" - after_n_weeks: - other: "建立於最近 {{count}} 週" + after_1_day: "昨天發佈的討論" + after_2_days: "過去兩天發佈的討論" + after_1_week: "過去一週發佈的討論" + after_2_weeks: "過去兩週發佈的討論" auto_track_topics: "自動追蹤我參與的討論" auto_track_options: never: "永不" - after_n_seconds: - other: "{{count}} 秒後" - after_n_minutes: - other: "{{count}} 分鐘後" + immediately: "立即" + after_30_seconds: "30 秒後" + after_1_minute: "一分鐘後" + after_2_minutes: "兩分鐘後" + after_3_minutes: "三分鐘後" + after_4_minutes: "四分鐘後" + after_5_minutes: "五分鐘後" + after_10_minutes: "十分鐘後" invited: search: "輸入要搜尋邀請的文字..." title: "邀請" user: "受邀請的用戶" - none: "你尚未邀請任何人。" + sent: "送出" truncated: "顯示前 {{count}} 個邀請。" redeemed: "已接受的邀請" redeemed_at: "接受日期" @@ -457,10 +489,12 @@ zh_TW: days_visited: "到訪天數" account_age_days: "帳號已建立 (天)" create: "送出邀請" + generate_link: "拷貝邀請連結" bulk_invite: none: "你尚未邀請任何人。你可以發送個別邀請，或者透過上傳邀請名單一次邀請一群人。" text: "從檔案大量邀請" uploading: "正在上傳..." + success: "檔案已上傳成功，處理完畢後將以私人訊息通知你。" error: "上傳 '{{filename}}' 時發生問題：{{message}}" password: title: "密碼" @@ -509,6 +543,7 @@ zh_TW: logout: "已登出" refresh: "重新整理" read_only_mode: + enabled: "管理員開啟了唯讀模式。你可以繼續瀏覽網站，但一些互動功能可能無法使用。" login_disabled: "在唯讀模式下不能登入" learn_more: "進一步了解..." year: '年' @@ -523,6 +558,8 @@ zh_TW: unmute: 取消靜音 last_post: 最後一篇文章 last_reply_lowercase: 最新回覆 + replies_lowercase: + other: 回覆 summary: enabled_description: "你正在檢視此討論話題的摘要：在這個社群裡最熱門的文章。" description: "共有 {{count}} 個回覆。" @@ -671,6 +708,7 @@ zh_TW: units: "（# 小時數）" examples: '輸入小時數（24）' notifications: + title: "當有人以「@用戶名稱」提及您、回覆您的貼文、或是傳送訊息給您的時候通知您的設定。" none: "目前無法載入通知訊息。" more: "檢視較舊的通知" total_flagged: "所有被投訴的文章" @@ -686,6 +724,8 @@ zh_TW: moved_post: "

      {{username}} 移動了 {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      獲得徽章「{{description}}」

      " + alt: + linked: "連結到你的討論" upload_selector: title: "加入一張圖片" title_with_attachments: "加入一張圖片或一個檔案" @@ -693,22 +733,20 @@ zh_TW: from_the_web: "從網站" remote_tip: "圖片連結" remote_tip_with_attachments: "圖片或文件連結 ({{authorized_extensions}})" - local_tip: "按此從你的電腦選擇圖片" - local_tip_with_attachments: "從你的裝置中選擇圖片或文件（支援的格式： ({{authorized_extensions}})）。" hint: "(你也可以將檔案拖放至編輯器直接上傳)" - hint_for_supported_browsers: "( 你也可以將圖片拖放或貼上至編輯器內直接上傳 )" uploading: "正在上傳" + select_file: "選取檔案" image_link: "連結你的圖片將指向" search: title: "搜尋討論話題、文章、用戶或分類" no_results: "未找到任何結果。" + search_help: 搜尋幫助 searching: "正在搜尋..." post_format: "#{{post_number}} {{username}}" context: user: "搜尋 @{{username}} 的文章" category: "搜尋 \"{{category}}\" 分類" topic: "搜尋此討論話題" - site_map: "到另一個討論話題列表或分類" go_back: '返回' not_logged_in_user: '用戶頁面包含目前活動及喜好的總結' current_user: '到你的用戶頁面' @@ -757,6 +795,7 @@ zh_TW: filter_to: "在討論話題裡顯示 {{post_count}} 文章" create: '新討論話題' create_long: '建立新討論話題' + private_message: '發送訊息' list: '討論話題' new: '新討論話題' unread: '未讀' @@ -820,8 +859,6 @@ zh_TW: '2_4': '你將收到關於此討論話題的通知，因為你回覆了此討論話題。' '2_2': '你將收到關於此討論話題的通知，因為你正在追蹤此討論話題。' '2': '你將收到關於此討論話題的通知，因為你看過此討論話題。' - '1_2': '你將會在有人標注你 @name 或是回覆你的文章收到通知。' - '1': '你將會在有人標注你 @name 或是回覆你的文章收到通知。' '0_7': '你正忽略此分類中的所有通知。' '0_2': '你正忽略此討論話題的所有通知。' '0': '你正忽略此討論話題的所有通知。' @@ -829,19 +866,17 @@ zh_TW: title: "關注中" watching: title: "關注" - description: "當此討論話題有新回覆時會通知你，討論話題旁將會顯示未讀及新文章數。" tracking_pm: title: "追蹤" tracking: title: "追蹤" - description: "未讀和新文章的數量將出現在討論話題旁。您只會在別人@您或回覆您的主題時才會收到通知。" regular: - title: "普通" - description: "只有當有人@您或者回覆您的文章時，您才會收到通知。" + title: "一般" regular_pm: title: "一般" muted_pm: title: "靜音" + description: "你將不會再收到關於此訊息的通知。" muted: title: "靜音" description: "你將不會收到任何關於此討論話題的通知，此討論話題也不會出現在你的未讀分頁裡。" @@ -862,6 +897,7 @@ zh_TW: feature: pin: "置頂主題" unpin: "取消置頂主題" + pin_globally: "全區置頂討論話題" make_banner: "討論話題橫幅" remove_banner: "移除討論話題橫幅" reply: @@ -879,6 +915,7 @@ zh_TW: success_message: '已投訴此討論話題。' feature_topic: title: "擁有這個話題" + unpin: "取消此主題在{{categoryLink}}類別的置頂狀態" already_banner: zero: "沒有頂置的話題。" inviting: "正在邀請..." @@ -898,6 +935,7 @@ zh_TW: to_forum: "我們將向你的朋友發出一封電子郵件，他不必登入，他只要按電子郵件裡的連結就可以加入此論壇。" to_topic_blank: "輸入你想邀請的用戶的用戶名稱或電子郵件地址到該討論主題" email_placeholder: '電子郵件地址' + success_username: "我們已經邀請該使用者加入此主題討論" login_reply: '登入以發表回應' filters: n_posts: @@ -925,6 +963,10 @@ zh_TW: instructions: other: "請選擇一位新用戶作為此 {{count}} 篇由 {{old_user}} 撰寫之文章的擁有者。" instructions_warn: "注意，關於此篇文章的舊通知，並不會移轉到新用戶。
      警告：目前所有與文章相關的資料都不會移轉至新用戶，請謹慎使用。" + change_timestamp: + title: "變更時間戳記" + action: "變更時間戳記" + invalid_timestamp: "時間戳記不能為將來的時刻。" multi_select: select: '選取' selected: '選取了 ({{count}})' @@ -936,8 +978,6 @@ zh_TW: description: other: 你已選擇了 {{count}} 篇文章。 post: - reply: "回覆 {{replyAvatar}} {{username}} 發表的 {{link}}" - reply_topic: "回覆至 {{link}}" quote_reply: "引用回覆" edit: "編輯 {{replyAvatar}} {{username}} 發表的 {{link}}" edit_reason: "原因: " @@ -956,7 +996,13 @@ zh_TW: more_links: "{{count}} 更多..." unread: "文章未讀" has_replies: - other: "回覆" + other: "{{count}} 個回覆" + has_likes: + other: "{{count}} 個讚" + has_likes_title: + other: "{{count}} 個使用者對此文章讚好" + has_likes_title_you: + zero: "你已按讚" errors: create: "抱歉，建立你的文章時發生錯誤，請再試一次。" edit: "抱歉，編輯你的文章時發生錯誤，請再試一次。" @@ -1105,12 +1151,14 @@ zh_TW: category: can: '可以… ' none: '( 無分類 )' + all: '所有分類' choose: '選擇一個分類…' edit: '編輯' edit_long: "編輯" view: '檢視分類裡的討論話題' general: '一般' settings: '設定' + topic_template: "主題模板" delete: '刪除分類' create: '新分類' save: '儲存分類' @@ -1142,6 +1190,7 @@ zh_TW: email_in_allow_strangers: "接受非用戶的電郵" email_in_disabled: "\"用電子郵件張貼新的討論話題\"功能已被關閉。若要使用此功能，" email_in_disabled_click: '請啟用"email in"功能' + suppress_from_homepage: "不在首頁上顯示此分類。" allow_badges_label: "允許授予本分類的徽章" edit_permissions: "編輯權限" add_permission: "新增權限" @@ -1154,13 +1203,10 @@ zh_TW: notifications: watching: title: "關注" - description: "您將會自動監視這些分類中的所有新主題。您會收到新文章或新主題的通知，未讀和新文章數量將出現在每個主題後。" tracking: title: "追蹤" - description: "您將會自動追蹤這些分類中的所有新主題。未讀和新文章數量將出現在每個主題後。" regular: title: "一般" - description: "只有當有人@您或回覆您的文章時，您才會收到通知。" muted: title: "靜音" description: "你將不會收到這些分類中的新討論話題通知，它們也不會出現在你的未讀欄內。" @@ -1194,6 +1240,7 @@ zh_TW: notify_action: "訊息" topic_map: title: "討論話題摘要" + participants_title: "頻繁發文者" links_title: "熱門連結" links_shown: "顯示所有 {{totalLinks}} 個連結..." clicks: @@ -1205,6 +1252,8 @@ zh_TW: help: "已將此討論話題加入書籤" locked: help: "此討論話題已關閉，不再接受回覆" + archived: + help: "此討論話題已封存，已被凍結無法再修改" unpinned: title: "取消釘選" help: "此討論話題已取消置頂，將會以預設順序顯示。" @@ -1214,8 +1263,6 @@ zh_TW: pinned: title: "已釘選" help: "此討論話題已置頂，將顯示在它所屬分類話題列表的最上方" - archived: - help: "此討論話題已封存，已被凍結無法再修改" invisible: help: "此討論話題已隱藏，將不會出現在討論話題列表，只能以直接連結開啟。" posts: "文章" @@ -1246,7 +1293,10 @@ zh_TW: with_topics: "%{filter} 討論話題" with_category: "%{filter} %{category} 討論話題" latest: - title: "最近" + title: + zero: "最新主題" + one: "最新主題 (1)" + other: "最新主題 ({{count}})" help: "最近的討論話題" hot: title: "熱門" @@ -1299,6 +1349,8 @@ zh_TW: title: "所有時間" yearly: title: "年" + quarterly: + title: "季度" monthly: title: "月" weekly: @@ -1306,11 +1358,12 @@ zh_TW: daily: title: "日" all_time: "所以時間" - this_year: "本年" - this_month: "本月" - this_week: "本週" + this_year: "年" + this_quarter: "季度" + this_month: "月" + this_week: "週" today: "今天" - other_periods: "看更多精選討論話題" + other_periods: "前往頂端" browser_update: '抱歉，您的瀏覽器版本太舊，無法正常訪問該站點。。請升級您的瀏覽器。' permission_types: full: "建立 / 回覆 / 觀看" @@ -1377,6 +1430,7 @@ zh_TW: agree_title: "確認此投訴為有效且正確" agree_flag_modal_title: "批准並且 ..." agree_flag_hide_post: "批准 (隱藏文章 + 送出私人訊息)" + agree_flag_hide_post_title: "隱藏此文章，並自動向此用戶送出私人訊息，要求盡快修改它" agree_flag_restore_post: "同意（還原文章）" agree_flag_restore_post_title: "回復此文章" agree_flag: "同意投訴" @@ -1469,7 +1523,11 @@ zh_TW: name: "名稱" none_installed: "尚未安裝任何外掛" version: "版本" + enabled: "啟用?" + is_enabled: "是" + not_enabled: "否" change_settings: "更改設定" + change_settings_short: "設定" howto: "如何安裝外掛?" backups: title: "備份" @@ -1525,6 +1583,7 @@ zh_TW: confirm: "你確定要回溯資料庫到以前的工作階段?" export_csv: user_archive_confirm: "你確定要下載你的文章嗎?" + success: "開始匯出，處理完畢後將以私人訊息通知你。" failed: "匯出失敗。請觀看紀錄。" rate_limit_error: "文章每天只能下載一次，請明天再試。" button_text: "匯出" @@ -1534,6 +1593,8 @@ zh_TW: screened_email: "以 CSV 格式匯出所有已顯示的電子郵件列表" screened_ip: "以 CSV 格式匯出所有已顯示的 IP 列表" screened_url: "以 CSV 格式匯出所有已顯示的 URL 列表" + export_json: + button_text: "匯出" invite: button_text: "送出邀請" button_title: "送出邀請" @@ -1544,6 +1605,7 @@ zh_TW: header: "標頭" top: "精選" footer: "頁尾" + embedded_css: "內嵌 CSS" head_tag: text: "" title: "HTML 將會置於 之前" @@ -1561,6 +1623,8 @@ zh_TW: save: "儲存" new: "新增" new_style: "新增樣式" + import: "匯入" + import_title: "選取檔案或貼上文本" delete: "刪除" delete_confirm: "刪除此樣式？" about: "修改網站的 CSS 和 HTML headers。請新增一個自定樣式來開始使用。" @@ -1633,7 +1697,6 @@ zh_TW: sent_test: "已送出!" delivery_method: "傳送方式" preview_digest: "預覽文摘" - preview_digest_desc: "預覽每周寄送給不活躍用戶的摘要郵件內容。" refresh: "重新整理" format: "格式" html: "html" @@ -1911,6 +1974,7 @@ zh_TW: delete: "刪除" cancel: "取消" delete_confirm: "你確定要刪除此用戶欄位 ?" + options: "選項" required: title: "在註冊時必填？" enabled: "必填" @@ -1926,6 +1990,7 @@ zh_TW: field_types: text: '文字區域' confirm: '確認' + dropdown: "下拉" site_text: none: "選擇一個內容類別開始編輯" title: '文字內容' @@ -1937,6 +2002,7 @@ zh_TW: no_results: "未找到任何結果。" clear_filter: "清除" add_url: "加入網址" + add_host: "新增主機" categories: all_results: '全部' required: '必要設定' @@ -1958,6 +2024,7 @@ zh_TW: backups: "備份" login: "登入" plugins: "延伸套件" + user_preferences: "偏好設定" badges: title: 徽章 new_badge: 新徽章 @@ -2031,6 +2098,29 @@ zh_TW: name: "名稱" image: "圖片" delete_confirm: "你確定要刪除 :%{name}: emoji ?" + embedding: + confirm_delete: "你確定要刪除此主機？" + title: "嵌入" + host: "允許的主機" + edit: "編輯" + add_host: "新增主機" + settings: "嵌入設定" + crawling_settings: "爬蟲設定" + permalink: + title: "固定連結" + url: "網址" + topic_id: "討論話題 ID" + topic_title: "討論話題" + post_id: "貼文 ID" + post_title: "貼文" + category_id: "分類 ID" + category_title: "分類" + external_url: "外部網址" + delete_confirm: 你確定要刪除此固定連結？ + form: + label: "新增：" + add: "新增" + filter: "搜尋 (網址或外部網址)" lightbox: download: "下載" search_help: @@ -2039,12 +2129,14 @@ zh_TW: title: '快捷鍵' jump_to: title: '跳到' + home: 'g, h 首頁' latest: 'g, l 最新' new: 'g , n 新' unread: 'g , u 未讀' categories: 'g, c 分類' top: 'g, t 頂端' bookmarks: 'g, b 書籤' + messages: 'g, m 私人訊息' navigation: title: '導航' jump: '# 前往文章 #' @@ -2056,13 +2148,14 @@ zh_TW: title: 'Application' create: 'c 表示新討論話題' notifications: 'n 開啟通知' - site_map_menu: '= 打開網站選單' + hamburger_menu: '= 打開漢堡選單' user_profile_menu: 'p 打開使用者選單' show_incoming_updated_topics: '. 顯示有更新的討論話題' search: '/ 搜尋' help: '? 打開按鍵說明' dismiss_new_posts: 'x, r 解除新文章或回覆的提示' dismiss_topics: 'x, t 解除主題的提示' + log_out: 'shift+z shift+z 登出' actions: title: '行動' bookmark_topic: 'f 加入/移除書籤' @@ -2168,10 +2261,8 @@ zh_TW: description: 已邀請一位用戶 campaigner: name: 說客 - description: 已邀請 3 位成員 champion: name: 鬥士 - description: 已邀請 10 位成員 first_share: name: 首個分享 description: 分享文章 @@ -2187,12 +2278,5 @@ zh_TW: reader: name: 讀者 description: 觀看每個超過100篇文章的討論話題 - google_search: | -

      Google 搜尋

      -

      - - - - - -

      + popular_link: + name: 熱門連結 diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 37ebdabf7f..74f2f6b726 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -9,67 +9,329 @@ ar: dates: short_date_no_year: "يوم شهر" short_date: "يوم شهر سنة" + long_date: "شهر يوم، سنه ساعة :دقائق" title: "ديسكورس" topics: "عناوين" posts: "منشورات" loading: "تحميل" + powered_by_html: 'مدعوم من ديسكورس ,لتفعيل أفضل رؤية مع جافاسكربت' log_in: "تسجيل الدخول" via: "%{username} من موقع %{site_name}" is_reserved: "محجوز" + purge_reason: "حذف آلي للحسابات المهجوره وغير النشطه " disable_remote_images_download_reason: "لقد تم تعطيل تحميل الصور عن بعد بسبب عدم وجود مساحة كافية" + anonymous: "مجهول" errors: + format: '%{attribute} %{message}' messages: too_long_validation: "إنها محددة بعدد حروف %{max} حرف; لقد أدخلت %{length}." invalid_boolean: "قيمة منطقية غير صحيحة" + taken: "تم حجزه من قبل " + accepted: يجب أن تُقبل + blank: لا يمكن جعله فارغا + present: يجب أن يكون فارغ + confirmation: "ليست مطابقة ل %{attribute}" + empty: لا يمكن جعله فارغا + equal_to: يجب أن تكون مساوي لـ %{count} + even: يجب أن يكون زوجي + exclusion: محجوز + greater_than: يجب أن تكون أكبر من %{count} + greater_than_or_equal_to: يجب أن تكون أكبر من أو تساوي %{count} + inclusion: غير متضمن في القائمة + invalid: غير صالح + less_than: يجب أن يكون أقل من %{count} + less_than_or_equal_to: يجب أن تكون أقل من أو تساوي %{count} + not_a_number: ليس عدد + not_an_integer: يجب أن يكون عدد صحيح + odd: يجب أن يكون مفرد + record_invalid: 'التأكد من الصلاحية غير ممكن : %{errors}' + restrict_dependent_destroy: + one: "لا يمكن حذف السجل لإعتماد سجل آخر عليه %{record} " + many: "لا يمكن حذف السجل لاعتماده %{record} موجود" + too_long: + zero: طويل جدا (الحد الأقصى بدون الحروف) + one: طويل جدا (الحد الأقصى حرف واحد) + two: طويل جدا (الحد الأقصى حرفين) + few: طويل جدا (الحد الأقصى حروف قليلة) + many: طويل جدا (الحد الأقصى %{count} حرفا) + other: طويل جدا (الحد الأقصى %{count} حرفا) + too_short: + zero: قصير جدا (الحد الأدنى بدون حروف) + one: قصير جدا (الحد الأدنى حرف واحد) + two: قصير جدا (الحد الأدنى حرفين) + few: قصير جدا (الحد الأدنى حروف قليلة) + many: قصير جدا (الحد الأدنى حروف كثيرة) + other: قصير جدا (الحد الأدنى %{count} حروف) + wrong_length: + zero: طول خاطئ (يجب أن يكون بدون حروف) + one: طول خاطئ (يجب أن يكون حرف واحد) + two: طول خاطئ (يجب أن يكون حرفين) + few: طول خاطئ (يجب أن يكون حروف قليلة) + many: طول خاطئ (يجب أن يكون حروف كثيرة) + other: طول خاطئ (يجب أن يكون %{count} حروف) + other_than: "يجب أن تكون غير %{count}" + template: + body: 'هناك مشاكل بالحقول التالية ' + header: + zero: لا أخطاء تمنع هذا %{model} من الحفظ + one: خطأ واحد منع هذا %{model} من الحفظ + two: خطأن منعا هذا %{model} من الحفظ + few: أخطاء قليل تمنع هذا %{model} من الحفظ + many: أخطاء كثيرة تمنع هذا %{model} من الحفظ + other: '%{count} أخطاء منعت هذا %{model} من الحفظ' embed: load_from_remote: "هناك خطأ في تحميل هذا المنشور." + site_settings: + min_username_length_exists: "لا يمكنك تعيين الحد الأدنى لطول اسم المستخدم أعلى من أقصر اسم المستخدم." + min_username_length_range: "لا يمكنك تعيين الحد الأدنى أعلى من الحد الأقصى." + max_username_length_exists: "لا يمكنك تعيين الحد الأقصى لطول اسم المستخدم أدنى من أطول اسم المستخدم." + max_username_length_range: "لا يمكنك تعيين الحد الأقصى أقل من الحد الأدنى." + default_categories_already_selected: "لا يمكنك تحديد فئة تستخدم في قائمة أخرى." + s3_upload_bucket_is_required: "لا يمكنك تفعيل الملفات المرفوعة إلى S3 إلا إذا أتممت 's3_upload_bucket'." bulk_invite: file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق وامتداد txt أو csv" backup: + operation_already_running: "هناك عملية قيد العمل حاليا. لا يمكن بدء مهمة جديدة في الوقت الحالي " backup_file_should_be_tar_gz: "ملف الاحتياط يجب أن يكون أرشيف .tar.gz." + not_enough_space_on_disk: "ليست هناك مساحة كافية على القرص لتحميل هذه النسخة الاحتياطية" not_logged_in: "يجب عليك تسجيل الدخول لفعل هذا." + not_found: "تعذر العثور على رابط العنوان المطلوب" + invalid_access: "لا تمتلك صلاحيات لعرض المطلوب " + read_only_mode_enabled: "الموقع في وضع القراءة فقط . تم تعطيل التفاعلات " + too_many_replies: + zero: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـعدم الرد في نفس الموضوع." + one: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـرد واحد في نفس الموضوع." + two: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردّين في نفس الموضوع." + few: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردود قليلة في نفس الموضوع." + many: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردود كثيرة في نفس الموضوع." + other: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـ%{count} ردود في نفس الموضوع." embed: start_discussion: "إبدأ نقاش" continue: "الاستمرار في هذا النقاش" + more_replies: + zero: "لا يوجد رد إضافي" + one: "رد واحد إضافي" + two: "ردّين إضافيين" + few: "ردود قليلة إضافية" + many: "ردود كثيرة إضافية" + other: "%{count} ردود إضافية" loading: "تحميل النقاش" + permalink: "الرابط الثابت" + imported_from: "هذا موضوع نقاش مصاحب للمدخل الأصلي على %{link}" + in_reply_to: "{اسم المستخدم}%" + replies: + zero: "لا يوجد رد" + one: "رد واحد" + two: "ردّين" + few: "ردود قليلة" + many: "ردود كثيرة" + other: "%{count} ردود" too_many_mentions: zero: "عذراً، لا يمكنكم تنويه مستخدمين آخرين." - one: "عذراً، يمكنكم فقط تنويه مستخدم واحد في هذا المنشور." + one: "عذراً، يمكنك فقط تنويه مستخدم واحد في هذا المنشور." + other: "عذرا, يمكنك تذكير %{count} مستخدمين فقط في المشاركة." + too_many_mentions_newuser: + zero: "عذرا, المستخدمون الجدد لا يمكنهم تذكير المستخدمين الأخرين." + one: "عذرا, المستخدمون الجدد يمكنهم تذكير مستخدم واحد أخر فقط في المشاركة." + other: "عذرا, المستخدمون الجدد يمكنهم تذكير %{count} مستخجمين فقط في المشاركة." too_many_images: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع الصور في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع صورة واحدة فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} صور فقط في المشاركة." too_many_attachments: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع مرفقات في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع مرفق واحد فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} مرفقات فقط في المشاركة." too_many_links: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع الروابط في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع رابط واحد فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} روابط فقط في المشاركة." + spamming_host: "عذرا لا يمكنك مشاركة رابط لهذا المضيف." + user_is_suspended: "المستخدمون الموقوفون لا يسمح لهم بالمشاركة." + topic_not_found: "هناك خطأ. ربما هذا الموضوع أغلق أو حذف وأنت تبحث عنه." + just_posted_that: "هذا مماثل لما شاركته مؤخرا" has_already_been_used: "هو مستخدم بالفعل" + invalid_characters: "يحتوي احرف غير صالحة " + is_invalid: "غير صالح حاول ان تضع وصف اكثر" next_page: "الصفحة التالية ←" prev_page: "→ الصفحة السابقة " + page_num: "الصفحة رقم %{num}" + home_title: "الصفحة الرئيسية " + topics_in_category: "المواضيع في '%{category}' الفئة" + rss_posts_in_topic: "مغذي RSS لـ'%{topic}'" + rss_topics_in_category: "مغذي RSS للمواضيع في '%{category}' الفئة" + author_wrote: "كتب %{author} :" + num_posts: "تعليق " num_participants: "المشاركين" read_full_topic: "قراءة العنوان كامل" + private_message_abbrev: "رسالة" rss_description: latest: "آخر المواضيع" hot: "عناوين ساخنة" + posts: "اخر المشاركات " + too_late_to_edit: "تم انشاء هذا التعليق منذ فترة وليس بالامكان تعديله او حذفه" excerpt_image: "صورة" + queue: + delete_reason: "حذف عبر طابور مشاركة معتدل" groups: + errors: + can_not_modify_automatic: "لا يمكنك تعديل مجموعة تلقائية" + member_already_exist: " '%{username}' هو بالفعل عضو في هذه المجموع" default_names: everyone: "الجميع" admins: "المسؤولين" + moderators: "مشرفين" staff: "العاملين" + trust_level_0: "مستوى_الثقة_0" + trust_level_1: "مستوى_الثقة_1" + trust_level_2: "مستوى_الثقة_2" + trust_level_3: "مستوى_الثقة_3" + trust_level_4: "مستوى_الثقة_4" + education: + until_posts: + zero: "لا يوجد مشاركات" + one: "مشاركة واحدة" + two: "مشاركتين" + few: "مشاركات قليلة" + many: "مشاركات كثيرة" + other: "%{count} مشاركات" + new-topic: | + مرحبا بك في %{site_name} — **شكرا لك لأجل بدء محادثه جديدة!** + + هل يبدو العنوان مثيرا للاهتمام إذا كنت تقرأ بصوت عال؟ هو ملخص جيد؟ + + - من هو الشخص الذي سيكون مهتما بهذا ؟ لماذا يهتم ؟ أي نوع من ردود تريد ؟ + + - تتضمن أكثر الكلمات الشائعة استخداما في في موضوعك بحيث يمكن للآخرين أن * يجدوها* لمجموعة موضوعك مع المواضيع ذات الصلة، حدد فئة. + + لمعلومات أكثر ، [انظر المبادئ التوجيهية مجتمعنا] (/guidelines). وهذه اللوحة ستظهر لك لأول مرة فقط %{education_posts_text}. + new-reply: | + مرحباً بك في %{site_name} — **شكراً للمساهمة**! + + -هل يُحسن ردّك المحادثة في جانب معين؟ + + -كن طيبا مع أصدقاءك أعضاء المجتمع. + + -نرحب بالنقد البناء, ولكن انتقاد الأفكار لا الناس! + + للمزيد, [انظر ارشادات المجتمع](/guidelines). هذه اللوحة ستظهر فقط لأول %{education_posts_text} لك. + avatar: | + ### ماذا عن صورة لحسابك؟ + + لقد شاركت بعض المواضيع والردود, لكن صورة ملف تعريفك ليست مميزة مثلك --هذه رسالة فقط؟ + + هل فكرت في ** [زيارة ملف التعريف الخاص بك] (%{profile_path})** ورفع الصورة التي تمثل لك؟ + + تسهل متابعة النقاشات وايجاد الاشخاص المهمين في المحادثة في حين أن الجميع لديه صورة حساب مميزة ! + sequential_replies: | + ### الرد على عدة مشاركات مرةً واحدة + + بدلاً من عدة ردود متتابعة على موضوع ما, فضلا رداً واحداً يتضمن اقتباسات من مشاركات سابقة أو @اسم كمراجع. + + تستطيع التعديل على ردك السابق لإضافة اقتباس بتضليلك النص و اختيارك زر quote reply الظاهر. + + يسهل على الكل قراءة المواضيع التي لها بعض الردود المتعمقة بدلاً من الكثير من الردود الفردية الصغيرة + dominating_topic: | + ### دع الآخرين ينضموا للمحادثة + + هذا الموضوع ذو أهمية واضحة بالنسبة لك – لقد شارك أكثر من {percent}% % من الردود هنا. + + هل أنت متأكد أنك توفر الوقت الكافي لأشخاص آخرين ليشاركوا وجهات نظرهم, أيضاً؟ + too_many_replies: | + ### لقد وصلت إلى حدود الرد في هذا الموضوع + + نحن آسفون ، ولكن الأعضاء الجدد محدودين مؤقتا %{newuser_max_replies_per_topic} بالردود على نفس الموضوع. + + بدلا من إضافة رد آخر، يرجى النظر في تحرير الردود السابقة، أو زيارة مواضيع أخرى. + reviving_old_topic: "### إحياء هذا الموضوع؟\n\nآخر رد لهذا الموضوع هو الآن قبل %{days} يوم. ردُّك سيرفع الموضوع الى \nأعلى القائمته وينبه أي شخص سبق وشارك في المحادثة.\n\nهل أنت متأكد أنك تردي الاستمرار في هذه المحادثة القديمة؟\n" activerecord: + attributes: + category: + name: "اسم الفئة" + post: + raw: "متن النص" + user_profile: + bio_raw: "معلومات عنّي" errors: + messages: + is_invalid: "غير صالح حاول ان تضع وصف اكثر" + has_already_been_used: "مستخدم بالفعل " models: + topic: + attributes: + base: + warning_requires_pm: "يمكنك ارفاق تحذيرات في الرسائل الخاصة فقط " + too_many_users: "يمكنك ارسال التحذيرات لمستخدم واحد فقط في نفس الوقت" + cant_send_pm: "عذرا، لا يمكنك إرسال رسالة خاصة لهذا المستخدم." + no_user_selected: "يجب تحديد مستخدم موجود " user: attributes: + password: + common: "كلمة المرور هذه ضعيفة وهي من اكثر 10000 كلمة مرور مستخدمة يرجى استخدام كلمة مرور اكثر امنا" + same_as_username: "كلمة المرور هي نفس اسم المستخدم. يرجى أختيار كلمة مرور أخرى أكثر امناً" + same_as_email: "كلمة المرور هي نفس عنوان البريد الألكتروني الخاص بك. يرجى أختيار كلمة مرور أخرى أكثر أماناً" ip_address: signup_not_allowed: "التسجيل غير مسموح من هذا الحساب." color_scheme_color: attributes: hex: - invalid: "هذا لون غير صالح" + invalid: "هذا اللون غير صالح" + user_profile: + no_info_me: "
      مجال المعلومات عني لملف تعريفك فارغ حاليا، هل تريد أن تملأه؟
      " + no_info_other: "
      %{name} لم يدخلوا أي شيء في مجال المعلومات عني لملفهم بعد
      " + vip_category_name: "استراحة" + vip_category_description: "الفئة مخصصة للأعضاء ذوي مستوى الثقة 3 أو أعلى." + meta_category_name: "موقع التغذية الإرتجاعية" + meta_category_description: "نقاش حول هذا الموقع, كيفية تنظيمه والعمل عليه أكثر وكيف يمكننا تحسينه." + staff_category_name: "الإدارة" + staff_category_description: "فئة مخصصة للنقاش في مواضيع الإدارة. المواضيع مرئية فقط للأدارة وللمشرفين." + assets_topic_body: "هذا الموضوع مشاهد بشكل دائم للأعضاء فقط . ولحفظ الصورة والملف استخدم موقع التصميم. لا تقوم بحذفها\n\n\nكيف يكون العمل هنا.\n\n1. الرد على الموضوع.\n\n2. رفع كل الصور التي تود أن تستخدمها في الشعار." + lounge_welcome: + title: "مرحبا بك في الاستراحة." + body: |2 + + تهانينا! :confetti_ball: + + إذا تمكنت من رؤية هذا الموضوع, فأنت رقيت مؤخرا لـ**منتظم** (مستوى الثقة 3). + + You can now … + + * تعديل العنوان لأي موضوع + * تغيير الفئة لأي موضوع + * جميع روابطك المتبوعة بـ ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) محذوفة) + * الوصول لفئة استراحة خاصة مرئية فقط لأعضاء مستوى الثقة 3 أو أعلى + * إخفاء الرسائل الغير هامة بتبليغ واحد + + من هنا [القائمة الحالية لمتابع منتظم](/badges/3/regular). طبعا قل مرحبا. + + شكرا لكونك جزءً هاما من هذا المجتمع! + + (لمعلومات أكثر حول مستويات الثقة, [see this topic][trust]. نرجو ملاحظة أن العضو الوحيد الذي يستمر في تلبية إحتياجات أكثر من الوقت سيبقون منتظمين.) + + [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 + category: + topic_prefix: "عن الفئة %{category}." + replace_paragraph: "[استبدل هذا الفقرة الأولى بوصف قصير لفئتك الجديدة. سيظهر هذا التوجيه في منطقة اختيار الفئة, لذا حاول أن تبقيها أقل من 200 حرف. حتى عند تحريرك لهذا النص أو إنشائك لموضوع, هذه الفئة لن تظهر على صفحة الفئات.]" + post_template: "%{replace_paragraph}\n\nاستخدم الفقرات التالي لوصف طويل, إضافة لإنشاء أي فئة قواعد أو توجيهات.\n\nبعض الأشياء تؤخذ بعين الإعتبار في أسفل أي ردود لنقاش:\n\n- لما هذا الفئة؟لماذا يختار الناس هذه الفئة لمواضيعهم؟\n\n- كيف تختلف الفئات الأخرى عن التي لدينا؟\n\n- هل نحتاج هذه الفئة؟\n\n- هل يجب أن ندمج هذه مع فئة أخرى, أو تقسم إلى أكثر من قئة ؟\n" + errors: + uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم" + self_parent: "الفئة الفرعية لا يمكن ان تكون كالفئة الرئيسية." + depth: "لا يمكنك تضمين فئة فرعية تحت فئة فرعية اخرى" + email_in_already_exist: "البريد الإلكتروني الوارد '%{email_in}' مستخدم حاليا للفئة '%{category_name}'." + cannot_delete: + uncategorized: "لايمكن حذف الغير مصنف" + has_subcategories: "لايمكن حذف هذه الفئة لأنها تحتوي على فئات فرعية " + topic_exists: + zero: "لا يمكنك حذف هذه الفئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}." + one: "لا يمكنك حذف هذه الفئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}." + two: "لا يمكنك حذف هذه الفئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}." + few: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}." + many: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}." + other: "لا يمكنك حذف هذه الفئة ﻷن لها %{count} مواضيع.أقدم موضوع هو %{topic_link}." + topic_exists_no_oldest: "لايمكن حذف هذه الفئة لعدد المواضيع التي تحتويه. عدد المواضيع %{count}." trust_levels: + newuser: + title: "مستخدم جديد " basic: title: "مستخدم أساسي" regular: @@ -78,35 +340,1907 @@ ar: title: "منتظم" elder: title: "قائد" + change_failed_explanation: "حاولت تخفيض رتبة %{user_name} إلى '%{new_trust_level}'. أيضا مستوى الثقة لهم حاليا '%{current_trust_level}'. %{user_name} سيبقى في '%{current_trust_level}' - إذا رغبت في تخفيض رتبة عضو أنظر لمستوى الثقة أولاً." + rate_limiter: + slow_down: "لقد أنجزت هذا العمل مرات كثيرة، حاول مجددا." + too_many_requests: "لدينا حد يومي لعدد المرات التي يمكن للعمل أن ينجز بها. رجاءا انتظر %{time_left} قبل المحاولة مجدداً." + hours: + zero: "1 ساعة" + one: "1 ساعة" + two: "%{count} ساعة" + few: "%{count} ساعات" + many: "%{count} ساعات" + other: "%{count} ساعات" + minutes: + zero: "1 دقيقة" + one: "1 دقيقة" + two: "%{count} دقيقة" + few: "%{count} دقائق" + many: "%{count} دقائق" + other: "%{count} دقائق" + seconds: + zero: "1 ثانية" + one: "1 ثانية" + two: "%{count} ثواني" + few: "%{count} ثواني" + many: "%{count} ثواني" + other: "%{count} ثواني" + datetime: + distance_in_words: + half_a_minute: "< 1 دقيقة" + less_than_x_seconds: + zero: "< صفر ثانية" + one: "< ثانية واحدة" + two: "< ثانيتان" + few: "< ثواني قليلة" + many: "< ثواني كثيرة" + other: "< %{count} ثوان" + x_seconds: + zero: "1ث" + one: "1ث" + two: "ث {count}%" + few: "ث {count}%" + many: "ث {count}%" + other: "ث {count}%" + less_than_x_minutes: + zero: "< 1د" + one: "< 1د" + two: "< %{count} د" + few: "< %{count} د" + many: "< %{count} د" + other: "< %{count} د" + x_minutes: + zero: "1د" + one: "1د" + two: "%{count} د" + few: "%{count} د" + many: "%{count} د" + other: "%{count} د" + about_x_hours: + zero: "0 ساعة " + one: "ساعة واحدة" + two: "ساعتان" + few: "ساعات قليلة" + many: "ساعات كثيرة" + other: "%{count}ساعة" + x_days: + zero: "0 يوم " + one: "يوم واحد" + two: "يومان" + few: "أيام قليلة" + many: "أيام كثيرة" + other: "%{count} أيام" + about_x_months: + zero: "لا يوجد شهور" + one: "شهر فقط" + two: "شهران" + few: "شهور قليلة" + many: "شهور كثيرة" + other: "%{count}شهر" + x_months: + zero: "1 شهر" + one: "1 شهر" + two: "شهرين{count}%" + few: "شهور{count}%" + many: "شهور{count}%" + other: "شهور{count}%" + about_x_years: + zero: "1 س" + one: "1 س" + two: "%{count} س" + few: "%{count} س" + many: "%{count} س" + other: "%{count} س" + over_x_years: + zero: "س > 1" + one: "س > 1" + two: "س > %{count}" + few: "س > %{count}" + many: "س > %{count}" + other: "س > %{count}" + almost_x_years: + zero: "1 س" + one: "1 س" + two: "س %{count}" + few: "س %{count}" + many: "س %{count}" + other: "س %{count}" + distance_in_words_verbose: + half_a_minute: "الأن" + less_than_x_seconds: + zero: "الآن" + one: "الآن" + two: "الآن" + few: "الآن" + many: "الآن" + other: "الآن" + x_seconds: + zero: "1 ثانية مضت" + one: "1 ثانية مضت" + two: "%{count} ثواني مضت" + few: "%{count} ثواني مضت" + many: "%{count} ثواني مضت" + other: "%{count} ثواني مضت" + less_than_x_minutes: + zero: "أقل من 1 دقيقة مضت" + one: "أقل من 1دقيقة مضت" + two: "أقل من %{count} دقيقتين مضت" + few: "أقل من %{count} دقائق مضت" + many: "أقل من %{count} دقائق مضت" + other: "أقل من %{count} دقائق مضت" + x_minutes: + zero: "1 دقيقة مضت" + one: "1 دقيقة مضت" + two: "%{count} دقائق مضت" + few: "%{count} دقائق مضت" + many: "%{count} دقائق مضت" + other: "%{count} دقائق مضت" + about_x_hours: + zero: "1 ساعة مضت" + one: "1 ساعة مضت" + two: "%{count} ساعات مضت" + few: "%{count} ساعات مضت" + many: "%{count} ساعات مضت" + other: "%{count} ساعات مضت" + x_days: + zero: "1 يوم مضى" + one: "1 يوم مضى" + two: "%{count} أيام مضت" + few: "%{count} أيام مضت" + many: "%{count} أيام مضت" + other: "%{count} أيام مضت" + about_x_months: + zero: "حوالي 1 شهر مضى" + one: "حوالي 1 شهر مضى" + two: "حوالي %{count} أشهر مضت" + few: "حوالي %{count} أشهر مضت" + many: "حوالي %{count} أشهر مضت" + other: "حوالي %{count} أشهر مضت" + x_months: + zero: "1 شهر مضى" + one: "1 شهر مضى" + two: "%{count} أشهر مضىت" + few: "%{count} أشهر مضىت" + many: "%{count} أشهر مضىت" + other: "%{count} أشهر مضىت" + about_x_years: + zero: "حوالي 1 سنة مضت" + one: "حوالي 1 سنة مضت" + two: "حوالي %{count} سنوات مضت" + few: "حوالي %{count} سنوات مضت" + many: "حوالي %{count} سنوات مضت" + other: "حوالي %{count} سنوات مضت" + over_x_years: + zero: "منذ 1 سنة مضت" + one: "منذ 1 سنة مضت" + two: "منذ %{count} سنوات مضت" + few: "منذ %{count} سنوات مضت" + many: "منذ %{count} سنوات مضت" + other: "منذ %{count} سنوات مضت" + almost_x_years: + zero: "تقريبا 1 سنة مضت" + one: "تقريبا 1 سنة مضت" + two: "تقريبا %{count} سنتين مضت" + few: "تقريبا %{count} سنوات مضت" + many: "تقريبا %{count} سنوات مضت" + other: "تقريبا %{count} سنوات مضت" + password_reset: + no_token: "عذراً , رابط تغيير كلمة المرور قديم . رجاءً أعد عملية إسترجاع كلمة المرور ." + choose_new: "يرجى اختيار كلمة مرور جديدة" + choose: "يرجى أختيار كلمة مرور" + update: 'تحديث كلمة المرور' + save: 'تعين كلمة المرور' + title: 'إعادة تعين كلمة المرور' + success: "تم تغير كلمة المرور بنجاح ويمكنك تسجيل الدخول الأن " + success_unapproved: "تم تغير كلمة المرور بنجاح." + continue: "الاستمرار لـ %{site_name}" change_email: confirmed: "تم تحديث بريدك اﻹلكتروني" + please_continue: "الاستمرار لـ %{site_name}" + error: "حدث خطأ عند تغير بريدك الإلكتروني. ربما يكون هذا البريد الإلكتروني قد أستوخدم من قبل ؟" activation: - action: "تفعيل حسابك" + action: "أضغط هنا لتفعيل حسابك" + already_done: "رابط تأكيد الحساب لم يعد صالحاً , ربما الحساب نشط ؟" + please_continue: "تأكيد حسابك الجديد : جاري توجيهك إلى الصفحة الرئيسية ." + continue_button: "الاستمرار لـ %{site_name}" + welcome_to: "مرحبا بك في %{site_name}!" + approval_required: "يجب على المشرف أن يقبل حسابك الجديد قبل أن تستطيع الدخول لهذا المنتدى. سوف تتلقى بريد إلكتروني عندما يتم قبول حسابك." + missing_session: "نحن لا نستطيع أن نتحقق أن حسابك قد تمّ إنشاءه ، يرجى التأكد بإن ملفات تعريف الاتباط ** الملفات المؤقته مفعّله لديك ** cookies ." + post_action_types: + off_topic: + title: 'خارج الموضوع' + description: 'لا صلة للمشاركة بالنقاش الحالي على النحو المحدد بواسطة العنوان والمشاركة الأولى، وربما ينبغي نقلها لمكان أخر.' + long_form: 'أبلغ أن هذا خارج الموضوع.' + spam: + title: 'بريد مزعج' + description: 'هذه المشاركة هي إعلان. ليست مفيدة أو مناسبة للموضوع الحالي، ولكنه نوع ترويجي.' + long_form: 'تبليغ على أنه مزعج' + email_title: '"%{title}" تم الأبلاغ على أنه بريد مزعج' + email_body: "%{link}\n\n%{message}" + inappropriate: + title: 'غير مناسب' + description: 'هذه المشاركة تشمل محتوى أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـمبادئ مجتمعنا التوجيهية.' + long_form: 'ترفع علم هذا عن صورة غير ملائمة' + notify_user: + title: 'رسالة @{{username}}' + description: 'هذه المشاركة تحتوي بعض الأشياء التي أريد أن أتكلم مع هذا الشخص حولها مباشرة وسرا. لا يمكنك عمل تبليغ.' + long_form: 'العضو أرسل' + email_title: 'مشاركتك في "%{title}"' + email_body: "%{link}\n\n%{message}" + notify_moderators: + title: "شيء آخر " + description: 'تتطلب هذه الوظيفة الاهتمام مشرف لسبب آخر غير المذكورة اعلاه.' + long_form: 'علم هذا لتنبيه المراقب' + email_title: 'المشاركة "%{title}" تتطلب موافقة المشرف' + email_body: "%{link}\n\n%{message}" + bookmark: + title: 'المفضلة' + description: 'فضل هذه المشاركة' + long_form: 'فضلت هذه المشاركة' + like: + title: 'إعجاب' + description: 'أُعجَب بهذه المشاركة' + long_form: 'أعجبت بهذه' + vote: + title: 'تصويت' + description: 'صوت لهذا المنشور' + long_form: 'صوت لهذا المنشور' + topic_flag_types: + spam: + title: 'مؤذي' + description: 'هذا الموضوع هو الإعلان. ليس من المفيد أو المناسب لهذا الموقع، ولكن الترويجية في الطبيعة.' + long_form: 'ترفع علم هذا كدعاية' + inappropriate: + title: 'غير مناسب' + description: 'هذا الموضوع يشمل محتوى أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـمبادئ مجتمعنا التوجيهية.' + long_form: 'ترفع علم هذا عن صورة غير ملائمة' + notify_moderators: + title: "شيء آخر " + description: 'هذا الموضوع يتطلب اهتمام مشرف عام يعتمد على دليل التوجيهات, TOS, أو لسبب أخر غير مذكور أعلاه.' + long_form: 'علم هذا لتنبيه المراقب' + email_title: 'الموضوع "%{title}" يتطلب موافقة المشرف' + email_body: "%{link}\n\n%{message}" + flagging: + you_must_edit: '

      مشاركتك تم التبليغ عليها بواسطة المجتمع. نرجوا رؤية رسالتك.

      ' + user_must_edit: '

      هذه المشاركة كانت معلّمة بواسطة المجتمع وهي مخفية مؤقتاً.

      ' + archetypes: + regular: + title: "موضوع عادي" + banner: + title: "موضوع إعلاني" + message: + make: "هذا الموضوع معلّم الآن. سوف يظهر في أعلى كل صفحة حتى يرفض من قبل المستخدم." + remove: "هذا الموضوع لم يعد معلّم. لن يظهر في أعلى كل صفحة." + unsubscribed: + title: 'غير مشترك' + description: "لقد تم إلغاء اشتراكك. ونحن لن نتصال بك مرة أخرى!" + oops: "في حال أنك لا تقصد عمل هذا , أضغط أسفل." + error: "خطأ في إلغاء الإشتراك" + preferences_link: "تستطيع أيضاً إلغاء الاشتراك من رسائل الربيد التلخيصية عن طريق صفحة إعداداتك preferences page" + different_user_description: "أنت حالياً سجلت دخولك كمستخدم مختلف عن الذي كان يُرسله له الملخص. الرجاء تسجيل الدخول والمحاولة مجدداً." + not_found_description: "نأسف ، لم نستطيع أن نلغي اشتراكك . من الممكن أن الرابط المرسل إليك قد انتهت مدته . " + resubscribe: + action: "إعادة الاشتراك." + title: "إعادة الاشتراك." + description: "لقد تم إعادة إشتراكك." reports: + visits: + title: "زيارات العضو" + xaxis: "يوم" + yaxis: "عدد الزيارات" + signups: + title: "الأعضاء جدد" + xaxis: "يوم" + yaxis: "عدد الأعضاء الجدد" topics: title: "المواضيع" + xaxis: "اليوم" + yaxis: "عدد المواضيع الجديدة" posts: title: "المشاركات" + xaxis: "اليوم" yaxis: "عدد المشاركات الجديدة" likes: title: "اﻹعجابات" + xaxis: "يوم" yaxis: "عدد اﻹعجابات الجديدة" + flags: + title: "الأبلاغ" + xaxis: "يوم" + yaxis: "عدد الإبلاغات" + bookmarks: + title: "المفضلة" + xaxis: "يوم" + yaxis: "عدد العلامات المرجعية الجديدة." + starred: + title: "متألق" + xaxis: "يوم" + yaxis: "عدد المواضيع المتألقة الجديدة" users_by_trust_level: + title: "الأعضاء في مستوى الثقة" + xaxis: "مستوى الثقة" yaxis: "عدد اﻷعضاء" + emails: + title: "رسائل البريد الإلكتروني أرسلت" + xaxis: "يوم" + yaxis: "عدد رسائل البريد الإلكتروني" user_to_user_private_messages: + title: "عضو لعضو" + xaxis: "يوم" yaxis: "عدد الرسائل" system_private_messages: + title: "النظام" + xaxis: "اليوم" yaxis: "عدد الرسائل" moderator_warning_private_messages: + title: "تحذير مشرف " + xaxis: "يوم" yaxis: "عدد الرسائل" notify_moderators_private_messages: + title: "أبلغ المراقبين" + xaxis: "اليوم" yaxis: "عدد الرسائل" notify_user_private_messages: + title: "أبلاغ عضو" + xaxis: "اليوم" yaxis: "عدد الرسائل" top_referrers: + title: "أفضل الصفحات المرجعية" + xaxis: "مستخدم" + num_clicks: "نقرات" num_topics: "المواضيع" top_traffic_sources: + title: "أعلى مصادر مرور" + xaxis: "مجال" + num_clicks: "نقرات" num_topics: "المواضيع" num_users: "اﻷعضاء" top_referred_topics: + title: "أعلى مواضيع مشارة" xaxis: "موضوع" + num_clicks: "نقرات" + page_view_anon_reqs: + title: "مجهولون" + xaxis: "يوم" + yaxis: "طلبات API مجهولة " + page_view_logged_in_reqs: + title: "مسجل دخول" + xaxis: "يوم" + yaxis: "سجل طلبات API" + page_view_crawler_reqs: + title: "عناكب اﻹنترنت" + xaxis: "يوم" + yaxis: "طلبات API من عناكب الإنترنت" + page_view_total_reqs: + title: "مجموع" + xaxis: "يوم" + yaxis: "مجموع طلبات API" + page_view_logged_in_mobile_reqs: + title: "سجل طلبات API" + xaxis: "يوم" + yaxis: "سجل API لطلبات الهواتف " + page_view_anon_mobile_reqs: + title: "طلبات API مجهولة" + xaxis: "اليوم" + yaxis: "طلبات API مجهولة الهواتف" + http_background_reqs: + title: "خلفية" + xaxis: "اليوم" + yaxis: "طلبات تستخدم اﻷن وتتبع" + http_2xx_reqs: + title: " " + xaxis: "يوم" + yaxis: "طلبات ناجحة (Status 2xx)" + http_3xx_reqs: + title: "HTTP 3xx (إعادة توجيه)" + xaxis: "يوم" + yaxis: "إعادة توجيه الطلبات (الحالة 3xx)" + http_4xx_reqs: + title: "HTTP 4xx (خطأ العميل)" + xaxis: "يوم" + yaxis: "خطأ العميل (الحالة 4xx)" + http_5xx_reqs: + title: "HTTP 5xx (خطأ الخادم)" + xaxis: "يوم" + yaxis: "خطأ الخادم (الحالة 5xx)" + http_total_reqs: + title: "مجموع" + xaxis: "يوم" + yaxis: "إجمالي طلبات" + time_to_first_response: + title: "وقت أول استجابة" + xaxis: "اليوم" + yaxis: "متوسط الوقت (ساعات)" + topics_with_no_response: + title: "مواضيع بدون استجابة" + xaxis: "اليوم" + yaxis: "مجموع" + mobile_visits: + title: "زيارات العضو" + xaxis: "اليوم" + yaxis: "عدد الزيارات" + dashboard: + rails_env_warning: "خادمك يعمل في وضع %{env}." + ruby_version_warning: "أنت تشغل إصدار روبي \"Ruby 2.0.0\" المعروف بالمشاكل. قم بترقيته إلى باتش مستوى 247 أو أحدث." + host_names_warning: "ملف config/database.yml الخاص بك يستخدم الآن المضيف المحلي الافتراضي hostname. حدّثه لتستخدم مضيف موقعك." + gc_warning: 'خادمك يستخدم معاير روبي "ruby" لجمع المهملات, الذي لن يقدم أفض كفاءة . اقرأ هذا الموضوع عن ضبط الآداء: Tuning Ruby and Rails for Discourse.' + sidekiq_warning: "\"Sidekiq\" لا يعمل! \nالعديد من المهام, كإرسال البريدوغيرها, يتم تنفيذها بشكل غير متزامن من قبل \"sidekiq\". الرجاء التحقيق من عمل احدى وضائف الـ\"Sidekiq\". Learn about Sidekiq here." + queue_size_warning: 'عدد المهام قيد الانتظار هو %{queue_size}, وهو مرتفع. وقد يسبب مشكلة مع احدى/كل مهام "Sidekiq", أو قد تحتاج الى إضافة المزيد من (Sidekiq workers).' + memory_warning: 'خادمك يعمل بأقل من 1 جيجا بايت من الذاكرة الإجمالية. يتطلب على الأقل 1 جيجا بايت من الذاكرة.' + google_oauth2_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Google OAuth2 (enable_google_oauth2_logins)، لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقعوتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + facebook_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Facebook (enable_facebook_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقعوتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + twitter_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Twitter (enable_twitter_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + github_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع GitHub (enable_github_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + s3_config_warning: 'تم تهيئة الخادم لرفع ملفات إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. أذهب إلى إعدادات الموقع وتحديث الإعدادات. انظر "كيف ترفع الصور المرفوعة إلى S3؟" لتعلم المزيد.' + s3_backup_config_warning: 'تم تهيئة الخادم لرفع نسخة احتياطية إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. أذهب إلى إعدادات الموقع وتحديث الإعدادات. انظر "كيف ترفع الصور المرفوعة إلى S3؟" لتعلم المزيد.' + image_magick_warning: 'تم تهيئة الخادم لإنشاء صور مصغرة للصور الكبيرة، لكن ImageMagick لم يثبت. ثبته باستخدام مدير الحزم المفضل لك أو حمل أحدث نسخة.' + failing_emails_warning: 'يوجد %{num_failed_jobs} مهام بريد إلكتروني فشلت. تحقق من app.yml الخاص بك وتأكد من إعدادات خادم البريد أنها صحيحة. أنظر للمهام الفاشلة في Sidekiq.' + default_logo_warning: "ضع الشعارات الرسومية لموقعك. حدث logo_url, logo_small_url, و favicon_url in إعدادات الموقع." + contact_email_missing: "أدخل عنوان البريد الإلكتروني لجهة اتصال الموقع لتكون على وصول بالأمور العاجلة حول موقعك. حدثه في إعدادات الموقع." + contact_email_invalid: "البريد الالكتروني للموقع معطل. حدّثه Site Settings." + title_nag: "أدخل اسم موقعك. حدث العنوان في الاعدادات Site Settings." + site_description_missing: "أدخل جملة وصفية واحدة لموقعك والتي ستظهر في نتائج البحث. حدّث وصف_الموقع في اعدادات الموقع Site Settings." + consumer_email_warning: "موقعك مهيئ لاستخدام Gmail (أو مستهلك خدمة بريد إلكتروني أخر) لإرسال بريد إلكتروني. حدود Gmail كمية رسائل البريد الإلكتروني التي يمكنك إرسالها. فكر باستخدام مزود خدمة بريد إلكتروني مثل mandrill.com لضمان أهداف البريد الإلكتروني." + site_contact_username_warning: "أدخل اسم حسابات الأعضاء العاملين الودودين لإرسال رسالة مهمة آليا من تحديث site_contact_username في إعدادات الموقع." + notification_email_warning: "رسائل التنبية البريدية لم تكن مرسلة من عنوان بريدي صالح على مجالك؛ توصيل البريد سيكون غير منتظم ولايمكن الاعتماد عليها. الرجاء وضع رسائل التنبية في عنوان بريدي صالح في إعدادات الموقع Site Settings." + content_types: + education_new_reply: + title: "مستخدم جديد للتعليم: الردود الأولى" + description: "ينبثق الدليل بطريقه اوتوماتيكيه فوق المؤلف عندما يبدا المستخدمون الجدد بكتابه اول ردين جديدين لهم " + education_new_topic: + title: "مستخدم جديد للتعليم: موضوعات الأولى" + description: "ينبثق الدليل بطريقه اوتوماتيكيه للمؤلف عندما يبدا المستخدمون الجدد بكتابه اول ردين جديدين لهم " + usage_tips: + title: "توجيه مستخدم الجديد" + description: "الإرشادات والمعلومات الأساسية للمستخدمين الجدد. " + welcome_user: + title: "مرحباً: عضو جديد" + description: "هذه الرسالة تُرسل تلقائيًا لجميع أعضائنا الجدد حال اشتراكهم" + welcome_invite: + title: "مرحباً: عضو مدعو" + description: "ترسل رسالة أليا لكل الأعضاء المدعوين حديثا عندما يقبلون دعوة من عضو أخر مشارك." + login_required_welcome_message: + title: "مطلوب لتسجيل الدخول : رسالة ترحيب" + description: "رسالة الترحيب التي تظهر للأعضاء المسجلين خروجهم عندما يفعلون إعداد \"تسجيل الدخول مطلوب\"" + login_required: + title: "مطلوب لتسجيل الدخول : الصفحة الرئيسية" + description: "النص الظاهر للأعضاء الغير مصرح بهم عند الحاجة لتسجيل الدخول للموقع." + head: + title: "عنوان HTML رئيسي " + description: "HTML الذي سيدرج داخل علامات ." + top: + title: "أعلى الصفحة" + description: "HTML التي ستكون مضافة في الأعلى لكل صفحة ( بعد رأس الصفحة، أو قبل الملاحة أو عنوان الموضوع)." + bottom: + title: "أسفل الصفحة" + description: "HTML التي ستضاف قبل علامة ." + site_settings: + censored_words: "الكلمات التي ستستبدل تلقائيا مع ■■■■" + delete_old_hidden_posts: "سيتم حذف الوظائف المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا" + default_locale: "اللغة الإفتراضية لهذا الديسكورس نموذج (ISO 639-1 Code)" + allow_user_locale: "السماح للمستخدمين باختيار واجهة تفضيل لغة خاصة بهم." + min_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف" + min_first_post_length: "الحد الأدنى المسموح به لطول أول المشاركة (مقدمة العنوان) بالأحرف" + min_private_message_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف" + max_post_length: "الحد الأعلى المسموح به لطول مشاركة في الأحرف" + min_topic_title_length: "الحد الأدنى المسموح به موضوع طول اللقب في الأحرف" + max_topic_title_length: "الحد الأعلى المسموح به لطول عنوان موضوع في الأحرف" + min_private_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف" + min_search_term_length: "الحد الأدنى الصالح لطول مصطلح في الأحرف" + allow_uncategorized_topics: "اسمح بتصميم النقاشات من غير فئات. تحذير: اذا كان هناك نقاشات غير مصنفه، يجب عليك تصنيفها قبل اغلاق هذا " + uncategorized_description: "الوصف للفئة غير المصنفة. اتركه فارغا لعدم الوصف." + allow_duplicate_topic_titles: "اسمح بالمواضيع المماثلة والعناوين المكررة." + unique_posts_mins: "كمية الدقائق التي يمكن للعضو قبلها إنشاء مشاركة مع نفس المحتوى مجددا" + educate_until_posts: "عندما يبدا المستخدم كتابه منشورهم الاول.، اظهر انبثاق لوحه تعليمات المستخدم الجديد في المؤلف" + title: "الاسم لهذا الموقع، كأنه يستخدم علامة العنوان." + site_description: "صف هذا الموقع بجملة واحدة باستخدام علامة الوصف meta." + contact_email: "عنوان البريد الإلكتروني للاتصال الرئيسي المسؤول لهذا الموقع. تستخدم للإشعارات الحرجة كالتبليغات الغير معالجة، وكذلك عن / حول نموذج الاتصال للأمور المستعجلة." + contact_url: "اتصل بـ URL لهذا الموقع. استخدم في / حول نموذج الاتصال للأمور المستعجلة." + queue_jobs: "مطورين فقط ! تحذير ! افتراضياً، اذا تم تعطيل قوائم الانتظار في sidkiq سيتعطل الموقع." + crawl_images: "جلب الصور من الروابط لادراج الأبعاد الصحيحة." + download_remote_images_to_local: "تحويل الصور البعيدة إلى صور محلية بواسطة تحميلها؛ بإستثناء الصور التالفة" + download_remote_images_threshold: "ادني مساحه للقرص ضروربه لتحميل الصور البعيده محليا ( في المئه) " + disabled_image_download_domains: "الصور البعيدة لن يتم تنزيلها من هذا المجال. قائمة Pipe-delimited." + ninja_edit_window: "ل(n) ثواني بعد النشر، التعديل الذي سيتم لن يصنع نسخه جديده في القائمه التاريخيه للمنشورات" + post_edit_time_limit: "الكاتب يتستطيع تعديل و مسح مشاركته لعده (n) دقائق بعد النشر. اضبطه للعدد0 للابد" + edit_history_visible_to_public: "اسمح لاي شخص ان يرى النسخ السابقه للمنشورات المعدله. عندما يتم تعطيلها.،فقط اعضاء فريق العمل يمكنهم رؤيتها " + delete_removed_posts_after: "المشاركات التي تم إزالتها عن طريق الكتاب سيتم مسحها اوتوماتيكياً بعد(n) ساعات ة. اذا تم ضبطها علي 0، سيتم مسح المشاركه فوراً" + max_image_width: "أقصى عرض للصور المصغرة في مشاركة" + max_image_height: "أقصى ارتفاع للصور المصغرة في مشاركة" + category_featured_topics: "عدد المواضيع المعروضة لكل فئة من صفحة الفئات /categories .بعد تغير هذه القيمة, قد تستغرق صفحة الفئات 15 دقيقة لتُحَدّث." + show_subcategory_list: "اعرض قائمة الفئات الفرعية بدلاً من قائمة المواضيع عند ادخال فئة ما." + fixed_category_positions: "إذا تم التحقق, ستتمكن من ترتيب الفئات على شكل المطلوب. وإذا لم يتم التحقق, ستسرد الفئات على حسب الفعالية." + fixed_category_positions_on_create: "إذا تحققت، سيحفظ ترتيب الفئة في موضوع الحوار المنشأ (يتطلب fixed_category_positions)." + add_rel_nofollow_to_user_content: "أضف rel nofollow لجميع محتوى المستخدم المتقدم، باستثناء الروابط الداخلية (بما في ذلك المجالات الأصل). إذا غيرت هذا، يجب عليك عمل rebake لكل المشاركات بـ: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "قائمه النطاقات حيت لا اتباع لا يجب ان تضاف للروابط. tld.com سوف يقوم تلقائيا بالسماح sub.tld.com كذلك مثل الاصغر , يجب عليك اضافه النطاق الاعلى مستوي الخاص بالموقع لمساعده زحف الويب ليجاد جميع المحتويات.اذا كان باقي اجزاء موقعك في نطاقات اخرى , اضفهم ايضا" + post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص." + post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف." + onebox_domains_whitelist: "قائمة بالمجالات للسماح روابط تفصيلي؛ وينبغي دعم هذه المجالات OpenGraph أو oEmbed. اختبار لهم في http://iframely.com/debug" + logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا كان سيتم إظهار غادر نص عنوان موقع على بياض." + digest_logo_url: "صورة الشعار بديلة تستخدم في الجزء العلوي من البريد الإلكتروني موقعك. يجب أن تكون على شكل مستطيل واسع. إذا كان سيتم استخدام ترك فارغا `logo_url`." + logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل." + favicon_url: "الأيقونة الخاصة بموقعك, شاهد http://en.wikipedia.org/wiki/Favicon, لتعمل بشكل صحيح ضمن CDN يجب ان تكون بصيغة png." + mobile_logo_url: "صورة الشعار الثابتة ستظهر في الجزء العلوي الأيسر في نسخة الجوال من موقعك. يجب أن تكون مربعة. إذا تُركت فارغة، سيتم استخدام الـ `logo_url`. على سبيل المثال: http://example.com/uploads/default/logo.png" + apple_touch_icon_url: "الأيقونات المستخدمة لأجهزة اللمس Apple. يستحسن حجم 144px - 144px." + notification_email: "لمن: يستخدم عنوان البريد الالكتروني عند إرسال كل رسائل النظام الأساسي. المجال الخاص هنا يجب أن يكون SPF, DKIM وسجلات PTR عكسي تضبط بشكل صحيح لوصول البريد الالكتروني." + email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص." + email_subject: "لتخصيص تنسيق عناوين رسائل البريد الالكتروني القياسية. انظر https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" + use_https: "يجب ان يكون رابط url كامل للموقع(Discourse.base_url) يكون http او https؟ لا تشغل هذا الا اذا تم ضبطه و يعمل!" + summary_score_threshold: "الحد الأدنى للنقاط المطلوبة لتضمين مشاركة في \"تلخيص هذا الموضوع\"" + summary_posts_required: "الحد الأدنى للمشاركات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل." + summary_likes_required: "الحد الأدنى للإعجابات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل." + summary_percent_filter: "عندما يضغط المستخدم على \"تلخيص هذا الموضوع\"، يظهر أعلى % o المشاركات." + summary_max_results: "الحد الأقصى للمشاركات العائدة بـ 'ملخص هذا الموضوع'" + enable_private_messages: "يسمح مستوى الثقة 1 للمستخدمين بإنشاء والرد على الرسائل" + enable_long_polling: "ناقل الرسالة المستخدم للاشعارات يمكن أن يستخدم التصويت الطويل." + long_polling_base_url: "قاعدة URL تستخدم للتصويت الطويل (عندما CDN يخدم المحتوى الديناميكي, تأكد لتعيين هذا لسحب الأصل) eg: http://origin.site.com" + long_polling_interval: "المدة الزمنية التي سينتظرها الخادم قبل الرد على العملاء في حالة عدم وجود أية بيانات لارسالها (للأعضاء المسجلين فقط)" + polling_interval: "عندما لا يكون التصويت طويلا، عدد المرات التي يجب تسجيل عملاء التصويت فيها بالملي ثانية." + anon_polling_interval: "المرات التي يجب الاستعلام فيها عن العملاء المجهولين بالملي ثانية." + background_polling_interval: "كم ينبغي أن يكون عدد مرات الاستعلام عن العملاء في المللي ثانية ( عندما يكون الاطار في الخلفية )" + flags_required_to_hide_post: "عدد التبليغات التي تسبب إخفاء المشاركة آليا وترسل PM للعضو (0 لتعطيلها)" + cooldown_minutes_after_hiding_posts: "عدد الدقائق يجب على المستخدم الانتظار قبل أن يتمكنوا من تعديل موضوع مخفي عن طريق رفع الأعلام المجتمع" + max_topics_in_first_day: "الحد الأقصى لعدد الموضوعات يسمح للمستخدم لإنشاء في يومهم الأول على الموقع" + max_replies_in_first_day: "الحد الأقصى لعدد الردود يسمح للمستخدم لإنشاء في يومهم الأول على الموقع" + tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ لـمستوى الثقة 2 (عضو) بالضرب بهذا الرقم" + tl3_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ لـمستوى الثقة 3 (منتظم) بالضرب بهذا الرقم" + tl4_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـمستوى الثقة 4 (قائد) بالضرب بهذا الرقم" + num_flags_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا الكم من اعلامات البريد الغير هام من num_users_to_block_new_user اختلاف المستخدمين،اخفي جميع منشوراتهم و امنع جميع منشوراتهم المستقبليه.0 للالغاء" + num_users_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا الكم من اعلامات البريد الغير هام من num_flags_to_block_new_user اختلاف المستخدمين،اخفي جميع منشوراتهم و امنع جميع منشوراتهم المستقبليه.0 للالغاء" + notify_mods_when_user_blocked: "إذا تم حظر المستخدم تلقائيا، وإرسال رسالة الى جميع المشرفين." + flag_sockpuppets: "إذا رد أحد المستخدمين جديد إلى موضوع من عنوان IP نفسه باسم المستخدم الجديد الذي بدأ هذا الموضوع، علم كل من مناصبهم كدعاية المحتملين." + traditional_markdown_linebreaks: "استعمل السطور التالفه التقليديه في Markdown, التي تتطلب مساحتين بيضاوين للسطور التالفه" + allow_html_tables: "السماح للجداول لتكون مُدخلة بـMarkdown بإستخدام علامات HTML, و TABLE, THEAD, TD, TR, TH تكون قائمة بيضاء (تتطلب إعادة انشاء كامل لكل المشاركات القديمة التي تحتوي على جداول)" + post_undo_action_window_mins: "عدد الدقائق التي يسمح فيها للأعضاء بالتراجع عن آخر إجراءاتهم على المنشور (إعجاب، اشارة، إلخ...)" + must_approve_users: "يجب أن الموظفين يوافق على جميع حسابات المستخدم الجديدة قبل أن يتم السماح لهم للوصول إلى الموقع. تحذير: تمكين هذا لموقع الحية إلغاء وصول المستخدمين الحاليين غير الموظفين!" + ga_tracking_code: "تحليلات Google (ga.js) تتعقب رمز الشيفرة، مثال: UA-12345678-9; انظر http://google.com/analytics" + ga_domain_name: "تحليلات Google (ga.js) تتعقب اسم المجال، مثال: mysite.com; انظر http://google.com/analytics" + ga_universal_tracking_code: "تحليلات Google العالمية (analytics.js) تتعقب رمز الشيفرة، مثال: UA-12345678-9; انظر http://google.com/analytics" + ga_universal_domain_name: "تحليلات Google العالمية (analytics.js) تتعقب اسم المجال، مثال: mysite.com; انظر http://google.com/analytics" + enable_escaped_fragments: "تراجع لـGoogle's Ajax-Crawling API إذا لم يكشف عن webcrawler. أنظر https://support.google.com/webmasters/answer/174992?hl=en" + enable_noscript_support: "فعل دعم محرك بحث webcrawler عبر علامة غير نصية." + allow_moderators_to_create_categories: "السماح للمشرفين إنشاء قسم جديد" + cors_origins: "اسمح بالأصول للطلبات عبر المنشأ (CORS). كل أصل يجب أن يتضمن http:// أو https://. متغير env لـ DISCOURSE_ENABLE_CORS يجب أن يعين إلى true ليعمل CORS." + top_menu: "حدد الأدوات التي تظهر في ملاحة الصفحة الرئيسية، وما ترتيبها. مثال الأخير|الجديد|غير مقروء|فئات|أعلى|مقروء|مشارك|مفضلات" + post_menu: "تحديد العناصر التي تظهر في القائمة آخر، وبأي ترتيب. مثال مثل | تحرير | العلم | حذف | سهم | المرجعية | الرد" + post_menu_hidden_items: "عناصر القائمة لإخفاء افتراضيا في القائمة آخر ما لم يتم النقر على القطع التوسع جرا." + share_links: "تحديد العناصر التي تظهر على الحوار سهم، وبأي ترتيب." + track_external_right_clicks: "تتبع الروابط الخارجية التي يتم النقر الحق (على سبيل المثال: فتح في علامة تبويب جديدة) تعطيل افتراضيا لأنه يعيد كتابة عناوين المواقع" + site_contact_username: "الموظفين صالحة اسم المستخدم لإرسال كافة الرسائل الآلي من. وإذا ترك فارغا يتم استخدام حساب النظام الافتراضي." + send_welcome_message: "أرسل لكل الأعضاء الجدد رسالة ترحيب مع دليل البدء السريع." + suppress_reply_directly_below: "لا تظهر العد الرد توسيع على وظيفة عندما يكون هناك سوى رد واحد مباشرة تحت هذا المنصب." + suppress_reply_directly_above: "لا تظهر للتوسع في الرد لعلى وظيفة عندما يكون هناك سوى رد واحد مباشرة فوق هذا المنصب." + suppress_reply_when_quoting: "لا تظهر للتوسع في الرد لعلى وظيفة عندما يكون هناك سوى رد واحد مباشرة فوق هذا المنصب." + max_reply_history: "الحد الأقصى لعدد الردود على توسيع عند توسيع في الرد ل" + experimental_reply_expansion: "إخفاء ردود المتوسطة عند توسيع ردا على (تجريبي)" + topics_per_period_in_top_summary: "عدد من أهم الموضوعات هو مبين في موجز أعلى الافتراضية المواضيع." + topics_per_period_in_top_page: "عدد من أهم الموضوعات هو مبين في موجز أعلى الافتراضية المواضيع." + redirect_users_to_top_page: "إعادة توجيه تلقائيا للمستخدمين الجدد وغائبة لمدة طويلة إلى أعلى الصفحة." + show_email_on_profile: "إظهار بريدك المستخدم على صفحته الشخصية (مرئية فقط لأنفسهم والموظفين)" + email_token_valid_hours: "نسيت كلمه السر/ تنشيط رموز الحساب صالحه ل(n) ساعات" + email_token_grace_period_hours: "نسيت كلمه السر/ تنشيط رموز الحساب لا تزال صالحة لفترة سماح بالـ(n) ساعات بعد استبدالها." + enable_badges: "تفعيل نظام الشارات." + enable_whispers: "اسمح لمستخدمين باجراء محادثه سريه مع الطاقم " + allow_index_in_robots_txt: "تحديد في ملف robots.txt أن يسمح هذا الموقع ليتم فهرستها من قبل محركات البحث على شبكة الإنترنت." + email_domains_blacklist: "قائمة pipe-delimited المجالات البريد الإلكتروني الذي لا يسمح للمستخدمين تسجيل حسابات مع. مثال: mailinator.com | trashmail.net" + email_domains_whitelist: "قائمة pipe-delimited من مجالات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات مع. تحذير: لن يسمح للمستخدمين مع مجالات البريد الإلكتروني الأخرى غير المذكورة هنا!" + forgot_password_strict: "لم يكن لإبلاغ المستخدمين من الوجود حساب عند استخدامهم الحوار كلمة المرور نسيت." + log_out_strict: "عند تسجيل الخروج، تسجيل الخروج ALL جلسات للمستخدم على جميع الأجهزة" + version_checks: "Ping ديسكورس مركزا لتحديثات الإصدار وإظهار الرسائل النسخة الجديدة على لوحة القيادة / مسؤول" + new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح." + port: "DEVELOPER فقط! تحذير! استخدام هذا المنفذ HTTP بدلا من الافتراضي من المنفذ 80. المغادرة ابحث عن الافتراضي من 80." + force_hostname: "DEVELOPER فقط! تحذير! تحديد اسم المضيف في URL. اتركه فارغا لالافتراضي." + invite_expiry_days: "مدة صلاحية مفاتيح دعوة عضو، بالأيام." + invite_passthrough_hours: "كم المدة التي يمكن للعضو أن يستخدم مفتاح دعوة محرر سابقا لتسجيل الدخول، في الساعات" + invite_only: "تم التعطيل التسجيل العام، تسجيل الأعضاء الجدد يجب أن يكون بدعوة من الأعضاء أو الطاقم." + login_required: "أصلح التوثيق لقراءة الاتصال على هذا الموقع، لا تسمع بالوصول المجهول." + min_username_length: "الحد الأدنى لطول اسم العضو في الأحرف." + max_username_length: "الحد الأعلى لطول اسم العضو في الأحرف." + reserved_usernames: "الأعضاء الغير مسموح لها بالتسجيل." + min_password_length: "أقل طول لكلمة المرور" + block_common_passwords: "لا تسمح لكلمات المرور المسجلة في قائمة كلمات المرور الشائعةز" + enable_sso: " اسمح تسجيل دخول واحد عبر موقع خارجي(تحذير :عنوان بريد المستخدم *يجب* ان يتم التحقق من صحته عبر الموقع الخارجي)" + enable_sso_provider: "تنفيذ مزود بروتوكول Discourse SSO على نقطة نهاية /session/sso_provider, يتطلب sso_secret لتعينها" + sso_url: "نقطة نهاية URL الدخول الموحد" + sso_secret: "السلسلة السرية استخدمت لتشفير مصادقة معلومات SSO, كن متأكداً أنها 10 حروف أو أكثر" + sso_overrides_email: "يتجاوز البريد الاكتوني المحلي مع بريد موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع التتغيرات المحلية. (تحذير: ممكن يحدث تعارض بسبب الاختلاف طول اسم المستخدم/المتطلبات)" + sso_overrides_username: "يتجاوز \"اسم المستخدم المحلي\" مع \"اسم مستخدم موقع خارجي\" من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. (تحذير: ممكن يحدث تعارض بسبب الاختلاف طول اسم المستخدم/المتطلبات)" + sso_overrides_name: "يتجاوز الاسم المحلي مع اسم موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. " + sso_overrides_avatar: "تجاوز صوره المستخدم الرمزيه بواسطه موقع ور رميه خارجي من SSO المحمول. اذا فعلت, الغي allow_uploaded_avatarsعاليه مطلوبه " + sso_not_approved_url: "إعادة التوجيه لم توافق على حسابات SSO لهذا URL" + enable_local_logins: "فعل اسم مستخدم و كلمه مرور محليه تعتمد علي الحسابات(ملاحظه: يجب ان تفعل بالدعوات لتعمل) " + allow_new_registrations: "السماح تسجيل مستخدم جديد. إلغاء هذا لمنع أي شخص من إنشاء حساب جديد." + enable_signup_cta: "عرض إشعار لإرجاع المستخدمين المجهولين وحثهم على إنشاء حساب." + enable_yahoo_logins: "تفعيل مصادقة ياهو" + enable_google_oauth2_logins: "تمكين مصادقة جوجل Oauth2. هذا هو أسلوب المصادقة التي تؤيد جوجل حاليا. يتطلب مفتاح وسرا." + google_oauth2_client_id: "التسجيل بحسابك الشخصي في جوجل" + google_oauth2_client_secret: "العميل السري لتطبيق قوقل الخاص بك." + enable_twitter_logins: "تفعيل مصادقة تويتر , يطلب : twitter_consumer_key و twitter_consumer_secret" + twitter_consumer_key: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com" + twitter_consumer_secret: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com" + enable_facebook_logins: "تمكين مصادقة الفيسبوك، يتطلب facebook_app_id وfacebook_app_secret" + facebook_app_id: "التطبيق معرف للمصادقة الفيسبوك، مسجلة في https://developers.facebook.com/apps" + facebook_app_secret: "التطبيق معرف للمصادقة الفيسبوك، مسجلة في https://developers.facebook.com/apps" + enable_github_logins: "تمكين مصادقة جيثب، يتطلب github_client_id وgithub_client_secret" + github_client_id: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications" + github_client_secret: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications" + allow_restore: "تسمح استعادة، والتي يمكن أن تحل محل ALL بيانات الموقع! ترك كاذبة إلا إذا كنت تخطط لاستعادة نسخة احتياطية" + maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا" + automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد." + backup_frequency: "كمية النسخ الإحتياطية المتكررة التي أنشأناها، في اليوم." + enable_s3_backups: "تحميل النسخ الاحتياطي لS3 عند اكتماله. هام: يتطلب اعتماد S3 صالحة دخلت في إعدادات الملفات." + s3_backup_bucket: "الرفع عن بعد لإجراء نسخ إحتياطية. تحذير : تأكد من أنه رفع خاص." + active_user_rate_limit_secs: "كيف في كثير من الأحيان نقوم بتحديث حقل 'last_seen_at، في ثوان" + verbose_localization: "شاهد تلميحات الترجمة الممتدة في واجهة المستخدم." + previous_visit_timeout_hours: "متى زيارة تستمر قبل أن تنظر فيه الزيارة \"السابقة، في ساعات" + rate_limit_create_topic: "بعد إنشاء الموضوع، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء موضوع آخر." + rate_limit_create_post: "بعد نشر، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء منشور أخر." + rate_limit_new_user_create_topic: "بعد إنشاء الموضوع، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء موضوع آخر." + rate_limit_new_user_create_post: "بعد نشر، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء وظيفة أخرى." + max_likes_per_day: "أقصى عدد للإعجابات لكل عضو باليوم." + max_flags_per_day: "أقصى عدد للإعلامات لكل عضو باليوم." + max_bookmarks_per_day: "أقصى عدد للتفضيلات لكل عضو باليوم." + max_edits_per_day: "أقصى عدد للتعديلات لكل عضو باليوم." + max_topics_per_day: "أقصى عدد للمواضيع التي يمكن للعضو إنشائها باليوم." + max_private_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم." + max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم." + max_topic_invitations_per_day: "أقصى عدد لدعوات الموضوع التي يمكن للعضو إرسالها باليوم." + suggested_topics: "عدد المواضيع المواضيع المقترحة يظهر في أسفل الموضوع." + limit_suggested_to_category: "أظهر فقط المواضيع من الفئات الحالية في المواضيع المقترحة." + clean_up_uploads: " يتيم أزالة تحديث غير مرجعية لمنع استضافة غير المشروعة. تحذير: قد تحتاج لعمل نسخة احتياطية من الدليل / تحميل قبل تمكين هذا الإعداد." + clean_orphan_uploads_grace_period_hours: "فترة الراحة (بالساعات) قبل الرفع الوحيد تمت إزالته." + purge_deleted_uploads_grace_period_days: "يتم مسح فترة سماح (بالأيام) قبل تحميل حذفه." + purge_unactivated_users_grace_period_days: "يتم حذف فترة سماح (بالأيام) قبل المستخدم الذي لم تنشيط حساباتهم." + enable_s3_uploads: "وضع الإضافات على تخزين الأمازون S3. هام: يتطلب اعتماد S3 صالحة (على حد سواء الوصول معرف مفتاح ومفتاح الوصول السري)." + s3_use_iam_profile: 'إستعمل وظيفة AWS EC2 IAM لإسترجاع المفاتيح. ملاحظة : التمكين سوف يتجاوز " مفتاح معرف الوصول ل s3 " و "مفتاح الوصول السري ل s3" الإعدادات.' + s3_upload_bucket: "اسم حزمة Amazon S3 التي سيتم تحميل الملفات إليها. تحذير : يجب أن تكون أحرف صغيرة، لا تحوي مسافات، ولا _." + s3_access_key_id: "معرف مفتاح دخول امازون S3 سيستخدم لرفع الصور." + s3_secret_access_key: "مفتاح دخول أمازون السري S3 سيستخدم لرفع الصور." + s3_region: "اسم منطقة أمازون S3 سيستخدم لرفع الصور." + s3_cdn_url: "URL لـCDN يستخدم لكل أصول s3 (مثال: https://cdn.somewhere.com). تحذير : بعد تغيير هذا الإعداد يجب عمل rebake لكل المشاركات القديمة." + avatar_sizes: "قائمة أحجام الرمزية إنشاؤه تلقائيا." + external_system_avatars_enabled: "استخدم خدمات الهه النظام الخارجي " + external_system_avatars_url: "عنوان URL لخدمة الصور الرمزية النظام الخارجي. الاستعمال المسموح بها {username} {first_letter} {color} {size}" + enable_flash_video_onebox: "تمكين التضمين من swf و FLV (أدوبي فلاش) وصلات في مربع واحد. تحذير: قد يعرض المخاطر الأمنية." + default_invitee_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين." + default_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين.تحذير! التغيرات ستضعك تحت خطر البريد الغير هام." + tl1_requires_topics_entered: "كمية المواضيع التي يجب على العضو الجديد دخولها قبل ترقيته لمستوى الثقة 1." + tl1_requires_read_posts: "كمية المشاركات التي يجب على العضو الجديد قرائتها قبل ترقيته لمستوى الثقة 1." + tl1_requires_time_spent_mins: "كمية الدقائق التي يجب على العضو الجديد قراءة المشاركات فيها قبل ترقيته لمستوى الثقة 1." + tl2_requires_topics_entered: "كمية المواضيع التي يجب على العضو دخولها قبل ترقيته لمستوى الثقة 2." + tl2_requires_read_posts: "كمية المشاركات التي يجب على العضو قرائتها قبل ترقيته لمستوى الثقة 2." + tl2_requires_time_spent_mins: "كمية الدقائق التي يجب على العضو قراءة المشاركات فيها قبل ترقيته لمستوى الثقة 2." + tl2_requires_days_visited: "كمية الأيام التي يجب على العضو زيارة الموقع فيها قبل ترقيته لمستوى الثقة 2." + tl2_requires_likes_received: "كمية الإعجابات التي يجب على العضو إرسالها قبل ترقيته لمستوى الثقة 2." + tl2_requires_likes_given: "كمية الإعجابات التي يجب على العضو جمعها قبل ترقيته لمستوى الثقة 2." + tl2_requires_topic_reply_count: "كمية مواضيع العضو التي يجب الرد عليها قبل الترقية لمستوى الثقة 2." + tl3_requires_days_visited: "أقل عدد من الأيام التي يجب على المستخدم زيارة الموقع في آخر مئةيوم للتأهل لمستوى الثقة 3. (0 حتى 100)" + tl3_requires_topics_replied_to: "أقل عدد من المواضيع التي يجب على المستخدم الرد عليها في آخر 100 يوم للتأهل لمستوى الثقة 3. (0 أو أكثر)" + tl3_requires_topics_viewed: "نسبة الموضوعات التي تم إنشاؤها في آخر 100 يوم، تجعل المستخدم مؤهلًا لعرضه للترقية إلى مستوى الثقة الثالث3 . (من 0 الى 100)" + tl3_requires_posts_read: "النسبه المئويه للمنشورات التي تم انشاءها في اخر 100 يوم ,التي يحتاج المستخدم لمعينتها تؤهله للترقيه للمستوي الثقه 3. (0 الي 100)" + tl3_requires_topics_viewed_all_time: "أقل عدد من المواضيع التي يجب على المستخدم مشاهدتها للتأهل لمستوى الثقة 3." + tl3_requires_posts_read_all_time: "أقل عدد من المشاركات يجب على المستحدم قرائتها للتأهل لمستوى الثقة 3 ." + tl3_requires_max_flagged: "يجب علي المستخدم عدم الحصول علي اكثر من x مشاركات مؤشره من x مستخدمين مختلفين في اخر 100 يوم لليترقى للمستوي 3 من الثقه , عندما x تساوي قيمه (صفر او اكثر)" + tl3_promotion_min_duration: "أقل عدد من الأيام التي تكون الترقية إلى مستوى الثقة 3 قد أنتهت قبل عودة المستخدم لمستوى الثقة 2." + tl3_requires_likes_given: "أقل عدد من الإعجابات التي يجب أن تُمنح في آخر 100 يوم للتأهل لمستوى الثقة 3." + tl3_requires_likes_received: "أقل عدد من الإعجابات التي يجب أن تُتلقى في آخر 100 يوم للتأهل لمستوى الثقة 3." + tl3_links_no_follow: "لا تحذف rel=nofollow من روابط المشاركة بواسطة أعضاء مستوى الثقة 3." + min_trust_to_create_topic: "أدنى مستوى ثقة مطلوب لإنشاء موضوع جديد." + min_trust_to_edit_wiki_post: "الحد الأدنى لمستوى الثقة المطلوب لتعديل مشاركة معلمة كويكي." + newuser_max_links: "عدد الروابط التي يمكن للمستخدم الجديد إضافتها للمشاركة." + newuser_max_images: "عدد الصور التي يمكن للمستخدم الجديد إضافتها للمشاركة." + newuser_max_attachments: "عدد المرفقات التي يمكن للمستخدم الجديد إضافتها للمشاركة." + newuser_max_mentions_per_post: "أقصى عدد لاشعارات @name العضو الجديد يمكنه استخدامها في المشاركة." + newuser_max_replies_per_topic: "أقصى عدد من الردود التي يمكن للمستخدم الجديد الرد بها على موضوع واحد حتى يتم الرد من شخص آخر عليه." + max_mentions_per_post: "أقصى عدد لاشعارات @name أي شخص يمكنه استخدامها في المشاركة." + create_thumbnails: "أنشئ الصور المصغرة وصندوق الصور المضيء الكبيرة جدا لتناسب المشاركة." + email_time_window_mins: "انتظر (n) دقائق قبل ارسال اي بريد اشعاري , لتعطي المستخدم فرصه تعدل و انهاء منشوراته." + email_posts_context: "كمية الردود السابقة التي ضمنت كسياق في إشعارات البريد الإلكتروني." + flush_timings_secs: "عدد تكرارات التي نقوم بدفع وقت البيانات للخادم، بالثانية." + title_max_word_length: "الحد الأقصى المسموح لطول كلمة، بالأحرف، في عنوان الموضوع." + title_min_entropy: "أدنى إنتروبي (حروف فريدة، عدد غير إنجليزي للكثير) مطلوب لعنوان الموضوع." + body_min_entropy: "أدنى إنتروبي (حروف فريدة، عدد غير إنجليزي للكثير) مطلوب لصلب المشاركة." + title_fancy_entities: "تحويل أحرف ASCII مشتركة لكائنات HTML في عناوين الموضوع، ala SmartyPants http://daringfireball.net/projects/smartypants/" + min_title_similar_length: "الحد الأدنى لطول العنوان قبل أن يتم البحث عن مواضيع مشابهة." + min_body_similar_length: "الحد الادنى لطول المشاركة قبل أن يتم البحث عن مواضيع مشابه." + category_colors: "قائمة قيمة الألوان الست عشرية مسموحة في الفئات." + category_style: "النمط المرئي لفئة الشارات." + max_image_size_kb: "الحجم الاقص لتحميل صوره بالكيلو بايت.هذا يجب ضبطه في nginx (client_max_body_size) /اباتشي او البروكسي" + max_attachment_size_kb: "أقصى حجم لتحميل المرفقات الملفات بالكيلوبايت. وهذا يجب أن يتم تكوينه في nginx (client_max_body_size) / أباتشي أو الوكيل. " + authorized_extensions: "قائمة بالملفات المسموح رفعها (أستخدم '*' للسماح لجميع الأنواع)" + max_similar_results: "كم عدد المواضيع المتشابهه لتظهر للمحرر اثناء انشاء موضوع جديد.المقارنه تعتمد علي العنوان و المحتوي " + title_prettify: "امنع العنوين المشتركه الاخطاء المطبعيه و الاخطاء, و يتضمن كل الحروف الكبيره, الحروف الصغيره الفراغ الاول , اكثر من ! و ؟ , زئده . في النهايه الخ" + topic_views_heat_low: "بعد هذه المشاهدات العديدة، مجال هذه المشاهدات بارزة قليلا." + topic_views_heat_medium: "بعد هذه المشاهدات العديدة، مجال هذه المشاهدات بارزة باعتدال." + topic_views_heat_high: "بعد هذه المشاهدات العديدة، مجال هذه المشاهدات بارزة بقوة." + cold_age_days_low: "بعد هذه الأيام الكثيرة من المحادثة, تاريخ النشاط الأخير ضعيف قليلا." + cold_age_days_medium: "بعد هذه الأيام الكثيرة من المحادثة, تاريخ النشاط الأخير ضعيف نسبياً." + cold_age_days_high: "بعد هذه الأيام الكثيرة من المحادثة, تاريخ النشاط الأخير ضعيف جداً." + history_hours_low: "تعديل المشاركة مع العديد من الساعات له مؤشر تحرير بارز قليلا." + history_hours_medium: "تعديل المشاركة مع العديد من الساعات له مؤشر تحرير بارز باعتدال." + history_hours_high: "تعديل المشاركة مع العديد من الساعات له مؤشر تحرير بارز بقوة." + topic_post_like_heat_low: "بعد الاعجابات: نسبه تفوق هذه النسبه,سلط الضوء قليلا علي حقل المنشور" + topic_post_like_heat_medium: "بعد الاعجابات: نسبه تفوق هذه النسبه,سلط الضوء باعتدال علي حقل المنشور" + topic_post_like_heat_high: "بعد likes:post تفوق هذه النسبه,سلط الضوء بقوه علي حقل المنشور" + faq_url: "إذا كانت لديك معلومات حول إضافة أخرى تريد استخدامها, فضلًا قم بتوفير العنوان كاملاً هنا." + tos_url: "اذا كان لديك وثيقه شروط خدمه مستضيفها في مكان اخر و تريد استخدمها, وفر url الكامل هنا" + privacy_policy_url: "اذا كان لديك وثيقه سياسه خصوصيه مستضيفها في مكان ما و نريد استخدمها. وفر url الكامل هنا" + newuser_spam_host_threshold: "كم عدد مرات التي يستطيع فيها المستخدم نشر رابط في نفس المضيف ضمن newuser_spam_host_posts قبل ان يعتبر غير هام" + white_listed_spam_host_domains: "قائمة النطاقات المستثناة من اختبار مضيف البريد المزعج. لن يتم تقييد المستخدمين الجدد من إنشاء المشاركات مع الروابط إلى هذه النطاقات." + staff_like_weight: "كم عدد مرات الترجيح الاضافيه لمنح اعجابات الطاقم " + topic_view_duration_hours: "احسب عدد المواضيع التي تمت مشاهدتها مره واحده عبر ip/مستخدم كل N ساعات" + levenshtein_distance_spammer_emails: "عند ربط رسائل البريد الإلكتروني spammer، الأرقام والحروف تختلف التي ستبقى تسمح بربط غامض." + max_new_accounts_per_registration_ip: "اذا كان هناك بالفعل (N) مستوي ثقه الحسابات 0 من هذا IP ( و لم يكن عضو في الطاقم او TL2 او اعلى), توقف عن قبول تسجيلات الدخول الجديده من هذا IP" + min_ban_entries_for_roll_up: "When clicking the Roll up button, will create a new subnet ban entry if there are at least (N) entries." + max_age_unmatched_emails: "احذف عرض عدد مرات ادخال البريد الالكتروني الغير متطابق بعد (N) ايام." + max_age_unmatched_ips: "احذف عرض عدد مرات ادخال IP الغير متطابق بعد (N)ايام." + num_flaggers_to_close_topic: "ادني عدد من تبليغات المميزه المطلوبه ليتم ايقاف الموضوع تلفائيا ليدخل" + num_flags_to_close_topic: "ادني عدد من التبليغات النشطه المطلوبه ليتم توقيف الموضوع تلقائيا ليدخل" + auto_respond_to_flag_actions: "تمكين الرد التلقائي عند التخلص من التبليغ." + min_first_post_typing_time: "الحد الأدنى من الوقت بالمللي ثانية يجب على المستخدم كتابته خلال المشاركة الأولى، إذا لم تتم الاستجابة للحد الأدنى للمشاركة ستدخل تلقائيا في قائمة انتظار الموافقة على الاحتياجات. تعيين إلى 0 للتعطيل (غير مستحسن)" + auto_block_fast_typers_on_first_post: "اوتوماتيكيا احظر المستخدمين الذين لا يقابلون \nدقيقه_اول_منشور_كتابه_زمن" + auto_block_fast_typers_max_trust_level: "الحد الأعلى لمستوى الثقة لأنواع الحظر التلقائي السريع." + auto_block_first_post_regex: "التعابير القياسية ستتحسس عند مرور أول منشور، سيتم حظره وارساله لقائمة الانتظار للموافقة، مثال raging|a[bc]a ستؤدي جميع المشاركات التي تحتوي على عنصرية أو جمعية المحامين الأمريكي أو هيئة مكافحة الفساد للحظر أول مرة. تنطبق فقط على أول منشور." + reply_by_email_enabled: "تفعيل الرد على الموضوع بواسطة البريد الالكتروني" + reply_by_email_address: "قالب للرد على عنوان البريد الإلكتروني الوارد بواسطة البريد الإلكتروني، مثال: %{reply_key}@reply.example.com أو الردود+%{reply_key}@example.com" + disable_emails: "منع Discourse من إرسال أي نوع من رسائل البريد الإلكتروني" + strip_images_from_short_emails: "شريط الصور من البريد الإلكتروني لها حجم أقل من 2800 بايت" + short_email_length: "طول أقصر بريد الكتروني بـ Bytes." + pop3_polling_enabled: "تصويت عبرPOP3 لردود البريد الإلكتروني." + pop3_polling_ssl: "أستخدم SSL عند الأتصال بمخدم POP3.(مُستحسن)" + pop3_polling_period_mins: "الفترة دقائق بين التحقق من حساب POP3 للبريد الإلكتروني. ملاحظة : تتطلب إعادة تشغيل." + pop3_polling_port: "المنفذ للتصويت عن طريق حساب POP3." + pop3_polling_host: "المضيف للتصويت عن طريق البريد الإلكتروني عبر POP3." + pop3_polling_username: "اسم العضو لحساب POP3 للتصويت بالبريد الإلكتروني." + pop3_polling_password: "كلمة المرور لحساب POP3 للتصويت بالبريد الإلكتروني." + log_mail_processing_failures: " سجل كل فشل عمليات البريد الإلكتروني الي http://yourtsitename.com/logs" + email_in: "اسمح للمستخدمين بنشر المواضيع الجديده عن طريق البريد الالكتروني (يتطلب تصويت pop3 ). كون العناوين في الضبط صفحه لكل فئه " + email_in_min_trust: "أدنى مستوى ثقة يحتاجه العضو للسماح له بنشر موضوع جديد عبر البريد الألكتروني." + email_prefix: "[الوسم] يُستخدم في عنون رسالة البريد الألكتروني. سيكون إفتراضياً 'العنوان' في حال عدم تعيينه." + email_site_title: "عنوان الموقع يستعمل كمرسل للرسائل الإلكترونية من ااموقع. افترضيا 'العنوان' اذا لم يتم ضبطه. اذا كان، العنوان يحتوي علي رموز غير مسموح به في خانات البريد اامرسل، استعمل هذا الضبط. " + minimum_topics_similar: "عدد المواضيع التي يجب أن تكون موجودة قبل عرض المواضيع المشابهة عند إنشاء موضوع جديد." + relative_date_duration: "عدد الايام بعد النشر حيث التواريخ سوف تظهر تقريبا (7ايام) بدلا من (20 فبراير) " + delete_user_max_post_age: "لا تسمح بحذف المستخدمين الذين منشورهم الاول اقدم من (x) ايام" + delete_all_posts_max: "العدد الاقص للمشاركات التي يمكن مسحها مره واحده بزر مسح كل المشاركات.اذا المستخدم لديه اكثر من هذا العدد من المشاركات, المشاركات لا يمكن مسح جميعها مره واحدهو المستخدم لا يمكن حذفه" + username_change_period: "عدد الايام بعد التسجيل التي يستطيع فيها الحسابات بتغير اسم المستخدم الخاص بهم(0 لكي لا تسمح بتغير اسم المستخدم)" + email_editable: "يُسمح للأعضاء بتغيير بريدهم الألكتروني بعد التسجيل." + logout_redirect: "الموقع لاعاده توجيه المتصفح بعد تسجيل الخروج EG: (http://somesite.com/logout)" + allow_uploaded_avatars: "اسمح للمستخدمين بتحميل صور شخصيه مخصصه" + allow_animated_avatars: "يُسمح للمستخدمين باستخدام صور متحركة GIF كصورة شخصية.\nتحذير:يُمنع استخدام صور رمزية خليعة:سيتم تحديث الصورة فور تغييرها." + allow_animated_thumbnails: "يولد الصور المصغرة المتحركة للرسوم المتحركة. " + default_avatars: "سيتم استخدام عناوين URL للصور الرمزية بشكل افتراضيًا للأعضاء الجدد حتى يغيروا صورهم." + automatically_download_gravatars: "تحميل Gravatars للأعضاء عند تغيرهم البريد الإلكتروني الخاص بهم أو عند إنشائهم لحساب آخر." + digest_topics: "العدد الاقصي من المواضيع لعرضها في مضمون البريد الإلكتروني " + digest_min_excerpt_length: "الحد الادني من مشاركه مقتطفات خلاصه البريد الاكتروني,في الشخصيات" + suppress_digest_email_after_days: "احفظ خلاصه الرسائل الالكترونيه للمستخدمين الذين لم تتم رويتهم في الموقع لاكثر من (N) ايام" + disable_digest_emails: "عطل ملخص رسائل البريد الإلكتروني لكل الأعضاء." + detect_custom_avatars: "سواء او لا تفقد اذا كان المستخدم قام بتحميل صور شخصيه مخصصه" + max_daily_gravatar_crawls: "العدد الاقصي من مرات Dicourse سوف يتفقد Gravatar لصور رمزيه مخصصه في اليوم" + public_user_custom_fields: "حقول قائمه بيضاء مخصصه للمستدم يمكن رويتها علنا" + staff_user_custom_fields: "حقول القائمه البيضاء المخصصه للمستخدم يمكن اراها للطاقم" + enable_user_directory: "وفر دليل المستخدمين للتصفح" + allow_anonymous_posting: "اسمح للمستخدمين ان يغيروا لوضع المخفي" + anonymous_posting_min_trust_level: "أدنى مستوى ثقة للسماح بنشر مشاركات مجهولة." + anonymous_account_duration_minutes: "للحمايه الهويه اصنع حساب مجهول كل n دقائق لكل مستخدم.\nمثال:اذا ضبط 600 , بعد انقضي 600 دقيقه من اخر منشور و غير المستخدم للمجهول.تم انشاء حساب مجهول." + allow_profile_backgrounds: "اسمح للأعضاء برفع خلفيات ملف التعريف." + sequential_replies_threshold: "عدد مشاركات عضو في صف واحد في موضوع قبل يجري تذكير حول الردود متسلسلة كثيرة جداً." + enable_mobile_theme: "اجهزه الموبايل تستخدم ثيم مناسب للجوال,امكانيه التحويل للموقع الكامل .الغي هذا اذا اردت استخدام انماط سريعه الاستجابه" + dominating_topic_minimum_percent: "ما هي النسبه المئويه للمشاركات التي يجب علي المستخدم عملها في الموضوع قبل تلقيه لتنبيه عن خروجه لنطاق الموضوع" + daily_performance_report: "تحليل سجلات NGINX يومي ونشر موضوع \"قاقم فقط\" مع التفاصيل" + suppress_uncategorized_badge: "لا تظهر الشارة للمواضيع غير المصنفة في قائمة الموضوع." + permalink_normalizations: "يتم تطبيق التعابير القياسية قبل مطابقة صور الروابط الثابتة، على سبيل المثال: /(\\/topic.*)\\?.*/\\1 سوف تقطع الاستعلامات من الموضوع. التنسيق هو : التعبير القياسي+النص المستخدم \\ إلخ.. للوصول للقطع" + global_notice: "اعرض تنبيه, شعار عام طارئ ملاحظه لكل الزوار, غير الفراغ لاخفاء(HTML مسموح)" + disable_edit_notifications: "لتعطيل تحرير الاشعارات بواسطة العضو النظام عندما يكون نشطاً 'download_remote_images_to_local'." + full_name_required: "الإسم الكامل مطلوب وهو ضروري لإكمال الحساب " + enable_names: "عرض الاسم الكامل للعضو , بطاقة العضو , ورسائل البريد الالكتروني , تعطيل عرض الاسم في اي مكان " + display_name_on_posts: "عرض الاسم الكامل للعضو على التعليقات بالاضافة الى @username." + show_time_gap_days: "إذا تم إجراء وظيفتين في حد كثير من الأيام، عرض الفجوة الزمنية في الموضوع." + invites_per_page: "الدعوات الافتراضية تظهر في صفحة العضو" + short_progress_text_threshold: "بعد نعدي عدد المشاركات في الموضوع اكثر من هذا الرقم, شريط المهام فقط سوف يعرض رقم المشاركه الحاليه.اذا غيرت عرض شريط المهام, ربما تحتاج لتغير هذه القيمه" + default_code_lang: "تسليط الضوء علي تركيب جمله اللغه البرمجيه يطبق الي مكعبات اكواد GitHub (lang-auto, ruby, python etc.)" + warn_reviving_old_topic_age: "عندما يبدا احدهم بالرد علي الموضوع و اخر كان اقدم من هذه الايام, سوف يظهر تحذير, عطل عن طريق الضبط الي 0" + autohighlight_all_code: "تطبيق تسليط الضوء الاجباري علي الاكواد لكل مكعبات الاكواد لمهياه مسبقا . عندما لا تحدد اللغه بشكل صريح" + highlighted_languages: "يتضمن قوانين تسليط الضوء علي تركيب الجمله.(تنبيه: ادخال كثير من اللغات قد يؤثر علي الاداء) تفقد: https://highlightjs.org/static/demo/ للعرض" + feed_polling_enabled: "فقط التضمين : تضمين مغذي RSS/ATOM كمشاركات." + feed_polling_url: "فقط التضمين : URL لمغذي RSS/ATOM مضمن." + embed_by_username: "اسم مستخدم Discourse للعضو الذي ينشأ المواضيع المضمنة." + embed_username_key_from_feed: "مفتاح لسحب اسم مستخدم discourse من المغذي." + embed_truncate: "اقتطاع الوظائف المدمجة." + embed_post_limit: "أقصى عدد للمشاركات المضمنة." + embed_whitelist_selector: "منتقي CSS للعناصر التي تسمح في التضمينات." + embed_blacklist_selector: "منتقي CSS للعناصر التي حذفت من التضمينات." + notify_about_flags_after: "اذا كانت هناك علامه انه لم يتم تاتعامل معه بعد هذه الساعات, ارسال رساله الي جهه الاتصال_بريده الالكتروني. اضبط 0 للتعطيل" + enable_cdn_js_debugging: "السماح/logs لعرض أخطاء المناسبة عن طريق إضافة تتضمن تحليل عرض كل شبيبة." + show_create_topics_notice: "إذا كان الموقع يحتوي على أقل من 5 مواضيع عامة , إظهار إشعار مطالبة المسؤولين إنشاء بعض المواضيع." + delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما. + show_logout_in_header: "عرض تسجيل الخروج في القائمة المنسدلة للمستخدم في رأس الصفحة." + vacuum_db_days: "شغل التحليل الكامل للمساحة لاستعادة مساحة DB بعد الهجرات (ضع 0 للإغلاق)" + prevent_anons_from_downloading_files: "امنع المستخدمين المجهولين من تحميل المرفقات. تحذير:سوف تمنع اي شخص ليس لديه صوره موقع اصول نشره كمرفقات من العمل." + slug_generation_method: "اختر طريقه توليد سبيكه . 'مشفره' سوف تقوم بتوليد سلسله مئويه مشفره.'لاشي' سوف يعطل السبيكه" + enable_emoji: "تمكين الرموز التعبيرية " + emoji_set: "كيف تريد أن تكون الرموز التعبيرية الخاصة بك؟" + enforce_square_emoji: "أجبر نسبة جانب المربع لكل الرموز التعبيرية." + approve_post_count: "كمية مشاركات العضو الجديد التي يجب أن تتم الموافقة عليها" + approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها." + notify_about_queued_posts_after: "اذا كان هناك مشاركات تنتظر ليتم معينتها لاكثر من هذه الساعات, سوف يتم ارسال بريد الكتروني لبريد الاتصال . اختر 0 لتعطيل هذه الرسائل" + default_email_digest_frequency: "عدد المرات التي يتلقى الأعضاء فيها ملخص لبريدهم الإلكتروني إفتراضيا." + default_email_private_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا." + default_email_direct: "ارسل بريد الكتروني عندما يقوم احدهم بالرد/الاقتباس الي/ذكر او دعوه مستخدم افتراضيا" + default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا." + default_email_always: "أرسل إشعار بريد إلكتروني حتى عندما يكون العضو متاح إفتراضيا." + default_other_new_topic_duration_minutes: "الشروط العالمية الافتراضية لموضوع يعتبر جديد." + default_other_auto_track_topics_after_msecs: "الوقت العالمي الافتراضي قبل الموضوع متعقب آليا." + default_other_external_links_in_new_tab: "أفتح الروابط الخارجية في تبويب جديد إفتراضيا." + default_other_enable_quoting: "فعل إقتباس الردود لتحديد النص إفتراضيا." + default_other_dynamic_favicon: "إعرض عدد المواضيع الجديدة/الحديثة في أيقونة المتصفح إفتراضيا." + default_other_disable_jump_reply: "لا تتجاوز إلى مشاركة الضو بعد ردهم إفتراضيا." + default_other_edit_history_public: "أنشئ مشاركة المراجعات العامة إفتراضيا." + default_categories_watching: "قائمة الفئات التي تشاهد إفتراضيا." + default_categories_tracking: "قائمة الفئات التي تتابع إفتراضيا." + default_categories_muted: "قائمة الفئات التي توضع صامتة إفتراضيا." + errors: + invalid_email: "بريد الكتروني غير صالح " + invalid_username: "لا يوجد مستخدم بهذا الاسم " + invalid_integer_min_max: "القيمة يجب أن تكون بين %{min} و %{max}." + invalid_integer_min: "القيمة يجب أن تكون %{min} أو أكثر." + invalid_integer_max: "القيمة لا يمكن أن تكون أكثر من %{max}." + invalid_integer: "القيمة يجب أن تكون عدد صحيح" + regex_mismatch: "القيمة لا تتناسب مع الشكل المطلوب" + must_include_latest: "ويجب أن تتضمن القائمة العلوية علامة التبويب 'أحدث'." + invalid_string: "قيمة غير صحيحة" + invalid_string_min_max: "يجب أن تكون الأحرف بين %{min} و %{max}." + invalid_string_min: "يجب أن تكون على الأقل %{min} أحرف" + invalid_string_max: "يجب ان لا تكون الاحرف اكثر من %{max} " + invalid_reply_by_email_address: "القيمة يجب أن تحتوي '%{reply_key}' وتختلف عن إشعار البريد الإلكتروني." + notification_types: + mentioned: "%{display_username} ذكرك في %{link}" + liked: "%{display_username} أعجب بمشاركتك في %{link}" + replied: "%{display_username} رد على مشاركتك في %{link}" + quoted: "%{display_username} أقتبس مشاركتك في %{link}" + edited: "%{display_username} عدل مشاركتك في %{link}" + posted: "%{display_username} شارك في %{link}" + moved_post: "%{display_username} نقل مشاركتك إلى %{link}" + private_message: "%{display_username} أرسل لك رسالة: %{link}" + invited_to_private_message: "%{display_username} دعاك لرسالة: %{link}" + invited_to_topic: "%{display_username} دعاك لموضوع: %{link}" + invitee_accepted: "%{display_username} قبل دعوتك" + linked: "%{display_username} ربطك في %{link}" + granted_badge: "كسبت %{link}" + search: + within_post: "#%{post_number} بواسطة %{username}" + types: + category: 'فئات' + topic: 'نتائج ' + user: 'مستخدمين ' + sso: + not_found: "لا تستطيع البحث او انشاء حساب جديد , راجع ادارة الموقع " + account_not_approved: "الحساب بإنتظار الموافقة , ستتلقى إشعار بالبريد الكتروني بعد الموافقة " + unknown_error: "حدث خطأ أثناء تحديث المعلومات، راجع إدارة الموقع" + timeout_expired: "انتهى وقت الجلسة , يرجى تسجيل الدخول مرة اخرى " + original_poster: "المشاركات الأصلية " + most_posts: "معظم المشاركات" + most_recent_poster: "معظم المشاركات الاخيرة " + frequent_poster: "تكرار المشاركات " + redirected_to_top_reasons: + new_user: "مرحبا بكم في مجتمعنا! هذه هي المواضيع الأكثر شعبية الأخيرة." + not_seen_in_a_month: "مرحبا بعودتك! لم نرك منذ مدة. هذه أكثر المواضيع شعبية عندما كنت بعيدا." + move_posts: + new_topic_moderator_post: + zero: "المشاركه التي انقسمت الي موضوع جديد: %{topic_link}" + one: "المشاركه التي انقسمت الي موضوع جديد : %{topic_link}" + two: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] " + few: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] " + many: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] " + other: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] " + existing_topic_moderator_post: + zero: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}" + one: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}" + two: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}" + few: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}" + many: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}" + other: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}" + change_owner: + post_revision_text: "نقل الملكية من %{old_user} إلى %{new_user}" + deleted_user: "عضو محذوف" + emoji: + errors: + name_already_exists: "للأسف، الاسم '{name}%' مستخدم بواسطة رموز تعبيرية أخرى." + error_while_storing_emoji: "للأسف ، حدث خطأ عند تخزين الرموز التعبيرية." + topic_statuses: + archived_enabled: "هذا الموضوع مؤرشف الأن. لن تستطيع أن تعدل عليه بأي طريقة." + archived_disabled: "هذا الموضوع غير مؤرشف الأن.لم يجمد، و تستطيع أن تعدل عليه." + closed_enabled: "تم اغلاق هذا الموضوع لا يسمح باضافة ردود جديدة" + closed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + autoclosed_enabled_days: + zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان." + one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متوفره بعد الان." + two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان." + few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان." + many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان." + other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان." + autoclosed_enabled_hours: + zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان." + one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان." + two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه" + few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه" + many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه" + other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه" + autoclosed_enabled_minutes: + zero: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان." + one: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان." + two: "هذا الموضوع تم تم اغلاقه تلقائيا بعد %{count} دقائق . الردود الجديده غير مسموحه بعد الان." + few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان." + many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان " + other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان" + autoclosed_enabled_lastpost_days: + zero: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان." + one: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان." + two: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه." + few: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه." + many: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه." + other: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه." + autoclosed_enabled_lastpost_hours: + zero: "هذا الموضوع تم اغلاقه تلقائيا ب 1 ساعه بعد اخر رد.الردود الجديده غير مسموحه بعد الان." + one: "هذا الموضوع تم اغلاقه تلقائيا ب 1 ساعه بعد اخر رد.الردود الجديده غير مسموحه بعد الان." + two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات بعد اخر ردز الردود الجديده غير مسموحه بعد الان." + few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات بعد اخر ردز الردود الجديده غير مسموحه بعد الان." + many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات بعد اخر ردز الردود الجديده غير مسموحه بعد الان." + other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات بعد اخر ردز الردود الجديده غير مسموحه بعد الان." + autoclosed_enabled_lastpost_minutes: + zero: "هذا الموضوع تم اغلاقه تلقائيا 1 دقيقه بعتد الرد الاخير.الردود الجديده غير مسموحه بعد الان" + one: "هذا الموضوع تم اغلاقه تلقائيا 1 دقيقه بعتد الرد الاخير.الردود الجديده غير مسموحه بعد الان" + two: "هذا الموضوع تم اغلاقه تلقائيا %{count} دقائق بعد اخر ردز الردود الجديده غير مسموحه." + few: "هذا الموضوع تم اغلاقه تلقائيا %{count} دقائق بعد اخر ردز الردود الجديده غير مسموحه." + many: "هذا الموضوع تم اغلاقه تلقائيا %{count} دقائق بعد اخر ردز الردود الجديده غير مسموحه." + other: "هذا الموضوع تم اغلاقه تلقائيا %{count} دقائق بعد اخر ردز الردود الجديده غير مسموحه." + autoclosed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + pinned_enabled: "هذا الموضوع الآن مقيد. سوف تظهر في الجزء العلوي من فئة لها حتى أنها متغيرة من الموظفين لكل فرد، أو بواسطة المستخدمين انفسهم." + pinned_disabled: "هذا الموضوع يتم الآن إزالة. لن يظهر في الجزء العلوي من هذه الفئة." + pinned_globally_enabled: "هذا الموضوع معلّم الآن. سوف يظهر في أعلى كل صفحة حتى يرفض من قبل المستخدم." + pinned_globally_disabled: "هذا الموضوع الان غير مثبت . لن يكون موجودا في اعلى الفئه لمده طويله" + visible_enabled: "هذا الموضوع مدرج الأن. سيظهر في قائمة المواضيع." + visible_disabled: "غير مدرج الآن هذا الموضوع. لن يتم عرضها في اي قوائم الموضوع. الطريقة الوحيدة للوصول إلى هذا الموضوع هو عن طريق الرابط المباشر." + login: + not_approved: "لم تتم عملية الموافقة على حسابك حتى الآن. سيتم إعلامك عبر البريد الإلكتروني الخاص بك عندما يكون حسابك جاهزًا لتسجيل الدخول." + incorrect_username_email_or_password: "اسم المستخدم او كلمة المرور او البريد الالكتروني غير صحيح" + wait_approval: "شكرًا على التسجيل. سيتم إبلاغك عندما تتم عملية الموافقة على حسابك." + active: "حسابك مفعل وجاهز للاستخدام." + activate_email: "لقد انتهيت تقريبا! لقد ارسلنا رساله تفعيل الي %{email} .الرجاء اتباع التعليمات في الرساله لتفعيل حسابك.

      اذا لم تصلك, تفقد مجلد البيد الغير هام, او حاول تسجيل الدخول مره اخرى للرسال بريد تفعيل اخر. .

      " + not_activated: "لا يمكنك تسجيل الدخول حتى الان. أرسلنا رسالة تنشيط لك. يرجى اتباع التعليمات الواردة في البريد الإلكتروني لتفعيل حسابك" + not_allowed_from_ip_address: "ﻻ يمكنك تسجيل الدخول كـ %{username} من هذا الـIP" + admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمدير من خلال هذا العنوان الرقمي - IP." + suspended: "ﻻ يمكنك تسجيل الدخول حتى %{date}." + suspended_with_reason: "الحساب موقوف حتى %{date}: %{reason}" + errors: "%{errors}" + not_available: "غير متاح. جرّب %{suggestion} ؟" + something_already_taken: "حدث خطأ ما, ربما اسم المستخدم و البريد الالكتروني مسجل مسبقا, جرب رابط نسيان كلمة المرور." + omniauth_error: "نأسف, هناك خطأ في تصريح حسابك. ربما لم تعطي تصريح؟" + omniauth_error_unknown: "حدث خطأ ما في معالجة دخولك، الرجاء إعادة المحاولة." + new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت " + password_too_long: "الحد الاقصى لكلمة المرور 200 حرف" + email_too_long: "عنوان البريد الذي ادخلته طويل جدًا. يجب ان لا يزيد عدد الأحرف عن 254 حرفًا, ويجب أن تكون أسماء النطاقات أكثر من 253 حرفًا." + reserved_username: "اسم المستخدم ذلك غير مسموح." + missing_user_field: "لم تُكمل كافة الحقول المطلوبة " + close_window: "تم التحقق . اغلق هذه النافذة للإستمرار" + user: + no_accounts_associated: "لا حسابات مرتبطة" + username: + short: "يجب أن تكون على الأقل %{min} أحرف" + long: "يجب ان تكون الاحرف اكثر من %{max} " + characters: "يجب ان تحتوي الارقام والاحرف الصغيرة فقط " + unique: "يجب أن يكون فريدا" + blank: "يجب أن يكون موجود" + must_begin_with_alphanumeric: "يجب البدء بحرف أو رقم أو _" + must_end_with_alphanumeric: "يجب الإنتهاء بحرف أو رقم أو _" + must_not_contain_two_special_chars_in_seq: "يجب أن لا يحتوي على تسلسل من 2 أو رموز خاصة (.-_)" + must_not_contain_confusing_suffix: "يجب أن لا تحتوي على ملحقة مربكة مثل : json. أو png. الخ." + email: + not_allowed: "بريد الكتروني غير مسموح . يرجى استخدام بريد الكتروني آخر " + blocked: "غير مسموح" + ip_address: + blocked: "لا يُسمح بتسجيل جديد من عنوان ip الخاص بك " + max_new_accounts_per_registration_ip: "وفقًا لعنوان IP الخاص بك فقد تم حظر التسجيل (لقد وصلت للحد الأقصى المسموح به) تواصل مع أحد المشرفين." + invite_mailer: + subject_template: "%{invitee_name} دعاك إلى '%{topic_title}' على %{site_domain_name}" + text_body_template: | + %{invitee_name} دعوتك لمناقشة + + > **%{topic_title}** + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + + إذا كنت مهتما، انقر على الرابط أدناه: + + %{invite_link} + + هذه الدعوة هي من مستخدم موثوق به، حتى تتمكن من الرد على مناقشة على الفور. + invite_forum_mailer: + subject_template: "%{invitee_name} قام بدعوتك للإنضمام إلى %{site_domain_name}" + text_body_template: | + %{invitee_name} دعوتك للانضمام + + > **%{site_title}** + > + > %{site_description} + + إذا كنت مهتما، انقر على الرابط أدناه: + + %{invite_link} + + هذه الدعوة هي من مستخدم موثوق به، لذلك فلن تحتاج لتسجيل الدخول. + invite_password_instructions: + subject_template: "تعيين كلمة مرور %{site_name} حسابك" + text_body_template: | + شكرا لقبول دعوتك إلى %{site_name} -- أهلا بك! + + انقر فوق هذا الرابط لاختيار كلمة مرور الآن: + %{base_url}/users/password-reset/%{email_token} + + (إذا انتهت مدة صلاحية الرابط أعلاه، اختر "نسيت كلمة المرور" عند تسجيل الدخول مع عنوان البريد الإلكتروني الخاص بك.) + test_mailer: + subject_template: "[%{site_name}] بريد الكتروني بهدف الاختبار" + text_body_template: | + هذا بريد إختبار إلكتروني من + + [**%{base_url}**][0] + + أهداف البريد معقدة. هنا بعض الأشياء المهمة يجب عليك مراجعتها أولا: + + - كن *متأكد* لوضع `إشعارات البريد الإلكتروني` من: عنوان صحيح في إعدادات موقعك. **النطاق المخصص في أو "من" عنوان رسائل البريد الإلكتروني التي أرسلتها سيتم التحقق تجاه مجال بريدك الإلكتروني**. + + - معرفة كيفية عرض المصدر الخام للبريد الإلكتروني في عميل بريدك , لذا يمكنك البحث في رؤوس صفحات البريد الإلكتروني للأدلة المهمة. في Gmail, خيار "إظهار الأصلية" في القائمة المنسدلة في أعلى اليمين لكل بريد إلكتروني. + + - **مهم جدا:** هل الـ ISP الخاص بك له سجل DNS عكسي مدخل لربط أسماء النطاقات وعناوين IP التي أرسلت بريد منها؟ [اختبر سجل PTR العكسي][2] هنا. إذا كان ISP الخاص بك لم يدخل سجل مؤشر DNS العكسي المناسب, من غير المحتمل جدا تسليم أي من بريدك الإلكتروني. + + - هل مجالك لـ[سجل SPF][8] صحيح؟ [أختبر سجل SPF الخاص بك][1] هنا. لاحظ أن TXT هو نوع سجل رسمي صحيح لـSPF. + + - Iهل مجالك لـ [DKIM سجل][3] صحيح؟ هذا سيحسن بشكل كبير أهداف البريد الإلكتروني. [أختبر سجل DKIM الخاص بك][7] هنا. + + - إذا شغلت خادم البريد الخاص بك, راجع للتأكد من IPs لخادم بريدك [ليست في أي قوائم سوداء][4]. أيضا تحقق من إرسال تأكيد مضيف كامل التأهيل الذي يحل في DNS في رسالته الترحيبية. إذا كان لا, سيسبب رفض بريدك الإلكتروني من عدة خدمات. + + (الطريقة *السهلة* هي إنشاء حساب مجاني في [Mandrill][md] أو [Mailgun][mg] أو [Mailjet][mj], التي لديها عطاء مجاني والبريد مجاني والخطط وستكون جيدة للإتصالات القصيرة. لا تزال بحاجة لإعداد سجلات SPF و DKIM في DNS الخاص بك, رغم ذلك!) + + نأمل منك أن يلقي إختبار أهداف البريد الإلكتروني الموافقة! + + حظ جيد, + + أصدقائك في [Discourse](http://www.discourse.org) + + [0]: %{base_url} + [1]: http://www.kitterman.com/spf/validate.html + [2]: http://mxtoolbox.com/ReverseLookup.aspx + [3]: http://www.dkim.org/ + [4]: http://whatismyipaddress.com/blacklist-check + [7]: http://dkimcore.org/tools/dkimrecordcheck.html + [8]: http://www.openspf.org/SPF_Record_Syntax + [md]: http://mandrill.com + [mg]: http://www.mailgun.com/ + [mj]: https://www.mailjet.com/pricing + new_version_mailer: + subject_template: "[%{site_name}] يوجد اصدار جديد , تحديث متوفر" + text_body_template: | + نسخة جديدة من [Discourse](http://www.discourse.org) متوفرة. + + نسختك: %{installed_version} + النسخة الجديدة: **%{new_version}** + + ربما تريد أن: + + - ما الجدي في [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - التحديث من متصفحك من [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - زيارة [meta.discourse.org](http://meta.discourse.org) للأخبار, والمناقشة, ودعم Discourse. + new_version_mailer_with_notes: + subject_template: "[%{site_name}] التحديث متوفر" + text_body_template: | + نسخة جديدة من [Discourse](http://www.discourse.org) متوفرة. + + نسختك: %{installed_version} + النسخة الجديدة: **%{new_version}** + + ربما تريد أن: + + - ما الجدي في [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - التحديث من متصفحك من [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - زيارة [meta.discourse.org](http://meta.discourse.org) للأخبار, والمناقشة, ودعم Discourse. + + ### ملاحظات الإصدارة + + %{notes} + flags_reminder: + flags_were_submitted: + zero: "لم ترسل تبليغات خلال الساعات الماضية." + one: "هذه التبليغات أرسلت خلال ساعة مضت." + two: "هذه التبليغات أرسلت خلال ساعتان مضتا." + few: "هذه التبليغات أرسلت خلال %{count} ساعات مضت." + many: "هذه التبليغات أرسلت خلال %{count} ساعات مضت." + other: "هذه التبليغات أرسلت خلال %{count} ساعات مضت." + please_review: "يرجى مراجعة ذلك " + post_number: "مشاركة" + how_to_disable: 'يمكنك تعطيل أو تغيير تكرار تذكير البريد الإلكتروني عبر "إشعار حول الإعلامات بعد" الإعدادات.' + subject_template: + zero: "لا يوجد تبليغات تنتظر التعامل معها" + one: "تبليغ 1 ينتظر التعامل معها" + two: "تبليغان ينتظران التعامل معها" + few: "%{count} تبليغات تنتظر التعامل معها" + many: "%{count} تبليغات تنتظر التعامل معها" + other: "%{count} تبليغات تنتظر التعامل معها" + queued_posts_reminder: + subject_template: + zero: "[%{site_name}] %{count} المشاركات التي تنتظر معينتها" + one: "[%{site_name}] 1 المشاركات التي تنتظر معينتها " + two: "[%{site_name}] 1 المشاركات التي تنتظر معينتها" + few: "[%{site_name}] %{count} المشاركات التي يجب معينتها" + many: "[%{site_name}] %{count}المشاركات التي يجب معينتها" + other: "{site_name}] %{count}%] المشاركات التي تنتظر معينتها " + text_body_template: | + مرحبا, + + هناك مشاركات من المستخدمين الجدد تنتظر ليتم معينتها .[يمكن قبولهم او رفضهم هنا] (%{base_url}/queued-posts). + flag_reasons: + off_topic: "تم تاشير مشاركتك **خارج الموضوع**: المجتمع يشعر بانها لا تلائم الموضوع , حاليا كتعريف بالعنوان و المشاركه الاولى" + inappropriate: " مشاركتك **غير ملائم**: المجتمع يشعر بانها لا تلائم الموضوع . [our community guidelines](/guidelines)." + spam: "تم تثبيت منشورك ك **منشور مزعج**: المجتمع يشعر بانه إعلان، شيئ ما هو مروج بشكل مفرط في الطبيعة بدلاً من أن يكون مفيد للإستعمال أو أن يكون ذو صلة بالموضوع كما هو متوقع." + notify_moderators: "مشاركتك بلغ عليها **لتنبيه المشرف**: المجتمع يشعر بعض الشيء حول المشاركة تتطلب تدخل يدوي من الموظف." + flags_dispositions: + agreed: "شكراً لإعلامنا سننظر في الأمر " + agreed_and_deleted: "شكراً لإعلامنا سنتحقق من المشكلة ونزيل المشاركة" + disagreed: "شكراً لإعلامنا سننظر في ذلك " + deferred: "شكراً لإعلامنا سننظر في ذلك " + deferred_and_deleted: "شكرا لاعلامنا تم ازالة هذا التعليق " + temporarily_closed_due_to_flags: "هذا الموضوع مغلق مؤقتا بسبب عدد التبليغات الكبير للمجتمع." + system_messages: + post_hidden: + subject_template: "تم إخفاء المنشور بسبب حظر المجتمع" + text_body_template: | + مرحبا, + + هذه رسالة تلقائية من %{site_name} لتحيطك علما بأن مشاركتك اختفت. + + %{base_url}%{url} + + %{flag_reason} + + افراد المجتمع المتعددون بلغوا عن هذه المشاركة قبل اختفائها, لذا رجاء فكر كيف يمكنك تعديل مشاركتك لتغيير ملاحظاتهم. **يمكنك تعديل مشاركتك قبل %{edit_delay} دقائق, وسيتم تم إظهارها تلقائيا.** + + أيضا, إذا اختفت المشاركة مرة ثانية, ستظل مخفية حتى يتم التعامل معها من قبل الموظفين وربما يكون هناك مزيد من العمل, بما في ذلك من الممكن أن يعلق حسابك. + + لمزيد من الإرشادات، يرجى الرجوع لموقعنا[دليل المجتمع](%{base_url}/guidelines). + usage_tips: + text_body_template: | + هنا بعض الخطوات السريعة لتبدأ: + + ##قراءة + + لقراءة المزيد, **استمر بالتمرير لأسفل!** + + الردود الجديدة والمواضيع الجديدة ونحو ذلك, ستظهر تلقائياً -دون الحاجة لتحديث الصفحة. + + ## التصفح + + -للبحث, صفحة المستخدم الخاصة بك, أو القائمة ☰, استخدم **أيقونة الأزرار في الجزء العلوي الأيمن**. + + -اختيار عنوان موضوع سيأخذك دائماً الى **الرد التالي غير المقروء ** في الموضوع. + للدخول أول أو آخر الموضوع, اختر رقم الرد أو آخِر تاريخ. + + + + - عند قراءة موضوع, اختر شريط التقدم من الزر الأيمن لعناصر تحكم في التنقل كاملة. انتقل للأعلى بسرعة باختيار عنوان الموضوع. أضغط ? للحصول على قائمة باختصارات لوحة المفاتيح السريعة جدا. + + + + ## الرد + + - للرد على **الموضوع بشكل عام**, استخدم في الجزء السفلي جدا من الموضوع. + + - للرد على **شخص مخصص**, استخدم على مشاركاتهم. + + - للرد **بموضوع جديد**, استخدم إلى يمين المشاركة. كلا المواضيع القديمة والجديدة سيرتبطون مع بعضهم تلقائيا. + + لإدخال إقتباس, حدد النص الذي تريد إقتباسه, ثم أضغط أي زر رد. كرر للإقتباسات المتعددة! + + + + لإشعار شخص عن ردك, أشر بأسمائهم. أكتب `@` للبدء باختيار اسم العضو. + + + + لاستخدام [معيار الرسوم التعبيرية](http://www.emoji.codes/), أكتب فقط `:` لوصلها بالاسم, أو استخدم الوجوه التقليدية الضاحكة `;)` + + + + لتوليد اختصار لرابط, ألصقه في السطر بمفرده: + + + + ## التفاعل + + هناك أزرار التفاعل في أسفل كل مشاركة: + + + + لتسمح لشخص ما تعرفه الذي تستمتع وتقدر مشاركاتهم, استخدم زر **إعجاب** . شارك ما يعجبك! + + اذا رايت خطأ في منشور شخص ما .قم بتعديله شخصيا, أو [العاملون لدينا](%{base_url}/about), أعرف حول ذلك بزر **التبليغ** . يمكنك أيضا **مشاركة** رابط لمشاركة, أو **تفضيل** ليكون مرجع لك لاحقا على صفحة العضو. + + + ##تنبيهات + + + عندما يرد عليك احد,اقتبس منشورك,او ذكر اسم المستخدم خاصتك, هنالك رقم سوف يظهر فورا في الجزء العلوي الايمن من الصفحه. استعمله لتصل **لتنبيهاتك** + + + + + + لا تخف اذا نسيت ردا-سوف يصلك بريد الكتروني بكل التنبيهات التي وصلتك عندما كنت بعيدا. + + + ##تفضيلاتك + + + كل المواضيع في اقل من **يومين مضت** تعتبر جديدة. + + + اي موضوع كنت **شاركت فيه بنشاط**(بصنعه,الردود, او القراءه لفتره ممتده ) سوفي تعقب تلقائيا. + + + سوف ترى مؤشر الرقم الجديد الغير مقروى و الازرق بعد هذا الموضوع مباشره: + + + + + يمكنك تغيير إشعاراتك لأي موضوع عبر لوحة التحكم بالإشعارات في أسفل الموضوع. + + + + يمكنك أيضا تعيين حالة الإشعار لكل فئة, إذا أردت أن ترى كل موضوع جديد في فئة خاصة. + + لتغيير أي من هذه الإعدادات, أنظر [تفضيلات المستخدم الخاصة بك](%{base_url}/my/preferences). + + ## ثقة المجتمع + + يمكنك المشاركة هنا, ومع مرور الوقت ستكسب ثقة المجتمع, كن عضو صالح, وسيتم رفع قيود العضو الجديد. لترفع [مستوى الثقة] بما فيه الكفاية (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), عليك اكتساب قدرات جديدة لمساعدتنا في إدارة مجتمعنا معا. + welcome_user: + subject_template: "مرحبا بك في %{site_name}!" + text_body_template: | + شكراً لأنضمامك %{site_name}, ومرحباً بك! + + %{new_user_tips} + + نحن نؤمن [سلوك المجتمع المتحضر](%{base_url}/guidelines) في جميع الأوقات. + + أستمتع بوقتك! + + (أذا كنت بحاجة للتواصل مع [الموظفين](%{base_url}/about) كمستخدم جديد, فقط مجرد الرد على هذه الرسالة.) + welcome_invite: + subject_template: "مرحبا بك في %{site_name}!" + text_body_template: | + شكرًا لقبولك الدعوة إلى موقع %{site_name} أهلا بك . + + انشأنا حساب جديد لك **%{username}** وستقوم بتسجيل الدخول، وستتمكن من تغيير اسمك من [your user profile][prefs]. + + لتسجيل الدخول لاحقا: + + 1.دائما **استخدم نفس البريد الالكتروني الذي استقبلت فيه الدعوة** عند تسجيل الدخول، وإلا فإننا لن نستطيع معرفة أنه أنت ! + + 2. أنشأ كلمة مرور فريدة [your user profile][prefs] واستخدمها لتسجيل الدخول . + + %{new_user_tips} + + ونحن نتبع [civilized community behavior](%{base_url}/guidelines)دائما.. + + استمتع بوجودك بيننا ! + + (إذا كنت تريد التواصل مع [staff members](%{base_url}/about) كمستخدم جديد، رد على هذه الرسالة فقط لتتواصل معهم) + + [prefs]: %{user_preferences_url} + backup_succeeded: + subject_template: "اكتملت عملية النسخ الإحتياطي بنجاح" + text_body_template: "تم النسخ الاحتياطي بنجاح .\nزيارة [admin > backup section](%{base_url}/admin/backups) لتحميل النسخةالاحتياطية الجديدة." + backup_failed: + subject_template: "فشل النسخ الإحتياطي" + text_body_template: | + فشل النسخ الاحتياطي. + + هنا السجل: + + ``` + %{logs} + ``` + restore_succeeded: + subject_template: "أكتملت الإستعادة بنجاح" + text_body_template: "الاستعادة نجحت" + restore_failed: + subject_template: "فشل استعادة" + text_body_template: | + فشل عملية الاستعادة. + + هذا السجل: + + ``` + %{logs} + ``` + bulk_invite_succeeded: + subject_template: "دعوة العضو الجماعية تمت بنجاح" + text_body_template: "ملف دعوة العضو الجماعية الخاص بك تمت معالجته، %{sent} دعوات مرسلة." + bulk_invite_failed: + subject_template: "دعوة العضو الجماعية تمت مع وجود أخطاء" + text_body_template: "تمت معالجة ملف دعوات العضو , وتدعو %{sent} بالبريد مع %{failed} error(s). \n\nهنا السجل \n \n```\n%{logs}\n```\n" + csv_export_succeeded: + subject_template: "اكتمل تصدير البيانات" + text_body_template: | + تصدير البيانات الخاصة بك بنجاح! :dvd: + + %{file_name} (%{file_size}) + + رابط التحميل أعلاه ستكون صالحة لمدة 48 ساعة. + csv_export_failed: + subject_template: "فشل تصدير البيانات" + text_body_template: "نحن آسفون، لكنه فشل تصدير البيانات الخاصة بك. يرجى التحقق من السجلات أو اتصل بأحد المشرفين." + email_reject_trust_level: + subject_template: "[%{site_name}] بريد الكتروني -- غير موثوق" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nحسابك لا يمتلك مستوى الثقة المطلوب للنشر مواضيع جديدة إلى عنوان البريد الإلكتروني. إذا كنت تعتقد أن هذا الخطأ، اتصل بأعضاء المشرفين.\n" + email_reject_no_account: + subject_template: "[%{site_name}] بريد الكتروني -- حساب غير معروف" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nليس هنالك حساب عضو يمتلك هذا البريد الالكتروني. حاول أن ترسل من بريد الكتروني مختلف، أو أتصل بـ أحد المشرفين.\n\n" + email_reject_empty: + subject_template: "[%{site_name}] بريد الكتروني -- بدون محتوى" + text_body_template: |2 + آسفون، لكن رسالة البريد الالكتروني إلى %{destination} (titled %{former_title}) لم تنجح . + + لم نعثر على محتوى الرد في رسالتك. + + إذا حصل أنك لم تُشمِل الرد، حاول مرة أخرى مع التنسيق البسيط. + email_reject_parsing: + subject_template: "[%{site_name}] بريد الكتروني -- محتواه غير معروف" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. **تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n" + email_reject_invalid_access: + subject_template: "[%{site_name}] بريد الكتروني -- غير صالح" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nحسابك لا يمتلك الصلاحيات لنشر مواضيع جديدة في تلك الفئة. إذا كنت تعتقد أن هذا الخطأ، اتصل بالاعضاء المشرفين.\n" + email_reject_post_error: + subject_template: "[%{site_name}] بريد الكتروني -- خطأ المشاركة" + text_body_template: | + نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. + + بعض الأسباب المحتملة هي: التنسيق المعقد، رسالة كبيرة جدا، رسالة صغيرة جدا. يرجى المحاولة مرة أخرى، أو الرد عبر الموقع الإلكتروني إذا استمر هذا الوضع. + email_reject_post_error_specified: + subject_template: "[%{site_name}] بريد الكتروني -- خطأ المشاركة" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nالسبب:\n\n%{post_error}\n\nاذا كنت تستطيع تصحيح المشكلة، يرجى المحاولة لاحقاً.\n" + email_reject_reply_key: + subject_template: "[%{site_name}] بريد الكتروني -- مفتاح رد غير معروف" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nمفتاح الرد المُقدم غير صالح أو غير معروف، لذلك نحن لا نعرف ما هو هذا البريد الإلكتروني للرد عليه. أتصل بالأعضاء المشرفين.\n" + email_reject_destination: + subject_template: "[%{site_name}] بريد الكتروني -- عنوان غير معروف" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم يتم التعرف على أي من العناوين. الرجاء التأكد من أن عنوان الموقع هو في To: line (not Cc: or Bcc:)، والتي انت تقوم بإرسالها إلى عنوان البريد الإلكتروني الصحيح المقدمة من الاعضاء المشرفين.\n" + email_reject_topic_not_found: + subject_template: "[%{site_name}] بريد الكتروني -- موضوع غير موجود" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nالموضوع الذي تريد الرد عليه لم يعد موجودا، وربما تم حذفه؟ إذا كنت تعتقد أن هذا خطأ، اتصل أحد الاعضاء المشرفين. \n" + email_reject_topic_closed: + subject_template: "[%{site_name}] بريد الكتروني -- موضوع مغلق" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nالموضوع الذي تريد الرد عليه مغلق حاليا والتي لم تعد تقبل ردود. إذا كنت تعتقد أن هذا خطأ، اتصل أحد الأعضاء المشرفين.\n" + email_reject_auto_generated: + subject_template: "[%{site_name}] بريد الكتروني -- توليد رد آلي" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\n بريدك الإلكتروني عُلّم كـ\"مولد تلقائي\"، وهو ما لا يمكن قبوله. إذا كنت تعتقد أن هذا خطأ، اتصل أحد الاعضاء المشرفين.\n" + email_error_notification: + subject_template: "[%{site_name}] بريد الكتروني -- خطأ مصادقة POP" + text_body_template: | + خطأ في المصادقة عند استطلاع الرسائل من خادم POP . + + من فضلك تأكد من تكوين إعدادات خادم POP من[إعدادات الموقع](%{base_url}/admin/site_settings/category/email). + too_many_spam_flags: + subject_template: "حساب جديد مقفول" + text_body_template: | + مرحبا, + + هذه رساله اليه من %{site_name} لاعلاماك ان مشاركتك تم اخفاها اليا لانها كانت مؤشره من قبل المجتمع. + كجراء وقائي تم حظر حسابك من انشاء ردود جديده او مواضيع حتي يقوم اعضاء الطاقم بمراجعه حسابك. + للمعلومات الاضافيه.الرجاء مراجعه [قوانين مجتمعنا] (%{base_url}/guidelines). + blocked_by_staff: + subject_template: "الحساب مُعطل" + text_body_template: | + مرحبا, + + هذه رسالة تلقائية من %{site_name} أن أحيطكم علما بأن تم حظر الحساب الخاص بك عن طريق الطاقم + لمزيد من الإرشادات، يرجى الرجوع إلى موقعنا على [community guidelines](%{base_url}/guidelines). + user_automatically_blocked: + subject_template: "العضو الجديد %{username} تم حجبه بسبب تبليغات عليه في المجتمع" + text_body_template: | + هذه رسالة تلقائية. + + المستخدم الجديد [%{username}](%{base_url}%{user_url})تم حظره تلقائيا بسبب عدة بالغات من عدة مستخدمين %{username}'s post(s). + + رجاءًا [استعراض البلاغات](%{base_url}/admin/flags).إذا تم حظر %{username} بشكل خاطئ من المشاركة، أنقر فوق رفع الحظر [صفحة الإدارة](%{base_url}%{user_url}). + + يمكن تغيير هذا الحد من اعدادات الموقع `block_new_user` . + spam_post_blocked: + subject_template: "العضو الجديد %{username} تم حجب مشاركاته بسبب تكرار الروابط " + text_body_template: | + هذه رسالة تلقائية. + + عضو جديد [%{username}](%{base_url}%{user_url}) حاول إنشاء المشاركات متعددة مع روابط إلى %{domains},ولكن هذه المشاركات تم حظرها لتجنب البريد المزعج. المستخدم لا يزال قادراً على أنشاء مشاركات جديدة التي لم تصل إلى %{domains}. + + من فضلك [review the user](%{base_url}%{user_url}). + + هذا يمكن تعديلها عن طريق `` newuser_spam_host_threshold` وإعدادات موقع white_listed_spam_host_domains`. + unblocked: + subject_template: "الحساب مُفعل " + text_body_template: |+ + مرحبا, + + هذه رساله اليه من %{site_name} لاعلامك انه قد تم فك حظر حسابك بعد مراجعه الطاقم + + يمكنك الان انشاء ردود جديده و مواضيع مجددا. + + pending_users_reminder: + subject_template: + zero: "لا يوجد أعضاء تنتظر الموافقة." + one: "عضوا واحد ينتظر الموافقة." + two: "عضوان ينتظران الموافقة." + few: "%{count} أعضاء تنتظر الموافقة." + many: "%{count} أعضاء تنتظر الموافقة." + other: "%{count} أعضاء تنتظر الموافقة." + text_body_template: | + هناك تسجيلات مستخدمين جديده تنظر لكي يتم قبولها (او رفضها) قبل ان يمكنهم الوصول لهذه المدونه. + [الرجاء مراجعنهم في قسم المدراء](%{base_url}/admin/users/list/pending). + download_remote_images_disabled: + subject_template: "الغاء تفعيل تحميل الصور عن بعد " + text_body_template: "تم تعطيل الإعداد 'download_remote_images_to_local' لأنه تم الوصول إلى حد مساحة القرص في 'download_remote_images_threshold'." + unsubscribe_link: | + لإلغاء الاشتراك من هذه الرسائل، قم بزيارة [user preferences](%{user_preferences_url}). + + لإيقاف تلقي إشعارات حول هذا الموضوع بالذات، [click here](%{unsubscribe_url}). + subject_re: "اعادة " + subject_pm: "[مسائًا]" + user_notifications: + previous_discussion: "الردود السابقة " + unsubscribe: + title: "غير مشترك " + description: "لست مهتما في تلقي هذه الرسائل الالكترونيه؟ لا مشكله! اضغط تحت ليتم الغاء اشتركك فورا:" + reply_by_email: "للاستجابه, رد علي هذه الرساله او قم بزياره%{base_url}%{url}% في متصفحك" + visit_link_to_respond: "للرد، قم بزيارة %{base_url}%{url} في متصفحك." + posted_by: "مشاركة بواسطة %{username} على %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} دعاك لرسالة '%{topic_title}'" + text_body_template: |2 + + %{username} دعوتك إلى رسالة + + > **%{topic_title}** + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + + يرجى زيارة هذا الرابط لعرض الرسالة: %{base_url}%{url} + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} دعوتك للموضوع '%{topic_title}'" + text_body_template: |2 + + %{username} دعوتك للنقاش + + > **%{topic_title}** + > + > %{topic_excerpt} + + at + + > %{site_title} -- %{site_description} + + الرجاء زيارة هذا الرابط لعرض الرسالة: %{base_url}%{url} + user_replied: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{message} + + %{context} + + --- + %{respond_instructions} + user_quoted: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{message} + + %{context} + + --- + %{respond_instructions} + user_mentioned: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{message} + + %{context} + + --- + %{respond_instructions} + user_posted: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{message} + + %{context} + + --- + %{respond_instructions} + user_posted_pm: + subject_template: "[%{site_name}] [مساءً] %{topic_title}" + text_body_template: | + %{message} + + %{context} + + --- + %{respond_instructions} + digest: + why: "ملخص المؤجز من %{site_link} منذ زيارتك الاخيره في %{last_seen_at}" + subject_template: "[%{site_name}] الخلاصة" + new_activity: "يوجد نشاط جديد في المواضيع والمشاركات الخاصة بك:" + top_topics: "اشهر المشاركات " + other_new_topics: "اشهر المواضيع " + unsubscribe: "يتم إرسال هذا الملخص من %{site_link} لإلغاء الاشتراك %{unsubscribe_link}." + click_here: "أنقر هنا" + from: "%{site_name} الخلاصة" + read_more: "قراءة المزيد" + more_topics: "هناك %{new_topics_since_seen} مواضيع جديدة أخرى." + more_topics_category: "أكثر المواضيع الجديدة:" + forgot_password: + subject_template: "[%{site_name}] إعادة ضبط كلمة المرور" + text_body_template: | + شخص ما طلب إعادة تعيين كلمة المرور الخاصة بك [%{site_name}](%{base_url}). + + اذا لم يكن أنت من طلب هذا، يمكنك تجاهل هذه الرسالة بأمان ، + + أنقر هنا على الرابط التالي لتعيين كلمة مرور جديدة : + %{base_url}/users/password-reset/%{email_token} + set_password: + subject_template: "[%{site_name}] ضع كلمة المرور" + text_body_template: "شخص ما طلب إضافة كلمة مرور لحسابك [%{site_name}](%{base_url}). بدلاً من ذلك، يمكنك تسجيل الدخول بإستخدام خدمات أخرى على الانترنت، مثل (قوقل، فيس بوك,الخ...) سيتم اقران البريد الالكتروني والتحقق من صحته.\n\nاذا لم تقم أنت بطلب هذا، يمكنك تجاهل هذه الرسالة الالكترونية بأمان. \n\nأنقر على الرابط التالي لإختيار كلمة المرور :\n%{base_url}/users/password-reset/%{email_token}\n" + admin_login: + subject_template: "[%{site_name}] تسجيل الدخول" + text_body_template: | + شخص طلب تسجيل الدخول إلى الحساب الخاص بك في [%{site_name}](%{base_url}). + + إذا كنت لم تتقدم بهذا الطلب، يمكنك تجاهل هذه الرسالة الإلكترونية بأمان. + + اضغط على الرابط التالي للدخول: + %{base_url}/users/admin-login/%{email_token} + account_created: + subject_template: "[%{site_name}] حسابك الجديد" + text_body_template: | + تم إنشاء حساب جديد بالنسبة لك في %{site_name} + + انقر على الرابط التالي لاختيار كلمة مرور لحسابك الجديد: + %{base_url}/users/password-reset/%{email_token} + authorize_email: + subject_template: "[%{site_name}] تأكيد البريد الإلكتروني الجديد " + text_body_template: | + قم بتاكيد عنوان بريدك الالكتروني لـ %{site_name} عن طريق الضغط علي الرابط التالي: + %{base_url}/users/authorize-email/%{email_token} + signup_after_approval: + subject_template: "قد وافقت على %{site_name}!" + text_body_template: | + مرحبا بك الي %{site_name}! + + اعضاء الطاقم قاموا بالموافقه علي حسابك علي %{site_name} + + اضغط الرابط التالي للتاكيد و لتفعيل حسابك الجديد + base_url}/users/activate-account/%{email_token}% + اذا كان الرابط في الاعلى غير مضغوط , حاول نسخه و لصقه في ششريط العناوين الالكتروني في متصفح الويب خاصتك. + {new_user_tips}% + نح نؤمن في [سلوك المجتمع الراقي(base_url}/guidelines}%) في كل الاوقات + + تمتع ببقائك! + + (اذا احتجت للاتصال مع [افراد الطاقم]({base_url}/about}%)كمستخدم جديد , فقط قم بالرد علي هذه الرساله). + signup: + subject_template: "[%{site_name}] تأكيد حسابك الجديد " + text_body_template: | + مرحبا بكم في %{site_name}! + + انقر على الرابط التالي لتأكيد وتفعيل حسابك الجديد: + %{base_url}/users/activate-account/%{email_token} + + إذا كان الرابط أعلاه غير قابلة للنقر، حاول نسخ ولصقه في شريط العناوين في مستعرض ويب الخاص بك. + page_not_found: + title: "الصفحة المطلوبة غير موجودة او ليس لديك صلاحيات لرؤيتها " + popular_topics: "شعبي " + recent_topics: "الأخيرة" + see_more: "المزيد" + search_title: "البحث في الموقع" + search_google: "جوجل" + login_required: + welcome_message: | + #[أهلاً بكم %{title}](#مرحبًا) + الحساب مطلوب. الرجاء انشاء حساب او تسجيل الدخول للأستمرار. + terms_of_service: + title: "شروط الخدمة" + signup_form_message: 'لقد قرأت و أوافق على بنود الخدمة.' + deleted: 'حذف' + upload: + edit_reason: "تحميل نسخ محلية للصور" + unauthorized: "المعذرة، الملف الذي تحاول رفعه غير مسموح به (الامتدادات المسموح بها هي : %{authorized_extensions})." + pasted_image_filename: "لصق الصورة " + store_failure: "فشل حفظ التحميل #%{upload_id} للعضو #%{user_id}." + file_missing: "عذرا، يجب عليك توفير ملف للرفع." + attachments: + too_large: "نعتذر، الملف الذي تريد رفعه كبير جداً ( الحد الاقصى {max_size_kb} كيلوبايت )" + images: + too_large: "نعتذر، الصورة الذي تريد رفعها كبيرة جداً ( الحد الاقصى هو %{max_size_kb} كيلوبايت )،يرجى اعادة تغيير حجمها ثم حاول مرة اخرى." + size_not_found: "نعتذر، لكننا لا يمكن تحديد حجم الصورة. ربما صورتك تالفة؟" + avatar: + missing: "عذرا، صورة العرض التي اخترتها ليست متوفرة على الخادم، هل تستطيع رفعها مرة أخرى ؟" + flag_reason: + sockpuppet: "عضو جديد إنشاء موضوع , وعضو أخر جديد في نفس عنوان IP . شاهد flag_sockpuppets إعداد الموقع" + spam_hosts: "حاول هذا العضو الجديد إنشاء مشاركات متعددة لها روابط بنفس المجال. شاهد newuser_spam_host_threshold إعداد الموقع." + email_log: + no_user: "لا يمكنك إيجاد عضو بواسطة id %{user_id}" + anonymous_user: "المستخدم مجهول" + suspended_not_pm: "عضو موقوف، ليست رسالة" + seen_recently: "تم رؤية هذا المستخدم مسبقاً" + post_not_found: "لا يمكن إيجاد مشاركة مع معرف %{post_id}" + notification_already_read: "تم قراءة هذه الاشعارات " + topic_nil: "مشاركة.موضوع صفر" + post_deleted: "تم حذف الموضوع من قبل كاتبه " + user_suspended: "تم تعليق حساب المستخدم" + already_read: "المستخدم قرأ هذه المشاركة " + message_blank: "رسالة فارغة" + message_to_blank: "رسالة فارغة " + text_part_body_blank: "text_part.body فارغ" + body_blank: "محتوى فارغ " + color_schemes: + base_theme_name: "قاعدة" + about: "حول " + guidelines: "ارشادات" + privacy: "خصوصية" + edit_this_page: "تعديل هذه الصفحة" + csv_export: + boolean_yes: "نعم" + boolean_no: "لا" + static_topic_first_reply: | + تعديل محتويات المنشور الاول في هذا الموضوع %{page_name} page. + guidelines_topic: + title: "الأسئلة الشائعة/توجيهات" + body: "\n\n## [هذا مكان راقي للنقاشات العامة](#الراقي)\nالرجاء التعامل في هذا المنتدى بنفس الاحترام الذي يكون في حديقة عامة، نحن أيضًا مجتمع مشارك للمصدر و mdahs ؛ المكان هنا لتبادل المهارات والمعرفة والاهتمامات عبر الحوارات.\n\nهذه ليست شروط صارمة و سريعة، مجرد مساعده لحفظ حقوق الأشخاص في مجتمعنا، استخدام هذه المبادئ والتوجيهات يساعد في الحفاظ على الجتمع جيدًا للنقاشات الراقية.\n\n\n\n## [تحسين النقاشات](#تحسين)\n\nساعدنا على جعل هذا المكان جيد للمناقشة، من خلال العمل الدائم لتحسين المناقشات ببعض الطرق، مهما كانت صغيرة، اذا لم تكن متأكدًا أن ما تكتبه سيضيف قيمة، فكر فيما ستكتبه وحاول مرة أخرى في وقت لاحق.\n\nالموضوعات التي تتم مناقشتها هنا مهمة بالنسبة لنا، ونريد منك أن تناقشها كما لو أنها مهمة بالنسبة لك، احترم الموضوعات والاشخاص، حتى لو لم تكن متفقًا مع بعض ما يقال.\n\nأحد طرق تحسين النقاش هو اكتشاف ما يجري، يرجى قضاء بعض الوقت في تصفح المواضيع هنا قبل الرد أو نشر موضوعك، لتكون لديك فرصة افضل في تلبية حاجات الآخرين اللذين يشاركونك اهتماماتك.\n\n\n\n## [تقبل الآخرين، حتى لو كنت غير متفق](#تقبل)\n\nقد ترغب في الرد على من اختلفت معهم، هذا جيد/ ولكن تذكر، انتقد الافكار وليس الأشخاص، يرجى تجنب :\n\n* الاهانة.\n* Ad hominem attacks.\n* الرد على اسلوب المنشور بدلا من المضمون الفعلي.\n* لا تحتسب المتناقضات.\nبدلا من ذلك، وفر الأدلة البينة التي تعمل على تحسين المحادثة.\n\n\n\n## [مشاركاتكم](#شارك)\n\nالمحادثات التي تكون لدينا متناغمة مع الجميع، ساعدونا في التأثير على مستقبل المجتمع، عن طريق مناقشة ما يجعل لهذا المنتدى أهمية و mdash ؛ وتجنب غير ذلك.\n\nيوفر النقاش\ + \ الأدوات التي تمكن الجميع من معرفة أفضل (واسوأ) المشاركات: كالمفضلة، العلامات المرجعية، الاعجابات، البلاغات، الردود، التعديلات، وما الى ذلك. استخدمها لتحسين تجربة الجميع.\nدعونا نحاول ترك المكان أفضل مما كان.\n\n\n\n## [اذا رأيت مشكلة، بلّغ عنها ](#الابلاغ-عن-المشاكل)\n\nالمشرفون لديهم سلطة خاصة، وهم مسؤولون عن هذا المنتدى، ولكن حتى أنتم بمساعدتكم، يستطيع المشرفون تسيير المجتمع، ليس عمال النظافة أو الشرطة.\n\nعندما ترى سلوك سيئ، لا ترد عليه، وتشجع السلوك السيئ بالاعتراف به، وتستهلك طاقتك، قم بالإبلاغ عنه، اذا وصلت بلاغات بما فيه الكفاية، سيتم اتخاذ الإجراءات اللازمة، اما تلقائيا، أو عن طريق مشرف.\n\nمن أجل الحفاظ على سلامة المجتمع، المشرفين لديهم الحق في إزالة اي محتوى أو حذف أي حساب لأي سبب في اي وقت، المشرفون لا يتابعون جميع المنشورات الجديدة بأي شكل كان، المشرفون ومشغلوا الموقع لا يتحملون أية مسؤولية عن اي محتو يتم نشره بواسطة المجتمع.\n\n\n\n## [دائما كن محترما](#محترم)\n\nلا شيء يخرب المحادثة الجيدة، مثل الوقاحة:\n\n* كم محترمًا، لا تنشر أي شيء تهجمي، أو خطاب كراهية.\n* ابق المجتمع نظيفا، لا تنشر أي شيء فاحش أو جنسي صريح.\n* احترم الآخرين، لا تضايق أو تحزن شخص، لا تنتحل شخصية أحد آخر، أو تنشر معلوماتهم الخاصة.\n* احترم منتدانا، لا تعمل ازعاجا - spam - أو تخرب أو خلاف ذك في المنتدى.\n\nهذه المصطلحات ليست محددة مع تعريف دقيق و mdahs ؛ عليك تجنب ظهور اي من هذه الأشياء. اذا كنت غير مقتنع، أسال نفسك ما ذا سيكون شعورك اذا نشرت على الصفحة الاولى في صحيفة نيويورك تايمز.\nهذا منتدى عام، ومؤشرات محركات البحث تحتوي هذه النقاشات، حافظ على اللغة، الروابط والصور الآمنة للعائلة والاصدقاء.\n\n\n\ + \n## [حافظ عليه مرتبا](#المحافظة-على-الترتيب)\n\nأبذل مزيدا من الجهد في وضع الأمور في مكانها المناسب، حتى نتمكن من قضاء المزيد من الوقت في المناقشات ونقلل من التنظيف، هكذا:\n\n* لا تبدأ موضوع في قسم غير مناسب.\n* لا تنشر نفس المشاركة في مواضيع متعددة.\n* لا ترد ردودا دون محتوى مناسب.\n* لا تحول مسار الموضوع من المنتصف. \n* لا توقع مشاركاتك أو mdash؛ كل منشوراتك مرتبطة بمعلومات ملفك الشخصي.\n\nبدلا من كتابة \"+1\" أو كتابة \" نتفق عليه \"، استخدم زر أعجبني، من أخذ المواضيع لمواضيع مختلفة جذريا، استخدم ردا برابط الموضوع مرتبط .\n\n\n\n## [انشر فقط شيء تملكه](#سرقة)\nلا تستيطع نشر أي شيء رقمي يملكه شخص آخر دون إذن، لا تستطيع نشر وصف، رابط ، أو سرقة ممتلكات شخص ما الفكرية(البرامج والفيديو والصوت والصور)، أو انتهاك اي قانون آخر.\n\n\n\n## [بدعم منك](#دعم)\n\nيتم تشغيل هذا الموقع من قِبل [friendly local staff](/about) وأنت، و المجتمع، إذا كان لديك اي أسئلة أخرى حول كيف تعمل الأشياء هنا، افتح موضوع جديد في [site feedback category](/c/site-feedback)وأُدعنا للمناقشة! إذا كان هناك أي قضية حرجة أو حاجة ماسة لم يتم التعامل معها بموضوع ميت أو أو بلاغ، اتصل بنا عبر [staff page] (/about).\n\n\n\n## [شروط الخدمة](#شروط-الخدمة)\n\nنعم، الكلام القانوني ممل، ولكن يجب أن نحمي أنفسنا و ndahs ؛ من الاشخاص الغير ودودين، لدينا [Terms of Service](/tos) وصف لك (ولنا) السلوك والحقوق ذات الصلة بالمحتوى والخصوصية، لاستخدام هذه الخدمة، يجب أن توافق على التزامك بالشروط والقوانين[TOS](/tos).\n" + tos_topic: + title: "شروط الخدمة" + body: | + الشروط والأحكام التالية تنظم كل استخدام لموقع الـ%{company_domain} وكل الاتصالات, الخدمات أو المنتجات المتوفرة في الموقع أو من خلاله, بما فيه, لكن لا يقتصر على برنامج منتدى , %{company_domain}, %{company_domain} و دعم منتدى و %{company_domain} خدمة استضافة ("الاستضافة"), (جمعناها معا, الموقع). الموقع تعود ملكيته إلى %{company_full_name} ("%{company_name}"). الموقع يعرض المواضيع المقبولة منك بدون تعديل لجميع الشروط والأحكام الواردة في هذه الوثيقة وجميع قواعد التشغيل الأخرى, والسياسات (بما فيها, على سبيل المثال لا الحصر, %{company_domain}’s [Privacy Policy](/privacy) و [Community Guidelines](/faq)) والإجراءات التي يمكن أن تصدر من وقت لآخر على هذا الموقع بواسطة %{company_name} (جماعي, و "الاتفاقية"). + + رجاءً إقرأ الاتفاقية جيدا قبل الوصول واستخدام الموقع. عن طريق الوصول أو استخدام أي جزء للموقع, أنت توافق على أن تكون ملزما بالشروط والأحكام لهذه الاتفاقية. إذا لم توافق على جميع الشروط والأحكام في هذه الإتفاقية, فإنك ربما لن تصل للموقع أو لن تستخدم أي من خدماته. إذا اعتبرت هذه الشروط والأحكام اقتراح بواسطة %{company_name},القبول يقتصر على الوضوح في هذه الشروط. الموقع متوفر فقط للأفراد الذين أعمارهم لا تقل عن 13 سنة. + + + + ## [1. حسابك في %{company_domain}](#1) + + إذا أنشأت حساب في الموقع, فأنت مسؤول عن حفظ حماية حسابك وستتحمل كامل المسؤولية عن كل النشاطات التي تحدث في حسابك. يجب عليك إشعار%{company_name} فورا بأي استخدام غير مصرح به لحسابك أو أي ثغرة في الحماية. %{company_name} لن تكون مسؤولة عن أفعال أو حالات إهمال منك, بما في ذلك أي أضرار من أي نوع تكبدتها نتيجة لمثل هذه الأفعال أو الامتناع عنها. + + + + ## [2. مسؤولية المساهمين](#2) + + إذا شاركت مواد في الموقع, شارك الروابط في الموقع, أو بطريقة أخرى أجعل (أو اسمح بطرف ثالث ليجعل) المواد المتاحة عن طريق الموقع (أي مواد من هذا القبيل, "المحتوى"), أنت مسؤول كليا عن المحتوى, وأي ضرر ينتج من, ذلك المحتوى. هذا هو الحال بغض النظر عما إذا كان المحتوى في نص بشكل سؤال, رسومات, ملف صوت, أو برنامج حاسوبي. بجعل المحتوى متوفر, أنت تقر وتضمن الأتي: + + * التحميل, والنسخ واستخدام المحتوى بدون انتهاك الحقوق الملكية الفكرية, بما في ذلك حقوق الطبع والنشر, براءات الاختراع والعلامات التجارية أو حقوق التجارة السرية, أو أي طرف ثالث; + * إذا كان صاحب عملك لديه حقوق ملكية فكرية أنشأت لكم, (أ) عليك الحصول على تصريح من صاحب العمل للنشر أو إتاحة المحتوى, بما في ذلك أي برنامج, أو (ب) مضمون من تنازل صاحب عملك لجميع الحقوق فيه أو للمحتوى; + * امتثالك بالكامل بتراخيص طرف ثالث تتعلق بالمحتوى, وفعلت كل شيء ضروري للاجتياز بنجاح من خلال المستخدمين النهائيين لأي شروط مطلوبة; + * المحتوى لا يحوي أو يثبت أي فايروس, ديدان, برمجيات خبيثة, تروجانات أو غيرها من المحتويات الضارة والمدمرة; + * المحتوى لا يكون مؤذيا, وليس آلة- أو مولدات عشوائية, ولا يكون غير أخلاقي ومحتوى تجاري غير مرغوب فيه صمم لدفع الحركة لمواقع طرف ثالث أو زيادة تصنيفات محركات البحث لمواقع طرف ثالث, أو لمزيد من الأعمال غير المشروعة (كالتصيد) أو تضليل المستقبلين عن مصادر المواد (كالخداع); + * المحتوى لا يكون إباحيا, لا يحتوي تهديد أو تحريض على العنف, ولا تنتهك حقوق الخصوصية أو الدعاية لطرف ثالث; + * حسابك لا يتلقى إعلان عن طريق رسائل البريد الإلكترونية غير المرغوب بها مثل روابط البريد المزعج في مجموعات الأخبار, قوائم البريد الإلكتروني, والمدونات ومواقع الشبكة, ومشابهة الأساليب الترويجية الغير مرغوب فيها; + * لا يسمى محتواك بطريقة تضلل القراء للتفكير بأنك شخص أخر أو شركة أخرى; و + * لديك, في حالة أن المحتوى يتضمن شيفرة حاسوبية, مصنفة بدقة و/أو موصوفة النوع, والطبيعة, والاستخدام والتأئير للمواد, سواء طلب ذلك بواسطة %{company_name} أو أي شخص أخر. + + + + ## [3. رخصة محتوى المستخدم](#3) + + مساهمات العضو مرخصة تحت [المشاع الإبداعي الغير تجارية المشاركة بالمثل 3.0 رخصة التشارك](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). دون الحد من تلك الإقرارات والضمانات, %{company_name} لها حق (في حال عدم الإلتزام به) , %{company_name} بمحض اختيارها (أ) رفض أو حذف أي محتوى, برأيها المعقول %{company_name}, ينتهك أي سياسة لـ %{company_name} أو بأي شكل من الأشكال الضارة والغير مرغوب فيها, أو (ب) إنهاء أو منع الوصول للموقع واستخدامه لأي شخص أو كيان لأي سبب من الأسباب, في %{company_name} بمحض اختيارها. %{company_name} لن تلتزم بتوفير استرداد المبالغ المدفوعة سابقا. + + + + + ## [4. الدفع والتجديد](#4) + + ### الشروط العامة + + الخدمات المدفوعة الاختيارية والترقيات قد تكون متوفرة على الموقع. عند استخدام خدمة دفع اختيارية أو ترقية, أنت توافق على دفع رسوم الاشتراك الشهرية أو السنوية المحددة لـ%{company_name}. سيتم احتساب المدفوعات على أساس الدفع المسبق في اليوم الذي تبدأ بالاستفادة من الخدمة أو الترقية وسوف يشمل استخدام تلك الخدمة أو ترقيتها لفترة الاشتراك الشهري أو السنوي كما هو محدد. هذه الرسوم غير قابلة للرد. + + ### التجديد التلقائي + + باستثناء أنك أرسلت إشعار لـ%{company_name} قبل انتهاء فترة الاشتراك المطبق بأنك تريد إلغاء الخدمة أو الترقية, اشتراكك سيجدد تلقائيا وستأذن لنا بتطبيق جمع رسوم الاشتراك الشهرية أو السنوية (وكذلك الضرائب) باستخدام أي بطاقة ائتمان أو آلية دفع آخري يهمنا ما يناسبك. يمكن إلغاء الاشتراك بأي وقت. + + + + ## [5. الخدمات](#5) + + ### الاستضافة, خدمات الدعم + + تقدم الاستضافة الاختيارية وخدمات الدعم بواسطة %{company_name} وفقا لأحكام وشروط كل هذه الخدمة. بالاشتراك في حساب استضافة/دعم أو دعم خدمات، أنت توافق على الالتزام بالشروط والأحكام. + + + + ## [6. مسؤولية زوار المواقع](#6) + + %{company_name} لن تراجع, ولا يمكنها أن تراجع, جميع المواد, بما فيها برامج الحاسوب, ومشاركة الموقع, وبالتالي لن تكون مسؤولة عن محتوى تلك المواد, سواء استخدام وتأثيرات. من خلال تشغيل الموقع, %{company_name} لا تمثل أو تؤيد المواد التي تنشر هناك, أو تعتقد أنها مواد دقيقة, ومفيدة أو غير ضارة. أنت مسؤول عن اتخاذ الاحتياطات لحماية نفسك ونظم الحاسوب من الفيروسات، والديدان، والتروجانات، وغيرها من المحتوى الضار أو المدمر. قد يحتوي الموقع على محتوى. الموقع ربما يحتوي على مواد تنتهك الخصوصية أو الدعاية أو تنتهك حقوق الملكية الفكرية وحقوق الملكية الأخرى, من أطراف ثالثة, أو التحميل, والنسخ أو استخدام التي تخضع للشروط والأحكام الإضافية, المعلنة والغير معلنة. %{company_name} تتبرأ من أي مسؤولية عن أي ضرر ناتج عن استخدام من قبل زوار الموقع, أو من أي تحميل من قبل هؤلاء الزوار من محتوى ذلك المنشور. + + + + ## [7. مشاركة المحتوى على المواقع الأخرى](#7) + + نحن لا نراجع, ولا يمكننا أن نراجع, جميع المواد، بما فيها برامج الحاسوب, المتاحة من خلال المواقع وصفحات الشبكة التي لها روابط %{company_domain}, والتي تربط بـ%{company_domain}. %{company_name} لا تملك سيطرة على تلك المواقع وصفحات الشبكة الغير-%{company_domain}, وغير مسؤولة عن محتواها واستخدامها. بالربط بالمواقع وصفحات الشبكة الغير-%{company_domain}, %{company_name} لا تمثل أو تؤيد مثل هذه المواقع وصفحات الشبكة. أنت مسؤول عن اتخاذ الاحتياطات عند الضرورة لحماية نفسك ونظم الحاسوب من الفيروسا, الديدان, التروجانات, والمحتويات الأخرى الضارة أو الغير مرغوب فيها. %{company_name} تتبرأ من أي ضرر ناتج عن استخدامك للمواقع وصفحات الشبكة الغير-%{company_domain}. + + + + ## [8. التعدي على حق المؤلف وسياسة DMCA](#8) + + %{company_name} يسأل الأخرون عن احترام حقوق الملكية الفكرية, إنها تحترم حقوق الملكية الفكرية للآخرين. إذا كنت تعتقد أن المواد الموجودة فيها أو المرتبط بها بواسطة %{company_domain} تنتهك حقوق النشر الخاصة بك, وإذا كان هذا الموقع موجود في الولايات المتحدة الأمريكية, أنت مدعو لإشعار %{company_name}وفقا لـ[قانون حقوق النشر الرقمية للألفية] لـ%{company_name} (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") سياسة. %{company_name} سترد على كل هذه الاشعارات، بما في ذلك إزالة المواد المخالفة أو تعطيل جميع روابط المواد المخالفة على النحو الطلوب والمناسب. %{company_name} ستقطع وصول الزائر للموقع واستخدامه إذا،, في ظل الظروف المناسبة, ستحدد الزائر الذي تكرر منه التعدي على حقوق الملكية الفكرية الأخرى من %{company_name} أو غيرها. في حالة الفصل من الموقع, %{company_name} لن تكون ملزمة لتوفير مبلغ من أي مبالغ سبق دفعها لـ%{company_name}. + + + + ## [9. الملكية الفكرية](#9) + + هذه الاتفاقية لا تنقل من %{company_name} لك أي %{company_name} أو ملكية فكري لطرف ثالث, وجميع الحقوق, العنوان والمصلحة في هذه الممتلكات تبقى (بين الطرفين) فقط مع %{company_name}. %{company_name}, %{company_domain}, شعار %{company_domain}, وجميع العلامات التجارية وعلامات الخدمة والرسومات والشعارات المستخدمة في الاتصال مع %{company_domain}, أو موقع علامات تجارية أو علامات تجارية مسجلة لـ%{company_name} أو مرخصين %{company_name}. العلامات التجارية الأخرى وعلامات الخدمات والرسومات والشعارات المستخدمة في الاتصال مع الموقع قد تكون علامات تجارية أخرى لطرف ثالث. استخدامك للموقع لا يمنحك حق أو ترخيص لإعادة انتاج أو استخدام أي %{company_name} أو علامات تجارية لطرف ثالث. + + + + ## [10. الإعلانات](#10) + + %{company_name} تحتفظ بالحق في عرض الإعلانات على المحتوى الخاص بك إلا إذا كنت قد اشتريت ترقية خالية من الإعلان أو حساب الخدمات. + + + + ## [11. الإسناد](#11) + + %{company_name} تحتفظ لنفسها بحق عرض روابط الإسناد مثل ‘المدعومة بواسطة %{company_domain},’ وموضوع المؤلف, وإسناد الخط في تذييل المحتوى الخاص بك أو شريط الأدوات. اعتماديات التذييل وشريط الأدوات لـ %{company_domain} ربما لن يزال بغض النظر عن ترقيات التي اشتريت. + + + + ## [12. التغييرات](#12) + + %{company_name} تحتفظ لنفسها بحق تقدير أو تعديل أو استبدال أي جزء من هذه الاتفاقية. ومن مسؤوليتك التأكد من هذه الاتفاقية بشكل دوري لإجراء تغييرات. استمرار استخدامك للموقع أو الوصول له بعد نشر أي تغييرات على هذا الاتفاق يعد قبولا لها. %{company_name} ربما أيضا, في المستقبل, تقدم خدمات أو ميزات جديدة من خلال الموقع (بما في ذلك إصدار أدوات وموارد جديدة). فإن هذه الميزات او الخدمات الجديدة تخضع لشروط وأحكام الاتفاقية. + + + + ## [13. الإيقاف](#13) + + %{company_name} ربما تعطل وصولك لكل أو بعض أجزاء الموقع في أي وقت, بسبب أو بغير سبب, بإشعار أو بدون إشعار, فورا. إذا كنت تريد إنهاء هذه الاتفاقية أو حسابك لـ %{company_domain} (إذا كنت تملك واحد), ربما ببساطة لن تستمر باستخدام الموقع. جميع أحكام هذا التفاق الذي طبيعته يجب إبقاء الإنهاء ليبقى الإنهاء، بما في ذلك, أحكام الملكية, الضمان والتنازلات, تعويض حدود المسؤولية. + + + + ## [14. إخلاء المسؤولية عن الضمانات](#14) + + يتم تقديم الموقع "كما هو". %{company_name} وداعميها ومرخصيها يتبرؤون هنا من جميع الضمانات لأي نوع, صريحة أو ضمنية, بما فيها, الضمانات الخاصة بالتسويق, الملائمة لغرض خاص و غير الانتهاك. لا %{company_name} ولا داعميها ومرخصيها, يقدمون أي ضمان بأن الموقع سيكون خاليا من الأخطاء أو أن الوصول إليه سيكون مستمر بدون انقطاع. إذا قرأت هذا حقا, من هنا [حل](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). عليك أن تدرك أن ما تقوم بتحميله أو الحصول عليه من المحتوى والخدمات من خلال الموقع يكون في تحفظك وعلى مسؤوليتك. + + + + ## [15. حدود المسؤولية](#15) + + في أي أحوال %{company_name}, أو داعميها أو مرخصيها, يكونون مسؤولين فيما يتعلق بأي موضوع بهذه الاتفاقية بموجب أي عقد, أو إهمال, أو مسؤولية مطلقة أو غيرها من نظرية قانونية أو مصنفة لـ: (أ) أي خصوصي أو عرضي أو الأضرار التبعية; (ب) تكلفة شراء المنتجات أو الخدمات البديلة; (ج) لانقطاع الاستخدام أو فقدان أو تلف البيانات; أو (د) عن أي مبالغ تتجاوز الرسوم المدفوعة منك إلى %{company_name} بموجب هذه الاتفاقية خلال فترة (12) شهر السابقة من العمل. %{company_name} لا تتحمل أية مسؤولية عن أي تقصير أو تأخير بسبب أمور معقولة خارجة عن إرادتهم. لا نطبق ما سبق على حد يحظره القانون المعمول به. + + + + ## [16. التفويض العام والضمان](#16) + + تفويضك و صلاحيتك التي (i) استعمالك للموقع سوف تصبح متشدده وفقا لـ%{company_name}[privacy policy] (/privacy), [community guidelines] (/guidelines), مع هذه الاتقاقية تنطبق كل الشروط و الاحكام(و بدون اي حدود قانونية محلية او لوائح في بلدك، ولايتك، مدينتك، او اي نطاقات حكومية اخرى، فيما يتعلق بسلوكك على الموقع و موافقتك على المحتويات، و يضم كل الشروط التطبيقة و انتقال المعلومات التقنية و استيردها من البلد الذي ينتمي اليه الموقع او البلد الذي تنتمي اليه انت) و(ii) استعمالك للموقع لن يتعدي او يختلس حقوق الملكية الفكرية لاي طرف ثالث. + + + + ## [17. التعويض](#17) + + أنت توافق على تعويض وإبراء ذمة %{company_name}, ومتعاقدوها, ومرخصوها, ومخرجيها, ومدرائها ومسؤوليها ووكلائها تجاه جميع الطلبات والنفقات أو أي منها, بما في ذلك أتعاب المحاماة, الناشئة عن استخدامك للموقع, بما في ذلك خرقك لهذا الاتفاق ولا يقتصر على ذلك. + + + + ## [18. متفرقات](#18) + + هذه الاتفاقيه تشكل اتفاقيه الدخول بين %{company_name} حول مشكله الموضوع هنا، و يمكن فقط ان تعدل عن طريق كتابه تعديل موقع عن طريق مفوض من%{company_name} او عن طريق مشاركه %{company_name} او عن طريق اصدار منقح. الا الي مدي القوانين التطبيقية، اذا كان هناك تقدم،فستكون هذه الاتفاقيه،اي محاول وصول للموقع او استعمله سوف يتم محاكمتها بواسطه القضاء الخاص بولايه كلفورنيا، الولايات المتحده الامريكيه، ما عدا تناقض توفر الاحكام، والمكان المناسب للنزاعات الناشئة خارجا او تنتمي الي اي من نفس الموضوع، سوف تصبح الولايه و المحااكمات الفدرالية متمركزه في مقاطعه سان فرانسيسكو, كاليفورنيا ، الا المتطلبات القضائية او اعفاء منصف او المتطلبات حول الحقوق الفكريه(التي يمكن جلبها في اي محكمه مختصه من غير تعهد المشاركه)، اي نزاعات حول هذه الاتفاقيه يجب ان تحل نهائيا وفقا لتحكيم شامل و خدمات التفكر، inc. (“JAMS”) بواسطة ثلاث محكمين يتم تعيينهم وفقا لتلك القواعد. يعقد التحكيم في سان فرانسيسكو, كالفورنيا, باللغة الانجليزية ويمكن أن ينفذ القرار في أي محكمة. يحق للطرف المتغلب في أي عمل أو أي إجراء لتطبيق هذا الاتفاق لتكاليف وأتعاب المحاماة. إذا ثبت أن أي جزء من هذه الاتفاقية غير صالح أو غير قابل للتنفيذ, وسيفسر ذلك جزئيا بما يعكس نية الطرفين الحقيقية, وسوف تبقى الأجزاء الباقية في القوة والتأثير الكامل. والتنازل من قبل أي طرف في أي بند أو شرط من هذه الاتفاقية أو أي خرق لها, في أي لحظة, لن يعني التنازل عن هذا الشرط أو خرقه لاحقا. يجوز لك تعيين حقوقك بموجب هذا الاتفاق إلى أي طرف يوافق عليه, وتوافق على أن تكون ملزم به, وبشروطه وأحكامه; %{company_name} قد تتنازل عن حقوقها بموجب هذه الاتفاقية دون قيد أو شرط. وهذه الاتفاقية ستكون ملزمة وصالحة للتنفيذ لصالح الطرفين، خلفائهم والمتنازل لهم. + + هذا النص هو CC-BY-SA. أخر تحديث له May 31, 2013. + + متأقلم أصلا مع [ شروط خدمة WordPress](http://en.wordpress.com/tos/). + privacy_topic: + title: "سياسة الخصوصية" + body: "\n\n## [ما هي البيانات التي نقوم بجمعها؟](#جمع)\n\nنحن نجمع معلومات عنك عندما تسجل في موقعنا، وعندما تشارك في المنتدى عن طريق القراءة أو الكتابة، ونقوم بتقييم ما تم مشاركته هنا .\n\n\nيمكنك زيارة موقعنا بدون تسجيل، ولكن عند التسجيل في موقعنا، سيطلب منك ادخال اسمك وعنوان بريدك الالكتروني، وسيتم التحقق من بريدك الالكتروني بإرسال رسالة الى بريدك الالكتروني تحتوي على رابط خاص، عند الضغط على هذا الرابط، نحن سنعرف أنك مالك البريد الالكتروني المتحكم فيه.\n\nعندما تقوم بالتسجيل في موقعنا والنشر، سنقوم بتسجيل عنوان IP الذي نشرت منه، أيضا قد تحتفظ سجلات الخادم عناوين IP جميع الطلبات من الخادم.\n\n\n\n## [في ماذا نستخدم المعلومات الخاصة بك؟](#استخدام)\n\nيمكننا استخدام المعلومات التي نجمعها عنك بإحدى الطرق التالية:\n\n* لتخصيص تجربتك و mdahs؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أفضل لاحتياجاتك الفردية.\n* لتحسين موقعنا و mdash ؛ نسعى باستمرار لتحسين ما يعرضه الموقع استنادًا الى المعلومات والتغذية الراجعة - الملاحظات - التي نتلقاها منك.\n* لتحسين خدمة العملاء و mdash ؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أكثر فعالية لطلبات الدعم وخدمة العملاء.\n* لإرسال رسائل البريد الالكتروني الدورية و mdash ؛ سنستخدم عنوان البريد الالكتروني الذي وفرته لنا لإرسال معلومات إليك، الاشعارات التي تطلبها حول التحديثات في المواضيع، أو الاستجابة لاسم المستخدم الخاص بك، كالرد على الاستفسارات، او الطلبات أو اسئلة اخرى.\n\n\n\n## [كيف نقوم بحماية معلوماتك ؟](#حماية)\n\nنقوم بتطبيق مجموعة من الإجراءات الأمنية للمحافظة على أمن وسلامة معلوماتك الشخصية، عندما تقوم بإرسال أو إدخال أو الدخول لمعلوماتك الشخصية.\n\ + \n\n\n## [ما هي سياسة الاحتفاظ بالبيانات الخاصة بك ؟](#الاحتفاظ-بالبيانات)\n\nسوف نبذل جهونا بإخلاص للتالي :\n\n* الاحتفاظ بسجلات عناوين IP لجميع الطلبات لهذا الخادم لمدة لا تزيد عن 90 يومًا.\n* الاحتفاظ بعناوين IP الخاصة بالمستخدمين المسجلين ومنشوراتهم لمدة لا تزيد عن 5 سنوات.\n\n\n\n## [هل نستخدم الكعكات - cookies - ملفات تعريف الارتباط ؟ ](#كعكات)\n\nنعم، الكعكات هي عبارة عن ملفات صغيرة يقوم الموقع أو مزود الخدمة بنقلها الى القرص الصلب لحاسبك من خلال متصفحك (اذا سمحتم بذلك)، هذه الكعكات تعرف الموقع على متصفحك، فن كان لديك حساب مسجل، سيتم ربطه مع حسابك.\n\nنحن نستخدم ملفات تعريف الارتباط - cookies - لفهم وحفظ التفضيلات الخاصة بك للزيارات في المستقبل، وجمع البيانات العامة حول حركة المرور والتفاعل في الموقع حتى نتمكن من تقديم تجربة وأدوات افضل في المستقبل، نحن قد نتعاقد مع مقدمي خدمات من الطرف الثالث لمساعدتنا في تحسين فهمنا لزوار الموقع، مقدمي الخدمات لا يسمح لهم بإستخدام المعلومات التي تم جمعها نيابة عنا، إلّا لمساعدتنا في سلوكنا وتحسين أعمالنا.\n\n\n\n## [هل نقوم بالإفصاح عن أي معلومات لأطراف خارجية؟](#إفصاح)\n\nنحن لا نبيع، ولا نتاجر أو ننقل المعلومات الشخصية الى أطراف خارجية. وهذا لا يشمل الطرف الخاجية الموثوق بها والتي تساعد في تشغيل موقعنا، واجراء أعمالنا، أو تقديم الخدمات لكم، طالما أن تلك الأطراف موافقة للحفاظ على سرية المعلومات، يجوز لنا الافراج عن معوماتك الشخصية عندما نرى أنه هو المناسب للإمتثال للقانون، مع فرض سياسة موقعنا، أو حماية حقوقنا أو حقوق الآخرين، أو حقوق الملكية، أو السلامة. ومع ذلك، يمكننا تقديم معلومات الزائرين دون تحديد الهوية، الى أطراف أخرى للتسويق والاعلان،\ + \ أو غيرها من الاستخدامات.\n\n\n\n## [روابط الطرف الثالث](#الطرف-الثالث)\n\nأحيانًا، نفترض، أنه عند وجود مواقع طرف ثالث تقجم خدمات أو منتجات على موقعنا، كان لدى مواقع الطرف الثالث هذه، سياسات خصوصية منفصلة ومستقلة، لن يكون لدينا أية مسؤولية عن محتوى وأنشطة هذه المواقع المرتبطة، ومع ذلك، نحن نسعى إلى حماية موقعنا وسلامته، ونرحب بأي ملاحظات حول هذه المواقع. \n\n\n\n## [الالتزام بقانون حماية خصوصية الأطفال على الانترنت ](#coppa)\n\nموقعنا والمنتجات والخدمات موجهه للأشخاص اللذين لا تقل أعمارهم عن 13 سنة، إذا كان هذا الخادم في الولايات المتحدة الأمريكية، من شروط COPPA\n ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act))\nعدم استخدم هذا الموقع.\n\n\n\n## [سياسة الخصوصية على الانترنت](#متصل)\n\nتنطبق سياسة الخصوصية على الانترنت فقط على المعلومات التي يتم جمعها من خلال موقعنا، ولاتنطبق على المعلومات التي يتم جمعها أثناء عدم الاتصال.\n\n\n\n## [الموافقة](#الموافقة)\n\nبإستخدام موقعنا، أنت توافق على سياسة الخصوصية لموقعنا.\n\n\n\n## [تغييرات على سياسة الخصوصية](#تغييرات)\n\nإذا قمنا بتغيير سياسة الخصوصية، سوف نقوم بنشر هذه التغييرات في هذه الصفحة.\n\nهذه الوثيقة هي نسخة من CC-BY-SA تم تحديثها في 31 مايو عام 2013م .\n" + static: + search_help: | +

      نصائح

      +

      +

        +
      • العناوين المتطابقة لها أولوية وحركة; عند الشك, ابحث عن العناوين
        • +
      • وحيد, الكلمات الغير مألوفة ستعطي أفضل نتائج
        • +
      • جرب البحث ضمن فئة خاصة, موضوع, أو عضو
        • +
      +

      +

      الخيارات

      +

      +

      {{i18n 'last_seen'}}{{i18n 'last_post'}}{{i18n 'last_seen'}}
      - {{avatar m imageSize="large"}} + {{user-small user=m}} + {{bound-date m.last_posted_at}} -

      {{#link-to 'user' m}}{{m.username}}{{/link-to}}

      -

      {{m.name}}

      -       		- {{bound-date m.last_seen_at}} + {{bound-date m.last_seen_at}}
      {{#each poster in posters}} -{{avatar poster usernamePath="user.username" imageSize="small"}} +{{avatar poster avatarTemplatePath="user.avatar_template" usernamePath="user.username" imageSize="small"}} {{/each}}
      -
      +
      {{topic-status topic=t}} {{topic-link t}} - {{topic-post-badges unread=t.unread - newPosts=t.new_posts - unseen=t.unseen - url=t.lastUnreadUrl}} {{#if t.hasExcerpt}}
      @@ -20,15 +16,19 @@ {{#unless t.canClearPin}}{{i18n 'read_more'}}{{/unless}} {{/if}} {{#if t.canClearPin}} - {{i18n 'topic.clear_pin.title'}} + {{i18n 'topic.clear_pin.title'}} {{/if}}
      {{/if}}
      +
      + {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}} +
      +
      - {{raw "list/posts-count-column" topic=t tagName="div"}} {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}} + {{t.last_poster_username}}
      {{#unless controller.hideCategory}}
      diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs new file mode 100644 index 0000000000..8f366864e8 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs @@ -0,0 +1,13 @@ +
    • + + {{selectedNavItem.displayName}} + + +
      • +{{#if expanded}} +
        + {{#each navItem in navItems}} + {{navigation-item content=navItem filterMode=filterMode}} + {{/each}} +
      +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs index 08c5446171..44ac3d68a3 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs @@ -1,4 +1,4 @@ -{{#each c in categories}} +{{#each model.categories as |c|}}
      @@ -21,8 +21,8 @@
      {{topic-status topic=t}} {{topic-link t}} + {{{format-age t.last_posted_at}}} - {{topic-post-badges unread=t.unread newPosts=t.new_posts unseen=t.unseen url=t.lastUnreadUrl}} {{#if t.hasExcerpt}}
      {{{t.excerpt}}} @@ -30,14 +30,13 @@ {{#unless t.canClearPin}}{{i18n 'read_more'}}{{/unless}} {{/if}} {{#if t.canClearPin}} - {{i18n 'topic.clear_pin.title'}} + {{i18n 'topic.clear_pin.title'}} {{/if}}
      {{/if}}
      - - + {{/each}} @@ -60,7 +59,7 @@
      {{number c.topics_week}}
      {{i18n 'week'}}
      {{#if controller.canEdit}} - {{i18n 'category.edit'}} + {{i18n 'category.edit'}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs index 82f0e59d79..22cbceea9c 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs @@ -38,7 +38,7 @@

      {{footerMessage}} - {{#if can_create_topic}}{{i18n 'topic.suggest_create_topic'}}{{/if}} + {{#if model.can_create_topic}}{{i18n 'topic.suggest_create_topic'}}{{/if}}

      {{else}} {{#if top}} diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs index f52e48ba43..aa4370c966 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs @@ -1,12 +1,13 @@ - - - - - - - - + {{#if usernameRequired}} + + + + + + + + + {{/if}} @@ -46,20 +48,20 @@ {{#if passwordRequired}} - - + + + + + + - - - - - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs deleted file mode 100644 index 99c8a98a63..0000000000 --- a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs +++ /dev/null @@ -1,21 +0,0 @@ -
      -
        - {{#each model.permissions as |p|}} -
      • - {{p.group_name}} - {{{i18n "category.can"}}} - {{p.permission.description}} - {{#if controller.editingPermissions}} - - {{/if}} -
        • - {{/each}} -
      - {{#if controller.editingPermissions}} - {{view 'select' content=availableGroups value=selectedGroup}} - {{view 'select' class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}} - - {{else}} - - {{/if}} -
      diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs deleted file mode 100644 index 2b8479e2bd..0000000000 --- a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs +++ /dev/null @@ -1,45 +0,0 @@ -
      - {{auto-close-form autoCloseTime=model.auto_close_hours - autoCloseBasedOnLastPost=model.auto_close_based_on_last_post - limited="true" }} -
      - -
      -
      -
      - {{input type="checkbox" checked=model.allow_badges}} - {{i18n 'category.allow_badges_label'}} -
      -
      -
      - -
      - -
      - -
      - {{#if showPositionInput}} - - {{text-field value=position class="position-input"}} - {{else}} - {{i18n 'category.position_disabled'}} - {{i18n 'category.position_disabled_click'}} - {{/if}} -
      diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs index bfd64468a6..6cde3451da 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs @@ -1,23 +1,29 @@
        - {{edit-category-tab selectedTab=selectedTab tab="general"}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="general"}} {{#unless model.isUncategorizedCategory}} - {{edit-category-tab selectedTab=selectedTab tab="security"}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="security"}} {{/unless}} - {{edit-category-tab selectedTab=selectedTab tab="settings"}} - {{edit-category-tab selectedTab=selectedTab tab="images"}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="settings"}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="images"}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="topic-template"}}
      - {{#each tab in view.panels}} - {{view 'edit-category-panel' tab=tab}} + {{#each panels as |tab|}} + {{component tab selectedTab=selectedTab category=model}} {{/each}}
      - + {{d-button id="save-category" class="btn-primary" disabled=disabled action="saveCategory" label=saveLabel}} + {{#if model.can_delete}} - + {{d-button class="btn-danger pull-right" + disabled=deleteDisabled + action="deleteCategory" + icon="trash-o" + label="category.delete"}} {{else}}
      {{{model.cannot_delete_reason}}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs index 4ad1e97e4b..fcf524920c 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs @@ -1,4 +1,4 @@ -
      +
      {{auto-close-form autoCloseTime=model.auto_close_time autoCloseValid=auto_close_valid @@ -6,8 +6,8 @@ limited=model.details.auto_close_based_on_last_post }}
      - + {{d-button class="btn-primary" disabled=auto_close_invalid label="topic.auto_close_save" action="saveAutoClose"}} {{i18n 'cancel'}} - + {{d-button class="pull-right" action="removeAutoClose" label="topic.auto_close_remove"}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs index 73e0176055..7aee95425e 100644 --- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs @@ -1,80 +1,96 @@
      {{#if model.pinned_at}}
      -
      - {{d-button action="unpin" icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}} -
      -

      {{{unPinMessage}}}

      {{#if model.pinned_globally}} -

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

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

      +

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

      {{else}} -

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

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

      +

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

      {{/if}} +

      {{{unPinMessage}}}

      +

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

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

      {{{pinMessage}}}

      -

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

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

      +

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

      +

      + {{{pinMessage}}} + {{fa-icon "clock-o"}} + {{date-picker value=model.pinnedInCategoryUntil}} + {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}} +

      +

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

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

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

      -

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

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

      +

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

      +

      + {{i18n "topic.feature_topic.pin_globally"}} + {{fa-icon "clock-o"}} + {{date-picker value=model.pinnedGloballyUntil}} + {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}} +

      +

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

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

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

      - {{else}} -

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

      - {{/if}} -

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

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

      +

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

      +

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

      +

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

      diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs index 48ef43d59c..bcf20fbc1c 100644 --- a/app/assets/javascripts/discourse/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/templates/modal/history.hbs @@ -1,57 +1,57 @@
      - - + {{d-button action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}} + {{d-button action="loadPreviousVersion" icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
      {{#conditional-loading-spinner condition=loading size="small"}} - {{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="current_version" totalBinding="version_count"}} + {{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="model.current_version" totalBinding="model.version_count"}} {{/conditional-loading-spinner}}
      - - + {{d-button action="loadNextVersion" icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}} + {{d-button action="loadLastVersion" icon="fast-forward" title="post.revisions.controls.last" disabled=loadLastDisabled}} {{#if displayHide}} - + {{d-button action="hideVersion" icon="trash-o" title="post.revisions.controls.hide" class="btn-danger" disabled=loading}} {{/if}} {{#if displayShow}} - + {{d-button action="showVersion" icon="undo" title="post.revisions.controls.show" disabled=loading}} {{/if}}
      - + {{d-button action="displayInline" label="post.revisions.displays.inline.button" title="post.revisions.displays.inline.title" class=inlineClass}} {{#unless site.mobileView}} - - + {{d-button action="displaySideBySide" label="post.revisions.displays.side_by_side.button" title="post.revisions.displays.side_by_side.title" class=sideBySideClass}} + {{d-button action="displaySideBySideMarkdown" label="post.revisions.displays.side_by_side_markdown.button" title="post.revisions.displays.side_by_side_markdown.title" class=sideBySideMarkdownClass}} {{/unless}}
      - - {{#link-to 'user' username}} - {{bound-avatar-template content.avatar_template "small"}} {{username}} + {{fa-icon "pencil"}} + {{#link-to 'user' model.username}} + {{bound-avatar-template model.avatar_template "small"}} {{model.username}} {{/link-to}} - {{bound-date created_at}} - {{#if edit_reason}} - — {{edit_reason}} + {{bound-date model.created_at}} + {{#if model.edit_reason}} + — {{model.edit_reason}} {{/if}} {{#unless site.mobileView}} - {{#if user_changes}} - — {{bound-avatar-template user_changes.previous.avatar_template "small"}} {{user_changes.previous.username}} - → {{bound-avatar-template user_changes.current.avatar_template "small"}} {{user_changes.current.username}} + {{#if model.user_changes}} + — {{bound-avatar-template model.user_changes.previous.avatar_template "small"}} {{model.user_changes.previous.username}} + → {{bound-avatar-template model.user_changes.current.avatar_template "small"}} {{model.user_changes.current.username}} {{/if}} - {{#if wiki_changes}} + {{#if model.wiki_changes}} — {{disabled-icon icon="pencil-square-o" secondary=wikiDisabled}} {{/if}} - {{#if post_type_changes}} + {{#if model.post_type_changes}} — {{disabled-icon icon="shield" disabled=postTypeDisabled}} {{/if}} - {{#if category_id_changes}} + {{#if model.category_id_changes}} — {{{previousCategory}}} → {{{currentCategory}}} {{/if}} {{/unless}}
      - {{#if title_changes}} + {{#if model.title_changes}}

      {{{titleDiff}}}

      @@ -59,21 +59,21 @@ {{#if site.mobileView}} {{#if user_changes}}
      - {{bound-avatar-template user_changes.previous.avatar_template "small"}} {{user_changes.previous.username}} - → {{bound-avatar-template user_changes.current.avatar_template "small"}} {{user_changes.current.username}} + {{bound-avatar-template model.user_changes.previous.avatar_template "small"}} {{model.user_changes.previous.username}} + → {{bound-avatar-template model.user_changes.current.avatar_template "small"}} {{model.user_changes.current.username}}
      {{/if}} - {{#if wiki_changes}} + {{#if model.wiki_changes}}
      {{disabled-icon icon="pencil-square-o" secondary=wikiDisabled}}
      {{/if}} - {{#if post_type_changes}} + {{#if model.post_type_changes}}
      {{disabled-icon icon="shield" disabled=postTypeDisabled}}
      {{/if}} - {{#if category_id_changes}} + {{#if model.category_id_changes}}
      {{{previousCategory}}} → {{{currentCategory}}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs index 5984aa86ab..a5ccb897f1 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs @@ -1,11 +1,11 @@
      - {{#if error}} + {{#if model.error}}
      {{errorMessage}}
      {{/if}} - {{#if finished}} + {{#if model.finished}} {{{successMessage}}} {{else}} @@ -20,14 +20,17 @@ {{/if}} {{#if showGroups}} - {{group-selector groupFinder=groupFinder groupNames=groupNames placeholderKey="topic.invite_private.group_name"}} + {{group-selector groupFinder=groupFinder groupNames=model.groupNames placeholderKey="topic.invite_private.group_name"}} {{/if}} {{/if}}
      - {{#if finished}} + {{#if model.finished}} {{d-button class="btn-primary" action="closeModal" label="close"}} {{else}} - + {{d-button icon="envelope" action="createInvite" class="btn-primary" disabled=disabled label=buttonTitle}} + {{#if showCopyInviteButton}} + {{d-button icon="link" action="generateInvitelink" class="btn-primary" disabled=disabledCopyLink label='user.invited.generate_link'}} + {{/if}} {{/if}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs index 38167ba221..4b1053397a 100644 --- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs +++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs @@ -10,6 +10,8 @@
    • {{{i18n 'keyboard_shortcuts_help.jump_to.categories'}}}
    • {{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}
    • {{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}
      • +
    • {{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}
      • +
    • {{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}

      • {{i18n 'keyboard_shortcuts_help.navigation.title'}}

        @@ -24,14 +26,14 @@

        {{i18n 'keyboard_shortcuts_help.application.title'}}

        • {{{i18n 'keyboard_shortcuts_help.application.create'}}}
          • -
        • {{{i18n 'keyboard_shortcuts_help.application.notifications'}}}
          • -
        • {{{i18n 'keyboard_shortcuts_help.application.site_map_menu'}}}
          • +
        • {{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.search'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.help'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.dismiss_new_posts'}}}
        • {{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}
          • +
        • {{{i18n 'keyboard_shortcuts_help.application.log_out'}}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs index a05ac14f22..19160f99c0 100644 --- a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs @@ -1,17 +1,13 @@
      - {{#if error}} -
      - -
      - {{/if}} -

      {{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}

      - {{view "choose-topic" selectedTopicId=selectedTopicId}} + {{view "choose-topic" currentTopicId=model.id selectedTopicId=selectedTopicId}}
      - + {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}} + {{fa-icon 'sign-out'}} {{buttonTitle}} + {{/d-button}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs index 4266126c8d..f8df2639e9 100644 --- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs +++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs @@ -3,7 +3,7 @@ {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}} {{else}} {{{i18n 'login.not_activated' sentTo=sentTo}}} - {{i18n 'login.resend_activation_email'}} + {{i18n 'login.resend_activation_email'}} {{/if}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs new file mode 100644 index 0000000000..64c36b959d --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -0,0 +1,33 @@ +
      +
      +
      {{number t.posts_count}}{{{format-age t.last_posted_at}}}{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
      -
      +
      {{raw "topic-status" topic=content}} {{topic-link content}} - {{#if controller.showTopicPostBadges}} - {{raw "topic-post-badges" unread=content.unread newPosts=content.displayNewPosts unseen=content.unseen url=content.lastUnreadUrl}} - {{/if}} {{raw "list/topic-excerpt" topic=content}}
      +
      + {{raw "list/post-count-or-badges" topic=content postBadgesEnabled=controller.showTopicPostBadges}} +
      +
      {{#unless controller.hideCategory}} @@ -14,12 +15,12 @@ {{category-link content.category}}
      {{/unless}} + {{plugin-outlet "topic-list-tags"}}
      - {{raw "list/posts-count-column" topic=content tagName="div"}}
      - {{content.last_poster_username}} {{raw "list/activity-column" topic=content tagName="span" class="age"}} + {{content.last_poster_username}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs index be857517d0..e7d070d814 100644 --- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs +++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs @@ -2,32 +2,27 @@
      - +
      - - {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled class="no-text" icon="refresh"}} + + {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled icon="refresh"}}
      {{#if allowImageUpload}}
      - {{avatar-uploader username=username - user_id=id - uploadedAvatarTemplate=uploadedAvatarTemplate - custom_avatar_upload_id=custom_avatar_upload_id + {{avatar-uploader user_id=id + uploadedAvatarTemplate=custom_avatar_template + uploadedAvatarId=custom_avatar_upload_id uploading=uploading done="useUploadedAvatar"}}
      @@ -36,6 +31,6 @@
      - {{d-button action="saveAvatarSelection" class="btn-primary" disabled=saveDisabled label="save"}} + {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}} {{i18n 'cancel'}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs new file mode 100644 index 0000000000..c76c58e124 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs @@ -0,0 +1,18 @@ +
      +

      + {{i18n 'topic.change_timestamp.instructions'}} +

      + +

      + {{i18n 'topic.change_timestamp.invalid_timestamp'}} +

      + + + {{input type="date" value=date}} + {{input type="time" value=time}} + +
      + +
      + +
      diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index acac3c98d5..8b4ead4a85 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -21,17 +21,19 @@
      - {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} -  {{input-tip validation=usernameValidation id="username-validation"}} -
      + {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} +  {{input-tip validation=usernameValidation id="username-validation"}} +
      + {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} +  {{input-tip validation=passwordValidation}} +
      - {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} -  {{input-tip validation=passwordValidation}} + +
      {{i18n 'login.caps_lock_warning'}}
      - -
      {{i18n 'login.caps_lock_warning'}}
      -
      + + + + + {{#each categoriesOrdered as |cat|}} + + + + + {{/each}} +
      {{i18n "categories.reorder.position"}}{{i18n "categories.category"}}
      + {{number-field number=cat.position}} + {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} + {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} + {{#if cat.hasBufferedChanges}} + {{d-button class="no-text" action="commit" icon="check"}} + {{/if}} + {{category-badge cat allowUncategorized="true"}}
      +
      +
      + +
      + {{#if showFixIndices}} + {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}} + {{/if}} + {{#if showApplyAll}} + {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}} + {{/if}} + {{d-button class="btn-primary" disabled=saveDisabled action="saveOrder" label="categories.reorder.save"}} +
      diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs similarity index 59% rename from app/assets/javascripts/discourse/templates/modal/split_topic.hbs rename to app/assets/javascripts/discourse/templates/modal/split-topic.hbs index ff72aab89c..fe80f88174 100644 --- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs @@ -1,10 +1,4 @@
      - {{#if error}} -
      - -
      - {{/if}} - {{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}
      @@ -18,5 +12,7 @@
      - + {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}} + {{fa-icon 'sign-out'}} {{buttonTitle}} + {{/d-button}}
      diff --git a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs new file mode 100644 index 0000000000..db8cf3de27 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs @@ -0,0 +1,8 @@ + +
      + {{json-file-uploader value=customizationFile extension=".dcstyle.json"}} +
      +
      + {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}} +
      + diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs index 9957e2ffc0..254e02648b 100644 --- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs +++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs @@ -1,16 +1,14 @@
      - {{#if allowLocal}} -
      - - - {{#if local}} -
      -
      - {{unbound view.tip}} -
      - {{/if}} -
      - {{/if}} +
      + + + {{#if local}} +
      +
      + {{unbound view.tip}} +
      + {{/if}} +
      @@ -38,7 +36,7 @@
      {{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs index 1db91ae46e..e6a650cfbe 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs @@ -1,14 +1,9 @@ {{bread-crumbs categories=categories}} - +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if canCreateCategory}} - + {{categories-admin-dropdown}} {{/if}} {{#if canCreateTopic}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index 4a8aee557e..7d874edf17 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -3,12 +3,8 @@ noSubcategories=noSubcategories hideSubcategories=showingSubcategoryList}} - + +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if currentUser}} {{category-notifications-button category=category}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index d95de6b043..b02c503fd8 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -1,19 +1,7 @@ -{{#if isSearch}} -
      - {{input type="text" value=searchTerm class="input-xxlarge search" action="search"}} - -
      -{{else}} {{bread-crumbs categories=categories}} - +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if canCreateTopic}} {{/if}} -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/notifications.hbs b/app/assets/javascripts/discourse/templates/notifications.hbs deleted file mode 100644 index 8e646bf6b8..0000000000 --- a/app/assets/javascripts/discourse/templates/notifications.hbs +++ /dev/null @@ -1,16 +0,0 @@ -
      - {{#conditional-loading-spinner condition=loadingNotifications}} - {{#if content}} - - {{else}} -
      {{i18n 'notifications.none'}}
      - {{/if}} - {{/conditional-loading-spinner}} -
      diff --git a/app/assets/javascripts/discourse/templates/post-small-action.hbs b/app/assets/javascripts/discourse/templates/post-small-action.hbs new file mode 100644 index 0000000000..42c11c5246 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/post-small-action.hbs @@ -0,0 +1,9 @@ +{{post-gap post=this postStream=controller.model.postStream before="true"}} + +{{small-action actionCode=action_code + post=this + daysAgo=view.daysAgo + editPost="editPost" + deletePost="deletePost"}} + +{{post-gap post=this postStream=controller.model.postStream before="false"}} diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs index bbcd12acef..6fdfcfcdd2 100644 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ b/app/assets/javascripts/discourse/templates/post.hbs @@ -1,26 +1,29 @@ {{post-gap post=this postStream=controller.model.postStream before="true"}} +{{#if hasTimeGap}} + {{time-gap daysAgo=daysSincePrevious postStream=controller.model.postStream}} +{{/if}} +
      {{view 'reply-history' content=replyHistory}}
      -
      +
      -
      -
      +
      {{#if userDeleted}} {{else}} {{raw "post/poster-avatar" post=this classNames="main-avatar"}} {{/if}} {{plugin-outlet "poster-avatar-bottom"}} -
      {{poster-name post=this}} + {{plugin-outlet "poster-name-right"}}
      {{age-with-tooltip created_at}}
      @@ -40,15 +43,20 @@
      {{/if}} {{#if wiki}} -
      {{fa-icon "pencil-square-o"}}
      +
      {{fa-icon "pencil-square-o"}}
      {{/if}} {{#if via_email}} {{#if canViewRawEmail}} -
      {{fa-icon "envelope-o"}}
      +
      {{fa-icon "envelope-o"}}
      {{else}} -
      {{fa-icon "envelope-o"}}
      +
      {{fa-icon "envelope-o"}}
      {{/if}} {{/if}} + + {{#if view.whisper}} +
      {{fa-icon "eye-slash"}}
      + {{/if}} + {{#if showUserReplyTab}} {{#if loadingReplyHistory}} @@ -63,8 +71,8 @@
      {{fa-icon "circle"}}
      -
      - +
      +
      @@ -72,6 +80,7 @@
      {{{cooked}}} + {{plugin-outlet "post-after-cooked"}} {{#if firstPost}} {{plugin-outlet "topic-after-cooked"}} {{/if}} @@ -86,9 +95,26 @@ {{/if}} {{/if}} - {{view 'post-menu' post=this adminMenu=view.adminMenu}} + + {{post-menu post=this + canCreatePost=controller.model.details.can_create_post + replyToPost="replyToPost" + recoverPost="recoverPost" + deletePost="deletePost" + toggleLike="toggleLike" + toggleLikeTarget=view + showFlags="showFlags" + editPost="editPost" + toggleBookmark="toggleBookmark" + toggleWiki="toggleWiki" + togglePostType="togglePostType" + rebakePost="rebakePost" + unhidePost="unhidePost" + toggleWhoLiked="toggleWhoLiked" + toggleWhoLikedTarget=view}}
      + {{who-liked users=view.likedUsers}} {{#if replies}}
      {{#each reply in replies}} @@ -97,7 +123,7 @@
      {{/if}} - {{discourse-action-history post=this}} + {{actions-summary post=this}} {{view 'topic-map-container' post=this topic=controller.model}}
      @@ -110,3 +136,4 @@
      {{post-gap post=this postStream=controller.model.postStream before="false"}} +{{plugin-outlet "post-bottom"}} diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs index 400937caf5..5fc07e042b 100644 --- a/app/assets/javascripts/discourse/templates/queued-posts.hbs +++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs @@ -6,7 +6,6 @@ {{#user-link user=ctrl.post.user}} {{avatar ctrl.post.user imageSize="large"}} {{/user-link}} -
      @@ -14,6 +13,9 @@ {{#user-link user=ctrl.post.user}} {{ctrl.post.user.username}} {{/user-link}} + {{#if ctrl.post.user.blocked}} + + {{/if}}
      diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs deleted file mode 100644 index 6ad3c15955..0000000000 --- a/app/assets/javascripts/discourse/templates/search.hbs +++ /dev/null @@ -1,32 +0,0 @@ -{{view "search-text-field" value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}} -
      - {{#if searchContext}} - - {{/if}} - {{i18n "show_help"}} -
      -{{#if loading}} -
      {{loading-spinner}}
      -{{else}} -
      - {{#if noResults}} -
      - {{i18n "search.no_results"}} -
      - {{else}} - {{#each resultType in content.resultTypes}} -
        -
      • {{resultType.name}}
        • - {{view "search-results-type" type=resultType.type displayType=resultType.displayType content=resultType.results}} -
      -
      - {{#if resultType.more}} - {{i18n "show_more"}} {{fa-icon "chevron-down"}} - {{/if}} -
      - {{/each}} - {{/if}} -
      -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/search/category_result.hbs b/app/assets/javascripts/discourse/templates/search/category_result.hbs deleted file mode 100644 index ad0c40031b..0000000000 --- a/app/assets/javascripts/discourse/templates/search/category_result.hbs +++ /dev/null @@ -1,3 +0,0 @@ - - {{category-badge this}} - diff --git a/app/assets/javascripts/discourse/templates/search/post_result.hbs b/app/assets/javascripts/discourse/templates/search/post_result.hbs deleted file mode 100644 index 197ba51641..0000000000 --- a/app/assets/javascripts/discourse/templates/search/post_result.hbs +++ /dev/null @@ -1,10 +0,0 @@ - - - {{i18n 'search.post_format' post_number=post_number username=username}} - - {{#unless controller.site.mobileView}} - - {{{unbound blurb}}} - - {{/unless}} - diff --git a/app/assets/javascripts/discourse/templates/search/topic_result.hbs b/app/assets/javascripts/discourse/templates/search/topic_result.hbs deleted file mode 100644 index ef58e870d9..0000000000 --- a/app/assets/javascripts/discourse/templates/search/topic_result.hbs +++ /dev/null @@ -1,10 +0,0 @@ - - - {{topic-status topic=topic disableActions=true}}{{unbound topic.title}}{{category-badge topic.category}} - - {{#unless controller.site.mobileView}} - - {{format-age created_at}} - {{{unbound blurb}}} - - {{/unless}} - diff --git a/app/assets/javascripts/discourse/templates/search/user_result.hbs b/app/assets/javascripts/discourse/templates/search/user_result.hbs deleted file mode 100644 index 057d214573..0000000000 --- a/app/assets/javascripts/discourse/templates/search/user_result.hbs +++ /dev/null @@ -1,4 +0,0 @@ - - {{avatar this imageSize="small"}} - {{unbound username}} - diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs deleted file mode 100644 index 243082e035..0000000000 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ /dev/null @@ -1,81 +0,0 @@ -
      -
        - {{#if showAdminLinks}} -
      • - {{#link-to "admin" class="admin-link"}} - {{i18n 'admin_title'}} - {{/link-to}} -
        • -
      • - {{#link-to "adminFlags" class="flagged-posts-link"}} - {{fa-icon "flag"}} {{i18n 'flags_title'}} - {{#if currentUser.site_flagged_posts_count}} - {{currentUser.site_flagged_posts_count}} - {{/if}} - {{/link-to}} -
        • - {{/if}} -
      • - {{#link-to "discovery.latest" class="latest-topics-link"}} - {{i18n 'filters.latest.title'}} - {{/link-to}} -
        • - {{#if showBadgesLink}} -
      • - {{i18n 'badges.title'}} -
        • - {{/if}} - - {{#if siteSettings.enable_user_directory}} -
      • {{#link-to 'users'}}{{i18n "directory.title"}}{{/link-to}}
        • - {{/if}} - - {{#if currentUser.show_queued_posts}} -
      • - {{#link-to 'queued-posts'}} - {{i18n "queue.title"}} - {{#if currentUser.post_queue_new_count}} - {{currentUser.post_queue_new_count}} - {{/if}} - {{/link-to}} -
        • - {{/if}} - - {{plugin-outlet "site-map-links"}} - - {{#if showKeyboardShortcuts}} -
      • {{i18n 'keyboard_shortcuts_help.title'}}
        • - {{/if}} -
      • - {{i18n 'faq'}} -
        • -
      • - {{#link-to 'about'}}{{i18n 'about.simple_title'}}{{/link-to}} -
        • - {{#if showMobileToggle}} -
      • {{boundI18n mobileViewLinkTextKey}}
        • - {{/if}} -
      - - {{#if categories}} -
        -
      • - {{#link-to "discovery.categories"}}{{i18n 'filters.categories.title'}}{{/link-to}} -
        • - - {{#each c in categories itemController='site-map-category'}} -
      • - {{category-link c.model allowUncategorized="true"}} - - {{#if c.unreadTotal}} - {{c.unreadTotal}} - {{/if}} - - {{#if c.showTopicCount}} - {{unbound c.model.topic_count}} - {{/if}} -
        • - {{/each}} -
      - {{/if}} -
      diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs deleted file mode 100644 index 004df5255f..0000000000 --- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs +++ /dev/null @@ -1,58 +0,0 @@ -

      {{i18n 'admin_title'}}

      - -
        -
      • - {{d-button action="toggleMultiSelect" icon="tasks" label="topic.actions.multi_select" class="btn-admin"}} -
        • - - {{#if model.details.can_delete}} -
      • - {{d-button action="deleteTopic" icon="trash-o" label="topic.actions.delete" class="btn-admin btn-danger"}} -
        • - {{/if}} - - {{#if showRecover}} -
      • - {{d-button action="recoverTopic" icon="undo" label="topic.actions.recover" class="btn-admin"}} -
        • - {{/if}} - -
      • - {{#if model.closed}} - {{d-button action="toggleClosed" icon="unlock" label="topic.actions.open" class="btn-admin"}} - {{else}} - {{d-button action="toggleClosed" icon="lock" label="topic.actions.close" class="btn-admin"}} - {{d-button action="showAutoClose" icon="clock-o" label="topic.actions.auto_close" class="btn-admin"}} - {{/if}} -
        • - - {{#unless model.isPrivateMessage}} - {{#if model.visible}} -
      • - {{#if isFeatured}} - {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin" class="btn-admin"}} - {{else}} - {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin" class="btn-admin"}} - {{/if}} -
        • - {{/if}} - {{/unless}} - -
      • - {{#if model.archived}} - {{d-button action="toggleArchived" icon="folder" label="topic.actions.unarchive" class="btn-admin"}} - {{else}} - {{d-button action="toggleArchived" icon="folder" label="topic.actions.archive" class="btn-admin"}} - {{/if}} -
        • - -
      • - {{#if model.visible}} - {{d-button action="toggleVisibility" icon="eye-slash" label="topic.actions.invisible" class="btn-admin"}} - {{else}} - {{d-button action="toggleVisibility" icon="eye" label="topic.actions.visible" class="btn-admin"}} - {{/if}} -
        • - - {{plugin-outlet "topic-admin-menu-buttons"}} -
      diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/topic-entrance.hbs index 3dbe96f871..399ac0bdaf 100644 --- a/app/assets/javascripts/discourse/templates/topic-entrance.hbs +++ b/app/assets/javascripts/discourse/templates/topic-entrance.hbs @@ -1,7 +1,7 @@ -{{#d-button action="enterTop" class="full no-text jump-top"}} +{{#d-button action="enterTop" class="full jump-top"}} {{fa-icon 'caret-up'}} {{{topDate}}} {{/d-button}} -{{#d-button action="enterBottom" class="full no-text jump-button"}} +{{#d-button action="enterBottom" class="full jump-button"}} {{{bottomDate}}} {{fa-icon 'caret-down'}} {{/d-button}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index ea25c5c0ea..a93086ad18 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -1,33 +1,31 @@ -
      - {{custom-html "top"}} - {{global-notice}} - {{#if model}} +{{#if model}} +
      {{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}} - {{/if}} -
      +
      +{{/if}} {{plugin-outlet "topic-above-post-stream"}} {{#if model.postStream.loaded}} {{#if model.postStream.firstPostPresent}} -
      -
      +
      +
      {{#if editingTopic}} {{#if model.isPrivateMessage}} {{fa-icon "envelope"}} - {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} + {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}} {{else}} - {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} + {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
      {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}} {{/if}} {{plugin-outlet "edit-topic"}} - {{d-button action="finishedEditingTopic" class="btn-primary btn-small no-text submit-edit" icon="check"}} - {{d-button action="cancelEditingTopic" class="btn-small no-text cancel-edit" icon="times"}} + {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} + {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} {{else}}

      {{#unless model.is_warning}} @@ -36,13 +34,13 @@ {{#if model.details.loaded}} {{topic-status topic=model}} - - {{{model.fancy_title}}} + + {{{model.fancyTitle}}} {{/if}} {{#if model.details.can_edit}} - {{fa-icon "pencil"}} + {{fa-icon "pencil"}} {{/if}}

      @@ -57,14 +55,13 @@ {{/if}}
      - {{view "selected-posts"}}
      -
      -
      +
      +
      - {{render 'topic-progress'}} + {{render "topic-progress"}} {{conditional-loading-spinner condition=model.postStream.loadingAbove}} @@ -83,31 +80,38 @@ {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
      -
      +
      {{#conditional-loading-spinner condition=model.postStream.loadingFilter}} {{#if loadedAllPosts}} - {{view 'topic-closing' topic=model}} - {{view 'topic-footer-buttons' topic=model}} + {{view "topic-closing" topic=model}} + {{#if session.showSignupCta}} + {{! replace "Log In to Reply" with the infobox }} + {{signup-cta}} + {{else}} + {{view "topic-footer-buttons" topic=model}} + {{/if}} {{#if model.pending_posts_count}} -
      +
      {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}} - {{#link-to 'queued-posts'}} - {{fa-icon 'check'}} - {{i18n 'queue.view_pending'}} - {{/link-to}} + {{#if currentUser.show_queued_posts}} + {{#link-to "queued-posts"}} + {{fa-icon "check"}} + {{i18n "queue.view_pending"}} + {{/link-to}} + {{/if}}
      {{/if}} {{plugin-outlet "topic-above-suggested"}} {{#if model.details.suggested_topics.length}} -
      -

      {{i18n 'suggested_topics.title'}}

      -
      +
      +

      {{i18n "suggested_topics.title"}}

      +
      {{basic-topic-list topics=model.details.suggested_topics postsAction="showTopicEntrance"}}

      {{{view.browseMoreMessage}}}

      @@ -122,10 +126,10 @@
      {{else}} -
      +
      {{#conditional-loading-spinner condition=noErrorYet}} {{#if model.notFoundHtml}} - {{{model.notFoundHtml}}} +
      {{{model.notFoundHtml}}}
      {{else}}
      {{model.message}}
      @@ -150,6 +154,65 @@ {{/if}} {{#if currentUser.canManageTopic}} - {{show-topic-admin show="showTopicAdminMenu"}} - {{render "topic-admin-menu"}} + {{show-popup-button action="showTopicAdminMenu" class="show-topic-admin" title="topic_admin_menu" icon="wrench"}} + {{#popup-menu visible=adminMenuVisible hide="hideTopicAdminMenu" title="admin_title"}} +
    • + {{d-button action="toggleMultiSelect" icon="tasks" label="topic.actions.multi_select"}} +
      • + + {{#if model.details.can_delete}} +
    • + {{d-button action="deleteTopic" icon="trash-o" label="topic.actions.delete" class="btn-danger"}} +
      • + {{/if}} + + {{#if showRecover}} +
    • + {{d-button action="recoverTopic" icon="undo" label="topic.actions.recover"}} +
      • + {{/if}} + +
    • + {{#if model.closed}} + {{d-button action="toggleClosed" icon="unlock" label="topic.actions.open"}} + {{else}} + {{d-button action="toggleClosed" icon="lock" label="topic.actions.close"}} + {{d-button action="showAutoClose" icon="clock-o" label="topic.actions.auto_close"}} + {{/if}} +
      • + + {{#unless model.isPrivateMessage}} + {{#if model.visible}} +
    • + {{#if isFeatured}} + {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin"}} + {{else}} + {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin"}} + {{/if}} +
      • + {{/if}} + {{/unless}} + +
    • + {{d-button action="showChangeTimestamp" icon="calendar" label="topic.change_timestamp.title"}} +
      • + +
    • + {{#if model.archived}} + {{d-button action="toggleArchived" icon="folder" label="topic.actions.unarchive"}} + {{else}} + {{d-button action="toggleArchived" icon="folder" label="topic.actions.archive"}} + {{/if}} +
      • + +
    • + {{#if model.visible}} + {{d-button action="toggleVisibility" icon="eye-slash" label="topic.actions.invisible"}} + {{else}} + {{d-button action="toggleVisibility" icon="eye" label="topic.actions.visible"}} + {{/if}} +
      • + + {{plugin-outlet "topic-admin-menu-buttons"}} + {{/popup-menu}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs new file mode 100644 index 0000000000..d153867e87 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs @@ -0,0 +1,8 @@ +
      +

      + {{{stopNotificiationsText}}} +

      +

      + {{i18n "topic.unsubscribe.change_notification_state"}} {{topic-notifications-button topic=model}} +

      +
      diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs index fe4e196ed1..a6b30ca57e 100644 --- a/app/assets/javascripts/discourse/templates/user-card.hbs +++ b/app/assets/javascripts/discourse/templates/user-card.hbs @@ -1,12 +1,12 @@ {{#if controller.visible}}
      - {{bound-avatar avatar "huge"}} + {{bound-avatar avatar "huge"}}

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

      {{#if user.name}} @@ -17,9 +17,7 @@

      {{user.title}}

      {{/if}} - {{#if showName}} -

      {{name}}

      - {{/if}} + {{plugin-outlet "user-card-post-names"}}
      @@ -63,6 +61,7 @@

      {{i18n 'last_post'}} {{format-date user.last_posted_at leaveAgo="true"}}

      {{/if}}

      {{i18n 'joined'}} {{format-date user.created_at leaveAgo="true"}}

      + {{plugin-outlet "user-card-metadata"}}
      {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-dropdown.hbs b/app/assets/javascripts/discourse/templates/user-dropdown.hbs deleted file mode 100644 index b9216b4b37..0000000000 --- a/app/assets/javascripts/discourse/templates/user-dropdown.hbs +++ /dev/null @@ -1,16 +0,0 @@ -
      -
        -
      • {{#link-to 'user' currentUser class="user-activity-link" }}{{i18n 'user.profile'}}{{/link-to}}
        • -
      • - {{#link-to 'userPrivateMessages.index' currentUser class='user-messages-link'}} - {{i18n 'user.unread_message_count'}}{{#if currentUser.unread_private_messages}} {{currentUser.unread_private_messages}}{{/if}} - {{/link-to}} -
        • -
      • {{#link-to 'userActivity.bookmarks' currentUser}}{{i18n 'user.bookmarks'}}{{/link-to}}
        • -
      • {{#link-to 'preferences' currentUser}}{{i18n 'user.preferences'}}{{/link-to}}
        • - {{#if allowAnon}} -
      • {{#if isAnon}}{{i18n 'switch_from_anon'}}{{else}}{{i18n 'switch_to_anon'}}{{/if}}
        • - {{/if}} -
      • {{d-button action="logout" class="btn-danger right logout" icon="sign-out" label="user.log_out"}}
        • -
      -
      diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs new file mode 100644 index 0000000000..29c37bcb99 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -0,0 +1,100 @@ +{{#if canInviteToForum}} +
      +

      {{i18n 'user.invited.title'}}

      + + {{#if model.can_see_invite_details}} +
      +
      +
        + {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} + {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} +
      +
      + +
      + {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} + {{#if canBulkInvite}} + {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} + {{/if}} +
      +
      + {{/if}} + + {{#if showSearch}} +
      +
      {{text-field value=searchTerm placeholderKey="user.invited.search"}}
      +
      + {{/if}} + + {{#if model.invites}} + + + {{#if inviteRedeemed}} + + + {{#if model.can_see_invite_details}} + + + + + + {{/if}} + {{else}} + + + {{/if}} + + {{#each invite in model.invites}} + + {{#if invite.user}} + + + {{#if model.can_see_invite_details}} + + + + + + {{/if}} + {{else}} + + + + {{/if}} + + {{/each}} +
      {{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
      + {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} + {{format-date invite.redeemed_at}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} + / + {{{unbound invite.user.days_since_created}}}{{unbound invite.email}}{{format-date invite.created_at}} + {{#if invite.expired}} + {{i18n 'user.invited.expired'}} +      + {{/if}} + {{#if invite.rescinded}} + {{i18n 'user.invited.rescinded'}} + {{else}} + {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} + {{/if}} +      + {{#if invite.reinvited}} + {{i18n 'user.invited.reinvited'}} + {{else}} + {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} + {{/if}} +
      + {{conditional-loading-spinner condition=invitesLoading}} + + {{else}} +
      + {{#if canBulkInvite}} + {{{i18n 'user.invited.bulk_invite.none'}}} + {{else}} + {{i18n 'user.invited.none'}} + {{/if}} +
      + {{/if}} +
      +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs index f24fea4f55..e0f26deae8 100644 --- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs +++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs @@ -2,7 +2,8 @@
      - {{#if error}} -
      -
      -
      {{i18n 'user.change_about.error'}}
      -
      -
      - {{/if}} -
      - {{pagedown-editor value=bio_raw}} + {{pagedown-editor value=model.bio_raw}}
      - - {{#if saved}}{{i18n 'saved'}}{{/if}} + {{#d-button action="changeAbout" class="btn btn-primary"}} + {{saveButtonText}} + {{/d-button}}
      diff --git a/app/assets/javascripts/discourse/templates/user/invited.hbs b/app/assets/javascripts/discourse/templates/user/invited.hbs deleted file mode 100644 index c3314fe4b6..0000000000 --- a/app/assets/javascripts/discourse/templates/user/invited.hbs +++ /dev/null @@ -1,83 +0,0 @@ -{{#if canInviteToForum}} -
      - -

      {{i18n 'user.invited.title'}}

      - -
      - - {{#if canBulkInvite}} - {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} - {{/if}} -
      - - {{#if showSearch}} -
      - {{text-field value=searchTerm placeholderKey="user.invited.search"}} -
      - {{/if}} - - {{#if model.invites}} - - - - - {{#if can_see_invite_details}} - - - - - - {{/if}} - - {{#each invite in model.invites}} - - {{#if invite.user}} - - - {{#if can_see_invite_details}} - - - - - - {{/if}} - {{else}} - - - {{/if}} - - {{/each}} -
      {{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}
      - {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} - {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} - {{format-date invite.redeemed_at}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} - / - {{{unbound invite.user.days_since_created}}}{{unbound invite.email}} - {{#if invite.expired}} - {{i18n 'user.invited.expired'}} -      - {{/if}} - {{#if invite.rescinded}} - {{i18n 'user.invited.rescinded'}} - {{else}} - - {{/if}} -      - {{#if invite.reinvited}} - {{i18n 'user.invited.reinvited'}} - {{else}} - - {{/if}} -
      - {{conditional-loading-spinner condition=invitesLoading}} - - {{else}} - {{#if canBulkInvite}} - {{{i18n 'user.invited.bulk_invite.none'}}} - {{else}} - {{i18n 'user.invited.none'}} - {{/if}} - {{/if}} - -
      -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs index f3f6e67545..285824a59f 100644 --- a/app/assets/javascripts/discourse/templates/user/posts.hbs +++ b/app/assets/javascripts/discourse/templates/user/posts.hbs @@ -1,5 +1,5 @@ {{#each p in model.content}} -
      +
      diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index 76f5446c9c..b8e42444cd 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -72,7 +72,7 @@
      - + {{fa-icon "envelope"}} {{#if model.no_password}} {{i18n 'user.change_password.set_password'}} @@ -91,7 +91,7 @@ {{! we want the "huge" version even though we're downsizing it to "large" in CSS }} {{bound-avatar model "huge"}} {{#if allowAvatarUpload}} - {{d-button action="showAvatarSelector" class="pad-left no-text" icon="pencil"}} + {{d-button action="showAvatarSelector" class="pad-left" icon="pencil"}} {{else}} {{#unless ssoOverridesAvatar}} {{fa-icon "pencil"}} @@ -189,6 +189,12 @@
      +
      + + {{desktop-notification-config}} +
      {{i18n 'user.desktop_notifications.each_browser_note'}}
      +
      +
      @@ -210,23 +216,23 @@ {{preference-checkbox labelKey="user.edit_history_public" checked=model.edit_history_public}} {{/unless}} - {{plugin-outlet "user_custom_preferences"}} + {{plugin-outlet "user-custom-preferences"}}
      - + {{category-group categories=model.watchedCategories blacklist=selectedCategories}}
      {{i18n 'user.watched_categories_instructions'}}
      - + {{category-group categories=model.trackedCategories blacklist=selectedCategories}}
      {{i18n 'user.tracked_categories_instructions'}}
      - + {{category-group categories=model.mutedCategories blacklist=selectedCategories}}
      {{i18n 'user.muted_categories_instructions'}}
      @@ -235,11 +241,14 @@
      - + {{user-selector excludeCurrentUser=true usernames=model.muted_usernames class="user-selector"}}
      {{i18n 'user.muted_users_instructions'}}
      + + {{plugin-outlet "user-custom-controls"}} +
      {{partial 'user/preferences/save-button'}} diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs index 0637feec4b..c7b3114470 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.hbs +++ b/app/assets/javascripts/discourse/templates/user/stream.hbs @@ -1,29 +1,3 @@ -{{#each item in model.content}} -
      -
      -
      {{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}
       - {{format-date item.created_at}} - {{topic-status topic=item disableActions=true}} - - {{unbound item.title}} - -
      {{category-link item.category}}
      -
      -

      {{{unbound item.excerpt}}}

      - {{#each child in item.children}} -
      - - {{#each grandChild in child.items}} - {{#if grandChild.removableBookmark}} - - {{else}} -
      {{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
       - {{#if grandChild.edit_reason}} — {{unbound grandChild.edit_reason}}{{/if}} - {{/if}} - {{/each}} -
      - {{/each}} -
      +{{#each model.content as |item|}} + {{stream-item item=item removeBookmark="removeBookmark"}} {{/each}} diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs index 25a6a71674..28634a17f6 100644 --- a/app/assets/javascripts/discourse/templates/user/user.hbs +++ b/app/assets/javascripts/discourse/templates/user/user.hbs @@ -1,9 +1,4 @@ -
      - {{custom-html "top"}} - {{global-notice}} -
      - -
      +
      @@ -46,7 +41,7 @@ {{/if}} {{#if viewingSelf}} -
    • {{fa-icon "sign-out"}}{{i18n 'user.log_out'}}
      • +
    • {{fa-icon "sign-out"}}{{i18n 'user.log_out'}}
      • {{/if}} {{#if currentUser.staff}}
    • {{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}
      • @@ -55,7 +50,12 @@
    • {{#link-to 'preferences' class="btn right"}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}
      • {{/if}} {{#if canInviteToForum}} -
    • {{#link-to 'user.invited' class="btn right"}}{{fa-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}
      • +
    • {{#link-to 'userInvited' class="btn right"}}{{fa-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}
      • + {{/if}} + {{#if collapsedInfo}} + {{#if viewingSelf}} +
    • {{fa-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}
      • + {{/if}} {{/if}}
      @@ -68,12 +68,12 @@ {{/if}}

      {{#if model.location}}{{fa-icon "map-marker"}} {{model.location}}{{/if}} - {{#if websiteName}} + {{#if model.website_name}} {{fa-icon "globe"}} {{#if linkWebsite}} - {{websiteName}} + {{model.website_name}} {{else}} - {{websiteName}} + {{model.website_name}} {{/if}} {{/if}}

      @@ -82,8 +82,8 @@ {{#if model.isSuspended}}
      {{fa-icon "ban"}} - {{i18n 'user.suspended_notice' date=suspendedTillDate}}
      - {{i18n 'user.suspended_reason'}} {{suspend_reason}} + {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
      + {{i18n 'user.suspended_reason'}} {{model.suspend_reason}}
      {{/if}} {{{model.bio_cooked}}} @@ -170,7 +170,6 @@ {{#link-to 'user.notifications'}} {{fa-icon "comment" class="glyph"}} {{i18n 'user.notifications'}} - ({{model.notification_count}}) {{/link-to}} {{/link-to}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 3d4ba10012..bca1399a19 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -36,7 +36,7 @@
      		{{number it.topics_entered}} {{number it.posts_read}} {{number it.days_visited}}{{unbound it.time_read}}
      + + + + + + +
      order:viewsorder:latestorder:likes
      status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
      category:foouser:foogroup:foobadge:foo
      in:likesin:postedin:watchingin:trackingin:private
      in:bookmarksin:first
      posts_count:nummin_age:daysmax_age:days
      +

      +

      + rainbows category:parks status:open order:latestسيبحث عن المواضيع المحتوية كلمة "rainbows" في الفئة "parks" التي لم تغلق أو تؤرشف, رتبت بتاريخ أخر المشاركة. +

      + badges: + long_descriptions: + autobiographer: | + منحت هذه الشارة لتعبئتك صفحة المستخدم الشخصية واختيار صورة شخصية. السماح للمجتمع معرفة المزيد حولك وماذاترغب يجعل المجتمع أكثر ارتباطاً + first_like: | + منحت هذه الشارة لك لإعجابك للمرة الأولى بالمشاركة بواسطة :heart: button. الإعجاب بالمشاركات وسيلة رائعة تسمح لرفاقك في المجتمع معرفة أن المشاركة كانت مثيرة للاهتمام ومفيدة وجيدة، أو ممتعة. شارك ما يعجبك! + first_link: | + منحت لك هذه الشارة لأنك قمت أول مرة بوضع رابط لموضوع آخر في الردود. المواضيع المترابطة تساعد القراء المتابعين على إيجاد المواضيع المتعلقة بحوارهم ، ويظهر الصلة بين المواضيع. + first_quote: |+ + منحت هذه الشارة لإقتباسك المرة الأولى منشورًا في ردك. نقلًا عن الأجزاء ذات الصلة من المنشورات السابقة في ردودك يساعد على إبقاء المناقشات مرتكزة وحول موضوع المنشور. + + first_share: | + منحت هذه الشارة لمشاركتك لأول مرة رابط الرد أو المنشور باستعمال زر المشاركة. مشاركة الروابط وسيلة رائعة لإظهار النقاشات المهمة للآخرين وتنمية المجتمع الخاص بك. + read_guidelines: | + منحت هذه الشارة لأنك قرأت مبادئ و توجيهات المجتمع . اتباع هذه المبادئ والتوجيهات البسيطة تساعد على بناء مجتمع آمن وممتع دائمًا. + reader: | + منحت هذه الشارة لقراءتك موضوع طويل. القراءة أمر اساسي، القراءة عن كثب تساعدك على متابعة الحوار و كتابة ردود أفضل ومتكاملة. + editor: | + منحت هذه الشارة لتحريرك مشاركتك، لا تترد في تحرير مشاركاتك في أي وقت لتحسينها، وإصلاح الأخطاء الصغيرة، أو إضافة شئ نسيته. + first_flag: | + منحت هذه الشارة لتبليغك عن منشور، و التبليغ ذو أهمية بالغة لصحة مجتمعك، اذا لاحظت أي منشور يتطلب متابعة المشرف رجاءًا لا تتردد في الابلاغ عنه + يمكنك أيضًا استخدام مربع الابلاغ لإرسال رسالة الى المستخدمين الآخرين. + nice_share: | + منحت هذه الشارة لزيارة 25 شخصاً لرابط المشاركة الذي نشرته، عمل رائع ! مشاركة روابط النقاشات المثيرة للاهتمام مع أصدقاءك وسيلة ممتازة لتنمية مجتمعنا. + welcome: | + منحت هذه الشارة لأنك تلقيت علامة الإعجاب الأولى على منشورك، لقد وجد رفاقك أن منشورك مثيرٌ للاهتمام وممتعا، أو مفيدًا ! + anniversary: | + منحت هذه الشارة لأنك كنت عضوًا لمدة سنة، لقد نشرت منشورًا واحدًا على الأقل في هذه السنة. شكرًا لمساهمتك في مجتمعنا ! + good_share: | + منحت هذه الشارة لمشاركتك رابط المنشور الذي زاره 300 زائر، نجاح باهر! لقد عرضت نقاشًا مهما لـالكثير من الأشخاص الجدد وساعدت على تنمية مجتمعنا. + great_share: | + منحت هذه الشارة لمشاركتك رابط المنشور الذي زاره 100زائر، عمل رائع! لقد شجعت على مناقشة مهمة لجمهور جديد ضخم لهذا المجتمع وساعدت على تنميته بشكل كبير. + nice_post: | + هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل! + nice_topic: | + هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل! + good_post: | + هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد! + good_topic: | + هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد! + great_post: | + هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب! + great_topic: | + هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب! + basic: | + منحت هذه الشارة لأنك وصلت مستوى الثقة الأول 1 ، شكرًا لتعليقاتك وقراءتك عدد من المواضيع لتتعرف على مجتمعنا، وقد تم رفع جميع قيود المستخدم الجديد عنك، و مُنحت الامكانيات الأسياسة في المجتمع، مثل الرسائل الشخصية، و الإبلاغ، و تحرير الويكي والقدرة على نشر الصور والروابط المتعددة. + member: | + منحت هذه الشارة لأنك وصلت مستوى الثقة الثاني 2، شكرًا لمشاركتك لأسابيع منذ انضمامك لمجتعنا، يمكنك الآن إرسال دعوات للأعضاء من صفحتك الشخصية أو من المواضيع، إنشاء مجموعة الرسائل، وإعطاء علامات إعجاب أكثر في اليوم الواحد. + regular: |+ + يتم منح هذه الشارة عندما تصل لمستوى الثقة 3. شكرا لكونك جزءا منضبطاً من مجتمعنا على مدى أشهر، أحد القراء الأكثر نشاطا ومساهمة معتمدا، لما يجعل هذا المجتمع عظيم. يمكنك الآن إعادة تصنيف وإعادة تسمية الموضوعات، والوصول إلى الاستراحة الخاصة وأقدر على الإعلام بالبريد المزعج، وغيرها كثير من الإعجابات لكل يوم. + + leader: | + هذه الشارة تمنح لك عندما تصل للمرحلة 4. أنت قائد في هذا المجتمع مرشح من الطاقم كمثال جيد في المجتمع في أقوالك وأفعالك. لديك القدرة على تعديل كل المشاركات، إدارة المواضيع بالتثبيت والإغلاق والتقسيم والدمج والأرشفة والعديد من الإعجابات كل يوم. + admin_login: + success: "البريد أُرسل" + error: "خطأ!" + email_input: "مدير البريد الإيكتروني" + submit_button: "أرسل البريد الإلكتروني" + discourse_hub: + access_token_problem: "أخبر المدير : أرجوك قم بتحديث إعدادات الموقع لإضافة مفتاح الدخول الصحيح لـ ديسكورس" + performance_report: + initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع ' + initial_topic_title: التبليغ عن اداء الموقع diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index e492bd653c..a0ac846100 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -117,14 +117,6 @@ bs_BA: - Constructive criticism is welcome, but criticize *ideas*, not people. For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. - avatar: | - ### How about a new picture for your account? - - You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have. - - Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you? - - It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar! sequential_replies: | ### Consider replying to several posts at once @@ -182,7 +174,6 @@ bs_BA: no_info_other: "
      %{name} hasn't entered anything in the About Me field of their profile yet
      " vip_category_name: "Lounge" vip_category_description: "A category exclusive to members with trust level 3 and higher." - meta_category_name: "Meta" meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it." staff_category_name: "Staff" staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators." @@ -243,7 +234,6 @@ bs_BA: distance_in_words_verbose: half_a_minute: "just now" password_reset: - no_token: "Nažalost, vaš token za promjenu šifre je istekao. Prbajte opet resetirati." choose_new: "Odaberite novu šifru" choose: "Molimo vas odaberite šifru" update: 'Obnovi Šifru' @@ -257,7 +247,6 @@ bs_BA: please_continue: "Continue to %{site_name}" error: "There was an error changing your email address. Perhaps the address is already in use?" activation: - action: "Aktiviraj svoj nalog" already_done: "Link za konfirmaciju nije validan. Možda ste već aktivirani?" please_continue: "Vaš novi nalog je verifikovan, i možete se ulogovati." continue_button: "Idi na Revolucionar.com" @@ -427,7 +416,6 @@ 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your config/discourse.conf file and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' default_logo_warning: "You haven't customized the logo images for your site. Update logo_url, logo_small_url, and favicon_url in the Site Settings." contact_email_missing: "You haven't provided a contact email for your site. Please update contact_email in the Site Settings." contact_email_invalid: "The site contact email is invalid. Please update contact_email in the Site Settings." @@ -479,7 +467,6 @@ bs_BA: max_topic_title_length: "Maximum allowed topic title length in characters" min_private_message_title_length: "Minimum allowed title length for a private message in characters" min_search_term_length: "Minimum valid search term length in characters" - allow_uncategorized_topics: "Allow topics to be created without a category." uncategorized_description: "The description of the uncategorized category. Leave blank for no description." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -505,11 +492,6 @@ bs_BA: post_excerpt_maxlength: "Maximum length of a post excerpt / summary." post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters." onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug" - logo_url: "The logo image at the top left of your site eg: http://example.com/logo.png" - digest_logo_url: "The alternate logo used at the top of your site's email digest. If left blank `logo_url` will be used. eg: http://example.com/logo.png" - logo_small_url: "The small logo image at the top left of your site, seen when scrolling down. eg: http://example.com/logo-small.png" - favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px." notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." email_custom_headers: "A pipe-delimited list of custom email headers" @@ -524,8 +506,6 @@ bs_BA: long_polling_interval: "Interval before a new long poll is issued in milliseconds " polling_interval: "How often should logged in user clients poll in milliseconds" anon_polling_interval: "How often should anonymous clients poll in milliseconds" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging" max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" @@ -574,15 +554,10 @@ bs_BA: invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours" invite_only: "Public registration is disabled, all new users must be explicitly invited by other members or staff." login_required: "Require authentication to read content on this site, disallow anonymous access." - min_username_length: "Minimum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES SHORTER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." - max_username_length: "Maximum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES LONGER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." min_password_length: "Minimum password length." block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords." sso_url: "URL of single sign on endpoint" sso_secret: "Secret string used to encrypt/decrypt SSO information, be sure it is 10 chars or longer" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" - sso_overrides_name: "Overrides local name with external site name from SSO payload (WARNING: discrepancies can occur due to normalization of local names)" sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended" enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)" allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account." @@ -601,7 +576,6 @@ bs_BA: github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup" maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted" - backup_daily: "Automatically create a site backup once a day." enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings." s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket." active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" @@ -714,14 +688,9 @@ bs_BA: username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)." email_editable: "Allow users to change their e-mail address after registration." logout_redirect: "Location to redirect browser to after logout EG: (http://somesite.com/logout)" - allow_uploaded_avatars: "Allow users to upload custom avatars." - allow_animated_avatars: "Allow users to use animated gif avatars. WARNING: run the avatars:refresh rake task after changing this setting." automatically_download_gravatars: "Download Gravatars for users upon account creation or email change." digest_topics: "The maximum number of topics to display in the email digest." digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." - default_external_links_in_new_tab: "Open external links in a new tab. Users can change this in their preferences." - detect_custom_avatars: "Whether or not to check that users have uploaded custom avatars." max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day" public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publically." allow_profile_backgrounds: "Allow users to upload profile backgrounds." @@ -738,13 +707,11 @@ bs_BA: default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0." autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language." - embeddable_host: "Host that can embed the comments from this Discourse forum." feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts." feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed." embed_by_username: "Discourse username of the user who creates the embedded topics." embed_username_key_from_feed: "Key to pull discourse username from feed." embed_truncate: "Truncate the embedded posts." - embed_category: "Category of embedded topics." embed_post_limit: "Maximum number of posts to embed." embed_whitelist_selector: "CSS selector for elements that are allowed in embeds." embed_blacklist_selector: "CSS selector for elements that are removed from embeds." @@ -831,7 +798,6 @@ bs_BA: characters: "must only include numbers, letters and underscores" unique: "must be unique" blank: "must be present" - must_begin_with_alphanumeric: "must begin with a letter or number" email: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "is not allowed." @@ -869,11 +835,6 @@ bs_BA: Ova pozivnica dolazi od člana koji je zaslužio povjerenje na našem sajtu te smo mu/joj omogućili opciju slanja pozivnica. Što vama kao zvanici daje mogućnost da odgovorite na diskusiju bez registracije. invite_password_instructions: subject_template: "Set password for your %{site_name} account" - text_body_template: | - Thanks for accepting your invitation to %{site_name} -- welcome! - - To log in again, click the following link to choose a password: - %{base_url}/users/password-reset/%{email_token} test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" text_body_template: | @@ -920,38 +881,8 @@ bs_BA: There should be an unsubscribe footer on every email you send, so let's mock one up. This email was sent by Name of Company, 55 Main Street, Anytown, USA 12345. If you would like to opt out of future emails, [click here to unsubscribe][5]. new_version_mailer: subject_template: "[%{site_name}] New Discourse version, update available" - text_body_template: | - A new version of [Discourse](http://www.discourse.org) is available. - - Your version: %{installed_version} - New version: **%{new_version}** - - You may want to: - - - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) and pressing the "Upgrade" button. - - - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] update available" - text_body_template: | - A new version of [Discourse](http://www.discourse.org) is available. - - Your version: %{installed_version} - New version: **%{new_version}** - - You may want to: - - - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), and pressing the "Upgrade" button. - - - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. - - ### Release notes - - %{notes} flags_reminder: please_review: "Please review them." post_number: "post" @@ -986,75 +917,6 @@ bs_BA: However, if the post is hidden by the community a second time, it will remain hidden until handled by staff – and there may be further action, including the possible suspension of your account. For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines). - usage_tips: - text_body_template: | - This private message has a few quick tips to get you started. - - ## Keep scrolling - - There are no next page buttons or page numbers – to read more, **just keep scrolling down!** - - As new posts come in, they will appear automatically. - - ## Where am I? - - - For search, your user page, or the menu, use the **icon ☰ buttons at the upper right**. - - - Any topic title will take you to the next unread post. Use the last activity time and post count to enter at the top or bottom. - - - While reading a topic, jump to the top ↑ by selecting the topic title. Select the green progress bar at the bottom right for full navigation controls, or use the home and end keys. - - - - ## How do I reply? - - - To reply to the overall topic, use the Reply button at the very bottom of the page. - - - To reply to a specific post, use the Reply button on that post. - - - To take the conversation in a different direction, but keep them linked together, use Reply as linked Topic to the right of the post. - - To quote someone in your reply, select the text you wish to quote, then press any Reply button. - - - - To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up. - - - - For [standard Emoji](http://www.emoji.codes/), just start typing `:` or the traditional smileys `:)` :smile: - - ## What else can I do? - - There are action buttons at the bottom of each post. - - - - To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button. - - You can also **share** a link to a post, or **bookmark** it for later reference on your user page. - - ## Who is talking to me? - - When someone replies to your post, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it access your **notifications**. - - - - Don't worry about missing a reply – you'll be emailed direct replies (and private messages) if you aren't online when they arrive. - - ## When are conversations new? - - By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked. - - You will see the blue new and number indicators next to these topics: - - - - You can change the individual notification state of a topic via the control at the bottom of the topic (this can also be set per category). To change how you track topics, or the definition of new, see [your user preferences](/my/preferences). - - ## Why can't I do certain things? - - New users are somewhat limited for safety reasons. As you participate here, you'll gain the trust of the community, become a full citizen, and those limitations will automatically be removed. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain even more abilities to help us manage our community together. welcome_user: subject_template: "Dobrodošli na Revolucionar.com!" text_body_template: | @@ -1087,7 +949,6 @@ bs_BA: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Backup completed successfully" - text_body_template: "The backup was successful.\nVisit the [admin > backup section](/admin/backups) to download your new backup." backup_failed: subject_template: "Backup failed" text_body_template: | @@ -1239,7 +1100,6 @@ bs_BA: 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." - unsubscribe_link: "Da se odjavite od ovih email-a, posjetite vaše [korisničke postavke](%{user_preferences_url})." subject_re: "Re: " subject_pm: "[PM] " user_notifications: @@ -1362,7 +1222,6 @@ bs_BA: Enjoy your stay! signup: - subject_template: "[%{site_name}] Aktivirajte vaš novi nalog" text_body_template: | Dobrodošli na %{site_name}! @@ -1394,8 +1253,6 @@ bs_BA: too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}%kb)." images: too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}%kb), please resize it and try again." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -1423,316 +1280,7 @@ bs_BA: Edit the first post in this topic to change the contents of the %{page_name} page. guidelines_topic: title: "FAQ/Guidelines" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "Terms of Service" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Privacy Policy" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 1b95b92ca8..1a9c46a560 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -162,14 +162,6 @@ cs: - Konstruktivní kritika je vítaná, ale kritizujte *myšlenky*, ne lidi. Další doporučení máme v [pravidlech komunity](/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}. - avatar: | - ### How about a new picture for your account? - - You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have. - - Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you? - - It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar! dominating_topic: | ### Let others join the conversation @@ -185,7 +177,7 @@ cs: reviving_old_topic: | ### Oživit téma? - Poslední odpověď na tohle téma je přes %{days} dní stará. Vaše odpověď vyšvyhne toto téma v seznamu nahoru a uporozní všechny kdo se tohoto tématu účastní. + Poslední odpověď na tohle téma je přes %{days} dní stará. Vaše odpověď zvedne toto téma v seznamu nahoru a upozorní všechny diskutující. Určitě chcete pokračovat v této staré konverzaci? activerecord: @@ -225,7 +217,6 @@ cs: no_info_other: "
      %{name} o sobě zatím žádné informace nevyplnil
      " vip_category_name: "VIP" vip_category_description: "Kategorie je přístupná výhradně členům s důvěryhodností 3 a vyšší." - meta_category_name: "Meta" meta_category_description: "Diskutuje tento web, jeho organizaci, jak funguje a jak ho vylepšit." staff_category_name: "Redakce" staff_category_description: "Privátní kategorie pro diskuze štábu. Témata jsou viditelná pouze pro moderátory a správce." @@ -381,7 +372,6 @@ cs: please_continue: "Pokračovat na %{site_name}" error: "Nastala chyba běhěm změny emailové adresy. Není nová adresa již někým používána?" activation: - action: "Aktivovat účet" already_done: "Bohužel, tento odkaz pro aktivaci účtu již není platný. Není váš účet jíž aktivní?" please_continue: "Váš účet je aktivovaný; budete přesměrování na výchozí stránku." continue_button: "Pokračovat na %{site_name}" @@ -581,7 +571,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 nastevení webu a opravte nastavení. Pro více informací si přečtěte tento návod.' 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 nastavení webu a opravte nastavení. Přečtěte si "How to set up image uploads to S3?" pro více informací.' 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 web ImageMagick pro stažení aktuální verze.' - failing_emails_warning: '%{num_failed_jobs} emailů se nepodařilo odeslat. Zkontrolujte soubor config/production.rb a ujistěte se, že máte správné nastavení config.action_mailer.' contact_email_invalid: "Kontaktní email je neplatný. Prosím, aktualizujte položku contact_email v Nastavení webu." consumer_email_warning: "Váš web je nastaven, aby používal Gmail (nebo jinou uživatelskou emailovou službu) k odesílání emailů. Gmail limituje počet emailů, které můžete odeslat. Zvažte použití jiného emailového poskytovatele, jako je třeba mandrill.com k zajištění doručitelnosti emailů." content_types: @@ -616,18 +605,14 @@ cs: default_locale: "Výchozí jazyk této Discourse instance (kód ve formátu ISO 639-1)" allow_user_locale: "Povolit uživatelům nastavit si jazyk fóra" min_search_term_length: "Minimální délka hledaného výrazu ve znacích" - allow_uncategorized_topics: "Povolit vytváření tématů bez určení kategorie" unique_posts_mins: "Kolik minut musí uplynout, než může uživatel zaslat příspěvek se stejným obsahem" queue_jobs: "Zařazovat úlohy do fronty v sidekiq, není-li nastaveno, jsou úlohy vyřizovány okamžitě" category_featured_topics: "Počet témat zobrazených v seznamu kategorií" - favicon_url: "Favicona vašeho webu, viz http://en.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Ikona používaná pro doteková zařízení od firmy Apple. Doporučené rozměry jsou 144px krát 144px." email_custom_headers: "Seznam vlastních hlaviček emailů, oddělený svislítkem" use_https: "Should the full url for the site (Discourse.base_url) be http or https?" enable_long_polling: "'Message bus' smí používat dlouhé výzvy" anon_polling_interval: "Jak často se mají zasílat výzvy anonymním uživatelům v milisekundách" - auto_track_topics_after: "Výchozí počet milisekund než je téma automaticky sledováno, uživatelé si pomoc změnit (0 znamená vždy, -1 znamená nikdy)" - new_topic_duration_minutes: "Výchozí počet minut, jak dlouho je téma považováno za nové, uživatelé si pomoc změnit (-1 znamená vždy, -2 znamená od poslední návštěvy)" flags_required_to_hide_post: "Počet nahlášení, po kterých je příspěvek automaticky skryt a uživateli je zaslána soukromá zpráva (0 znamená nikdy)" max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site" @@ -647,8 +632,6 @@ cs: min_password_length: "Minimální povolená délka hesla." block_common_passwords: "Nepovolit heslo pokud je mezi 10 000 nejběžnějšími." sso_url: "URL pro single sign on" - sso_overrides_email: "Přepisuje místní email tím z dat SSO (VAROVÁNÍ: v důsledku normalizování lokálních emailů může dojít k nesrovnalostem)" - sso_overrides_username: "Přepisuje místní uživatelské jméno tím z dat SSO (VAROVÁNÍ: kvůli rozdílnostem v požadavcích na uživatelské jméno může dojít k nesrovnalostem)" enable_yahoo_logins: "Povolit přihlašování přes Yahoo" google_oauth2_client_id: "Client ID vaší Google aplikace." google_oauth2_client_secret: "Client secret vaší Google aplikace." @@ -661,7 +644,6 @@ cs: enable_github_logins: "Povolit přihlašování přes Github, vyžaduje správně nastavené 'github_client_id' a 'github_client_secret'" github_client_id: "'Client id' pro přihlašování přes Github, registrace na https://github.com/settings/applications" github_client_secret: "'Client secret' pro přihlašování přes Github, registrace na https://github.com/settings/applications" - backup_daily: "Automaticky zálohovat stránky jednou denně." active_user_rate_limit_secs: "Jak často aktualizujeme informaci o poslední návštěvě uživatelů, v sekundách" previous_visit_timeout_hours: "Kolik času musí uplynout v hodinách, než je návštěva uživatele považována za uplynulou" max_likes_per_day: "Maximální počet 'to se mi líbí', která smí uživatel za den udělit." @@ -681,8 +663,6 @@ cs: delete_all_posts_max: "Maximální počet příspěvků, které mohou být smazány najednou tlačítkem 'Odstranit všechny příspěvky'. Pokud má uživatel více příspěvků než je zde nastaveno, nemohou být jeho příspěvky smazány najednou a uživatele nelze odstranit." username_change_period: "Počet dní od registrace za kolik si uživatel může změnit svoje uživatelské jméno (0 pokud chcete změnu uživatelského jména úplně zakázat)." email_editable: "Povolit uživatelům změnit si po registraci emailovou adresu." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." - default_external_links_in_new_tab: "Otevírat odkazy na externí weby v novém tabu. Uživatelé si toto můžou změnit v svém nastavení." enable_mobile_theme: "Používat na mobilních zařízeních verzi přizpůsobenou pro mobily s možností přejít na plnou verzi. Zruště pokud chcete používat vlastní plně responzivní kaskádový styl." short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value." default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" @@ -710,15 +690,6 @@ cs: redirected_to_top_reasons: new_user: "Vítejte v naší komunitě! Tohle jsou poslední populární témata." not_seen_in_a_month: "Vítejte zprátky! Chvíli jsme se neviděli. Tohle jsou nejpopulárnější témata od vaší poslední návštěvy." - move_posts: - new_topic_moderator_post: - one: "Přesunul jsem příspěvek do nového tématu: %{topic_link}" - few: "Přesunul jsem %{count} příspěvky do nového tématu: %{topic_link}" - other: "Přesunul jsem %{count} příspěvků do nového tématu: %{topic_link}" - existing_topic_moderator_post: - one: "Přesunul jsem příspěvek do existujícího tématu: %{topic_link}" - few: "Přesunul jsem %{count} příspěvky do existujícího tématu: %{topic_link}" - other: "Přesunul jsem %{count} příspěvků do existujícího tématu: %{topic_link}" topic_statuses: archived_enabled: "Toto téma je archivováno. Je zmraženo a již nemůže být nijak změněno." archived_disabled: "Toto téma je vráceno z archivu. Již není zmraženo a může být měněno." @@ -744,7 +715,6 @@ cs: characters: "musí obsahovat pouze písmena a číslice" unique: "musí být unikátní" blank: "nesmí být prázdný" - must_begin_with_alphanumeric: "musí začínat písmenem nebo číslicí" email: not_allowed: "není povolen od tohoto emailového poskytovatele. Prosím použijte jinou emailovou adresu." blocked: "není povolen." @@ -788,7 +758,6 @@ cs: There are new user signups waiting to be approved (or rejected) before they can access this forum. [Please review them in the admin section](%{base_url}/admin/users/list/pending). - unsubscribe_link: "Pokud již od nás nechcete dostávat emaily, navšivte stránku s vašimi [uživatelskými preferencemi](%{user_preferences_url})." user_notifications: previous_discussion: "Předchozí diskuze" unsubscribe: @@ -879,7 +848,6 @@ cs: signup_after_approval: subject_template: "Byli jste schváleni na %{site_name}!" signup: - subject_template: "[%{site_name}] Aktivujte svůj nový účet" text_body_template: | Vítejte na %{site_name}! @@ -905,8 +873,6 @@ cs: unauthorized: "Bohužel, soubor, který se snažíte nahrát, není povolený (povolené přípony: %{authorized_extensions})." pasted_image_filename: "Vložený obrázek" images: - fetch_failure: "Bohužel, nastala chybí při získávání obrázku." - unknown_image_type: "Bohužel, soubor, který se snažíte nahrát, zřejmě není obrázek." size_not_found: "Bohužel se nepodařilo zjistit velikost obrázku. Není soubor s obrázkem poškozený?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -935,156 +901,3 @@ cs: title: "Podmínky používání" privacy_topic: title: "Ochrana soukromí" - body: | - - - ## [Jaké informace sbíráme?](#collect) - - Sbíráme informace od vaší registrace a shromažďujeme data o tom když se účastníte chodu fóra čtením, přispíváním a hodnocením zdejšího obsahu. - - Při registraci na náš web můžete být požádání o jméno a emailovou adresu. Můžete ale tento web navštěvovat i bez registrace. Vaše emailová adresa bude ověřena emailem obsahujícím unikátní odkaz. Po návštěvě tohoto odkazu víme, že spravujete onu emailovou adresu. - - Při registraci a při přispívání uchováváme IP adresu ze které byl požadavek odeslán. Dále také můžeme mít na serveru logy které uchovávají IP adresu každého požadavku na tento server. - - - - ## [Na co vaše informace používáme?](#use) - - Každá informace kterou shromažďujeme může být použivate následovně: - - * Přizpůsobení webu — vaše informace nám pomáhá lépe upravit fórum pro vaše osobní potřeby. - * Zdokonalování našeho webu — neustále se na základě vaší odezvy snažíme náš web vylepšovat. - * Lepší uživatelská podpora — vaše informace nám pomáhají efektivněji řešit uživatelskou podporu. - * Odesílání periodických emailů — Emailová adresa kterou nám poskytnete může být použita k tomu, že vám odešleme informace a nebo upozornění na změny na webu a nebo akce ostatních uživatelů nebo další otázky, požadavky nebo odpovědi. - - - - ## [Jak chráníme vaše informace?](#protect) - - Zavedli jsme celou řadu bezpečnostních opatření abychom zajistili bezpočnost vašich soukromých informací vždy když vkládáte, odesíláte nebo čtete vaše soukromé informace. - - - - ## [Jaká je vaše politika uchovávání osobních údajů?](#data-retention) - - Snažíme se: - - * Uchovávat logy obsahující IP adresu všech požadavků na tento server méně než 90 dní. - * Uchovávat IP adresu asociovanou s registrovaným uživatelem a jejich příspěvky méně než 5 let. - - - - ## [Používáme cookies?](#cookies) - - Samozřejmě. Cookies jsou miniaturní soubory, které stránka nebo její provozovatel vytvoří na vašem počítači skrz webový prohlížeč (pokud to ten povolí). Tato cookies umožňují rozpoznat váš prohlížeč a, pokud máte registrovaný účet, asociovat vás s registrovaným účtem. - - Používáme cookie k pochopení a uložení vašich preferencí pro budoucí návštěvi a kompilujeme souhrná data o provozu na webu a interakcí s webem tak, že můžeme nabídnout lepší uživatelský zážitek a nástroje. Můžeme tato souhrnná data poskytnout třetí straně, která nám pomůže lépe porozumět uživatelům našeho webu. Tyto třetí strany nemají povoleno tyto souhrné informace využívat kromě toho, když nám pomáhají vylepšovat náš web. - - - - ## [Prozrazujeme libovolné informace cizím stranám?](#disclose) - - Neprodáváme, neobchodujeme s, ani jinak nepřenášíme cizím stranám vaše osobní údaje. Toto se nevztahuje na důvěryhodné třetí strany které nám pomáhají provozovat tento web, vést podnikání, dokud tyto strany souhlasí, že vaše osobní data zůstanou důvěrná. Můžeme také uvolnit informace v důsledku dodržování zákonů, pro vynucování politiky tohoto webu, k ochranně našich nebo cizích práv, majetku nebo bezpečnosti. Neosobní informace ale můžeme poskytnout třetím stranám pro účely marketingu, reklamy nebo další použití. - - - - ## [Odkazy třetích stran](#third-party) - - Podle našeho uvážení můžeme příležitostně na tomto webu zobrazovat produkty a služby třetích stran. Tyto třetí strany mohou mít jiné a nezávislé zásady ochrany osobních údajů. Nemáme tedy žádnou odpovědnost ani ručení za obsah těchto stran. Snažíme se nicméně ochraňovat integritu tohoto webu a vítáme zpětnou vazbu o obsahu cizích stran na tomto webu. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Tento web, produkty a služby jsou určeny pro lidi staré alespoň 13 let. Pokud je tento server v USA a jste mladší než 13 let, nesmíte podle požadavků COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)) tento web používat. - - - - ## [Pouze online zásady](#online) - - Tyto zásady ochrany osobních údajů jsou platné pouze online a nevztahují se na informace sbírané offline. - - - - ## [Váš souhlas](#consent) - - Používáním tohoto webu souhlasíte s těmito zásadami ochrany osobních údajů. - - - - ## [Změny v zásadách ochrany osobních údajů](#changes) - - Pokud se rozhodneme změnit naše zásady ochrany osobních údajů, oznámíme tyto změny na této stránce. - - Tento text je pod licencí CC-BY-SA. Naposledy byl změněn 22. listopadu 2014. - badges: - long_descriptions: - autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah - first_link: | - Blah blah blah - Blah blah blah - first_quote: | - Blah blah blah - Blah blah blah - first_share: | - Blah blah blah - Blah blah blah - read_guidelines: | - Blah blah blah - Blah blah blah - reader: | - Blah blah blah - Blah blah blah - editor: | - Blah blah blah - Blah blah blah - nice_share: | - Blah blah blah - Blah blah blah - welcome: | - Blah blah blah - Blah blah blah - anniversary: | - Blah blah blah - Blah blah blah - good_share: | - Blah blah blah - Blah blah blah - great_share: | - Blah blah blah - Blah blah blah - nice_post: | - Blah blah blah - Blah blah blah - nice_topic: | - Blah blah blah - Blah blah blah - good_post: | - Blah blah blah - Blah blah blah - good_topic: | - Blah blah blah - Blah blah blah - great_post: | - Blah blah blah - Blah blah blah - great_topic: | - Blah blah blah - Blah blah blah - basic: | - Blah blah blah - Blah blah blah - member: | - Blah blah blah - Blah blah blah - regular: | - Blah blah blah - Blah blah blah - leader: | - Blah blah blah - Blah blah blah diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index f3d61cfb69..042e41c36f 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -130,6 +130,7 @@ da: rss_description: latest: "Seneste emner" hot: "Populære emner" + posts: "Seneste indlæg" too_late_to_edit: "Dette indlæg er gammelt og kan ikke længere redigeres eller slettes." excerpt_image: "billede" groups: @@ -162,14 +163,6 @@ da: - Det er godt med kritik, men husk at kritisere *ideer*, ikke personer. For flere tips, [se vores retningslinier](/guidelines). Denne boks dukker kun op for dine første %{education_posts_text}. - avatar: | - ### Hvad med et billede til din konto? - - Du har oprettet et par emner og svar, men din avatar er ikke så unik som du er -- det er den samme standard avatar som alle brugere har. - - Har du overvejet at **[besøge din brugerprofil](%{profile_path})** og uploade et billede, som repræsenterer dig? - - Det er nemmere at følge diskussioner og finde interessanter mennesker i samtaler når alle har en unik avatar! dominating_topic: | ### Lad andre deltage i samtalen @@ -206,6 +199,7 @@ da: base: warning_requires_pm: "Du kan kun vedhæfte advarsler til private beskeder." too_many_users: "Du kan kun sende advarsler til en bruger ad gangen." + cant_send_pm: "Beklager, du kan ikke sende en privat besked til den bruger." no_user_selected: "Du skal vælge en gyldig bruger." user: attributes: @@ -224,7 +218,6 @@ da: no_info_other: "
      %{name} har ikke skrevet noget i “Om mig”-feltet endnu
      " vip_category_name: "Lounge" vip_category_description: "En ekslusiv kategori der kun er tilgængelig for medlemmer med tillidsniveu 3 eller højere." - meta_category_name: "meta" meta_category_description: "Diskussion om dette site, hvordan det er indrettet, hvordan det virker og hvordan vi kan forbedre det." staff_category_name: "Staff" staff_category_description: "Privat gruppe for staff diskussioner. Emner er kun synlige for administratorer og moderatorer." @@ -350,7 +343,6 @@ da: please_continue: "Fortsæt til %{site_name}" error: "Der opstod en fejl under opdateringen af din e-mail-adresse. Måske er adressen allerede i brug?" activation: - action: "Aktiver din konto" already_done: "Beklager, dette bekræftelses-link er ikke længere gyldigt. Måske er din konto allerede aktiv?" please_continue: "Din nye konto er bekræftet; du bliver nu ledt til forsiden." continue_button: "Fortsæt til %{site_name}" @@ -376,6 +368,7 @@ da: email_title: 'Dit indlæg i "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: + title: "Noget andet" description: 'Dette indlæg kræver moderatorernes opmærksomhed baseret på en anden grund som ikke er nævnt ovenfor.' email_title: 'Et indlæg i "%{title}" kræver moderatorernes opmærksomhed' email_body: "%{link}\n\n%{message}" @@ -400,6 +393,7 @@ da: title: 'Upassende' long_form: 'markeret upassende' notify_moderators: + title: "Noget andet" email_title: 'Emnet "%{title}" kræver moderator-opmærksomhed' email_body: "%{link}\n\n%{message}" archetypes: @@ -427,6 +421,7 @@ da: xaxis: "Dag" yaxis: "Antal besøg" signups: + title: "Nye brugere" xaxis: "Dag" yaxis: "Antal nye brugere" topics: @@ -464,18 +459,23 @@ da: user_to_user_private_messages: title: "Bruger-til-bruger" xaxis: "Dag" + yaxis: "Antal beskeder" system_private_messages: title: "System" xaxis: "Dag" + yaxis: "Antal beskeder" moderator_warning_private_messages: title: "Moderatoradvarsler" xaxis: "Dag" + yaxis: "Antal beskeder" notify_moderators_private_messages: title: "Underret moderatorer" xaxis: "Dag" + yaxis: "Antal beskeder" notify_user_private_messages: title: "Underret bruger" xaxis: "Dag" + yaxis: "Antal beskeder" top_referrers: title: "Top henvisere" xaxis: "bruger" @@ -502,9 +502,32 @@ da: page_view_total_reqs: title: "Total" xaxis: "Dag" + page_view_logged_in_mobile_reqs: + xaxis: "Dag" + page_view_anon_mobile_reqs: + xaxis: "Dag" http_background_reqs: title: "Baggrund" xaxis: "Dag" + http_2xx_reqs: + xaxis: "Dag" + http_3xx_reqs: + xaxis: "Dag" + http_4xx_reqs: + xaxis: "Dag" + http_5xx_reqs: + xaxis: "Dag" + http_total_reqs: + title: "Total" + xaxis: "Dag" + time_to_first_response: + xaxis: "Dag" + topics_with_no_response: + title: "Emner uden svar" + xaxis: "Dag" + yaxis: "Total" + mobile_visits: + xaxis: "Dag" dashboard: rails_env_warning: "Din server kører i %{env}-tilstand." ruby_version_warning: "Du kører en version af Ruby 2.0.0 som har kendte problemer. Opgradér til patch-level 247 eller senere." @@ -517,7 +540,6 @@ da: github_config_warning: 'Serveren er konfigureret til at tillade tilmelding og login med GitHub (enable_github_logins), men client id og secret værdierne er ikke angivet. Gå til indstillinger og opdatér indstillingerne. Se denne vejledning for mere information.' 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 indstillinger og opdatér indstillingerne. Se "How to set up image uploads to S3?" for mere information.' 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 download den seneste udgave.' - failing_emails_warning: 'Der er %{num_failed_jobs} mislykkede e-mail-jobs. Kontrollér din config/discourse.conf-fil og kontrollér at e-mail-serverens indstillinger er korrekte. Se mislykkede jobs i Sidekiq.' consumer_email_warning: "Dit site er konfigureret til at bruge Gmail (eller en anden offentlig e-mail-tjeneste) til at sende e-mail. Gmail har en grænse for, hvor mange mails du kan sende. Overvej at bruge en e-mail-udbyder som mandrill.com for at sikre at din mail bliver leveret." content_types: education_new_reply: @@ -553,17 +575,13 @@ da: max_post_length: "Maksimal længde af indlæg i tegn" min_topic_title_length: "Minimumslængde af emnetitel i tegn." max_topic_title_length: "Maksimumslængde af emnetitel i tegn." - allow_uncategorized_topics: "Tillad emner at blive oprettet uden en kategori." unique_posts_mins: "Hvor mange minutter der skal gå før en bruger kan skrive et indlæg med det samme indhold igen." queue_jobs: "KUN FOR UDVIKLERE! ADVARSEL! Brug sidekiq som jobkø. Hvis dette slås fra går dit site i stykker." category_featured_topics: "Antallet af emner der vises pr. kategori på /categories-siden. Efter ændring af denne værdi kan det tage op til 15 minutter før kategorisiden opdateres." - favicon_url: "Sitets favicon, se http://en.wikipedia.org/wiki/Favicon." apple_touch_icon_url: "Ikon til Apple touch-enheder. Den anbefalede størrelse er 144px gange 144px." email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn." enable_long_polling: "Message bus til underretninger kan bruge long polling" anon_polling_interval: "Hvor ofte skal anonyme brugere polle, i millisekunder." - auto_track_topics_after: "Globalt antal millisekunder før et emne automatisk spores, kan tilsidesættes af brugerne (0 for altid, -1 for aldrig)." - new_topic_duration_minutes: "Globalt antal minutter et emne opfattes som nyt, kan tilsidesættes af brugerne (-1 for altid, -2 for seneste besøg)." flags_required_to_hide_post: "Antallet af flag som gør at et indlæg automatisk skjules og der sendes en PM til brugeren (0 for aldrig)." max_topics_in_first_day: "Det maksimale antal indlæg en bruger har lov til at oprette på deres første dag på sitet." max_replies_in_first_day: "Det maksimale antal svar en bruger har lov til at oprette på deres første dag på sitet." @@ -603,8 +621,6 @@ da: delete_all_posts_max: "Det maksimale antal indlæg der kan slettes på én gang med “Slet alle indlæg”-knappen. Hvis en bruger har mere end dette antal indlæg, kan indlæggene ikke slettes på én gang og brugeren kan ikke slettes." username_change_period: "Antal dage efter oprettelsen hvor brugere kan ændre deres brugernavn (0 for ikke at tillade skift af brugernavn)." email_editable: "Lad brugerne skifte deres e-mail-adresse efter oprettelsen." - default_digest_email_frequency: "Hvor ofte brugerne som standard modtager e-mail-sammendrag. De kan ændre indstillingen på deres profil." - default_external_links_in_new_tab: "Åbn eksterne links i en nu fane; brugerne kan ændre dette på deres profil" enable_mobile_theme: "Mobile enheder bruger et mobilvenligt tema, med mulighed for at skifte til det fulde site. Deaktivér dette hvis du ønsker at anvende et brugerdefineret stylesheet som er fuldstændigt responsivt." short_progress_text_threshold: "Når antallet af indlæg overstiger dette tal viser statuslinjen kun det aktuelle indlægsnummer. Hvis du ændrer bredden af statuslinjen kan det være nødvendigt at opdatere denne værdi." default_code_lang: "Standard syntax highlighting som bruges i GitHub kodeblokke (lang-auto, ruby, python etc.)." @@ -626,13 +642,6 @@ da: most_posts: "Flest indlæg" most_recent_poster: "Seneste forfatter" frequent_poster: "Hyppig forfatter" - move_posts: - new_topic_moderator_post: - one: "Jeg flyttede et indlæg til et nyt emne: %{topic_link}" - other: "Jeg flyttede %{count} indlæg til et nyt emne: %{topic_link}" - existing_topic_moderator_post: - one: "Jeg flyttede et indlæg til et eksisterende emne: %{topic_link}" - other: "Jeg flyttede %{count} indlæg til et eksisterende emne: %{topic_link}" topic_statuses: archived_enabled: "Dette emne er nu arkiveret. Det er frosset fast og kan ikke ændres på nogen måde." archived_disabled: "Dette emne er nu ikke længere arkiveret. Det er ikke længere frosset fast, og kan ændres." @@ -660,7 +669,6 @@ da: characters: "må kun indeholde bogstaver og tal" unique: "skal være unik" blank: "skal udfyldes" - must_begin_with_alphanumeric: "skal starte med et bogstav eller tal" email: not_allowed: "er ikke tilladt fra den e-mail-udbyder. Brug venligst en anden e-mail-adresse." blocked: "er ikke tilladt." @@ -697,7 +705,6 @@ da: Der er nye brugere, som afventer godkendelse (eller afvisning) før de kan tilgå dette forum. [Gennemgå dem venligst på administrationssiden](%{base_url}/admin/users/list/pending). - unsubscribe_link: "Hvis du ikke ønsker at modtage disse mails, du kan framelde dem på [din brugerprofil](%{user_preferences_url})." user_notifications: previous_discussion: "Forrige svar" unsubscribe: @@ -788,7 +795,6 @@ da: signup_after_approval: subject_template: "Du er blevet godkendt på %{site_name}!" signup: - subject_template: "[%{site_name}] Aktivér din nye konto" text_body_template: | Velkommen til %{site_name}! @@ -802,17 +808,17 @@ da: recent_topics: "Nye" see_more: "Flere" search_title: "Søg på denne side" + search_google: "Google" deleted: 'slettet' upload: unauthorized: "Beklager, filen, som du forsøger at uploade er ikke autoriseret (autoriserede filendelser: %{authorized_extensions})." pasted_image_filename: "Indsat billede" images: - fetch_failure: "Beklager, der opstod en fejl ved hentning af det eksterne billede." - unknown_image_type: "Beklager, men filen, som du forsøgte at uploade, ser ikke ud til at være et billede." size_not_found: "Beklager, men vi kunne ikke fastslå billedets størrelse. Måske er dit billede ødelagt?" flag_reason: sockpuppet: "En ny bruger oprettede et emne, og en anden ny bruger med den samme IP-adresse svarede på det. Se indstillingen af flag_sockpuppets." email_log: + anonymous_user: "Brugeren er anonym" seen_recently: "Bruger har været logget på for nyligt" about: "Om" guidelines: "Retningslinjer" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index cf2a6222b4..bbd860d349 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -65,6 +65,10 @@ de: other: '%{count} Fehler verhindern, dass %{model} gespeichert wird' embed: load_from_remote: "Beim Laden des Beitrags ist ein Fehler aufgetreten." + site_settings: + min_username_length_exists: "Die minimale Länge für den Benutzernamen kann nicht höher sein als der kürzeste Benutzername." + min_username_length_range: "Du kannst das Minimum nicht höher setzen als das Maximum." + max_username_length_exists: "Die maximale Länge für den Benutzernamen kann nicht kürzer sein als der längste Benutzername." bulk_invite: file_should_be_csv: "Die hochgeladene Datei sollte im CSV oder TXT Format vorliegen." backup: @@ -115,7 +119,7 @@ de: user_is_suspended: "Gesperrte Benutzer dürfen keine Beiträge schreiben." topic_not_found: "Etwas ist schief gelaufen. Wurde das Thema eventuell geschlossen oder gelöscht, während du es angeschaut hast?" just_posted_that: "ist einer einer vor Kurzem von dir geschriebenen Nachricht zu ähnlich" - has_already_been_used: "wurde schon benutzt" + has_already_been_used: "wird bereits verwendet" invalid_characters: "enthält ungültige Zeichen" is_invalid: "ist ungültig; bitte ein wenig anschaulicher" next_page: "nächste Seite →" @@ -133,6 +137,7 @@ de: rss_description: latest: "Aktuelle Themen" hot: "Beliebte Themen" + posts: "Letzte Beiträge" too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden." excerpt_image: "Bild" queue: @@ -158,13 +163,13 @@ de: new-topic: | Willkommen bei %{site_name} — **danke, dass du ein neues Thema erstellst!** - - Klingt der Titel interessant, wenn du ihn laut ließt? Ist er eine gute Zusammenfassung? + - Klingt der Titel interessant, wenn du ihn laut liest? Ist er eine gute Zusammenfassung? - Wer sollte sich für dieses Thema interessieren? Warum ist es wichtig? Welche Art Antworten wünschst du dir? - Verwende gebräuchliche, gut definierte Wörter, damit dein Thema *gefunden* werden kann. Wähle eine Kategorie, um es mit ähnlichen Themen zu gruppieren. - Für mehr Tips, [siehe unsere Community Richtlinien](/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt. + Für mehr Tips, [siehe unsere Community-Richtlinien](/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt. new-reply: | Willkommen bei %{site_name} — **Danke für deinen Beitrag zum Thema!** @@ -172,17 +177,9 @@ de: - Behandle deine Gesprächspartner mit demselben Respekt, den du von ihnen erwartest. - - Kritk ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen. + - Kritik ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen. Beachte bitte auch [unsere Richtlinien](/guidelines). Dieser Hilfetext wird nur bei deinen ersten %{education_posts_text} Beiträgen angezeigt. - avatar: | - ### Wie wäre es mit einem neuen Bild für dein Konto? - - Du hast einige Beiträge und Antworten geschrieben, aber dein Avatar ist nicht so einzigartig wie du es bist -- es ist der gewöhnliche Standard-Avatar, dan alle neuen Benutzer verwenden. - - Hast du darüber nachgedacht, in **[deinem Benutzerprofil](%{profile_path})** ein eigenes Bild hochzuladen, das dich besser wiederspiegelt? - - Es ist einfacher, einer gemeinschaftlichen Diskussionen zu folgen und interessante Leute zu finden, wenn jeder einen einzigartigen Avatar hat! sequential_replies: | ### Bitte antworte mehreren Beiträge gleichzeitig @@ -246,7 +243,7 @@ de: no_info_other: "
      %{name} hat noch nichts in das 'Über mich'-Feld des Nutzerprofils eingetragen
      " vip_category_name: "Lounge" vip_category_description: "Eine Kategorie exklusiv für Mitglieder mit Vertrauensstufe 3 oder höher." - meta_category_name: "Meta" + meta_category_name: "Feedback" meta_category_description: "Diskussionen über dieses Forum, seine Organisation, wie es funktioniert und wie wir es verbessern können." staff_category_name: "Mitarbeiter" staff_category_description: "Geschützte Kategorie für Mitarbeiter. Themen sind nur für Administratoren und Moderatoren sichtbar." @@ -274,7 +271,7 @@ de: newuser: title: "Neuer Benutzer" basic: - title: "Neuling" + title: "Anwärter" regular: title: "Mitglied" leader: @@ -366,13 +363,12 @@ de: one: "vor fast einem Jahr" other: "vor fast %{count} Jahren" password_reset: - no_token: "Der Link zum Zurücksetzen des Passworts ist zu alt. Damit dir ein neuer Link zugesendet wird, melde dich an und wähle erneut 'Passwort zurücksetzen'." choose_new: "Bitte wähle ein neues Passwort" choose: "Bitte wähle ein Passwort" update: 'Passwort aktualisieren' save: 'Passwort festlegen' title: 'Passwort zurücksetzen' - success: "Dein Passwort wurde erfolgreich geändert, Du bist nun angemeldet." + success: "Dein Passwort wurde erfolgreich geändert, du bist nun angemeldet." success_unapproved: "Dein Passwort wurde erfolgreich verändert." continue: "Weiter zu %{site_name}" change_email: @@ -380,12 +376,12 @@ de: please_continue: "Weiter zu %{site_name}" error: "Es gab einen Fehler beim Ändern deiner Mailadresse. Wird diese Adresse bereits genutzt?" activation: - action: "Aktiviere dein Benutzerkonto" already_done: "Entschuldige, dieser Link zur Aktivierung des Benutzerkontos ist nicht mehr gültig. Ist dein Konto schon aktiviert?" please_continue: "Dein neues Konto ist jetzt bestätigt; du wirst auf die Startseite weitergeleitet." continue_button: "Weiter zu %{site_name}" welcome_to: "Willkommen bei %{site_name}!" approval_required: "Bevor du auf das Forum zugreifen kannst, muss dein neues Konto noch von einem Moderator genehmigt werden. Du erhältst eine E-Mail, sobald dies geschehen ist!" + missing_session: "Wir können nicht erkennen ob dein Konto angelegt wurde. Bitte stelle sicher dass Cookies aktiviert sind." post_action_types: off_topic: title: 'Am Thema vorbei' @@ -447,6 +443,7 @@ de: regular: title: "Normales Thema" banner: + title: "Thema des Ankündigungsbanners" message: make: "Dieses Thema ist jetzt ein Banner. Es wird auf jeder Seite ganz oben angezeigt, bis es vom Benutzer ausgeblendet wird." remove: "Dieses Thema ist jetzt kein Banner mehr. Es wird nicht mehr auf jeder Seite ganz oben angezeigt." @@ -456,8 +453,8 @@ de: oops: "Bitte klicke unten, falls du das nicht tun wolltest." error: "Beim Löschen des Abonnements trat ein Fehler auf." preferences_link: "Du kannst den Empfang von Zusammenfassungen per E-Mail auch in deinen Profil-Einstellungen deaktivieren." - different_user_description: "Die Zusammenfassung wurde einem anderen als dem momentan angemeldeten Benutzer geschickt. Bitte melde Dich ab und versuche es erneut." - not_found_description: "Entschuldige, wir konnten Dein Abo nicht abbestellen. Möglicherweise ist der Link aus deiner Mail veraltet." + different_user_description: "Die Zusammenfassung wurde einem anderen als dem momentan angemeldeten Benutzer geschickt. Bitte melde dich ab und versuche es erneut." + not_found_description: "Entschuldige, wir konnten dein Abo nicht abbestellen. Möglicherweise ist der Link aus deiner Mail veraltet." resubscribe: action: "Abo wieder aufnehmen" title: "Abo wieder aufgenommen!" @@ -554,6 +551,13 @@ de: title: "Gesamt" xaxis: "Tag" yaxis: "Gesamte API-Anfragen" + page_view_logged_in_mobile_reqs: + title: "API-Anfragen von angemeldeten Nutzern" + xaxis: "Tag" + yaxis: "Mobile API-Anfrangen von angemeldeten Nutzern" + page_view_anon_mobile_reqs: + title: "Anonyme API-Anfrangen" + xaxis: "Tag" http_background_reqs: title: "Hintergrund" xaxis: "Tag" @@ -578,6 +582,18 @@ de: title: "Gesamt" xaxis: "Tag" yaxis: "Gesamte Anfragen" + time_to_first_response: + title: "Zeit bis zur ersten Reaktion" + xaxis: "Tag" + yaxis: "Durchschnittszeit (Stunden)" + topics_with_no_response: + title: "Themen ohne Reaktionen" + xaxis: "Tag" + yaxis: "Gesamt" + mobile_visits: + title: "Nutzerbesuche" + xaxis: "Tag" + yaxis: "Anzahl der Besuche" dashboard: rails_env_warning: "Dein Server läuft im %{env}-Modus." ruby_version_warning: "Du verwendest eine Version von Ruby 2.0.0, die für Probleme bekannt ist. Aktualisiere auf Patchlevel 247 oder höher." @@ -592,7 +608,6 @@ de: s3_config_warning: 'Der Server wurde konfiguriert um Dateien nach s3 hochzuladen, aber mindestens der folgenden Einstellungen fehlt: s3_access_key_id, s3_secret_access_key oder s3_upload_bucket. Besuche die Einstellungen um die fehlenden Einträge hinzuzufügen. Besuche "How to set up image uploads to S3?" um mehr zu erfahren.' s3_backup_config_warning: 'Der Server ist so konfiguriert, dass Datensicherungen auf S3 geladen werden, aber mindestens einer der folgenden Einstellungen: s3_access_key_id, s3_secret_access_key or s3_backup_bucket ist nicht festgelegt. Gehe Sie zu den Seiteneinstellungen und aktualisieren Sie die Einstellungen. Siehe "Wie konfiguriere ich das Hochladen von Bildern zu S3?" um mehr darüber zu erfahren.' 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 um das aktuelle Paket herunterzuladen.' - failing_emails_warning: 'Es konnten insgesamt %{num_failed_jobs} Mails nicht versendet werden. Bitte überprüfe die Mailserver-Einstellungen in config/discourse.conf. Siehe auch: Fehlgeschlagene Jobs in Sidekiq.' default_logo_warning: "Richte das Logo für deine Seite ein. Konfiguriere dafür logo_url, logo_small_url, und favicon_url unter Website-Einstellungen." contact_email_missing: "Gib eine Kontakt-E-Mail-Adresse an, damit du dringende Meldungen bezüglich deiner Seite erhalten kannst. Trage sie in den Einstellungen ein." contact_email_invalid: "Die Kontakt E-Mail-Adresse ist ungültig. Ändere sie in den Einstellungen." @@ -628,7 +643,7 @@ de: description: "HTML, das zwischen den Tags eingefügt wird." top: title: "Oberer Teil der Seiten" - description: "HTML das am Anfang jeder Seite hinzugefügt wird (Nach dem Header, vor der Navigation oder dem Thementitel)." + description: "HTML, das am Anfang jeder Seite hinzugefügt wird (Nach dem Header, vor der Navigation oder dem Thementitel)." bottom: title: "Unterer Teil der Seiten" description: "HTML das vor dem Tag eingefügt wird." @@ -636,7 +651,7 @@ de: censored_words: "Wörter, die automatisch durch ■■■■ ersetzt werden" delete_old_hidden_posts: "Automatisch alle Beiträge löschen, die länger als 30 Tage versteckt bleiben." default_locale: "Die Standardsprache dieser Discourse-Instanz (kodiert in ISO 639-1)." - allow_user_locale: "Erlaube Benutzern ihre eigene Interfacesprache zu wählen" + allow_user_locale: "Erlaube Benutzern, ihre eigene Interfacesprache zu wählen" min_post_length: "Minimal zulässige Beitragslänge in Zeichen." min_first_post_length: "Minimal zulässige Länge des ersten Beitrags (eines Themas) in Zeichen" min_private_message_post_length: "Minimale zulässige Beitragslänge in Zeichen für Nachrichten" @@ -645,7 +660,7 @@ de: max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen." min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen." min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen." - allow_uncategorized_topics: "Erlaube Themen ohne Kategorie" + allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: Falls es unkategorisierte Themen gibt, musst du sie neu kategorisieren, bevor du diese Option abschaltest." uncategorized_description: "Beschreibung der Kategorie für unkategorisierte Themen. Leer lassen, wenn keine Beschreibung erwünscht ist." allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln." unique_posts_mins: "Minuten, nach denen ein Nutzer denselben Inhalt noch einmal posten kann." @@ -672,20 +687,15 @@ de: post_excerpt_maxlength: "Maximale Länge eines Beitrags-Auszuges bzw. -Zusammfassung." post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen." onebox_domains_whitelist: "Liste von Domains, deren Inhalte für Oneboxen erlaubt sind; diese Domains sollten OpenGraph oder oEmbed unterstützen. Teste ihre Kompatibilität unter http://iframely.com/debug" - logo_url: "Die Logo-Grafik oben links auf deiner Seite; wenn leer wird der Name der Seite angezeigt." - digest_logo_url: "Alternatives Logo, das oben in E-Mail-Zusammenfassungen verwendet wird. Wenn leer wird `logo_url` verwendet. Zum Beispiel: http://example.com/logo.png " - logo_small_url: "Kleine Logo-Grafik oben links auf der Seite, die beim Herunterscrollen angezeigt wird. Falls leer wird ein \"Home\" Zeichen angezeigt." - favicon_url: "Das Favicon deiner Website, siehe http://de.wikipedia.org/wiki/Favicon" - mobile_logo_url: "Die statische Logo-Grafik oben links auf deiner Seite für mobile Geräte. Falls leer wird `logo_url` verwendet." - apple_touch_icon_url: "Icon für berührungsempfindliche Apple Geräte. Empfohlene Grösse ist 144px auf 144px." + apple_touch_icon_url: "Icon für berührungsempfindliche Apple-Geräte. Empfohlene Grösse ist 144px auf 144px." notification_email: "Die E-Mail-Adresse die als \"From:\" Absender aller wichtiger System-Emails benutzt wird. Die benutzte Domain sollte über korrekte SPF, DKIM und PTR Einträge verfügen, damit Emails sicher zugestellt werden können." email_custom_headers: "Eine Pipe-getrennte (|) Liste von eigenen Mail Headern" email_subject: "Format der Betreffzeile in Standard-E-Mails. Siehe https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" use_https: "Soll die volle URL der Seite (Discourse.base_url) mit http oder https beginnen? AKTIVIERE DIES NICHT BIS HTTPS AUFGESETZT IST UND BEREITS FUNKTIONIERT!" - summary_score_threshold: "Mindestpunktzahl die ein Beitrag benötigt, in der \"Thema zusammenfassen\" Ansicht zu erscheinen." - summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird." + summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen." + summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird." summary_likes_required: "Mindestanzahl an \"Gefällt mir\" Wertungen in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird." - summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\" Ansicht." + summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht." summary_max_results: "Maximale Anzahl der sichtbaren Beiträge beim Zusammenfassen von Themen" enable_private_messages: "Erlaube Benutzern auf Vertrauensstufe 1, Direktnachrichten zu erstellen und zu beantworten." enable_long_polling: "Nachrichtenbus für Benachrichtigungen kann Long-Polling nutzen." @@ -694,8 +704,6 @@ de: polling_interval: "Polling-Intervall in Millisekunden für angemeldete Clients, wenn Long Polling nicht verwendet wird." anon_polling_interval: "Polling-Intervall in Millisekunden für anonyme Clients." background_polling_interval: "Polling-Intervall in Millisekunden für Clients, wenn sich das Browser-Fenster im Hintergrund befindet." - auto_track_topics_after: "Millisekunden, bevor ein Thema automatisch verfolgt wird. Nutzer können diesen Wert überschreiben (0 heißt immer, -1 heißt niemals)." - new_topic_duration_minutes: "Minuten, die ein neues Thema als neu aufgeführt wird. Nutzer können diesen Wert überschreiben (-1 heißt immer, -2 heißt seit dem letzten Besuch)." flags_required_to_hide_post: "Anzahl der Meldungen, die dazu führen, dass ein Beitrag automatisch versteckt und eine private Nachricht an den Nutzer geschickt wird (0 für niemals)." cooldown_minutes_after_hiding_posts: "Minuten, die ein Nutzer warten muss, bevor ein Beitrag, der wegen Meldungen anderer Nutzer versteckt wurde, bearbeitet werden kann." max_topics_in_first_day: "Maximale Anzahl an Themen, die ein Benutzer an seinem ersten Tag auf der Seite erstellen kann" @@ -703,12 +711,12 @@ de: tl2_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Nutzer auf Vertrauensstufe 2 (Mitglied) mit diesem Faktor multiplizieren" tl3_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Nutzer auf Vertrauensstufe 3 (Stammgast) mit diesem Faktor multiplizieren" tl4_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Nutzer auf Vertrauensstufe 4 (Anführer) mit diesem Faktor multiplizieren" - num_flags_to_block_new_user: "Verstecke alle Beiträge eines neuen Nutzers und erlaube keine neuen Beiträge mehr, wenn der neue Nutzer die hier angegebene Zahl Meldungen bezüglich Werbung von num_users_to_block_new_user verschiedenen anderen Nutzern erhalten hat. 0 deaktiviert diese Funktion." + num_flags_to_block_new_user: "Verstecke alle Beiträge eines neuen Nutzers und erlaube keine neuen Beiträge mehr, wenn der neue Nutzer die hier angegebene Zahl an Meldungen bezüglich Werbung von num_users_to_block_new_user verschiedenen anderen Nutzern erhalten hat. 0 deaktiviert diese Funktion." num_users_to_block_new_user: "Verstecke alle Beiträge eines neuen Nutzers und erlaube keine neuen Beiträge mehr, wenn der neue Nutzer num_flags_to_block_new_user Meldungen bezüglich Werbung von der hier angegebenen Zahl verschiedener anderer Nutzer erhalten hat. 0 deaktiviert diese Funktion." notify_mods_when_user_blocked: "Wenn ein Benutzer automatisch gesperrt wird, sende eine Mail an alle Moderatoren." flag_sockpuppets: "Wenn ein neuer Nutzer auf ein Thema antwortet, das von einem anderen neuen Nutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als Werbung." - traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, welche zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen." - post_undo_action_window_mins: "Sekunden, die ein Nutzer hat, um Aktionen auf Beiträgen rückgängig zu machen (Like, Meldung, usw.)." + traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, die zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen." + post_undo_action_window_mins: "Minuten, die ein Nutzer hat, um Aktionen auf Beiträgen rückgängig zu machen (Like, Meldung, usw.)." ga_tracking_code: "Google Analytics Trackingcode, zum Beispiel: UA-12345678-9; siehe http://google.com/analytics" ga_domain_name: "Google Analytics Domänenname, zum Beispiel: mysite.com; siehe http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, beispielsweise: UA-12345678-9; Siehe http://google.com/analytics" @@ -749,17 +757,15 @@ de: invite_passthrough_hours: "Wie lange, in Stunden, ein Benutzer einen bereits eingelösten Einladungsschlüssel zum einloggen verwenden kann." invite_only: "Deaktiviere die öffentliche Registrierung, neue Nutzer können nur durch eine Einladung von existierenden Mitgliedern oder Mitarbeitern beitreten." login_required: "Nur angemeldete Nutzer dürfen Inhalte der Seite lesen, anonyme Zugriffe sind verboten." - min_username_length: "Minimale Länge für Benutzernamen in Zeichen. WARNUNG: EXISTIERENDE BENUTZER, DEREN BENUTZERNAMEN KÜRZER SIND, WERDEN DIE WEBSITE NICHT MEHR BENUTZEN KÖNNEN." - max_username_length: "Maximale Länge für Benutzernamen in Zeichen. WARNUNG: EXISTIERENDE BENUTZER, DEREN BENUTZERNAMEN LÄNGER SIND, WERDEN DIE WEBSITE NICHT MEHR BENUTZEN KÖNNEN." + min_username_length: "Minimale Benutzernamenlänge in Zeichen." + max_username_length: "Maximale Benutzernamenlänge in Zeichen." min_password_length: "Minimale Länge des Passworts." block_common_passwords: "Erlaube kein Passwort unter den 10000 meist verwendeten Passwörter." enable_sso_provider: "Aktiviere das Discourse SSO Anbieter Protokoll unter /session/sso_provider; benötigt sso_secret." sso_url: "URL des Single Sign On Endpunkts" sso_secret: "Geheime Zeichenkette die als Schlüssel für die Authentifizierung von SSO-Informationen verwendet wird. Sollte unbedingt 10 Zeichen oder länger sein." - sso_overrides_email: "Überschreibt lokale mit externer E-Mail-Adresse aus den SSO Daten (WARNUNG: es können dennoch Unterschiede auf Grund von Normalisierung lokaler E-Mail-Adressen auftreten)" - sso_overrides_username: "Überschreibt lokale Benutzernamen mit externen Seiten-Usernamen von SSO Daten (WARNUNG: Diskrepanzen können aufgrund von Unterschieden in Benutzernamenlängen/-anforderungen, auftreten)" - sso_overrides_name: "Ersetzt den lokal gespeicherten vollen Namen mit dem vollen Namen der externen Seite aus den SSO Daten" sso_overrides_avatar: "Überschreibt den Avatar des Benutzers mit dem Avatar aus der SSO Payload. Wenn aktiv, dann sollte allow_uploaded_avatars deaktiviert werden." + sso_not_approved_url: "Nicht genehmigte SSO-Accounts zu dieser URL weiterleiten" enable_local_logins: "Aktiviere Login mit lokal gespeicherten Benutzernamen und Passwörtern. (Anmerkung: muss aktiviert sein, damit Einladungen funktionieren)" allow_new_registrations: "Erlaube das Registrieren neuer Benutzerkonten. Wird dies deaktiviert, so kann niemand mehr ein neues Konto erstellen." enable_yahoo_logins: "Aktiviere Yahoo Authentifizierung." @@ -777,7 +783,6 @@ de: github_client_secret: "Client Secret für Github Authentifizierung, registriert auf https://github.com/settings/applications" allow_restore: "Wiederherstellung zulassen, welche ALLE vorhandenen Daten überschreiben kann! Auf 'false' lassen, sofern Sie nicht planen, eine Sicherung wiederherzustellen." maximum_backups: "Die maximale Anzahl an Sicherungen, die auf dem Server gespeichert werden. Ältere Sicherungen werden automatisch gelöscht." - backup_daily: "Jeden Tag automatisch eine Sicherung erstellen." enable_s3_backups: "Lade fertige Backups zu S3 hoch. WICHTIG: In den Dateien-Einstellungen müssen gültige S3-Kontodaten eingegeben sein." s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt." active_user_rate_limit_secs: "Sekunden, nach denen das 'last_seen_at'-Feld aktualisiert wird." @@ -794,6 +799,7 @@ de: max_topics_per_day: "Maximale Anzahl der Themen, die ein Nutzer pro Tag erstellen kann." max_private_messages_per_day: "Maximale Zahl Direktnachrichten, die ein Nutzer pro Tag erstellen kann." max_invites_per_day: "Maximale Zahl an Einladungen, die ein Nutzer pro Tag verschicken kann." + max_topic_invitations_per_day: "Maximale Zahl an Themen-Einladungen, die ein Nutzer pro Tag verschicken kann." suggested_topics: "Anzahl der empfohlenen Themen am Ende eines Themas." limit_suggested_to_category: "Zeige nur Themen der aktuellen Kategorie in vorgeschlagenen Themen." clean_up_uploads: "Lösche verwaiste Uploads, um illegales Hosting zu vermeiden. ACHTUNG: du solltest ein Backup deines /uploads-Verzeichnis erstellen, bevor du diese Funktion aktivierst." @@ -870,7 +876,6 @@ de: newuser_spam_host_threshold: "Die Anzahl welche ein Frischling Beiträge mit Links auf die gleiche Seite innerhalb ihrer `newuser_spam_host_posts` veröffentlichen, bevor der Beitrag als Spam klassifiziert wird." white_listed_spam_host_domains: "Liste von Domänen, die keinem Spam-Host Test unterzogen werden. Neue Benutzer werden niemals daran gehindert, Beiträge mit Links zu diesen Domains zu erstellen." staff_like_weight: "Zusätzlicher Gewichtungsfaktor für \"Gefällt mir\" Wertungen von Mitarbeitern." - topic_view_duration_hours: "Alle N Stunden einen Themenaufruf pro IP/Benutzer zählen." levenshtein_distance_spammer_emails: "E-Mail-Adressen, die sich um so viele Zeichen unterscheiden, werden beim Vergleich von Adressen von Spam-Nutzern dennoch als identisch betrachtet." max_new_accounts_per_registration_ip: "Keine neuen Registrierungen von einer IP-Adresse annehmen, zu der bereits (n) Benutzerkonten mit Vertrauensstufe 0 (und keine Konten von Mitarbeitern oder mit Vertrauensstufe 2 oder höher) gehören." min_ban_entries_for_roll_up: "Ein Klick auf den \"Zusammenfassen\" Knopf führt (N) oder mehr Sperren zu einer einzelnen Subnetz-Sperre zusammen." @@ -902,18 +907,13 @@ de: username_change_period: "Die Anzahl der Tage, die neu registrierte Benutzer Zeit haben, um ihren Benutzernamen zu ändern (0 verbietet Änderungen)." email_editable: "Erlaube Benutzern ihre E-Mail-Adresse nach der Registrierung zu ändern." logout_redirect: "Ziel für Weiterleitung nach einem Logout (z. B.: http://somesite.com/logout)" - allow_uploaded_avatars: "Erlaube das Hochladen benutzerdefinierter Avatare." - allow_animated_avatars: "Erlaube den Benutzern animierte GIFs als Avatar zu benutzen. ACHTUNG: Wenn du diese Einstellung änderst, solltest du den Rake-Task avatars:refresh ausführen." allow_animated_thumbnails: "Generiert animierte Vorschaubilder von animierten gifs." default_avatars: "URLs zu Bildern, die als Standard-Avatare verwendet werden sollen, bis neue Nutzer ihren Avatar geändert haben." automatically_download_gravatars: "Avatare von Gravatar herunterladen, wenn ein Nutzer sich registriert oder seine E-Mail-Adresse ändert." digest_topics: "Maximale Anzahl von Themen, die in der E-Mail-Zusammenfassung angezeigt werden." digest_min_excerpt_length: "Minimale Länge des Auszugs aus einem Beitrag in der E-Mail-Zusammenfassung, in Zeichen." - default_digest_email_frequency: "Wie oft man Zusammenfassungen per Mail standardmässig erhält. Diese Einstellung kann von jedem geändert werden." suppress_digest_email_after_days: "Sende keine E-Mail-Zusammenfassungen an Benutzer, die die Seite seit mehr als (n) Tagen nicht mehr besucht haben." disable_digest_emails: "E-Mail-Zusammenfassungen für alle Benutzer deaktivieren." - default_external_links_in_new_tab: "Öffne externe Links in einem neuen Tab. Benutzer können dies in ihren Einstellungen ändern." - detect_custom_avatars: "Ob überprüft wird, dass Benutzer benutzerdefinierte Avatare hochgeladen haben." max_daily_gravatar_crawls: "Wie oft pro Tag Discourse höchstens auf Gravatar nach benuterdefinierten Avataren suchen soll." public_user_custom_fields: "Liste selbst definierter Profil-Felder, die öffentlich angezeigt werden dürfen." staff_user_custom_fields: "Liste selbst definierter Profil-Felder, die Mitarbeitern angezeigt werden dürfen." @@ -937,19 +937,18 @@ de: warn_reviving_old_topic_age: "Wenn jemand beginnt auf ein Thema zu antworten, dessen letzte Antwort älter als diese Anzahl an Tagen ist, wird eine Warnung angezeigt. Deaktiviere dies durch setzen auf 0." autohighlight_all_code: "Erzwinge Syntaxhervorhebung für alle Quellcode-Blöcke, auch dann wenn keine Sprache angeben wurde." highlighted_languages: "Es wurden Syntaxregeln zur Hervorhebung von Textstellen hinzugefügt. (Achtung: Werden zu viele Sprachen hinzugefügt, kann das die Performance beeinflussen) siehe: https://highlightjs.org/static/demo/ für eine Demo." - embeddable_host: "Host, der Kommentare aus diesem Discourse Forum einbetten darf. Nur Hostname ohne http://" feed_polling_enabled: "NUR WENN EINGEBETTET: Bestimmt, ob Inhalte eines RSS-/ATOM-Feeds als zusätzliche Beiträge dargestellt werden." feed_polling_url: "NUR WENN EINGEBETTET: URL des einzubettenden RSS-/ATOM-Feeds." embed_by_username: "Discourse-Benutzername des Benutzers, der die eingebetteten Themen erstellt." embed_username_key_from_feed: "Schlüsse, um Discourse-Benutzernamen aus Feed zu ziehen." embed_truncate: "Kürze die eingebetteten Beiträge" - embed_category: "Kategorie für eingebettete Themen." embed_post_limit: "Maximale Anzahl der Beiträge die eingebettet werden." embed_whitelist_selector: "CSS Selektor für Elemente, die in Einbettungen erlaubt sind." embed_blacklist_selector: "CSS Selektor für Elemente, die in Einbettungen entfernt werden." - notify_about_flags_after: "Wenn es Markierungen gibt, dich nach nach dieser Anzahl von Stunden behandelt wurden, sende eine E-Mail an den contact_email. Setze dies auf 0 um es zu deaktivieren." + notify_about_flags_after: "Wenn es Markierungen gibt, die nicht nach dieser Anzahl von Stunden behandelt wurden, sende eine E-Mail an contact_email. Setze dies auf 0 um es zu deaktivieren." enable_cdn_js_debugging: "Ermöglicht die Anzeige vollständiger Fehler auf /logs, indem alle eingebetteten JavaScripts Cross-Origin Zugriffsberechtigungen erhalten." show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren." + delete_drafts_older_than_n_days: Lösche Entwürfe, die mehr als (n) Tage alt sind. vacuum_db_days: "Führe VACUUM FULL ANALYZE aus, um nach Migrationen Speicher in der Datenbank zurückzugewinnen (zum Deaktivieren auf 0 setzen)" prevent_anons_from_downloading_files: "Nichtangemeldeten Benutzern das Herunterladen von Anhängen verbieten. WARNUNG: dies verhindert auch das Herunterladen jeglicher Ressourcen für Website-Anpassungen, die als Anhänge gespeichert wurden." enable_emoji: "Aktiviere emoji" @@ -999,19 +998,17 @@ de: original_poster: "Autor des ersten Beitrags" most_posts: "Autor der meisten Beiträge" most_recent_poster: "Autor des jüngsten Beitrags" - frequent_poster: "Autor regelmäßiger Beiträge" + frequent_poster: "Autor vieler Beiträge" redirected_to_top_reasons: new_user: "Willkommen bei unserer Community! Dies sind die derzeit am beliebtesten Themen." not_seen_in_a_month: "Willkommen zurück! Wir haben dich länger nicht gesehen. Während deiner Abwesenheit waren dies die beliebtesten Themen." move_posts: new_topic_moderator_post: - one: "Ich habe einen Beitrag in ein neues Thema verschoben: %{topic_link}" - other: "Ich habe %{count} Beiträge in ein neues Thema verschoben: %{topic_link}" - existing_topic_moderator_post: - one: "Ich habe den Beitrag in ein vorhandenes Thema verschoben: %{topic_link}" - other: "Ich hab %{count} Beiträge in ein vorhandenes Thema verschoben: %{topic_link}" + one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}" + other: "%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}" change_owner: post_revision_text: "Eigentümer geändert von %{old_user} zu %{new_user}" + deleted_user: "ein gelöschter Benutzer" emoji: errors: name_already_exists: "Es tut uns leid, der Name '%{name}' wird schon von einem anderen emoji verwendet." @@ -1057,6 +1054,7 @@ de: not_allowed_from_ip_address: "Du kannst dich von dieser IP-Adresse aus nicht als %{username} anmelden." admin_not_allowed_from_ip_address: "Du kannst dich von dieser IP-Adresse aus nicht als Administrator anmelden." suspended: "Du kannst dich bis zum %{date} nicht anmelden." + suspended_with_reason: "Dieser Nutzer ist bis zum %{date} suspendiert: %{reason}" errors: "%{errors}" not_available: " Nicht verfügbar. Versuche %{suggestion}?" something_already_taken: "Etwas ist schief gelaufen. Möglicherweise ist der Benutzername bereits registriert. Probiere den 'Passwort vergessen'-Link." @@ -1064,6 +1062,7 @@ de: omniauth_error_unknown: "Während des Anmeldens ist etwas schief gelaufen, bitte versuche es noch einmal." new_registrations_disabled: "Leider können derzeit keine neuen Konten registriert werden." password_too_long: "Passwörter sind beschränkt auf 200 Zeichen." + reserved_username: "Der Benutzername ist nicht erlaubt." missing_user_field: "Sie haben nicht alle Benutzerfelder ausgefüllt" close_window: "Authentifizierung abgeschlossen. Schließe das Fenster um fortzufahren." user: @@ -1074,10 +1073,11 @@ de: characters: "darf nur aus Zahlen und Buchstaben bestehen" unique: "muss eindeutig sein" blank: "muss angegeben werden" - must_begin_with_alphanumeric: "muss mit einer Zahl oder einem Buchstaben anfangen" email: not_allowed: "ist für diesen Mailprovider nicht erlaubt. Bitte verwende eine andere Mailadresse." blocked: "ist nicht erlaubt." + ip_address: + blocked: "Von Deiner IP Adresse aus ist es nicht erlaub sich zu registrieren." invite_mailer: subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen" text_body_template: | @@ -1097,55 +1097,25 @@ de: invite_forum_mailer: subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten" text_body_template: | - %{invitee_name} hat dich eingeladen zu: + %{invitee_name} hat dich zur Teilnahme eingeladen > **%{site_title}** > > %{site_description} - Falls du interessiert bis, klicke auf den nachfolgenden Link: + Falls du Interesse hast, klicke auf den nachfolgenden Link: %{invite_link} - Die Einladung ist von einem vertrautem Benutzer, du musst dich daher nicht einloggen. + Dies ist eine Einladung von einem vertrauenswürdigen Benutzer. Du brauchst dich daher nicht anzumelden. invite_password_instructions: - subject_template: "Legen Sie ein Passwort für Ihr %{site_name}-Konto fest" + subject_template: "Lege ein Passwort für dein %{site_name}-Konto fest" test_mailer: subject_template: "[%{site_name}] Test der Mailzustellbarkeit" new_version_mailer: subject_template: "[%{site_name}] Neue Discourse Version, Update verfügbar" - text_body_template: | - Eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar. - - Deine Version: %{installed_version} - Neue Version: **%{new_version}** - - Dies könnte interessant sein: - - - Erkundige dich über Neues im [GitHub Changelog](https://github.com/discourse/discourse/commits/master). - - - Upgrade deine Version unter [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) mit dem "Upgrade"-Knopf. - - - Besuche [meta.discourse.org](http://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung für Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] Update verfügbar" - text_body_template: | - Eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar. - - Deine Version: %{installed_version} - Neue Version: **%{new_version}** - - So geht's weiter: - - - Lies nach, was sich in der neuen Version [geändert hat](https://github.com/discourse/discourse/commits/master). - - - Aktualisiere dein Forum mit dem "Upgrade" Knopf auf [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Besuche [meta.discourse.org](http://meta.discourse.org) für weitere Neuigkeiten, Diskussionen und Hilfestellungen rund um Discourse. - - ### Versionshinweise - - %{notes} flags_reminder: flags_were_submitted: one: "Folgende Markierungen wurden währen der letzten Stunden vorgenommen." @@ -1167,7 +1137,6 @@ de: disagreed: "Danke für deine Meldung. Wir sehen uns das an." deferred: "Danke für deine Meldung. Wir sehen uns das an." deferred_and_deleted: "Danke für deine Meldung. Wir haben den Beitrag entfernt." - temporarily_closed_due_to_flags: "Der Diskussionsstrang wurde wegen zahlreicher Meldungen aus der Community vorübergehend geschlossen." system_messages: post_hidden: subject_template: "Beitrag wegen Meldungen aus der Community versteckt" @@ -1207,7 +1176,6 @@ de: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Sicherung erfolgreich abgeschlossen" - text_body_template: "Backup erfolgreich durchgeführt.\nDu kannst das neue Backup unter [Admin > Backups](/admin/backups) herunterladen." backup_failed: subject_template: "Sicherung fehlgeschlagen" text_body_template: | @@ -1373,7 +1341,6 @@ de: download_remote_images_disabled: subject_template: "Download von externen Bildern deaktiviert" text_body_template: "Die `download_remote_images_to_local` Einstellung wurde deaktiviert, da das Speicherplatz Limit von `download_remote_images_threshold` erreicht wurde." - unsubscribe_link: "Wenn du diese E-Mails nicht mehr erhalten möchtest, verändere deine [Benutzereinstellungen](%{user_preferences_url})." subject_re: "Re: " subject_pm: "[PN]" user_notifications: @@ -1524,7 +1491,6 @@ de: (Wenn du als neuer Benutzer unter vier Augen mit einem unserer [Mitarbeiter](%{base_url}/about) reden möchtest, antworte einfach auf diese Nachricht.) signup: - subject_template: "[%{site_name}] Aktiviere deinen neues Konto" text_body_template: | Willkommen bei %{site_name}! @@ -1553,15 +1519,13 @@ de: pasted_image_filename: "Hinzugefügtes Bild" store_failure: "Hochladen von #%{upload_id} für Benutzer #%{user_id} ist fehlgeschlagen." attachments: - too_large: "Entschuldigung, die Datei die du hochladen möchtest ist zu groß (maximale Dateigröße ist %{max_size_kb}KB)." + too_large: "Entschuldigung, die Datei die du hochladen möchtest, ist zu groß (maximale Dateigröße ist %{max_size_kb}KB)." images: - too_large: "Entschuldigung, das Bild das du hochladen möchtest ist zu groß (maximale Dateigröße ist %{max_size_kb}KB). Bitte verkleinere es und versuche es erneut." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Entschuldigung, aber die Datei die du hochladen möchtest scheint kein Bild zu sein." - size_not_found: "Entschuldige, aber wir konnten die Grösse des Bildes nicht feststellen. Vielleicht ist das Bild defekt?" + too_large: "Entschuldigung, das Bild das du hochladen möchtest, ist zu groß (maximale Dateigröße ist %{max_size_kb}KB). Bitte verkleinere es und versuche es erneut." + size_not_found: "Entschuldige, aber wir konnten die Größe des Bildes nicht bestimmen. Vielleicht ist das Bild defekt?" flag_reason: - sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP Adresse hat darauf geantwortet. Beachte die flag_sockpuppets Einstellung." - spam_hosts: "Dieser Benutzer hat versucht mehrere Antworten mit Links zur selben Domain zu posten. Beachte die newuser_spam_host_threshold Einstellung." + sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP-Adresse hat darauf geantwortet. Beachte die flag_sockpuppets Einstellung." + spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur selben Domain zu posten. Beachte die newuser_spam_host_threshold Einstellung." email_log: no_user: "Kann Benutzer mit ID %{user_id} nicht finden " anonymous_user: "Benutzer ist anonym" @@ -1594,80 +1558,6 @@ de: title: "Nutzungsbedingungen" privacy_topic: title: "Datenschutzrichtlinie" - badges: - long_descriptions: - autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah - first_link: | - Blah blah blah - Blah blah blah - first_quote: | - Blah blah blah - Blah blah blah - first_share: | - Blah blah blah - Blah blah blah - read_guidelines: | - Blah blah blah - Blah blah blah - reader: | - Blah blah blah - Blah blah blah - editor: | - Blah blah blah - Blah blah blah - first_flag: | - Meldungen sind für ein gutes Klima in der Community sehr wichtig. Wenn du einen Beitrag findest, der die Aufmerksamkeit eines Moderators benötigt, zögere bitte nicht eine Meldung abzugeben. - Du kannst den Meldungs-Dialog auch benutzen, um einem anderen Nutzer eine Direktnachricht zu senden, sobald du Vertrauensstufe 1 erreicht hast. - nice_share: | - Blah blah blah - Blah blah blah - welcome: | - Blah blah blah - Blah blah blah - anniversary: | - Blah blah blah - Blah blah blah - good_share: | - Blah blah blah - Blah blah blah - great_share: | - Blah blah blah - Blah blah blah - nice_post: | - Blah blah blah - Blah blah blah - nice_topic: | - Blah blah blah - Blah blah blah - good_post: | - Blah blah blah - Blah blah blah - good_topic: | - Blah blah blah - Blah blah blah - great_post: | - Blah blah blah - Blah blah blah - great_topic: | - Blah blah blah - Blah blah blah - basic: | - Blah blah blah - Blah blah blah - member: | - Blah blah blah - Blah blah blah - regular: | - Blah blah blah - Blah blah blah - leader: | - Blah blah blah - Blah blah blah admin_login: success: "E-Mail gesendet" error: "Fehler!" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7e74180d69..94921497a9 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -90,6 +90,13 @@ en: other: ! '%{count} errors prohibited this %{model} from being saved' embed: load_from_remote: "There was an error loading that post." + site_settings: + min_username_length_exists: "You cannot set the minimum username length above the shortest username." + min_username_length_range: "You cannot set the minimum above the maximum." + max_username_length_exists: "You cannot set the maximum username length below the longest username." + max_username_length_range: "You cannot set the maximum below the minimum." + default_categories_already_selected: "You cannot select a category used in another list." + s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'." activemodel: errors: @@ -173,6 +180,7 @@ en: rss_description: latest: "Latest topics" hot: "Hot topics" + posts: "Latest posts" too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted." excerpt_image: "image" @@ -223,13 +231,13 @@ en: For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. avatar: | - ### How about a new picture for your account? + ### How about a picture for your account? - You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have. + You've posted a few topics and replies, but your profile picture isn't as unique as you are -- it's just a letter. - Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you? + Have you considered **[visiting your user profile](%{profile_path})** and uploading a picture that represents you? - It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar! + It's easier to follow discussions and find interesting people in conversations when everyone has a unique profile picture! sequential_replies: | ### Consider replying to several posts at once @@ -303,7 +311,7 @@ en: vip_category_name: "Lounge" vip_category_description: "A category exclusive to members with trust level 3 and higher." - meta_category_name: "Meta" + meta_category_name: "Site Feedback" meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it." staff_category_name: "Staff" @@ -453,7 +461,7 @@ en: other: "almost %{count} years ago" password_reset: - no_token: "Sorry, that password change link is too old. Log in again and select 'I forgot my password' to get a new link." + no_token: "Sorry, that password change link is too old. Select the Log In button and use 'I forgot my password' to get a new link." choose_new: "Please choose a new password" choose: "Please choose a password" update: 'Update Password' @@ -469,7 +477,7 @@ en: error: "There was an error changing your email address. Perhaps the address is already in use?" activation: - action: "Activate your account" + action: "Click here to activate your account" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" please_continue: "Your new account is confirmed; you will be redirected to the home page." continue_button: "Continue to %{site_name}" @@ -540,6 +548,7 @@ en: regular: title: "Regular Topic" banner: + title: "Banner Topic" message: make: "This topic is now a banner. It will appear at the top of every page until it is dismissed by the user." remove: "This topic is no longer a banner. It will no longer appear at the top of every page." @@ -650,6 +659,14 @@ en: title: "Total" xaxis: "Day" yaxis: "Total API Requests" + page_view_logged_in_mobile_reqs: + title: "Logged In API Requests" + xaxis: "Day" + yaxis: "Mobile Logged In API Requests" + page_view_anon_mobile_reqs: + title: "Anon API Requests" + xaxis: "Day" + yaxis: "Mobile Anon API Requests" http_background_reqs: title: "Background" xaxis: "Day" @@ -674,6 +691,18 @@ en: title: "Total" xaxis: "Day" yaxis: "Total requests" + time_to_first_response: + title: "Time to first response" + xaxis: "Day" + yaxis: "Average time (hours)" + topics_with_no_response: + title: "Topics with no response" + xaxis: "Day" + yaxis: "Total" + mobile_visits: + title: "User Visits" + xaxis: "Day" + yaxis: "Number of visits" dashboard: rails_env_warning: "Your server is running in %{env} mode." @@ -681,6 +710,7 @@ en: host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname." gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' + queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' @@ -689,7 +719,7 @@ en: 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your config/discourse.conf file and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' + failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' default_logo_warning: "Set the graphic logos for your site. Update logo_url, logo_small_url, and favicon_url in Site Settings." contact_email_missing: "Enter a site contact email address so you can be reached for urgent matters regarding your site. Update it in Site Settings." contact_email_invalid: "The site contact email is invalid. Update it in Site Settings." @@ -744,7 +774,7 @@ en: max_topic_title_length: "Maximum allowed topic title length in characters" min_private_message_title_length: "Minimum allowed title length for a message in characters" min_search_term_length: "Minimum valid search term length in characters" - allow_uncategorized_topics: "Allow topics to be created without a category." + allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off." uncategorized_description: "The description of the uncategorized category. Leave blank for no description." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -767,6 +797,7 @@ en: category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." show_subcategory_list: "Show subcategory list instead of topic list when entering a category." fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity." + fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)." add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\"" exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too." @@ -774,11 +805,11 @@ en: post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters." onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug" - logo_url: "The logo image at the top left of your site; if left blank, the site title text will be shown." - digest_logo_url: "The alternate logo used at the top of your site's email digest. If left blank `logo_url` will be used. eg: http://example.com/logo.png" - logo_small_url: "The small logo image at the top left of your site, seen when scrolling down. If left blank, a home glyph will be shown." - favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. If left blank `logo_url` will be used." + logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown." + digest_logo_url: "The alternate logo image used at the top of your site's email digest. Should be a wide rectangle shape. If left blank `logo_url` will be used." + logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown." + favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png" + mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px." notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." @@ -800,9 +831,6 @@ en: anon_polling_interval: "How often should anonymous clients poll in milliseconds" background_polling_interval: "How often should the clients poll in milliseconds (when the window is in the background)" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" - flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging" @@ -819,6 +847,7 @@ en: flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam." traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak." + allow_html_tables: "Allow tables to be entered in Markdown using HTML tags, TABLE, THEAD, TD, TR, TH are whitelisted (requires full rebake on all old posts containing tables)" post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)." must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -852,6 +881,7 @@ en: email_token_grace_period_hours: "Forgot password / activate account tokens are still valid for a grace period of (n) hours after being redeemed." enable_badges: "Enable the badge system" + enable_whispers: "Allow users to whisper to staff" allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" @@ -867,14 +897,14 @@ en: invite_expiry_days: "How long user invitation keys are valid, in days" invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours" - # TODO: perhaps we need a way of protecting these settings for hosted solution, global settings ... - invite_only: "Public registration is disabled, all new users must be explicitly invited by other members or staff." login_required: "Require authentication to read content on this site, disallow anonymous access." - min_username_length: "Minimum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES SHORTER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." - max_username_length: "Maximum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES LONGER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." + min_username_length: "Minimum username length in characters." + max_username_length: "Maximum username length in characters." + + reserved_usernames: "Usernames for which signup is not allowed." min_password_length: "Minimum password length." block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords." @@ -883,14 +913,15 @@ en: enable_sso_provider: "Implement Discourse SSO provider protocol at the /session/sso_provider endpoint, requires sso_secret to be set" sso_url: "URL of single sign on endpoint" sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" - sso_overrides_name: "Overrides local full name with external site full name from SSO payload" + sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)" + sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes." sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended" sso_not_approved_url: "Redirect unapproved SSO accounts to this URL" enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)" allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account." + enable_signup_cta: "Show a notice to returning anonymous users prompting them to sign up for an account." enable_yahoo_logins: "Enable Yahoo authentication" enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret." @@ -911,7 +942,8 @@ en: allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup" maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted" - backup_daily: "Automatically create a site backup once a day." + automatic_backups_enabled: "Run automatic backups as defined in backup frequency" + backup_frequency: "How frequently we create a site backup, in days." enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings." s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket." @@ -950,6 +982,9 @@ en: avatar_sizes: "List of automatically generated avatar sizes." + external_system_avatars_enabled: "Use external system avatars service." + external_system_avatars_url: "URL of the external system avatars service. Allowed substitions are {username} {first_letter} {color} {size}" + enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks." default_invitee_trust_level: "Default trust level (0-4) for invited users." @@ -1038,7 +1073,7 @@ en: white_listed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains." staff_like_weight: "How much extra weighting factor to give staff likes." - topic_view_duration_hours: "Count new a topic view once per IP/User every N hours" + topic_view_duration_hours: "Count a new topic view once per IP/User every N hours" levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match." max_new_accounts_per_registration_ip: "If there are already (n) trust level 0 accounts from this IP (and none is a staff member or at TL2 or higher), stop accepting new signups from that IP." @@ -1052,6 +1087,10 @@ en: num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention" auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag." + min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)" + auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers" + auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post." reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" @@ -1068,6 +1107,7 @@ en: pop3_polling_host: "The host to poll for email via POP3." pop3_polling_username: "The username for the POP3 account to poll for email." pop3_polling_password: "The password for the POP3 account to poll for email." + log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs" email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category." email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email." email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set." @@ -1082,19 +1122,17 @@ en: email_editable: "Allow users to change their e-mail address after registration." logout_redirect: "Location to redirect browser to after logout EG: (http://somesite.com/logout)" - allow_uploaded_avatars: "Allow users to upload custom avatars." - allow_animated_avatars: "Allow users to use animated gif avatars. WARNING: run the avatars:refresh rake task after changing this setting." + allow_uploaded_avatars: "Allow users to upload custom profile pictures." + allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting." allow_animated_thumbnails: "Generates animated thumbnails of animated gifs." default_avatars: "URLs to avatars that will be used by default for new users until they change them." automatically_download_gravatars: "Download Gravatars for users upon account creation or email change." digest_topics: "The maximum number of topics to display in the email digest." digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." suppress_digest_email_after_days: "Suppress digest emails for users not seen on the site for more than (n) days." disable_digest_emails: "Disable digest emails for all users." - default_external_links_in_new_tab: "Open external links in a new tab. Users can change this in their preferences." - detect_custom_avatars: "Whether or not to check that users have uploaded custom avatars." + detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures." max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day" public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publicly." staff_user_custom_fields: "A whitelist of custom fields for a user that can be shown to staff." @@ -1110,8 +1148,13 @@ en: enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive." dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic." + + daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details" + suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists." + permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures" + global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)." disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active." @@ -1119,6 +1162,7 @@ en: full_name_required: "Full name is a required field of a user's profile." enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere." display_name_on_posts: "Show a user's full name on their posts in addition to their @username." + show_time_gap_days: "If two posts are made this many days apart, display the time gap in the topic." invites_per_page: "Default invites shown on the user page." short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value." default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" @@ -1126,13 +1170,11 @@ en: autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language." highlighted_languages: "Included syntax highlighting rules. (Warning: including too many langauges may impact performance) see: https://highlightjs.org/static/demo/ for a demo" - embeddable_host: "Host that can embed the comments from this Discourse forum. Hostname only, do not begin with http://" feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts." feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed." embed_by_username: "Discourse username of the user who creates the embedded topics." embed_username_key_from_feed: "Key to pull discourse username from feed." embed_truncate: "Truncate the embedded posts." - embed_category: "Category of embedded topics." embed_post_limit: "Maximum number of posts to embed." embed_whitelist_selector: "CSS selector for elements that are allowed in embeds." embed_blacklist_selector: "CSS selector for elements that are removed from embeds." @@ -1142,6 +1184,8 @@ en: delete_drafts_older_than_n_days: Delete drafts older than (n) days. + show_logout_in_header: "Show log out in user dropdown in header" + vacuum_db_days: "Run VACUUM FULL ANALYZE to reclaim DB space after migrations (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working." @@ -1154,6 +1198,25 @@ en: approve_post_count: "The amount of posts from a new user that must be approved" approve_unless_trust_level: "Posts for users below this trust level must be approved" + notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails." + + default_email_digest_frequency: "How often users receive digest emails by default." + default_email_private_messages: "Send an email when someone messages the user by default." + default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default." + default_email_mailing_list_mode: "Send an email for every new post by default." + default_email_always: "Send an email notification even when the user is active by default." + + default_other_new_topic_duration_minutes: "Global default condition for which a topic is considered new." + default_other_auto_track_topics_after_msecs: "Global default time before a topic is automatically tracked." + default_other_external_links_in_new_tab: "Open external links in a new tab by default." + default_other_enable_quoting: "Enable quote reply for highlighted text by default." + default_other_dynamic_favicon: "Show new/updated topic count on browser icon by default." + default_other_disable_jump_reply: "Don't jump to user's post after they reply by default." + default_other_edit_history_public: "Make the post revisions public by default." + + default_categories_watching: "List of categories that are watched by default." + default_categories_tracking: "List of categories that are tracked by default." + default_categories_muted: "List of categories that are muted by default." errors: invalid_email: "Invalid email address." @@ -1209,14 +1272,15 @@ en: move_posts: new_topic_moderator_post: - one: "I moved a post to a new topic: %{topic_link}" - other: "I moved %{count} posts to a new topic: %{topic_link}" + one: "A post was split to a new topic: %{topic_link}" + other: "%{count} posts were split to a new topic: %{topic_link}" existing_topic_moderator_post: - one: "I moved a post to an existing topic: %{topic_link}" - other: "I moved %{count} posts to an existing topic: %{topic_link}" + one: "A post was merged into an existing topic: %{topic_link}" + other: "%{count} posts were merged into an existing topic: %{topic_link}" change_owner: post_revision_text: "Ownership transferred from %{old_user} to %{new_user}" + deleted_user: "a deleted user" emoji: errors: @@ -1273,7 +1337,6 @@ en: omniauth_error_unknown: "Something went wrong processing your log in, please try again." new_registrations_disabled: "New account registrations are not allowed at this time." password_too_long: "Passwords are limited to 200 characters." - email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters." reserved_username: "That username is not allowed." missing_user_field: "You have not completed all the user fields" @@ -1287,7 +1350,10 @@ en: characters: "must only include numbers, letters and underscores" unique: "must be unique" blank: "must be present" - must_begin_with_alphanumeric: "must begin with a letter or number" + must_begin_with_alphanumeric: "must begin with a letter or number or an underscore" + must_end_with_alphanumeric: "must end with a letter or number or an underscore" + must_not_contain_two_special_chars_in_seq: "must not contain a sequence of 2 or more special chars (.-_)" + must_not_contain_confusing_suffix: "must not contain a confusing suffix like .json or .png etc." email: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "is not allowed." @@ -1337,7 +1403,7 @@ en: Click this link to choose a password now: %{base_url}/users/password-reset/%{email_token} - If you don't remember your password, or don't have one yet, choose "I forgot my password" when logging in with your email address. + (If the link above has expired, choose "I forgot my password" when logging in with your email address.) test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" @@ -1391,7 +1457,7 @@ en: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) and pressing the "Upgrade" button. + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. @@ -1407,7 +1473,7 @@ en: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), and pressing the "Upgrade" button. + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. @@ -1426,6 +1492,15 @@ en: one: "1 flag waiting to be handled" other: "%{count} flags waiting to be handled" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 post waiting to be reviewed" + other: "[%{site_name}] %{count} posts waiting to be reviewed" + text_body_template: | + Hello, + + There are posts from new users that are waiting to be reviewed. [They can be approved or rejected here](%{base_url}/queued-posts). + flag_reasons: off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post." inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)." @@ -1439,7 +1514,7 @@ en: deferred: "Thanks for letting us know. We're looking into it." deferred_and_deleted: "Thanks for letting us know. We've removed the post." - temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags" + temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags." system_messages: post_hidden: @@ -1461,73 +1536,89 @@ en: usage_tips: text_body_template: | - A few quick tips to get you started: + Here are a few quick tips to get you started: - ## Keep scrolling + ## Reading - There are no next page buttons or page numbers – to read more, **just keep scrolling down!** + To read more, **just keep scrolling down!** - As new posts come in, they will appear automatically. + As new replies or new topics arrive, they will appear automatically – no need to refresh the page. - ## Where am I? + ## Navigation - - For search, your user page, or the menu, use the **icon ☰ buttons at the upper right**. + - For search, your user page, or the ☰ menu, use the **icon buttons at upper right**. - - Any topic title will take you to the next unread post. Use the last activity time and post count to enter at the top or bottom. + - Selecting a topic title will always take you to the **next unread reply** in the topic. To enter at the top or bottom, select the reply count or last reply date instead. - - While reading a topic, jump to the top ↑ by selecting the topic title. Select the green progress bar at the bottom right for full navigation controls, or use the home and end keys. + - + - While reading a topic, select the progress bar at the bottom right for full navigation controls. Quickly jump back to the top by selecting the topic title. Press ? for a list of super-speedy keyboard shortcuts. - ## How do I reply? + - - To reply to the overall topic, use the Reply button at the very bottom of the page. + ## Replying - - To reply to a specific post, use the Reply button on that post. + - To reply to the **topic in general**, use at the very bottom of the topic. - - To take the conversation in a different direction, but keep them linked together, use Reply as linked Topic to the right of the post. + - To reply to a **specific person**, use on their post. - To quote someone in your reply, select the text you wish to quote, then press any Reply button. + - To reply with **a new topic**, use to the right of the post. Both old and new topics will be automatically linked together. - + To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes! - To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up. + - + To notify someone about your reply, mention their name. Type `@` to begin selecting a username. - For [standard Emoji](http://www.emoji.codes/), just start typing `:` or the traditional smileys `:)` :smile: + - ## What else can I do? + To use [standard Emoji](http://www.emoji.codes/), just type `:` to match by name, or use the traditional smileys `;)` - There are action buttons at the bottom of each post. + - + To generate a summary for a link, paste it on a line by itself: - To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button. + - You can also **share** a link to a post, or **bookmark** it for later reference on your user page. + ## Actions - ## Who is talking to me? + There are action buttons at the bottom of each post: - When someone replies to your post, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it access your **notifications**. + - + To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! - Don't worry about missing a reply – you'll be emailed replies (and messages) if you aren't online when they arrive. + If you see a problem with someone's post, privately let them, or [our staff](%{base_url}/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. - ## When are conversations new? + ## Notifications - By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked. + When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**. - You will see the blue new and number indicators next to these topics: + - + Don't worry about missing a reply – you'll be emailed any notifications that arrive when you are away. - You can change the individual notification state of a topic via the control at the bottom of the topic (this can also be set per category). To change how you track topics, or the definition of new, see [your user preferences](%{base_url}/my/preferences). + ## Your Preferences - ## Why can't I do certain things? + - All topics less than **two days old** are considered new. - New users are somewhat limited for safety reasons. As you participate here, you'll gain the trust of the community, become a full citizen, and those limitations will automatically be removed. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain even more abilities to help us manage our community together. + - Any topic you've **actively participated in** (by creating, replying, or reading for an extended period) will be automatically tracked. + + You will see the blue new and unread number indicators next to these topics: + + + + You can change your notifications for any topic via the notification control at the bottom of the topic. + + + + You can also set notification state per category, if you want to watch every new topic in a specific category. + + To change any of these settings, see [your user preferences](%{base_url}/my/preferences). + + ## Community Trust + + As you participate here, over time you'll gain the trust of the community, become a full citizen, and new user limitations will be lifted. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain new abilities to help us manage our community together. welcome_user: subject_template: "Welcome to %{site_name}!" @@ -1569,7 +1660,7 @@ en: subject_template: "Backup completed successfully" text_body_template: "The backup was successful. - Visit the [admin > backup section](/admin/backups) to download your new backup." + Visit the [admin > backup section](%{base_url}/admin/backups) to download your new backup." backup_failed: subject_template: "Backup failed" @@ -1644,9 +1735,9 @@ en: text_body_template: | We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. - We couldn't find any content in your email. Make sure your reply is at the top of the email -- we can't process inline replies. + We couldn't find any reply content in your email. - If you're getting this and you _did_ include content, try again with HTML content included in your email (not just plain text only). + If you're getting this and you _did_ include a reply, try again with simpler formatting. email_reject_parsing: subject_template: "[%{site_name}] Email issue -- Content unrecognized" @@ -1786,7 +1877,10 @@ en: 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." - unsubscribe_link: "To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url})." + unsubscribe_link: | + To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url}). + + To stop receiving notifications about this particular topic, [click here](%{unsubscribe_url}). subject_re: "Re: " subject_pm: "[PM] " @@ -1963,7 +2057,7 @@ en: (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.) signup: - subject_template: "[%{site_name}] Activate your new account" + subject_template: "[%{site_name}] Confirm your new account" text_body_template: | Welcome to %{site_name}! @@ -1996,14 +2090,16 @@ en: unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})." pasted_image_filename: "Pasted image" store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}." + file_missing: "Sorry, you must provide a file to upload." attachments: too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)." images: too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}KB), please resize it and try again." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" + avatar: + missing: "Sorry, but the avatar you have selected is not present on the server. Can you try uploading it again?" + flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." spam_hosts: "This new user tried to create multiple posts with links to the same domain. See the newuser_spam_host_threshold site setting." @@ -2133,7 +2229,7 @@ en: ## [Powered by You](#power) - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). + This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). @@ -2250,7 +2346,7 @@ en: ## [14. Disclaimer of Warranties](#14) - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. @@ -2343,7 +2439,7 @@ en: ## [Children's Online Privacy Protection Act Compliance](#coppa) - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. + Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), do not use this site. @@ -2367,22 +2463,23 @@ en: static: search_help: | -

      Tips

      +

      Tips

        -
      • Title matches are prioritized, so when in doubt, search for titles
        • -
      • Unique, uncommon words will always produce the best results
        • -
      • Whenever possible, scope your search to a particular category, user, or topic
        • +
      • Title matches are prioritized – when in doubt, search for titles
        • +
      • Unique, uncommon words will produce the best results
        • +
      • Try searching within a particular category, topic, or user

      -

      Options

      +

      Options

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

      @@ -2392,78 +2489,54 @@ en: badges: long_descriptions: autobiographer: | - Blah blah blah - Blah blah blah + This badge is granted for filling out your user profile and selecting a profile picture. Letting the community know more about who you are and what you're interested in makes for a better, more connected community. first_like: | - Blah blah blah - Blah blah blah + This badge is granted the first time you like a post using the :heart: button. Liking posts is a great way to let your fellow community members know that what they posted was interesting, useful, cool, or fun. Share the love! first_link: | - Blah blah blah - Blah blah blah + This badge is granted the first time you place a link to another topic in a reply. Linking topics helps fellow readers find interesting related conversations, by showing connections between topics in both directions. first_quote: | - Blah blah blah - Blah blah blah + This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions focused and on topic. first_share: | - Blah blah blah - Blah blah blah + This badge is granted the first time you share a link to a reply or topic using the share button. Sharing links is a great way to show off interesting discussions with the rest of the world and grow your community. read_guidelines: | - Blah blah blah - Blah blah blah + This badge is granted for reading the community guidelines. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community. reader: | - Blah blah blah - Blah blah blah + This badge is granted for reading a long topic. Reading is fundamental. Reading closely helps you follow the conversation and leads to better, more complete replies. editor: | - Blah blah blah - Blah blah blah + This badge is granted for editing your post. Don't hesitate to edit your posts any time to improve them, fix small mistakes, or add anything you forgot. first_flag: | - Flagging is critical to the health of your community. If you notice any posts that require moderator attention please - do not hesitate to flag. You may also use the flagging dialog to send messages to users once you reach - trust level 1. + This badge is granted for flagging a post. Flagging is critical to the health of your community. If you notice any posts that require moderator attention please + do not hesitate to flag. You may also use the flagging dialog to send messages to fellow users. nice_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 25 outside visitors. Nice job! Sharing links to interesting discussions with friends is an excellent way to grow our community. welcome: | - Blah blah blah - Blah blah blah + This badge is granted when you receive your first like on a post. Congratulations, you've posted something that your fellow community members found interesting, cool, or useful! anniversary: | - Blah blah blah - Blah blah blah + This badge is granted when you've been a member for a year with at least one post in that year. Thanks for sticking around and contributing to our community! good_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 300 outside visitors. Good work! You've shown off an interesting discussion to a lot of new people and helped us grow. great_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 100 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience for this community, and helped us grow in a big way. nice_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 10 likes. Nice job! nice_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a topic that gets 10 likes. Nice job! good_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 25 likes. Good work! good_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a topic that gets 25 likes. Good work! great_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a post that gets 50 likes. Wow! great_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 50 likes. Wow! basic: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted, and you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post images and multiple links. member: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to more join our community. You can now send personal invitations from your user page or individual topics, create group messages, and a few more likes per day. regular: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months, one of the most active readers and a reliable contributor to what makes this community great. You can now recategorize and rename topics, access a private lounge area, more powerful spam flags, and lots more likes per day. leader: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and set a positive example for the community in your deeds and words. You have the ability to edit all posts, take topic moderator actions such as pin, close, unlist, archive, split, and merge, and tons of likes per day. admin_login: success: "Email Sent" @@ -2473,3 +2546,7 @@ en: discourse_hub: access_token_problem: "Tell an admin: Please update the site settings to include the correct discourse_org_access_key." + + performance_report: + initial_post_raw: This topic includes daily performance reports for your site. + initial_topic_title: Website performance reports diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 707c6b407b..385334271f 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -65,6 +65,13 @@ es: other: '%{count} errores impidieron guardar este %{model}' embed: load_from_remote: "Hubo un error al cargar ese post." + site_settings: + min_username_length_exists: "No se puede establecer una longitud mínima para nombre de usuario mayor que el nombre de usuario más corto ya existente." + min_username_length_range: "No se puede establecer el mínimo por encima del máximo." + max_username_length_exists: "No se puede establecer una longitud máxima de nombre de usuario menor que el nombre de usuario más largo ya existente." + max_username_length_range: "No puedes poner el máximo por debajo del mínimo." + default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista." + s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a 's3_upload_bucket'." bulk_invite: file_should_be_csv: "El archivo a subir debe tener formato csv o txt." backup: @@ -133,6 +140,7 @@ es: rss_description: latest: "Temas recientes" hot: "Temas calientes" + posts: "Últimos posts" too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado." excerpt_image: "imagen" queue: @@ -167,13 +175,13 @@ es: Para más consejos, [visita las directrices de nuestra comunidad](/guidelines). Este panel solo aparecerá para tus primeros %{education_posts_text}. avatar: | - ### ¿Qué tal una nueva imagen para tu cuenta? + ### ¿Qué tal si añades una imagen para tu cuenta? - Has publicado unos cuantos temas o respuestas, pero tu avatar no es tan único y especial como tú -- es el mismo avatar por defecto que tienen algunos usuarios. + Has publicado algunos temas y comentarios, pero tu imagen de perfil no es tan destacada como tu escritura -- es sólo una letra. - ¿Has pensado **[visitar tu perfil de usuario](%{profile_path})** y subir tu propia imagen personalizada? + ¿Has considerado **[visitar tu perfil de usuario](%{profile_path})** y subir una imagen que te guste? - ¡Es más fácil serguir los debates de la comunidad y encontrar gente interesante en las conversaciones cuando todos tienen su propio y único avatar! + ¡Al tener todos imagen de perfil es mucho más fácil seguir las conversaciones y encontrar gente interesante! sequential_replies: | ### Considera la posibilidad de responder a varios posts a la vez @@ -237,7 +245,7 @@ es: no_info_other: "

      %{name} no has completado aún el campo 'Sobre mí' de tu perfil
      " vip_category_name: "Sala VIP" vip_category_description: "Una categoría exclusiva para miembros con un nivel de confianza de 3 o más." - meta_category_name: "Meta" + meta_category_name: "Sugerencias" meta_category_description: "Debate sobre este sitio, su gestión, cómo funciona y cómo podríamos mejorarlo." staff_category_name: "Staff" staff_category_description: "Categoría privada para debates entre moderadores y administradores. Los temas solo serán visibles para miembros del staff." @@ -377,7 +385,7 @@ es: one: "hace casi 1 año" other: "hace casi %{count} años" password_reset: - no_token: "Lo sentimos, el enlace de cambio de contraseña es demasiado antiguo. Inicia sesión de nuevo y selecciona 'Olvidé mi contraseña' para obtener un nuevo enlace." + no_token: "Lo sentimos, ese enlace para cambiar la contraseña es demasiado antiguo. Haz clic en el botón Iniciar sesión y utiliza el 'olvidé mi contraseña' para obtener un nuevo enlace. " choose_new: "Por favor elige un nuevo password" choose: "Por favor, elige una contraseña" update: 'Actualizar contraseña' @@ -391,7 +399,7 @@ es: please_continue: "Continuar a %{site_name}" error: "Hubo un problema cambiando tu dirección de email. ¿Quizás la dirección ya está en uso?" activation: - action: "Activar tu cuenta" + action: "Haz clic aquí para activar tu cuenta" already_done: "Lo sentimos, este link de confirmación de cuenta ya no es válido. ¿Quizás tu cuenta ya está activa?" please_continue: "Tu nueva cuenta está confirmada; se te redirigirá a la página de inicio." continue_button: "Continuar a %{site_name}" @@ -459,6 +467,7 @@ es: regular: title: "Tema normal" banner: + title: "Tema de Encabezado" message: make: "Este tema se utiliza ahora como banner. Aparecerá en la parte superior de cada página hasta que sea descartada por el usuario." remove: "Este tema ya no se utiliza como banner. Ya no aparecerá en la parte superior de cada página." @@ -566,6 +575,14 @@ es: title: "Total" xaxis: "Día" yaxis: "Total peticiones a la API" + page_view_logged_in_mobile_reqs: + title: "Peticiones de API con sesión iniciada" + xaxis: "Día" + yaxis: "Peticiones de API con sesión iniciada desde móvil" + page_view_anon_mobile_reqs: + title: "Peticiones de API anónimas" + xaxis: "Día" + yaxis: "Peticiones de API anónimas desde móvil" http_background_reqs: title: "Background" xaxis: "Día" @@ -590,12 +607,25 @@ es: title: "Total" xaxis: "Día" yaxis: "Peticiones totales" + time_to_first_response: + title: "Tiempo transcurrido hasta la primera respuesta" + xaxis: "Día" + yaxis: "Tiempo medio (horas)" + topics_with_no_response: + title: "Temas sin respuesta" + xaxis: "Día" + yaxis: "Total" + mobile_visits: + title: "Visitas de Usuarios" + xaxis: "Día" + yaxis: "Número de visita" dashboard: rails_env_warning: "Tu servidor está funcionando en modo de %{env}." ruby_version_warning: "Tú estás utilizando una versión de Ruby 2.0.0 que es conocida por tener problemas. Actualiza al nivel de parche 247 o más nuevo." host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio." gc_warning: 'Tu servidor está usando recolección de residuos predeterminada por Ruby, que no te proveerá el mejor rendimiento. Lee este tema acerca de optimización del rendimiento: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq no está funcionando. Muchas tareas, por ejemplo el envío de correos, están realizadas desincronizadamente por sidekiq. Por favor asegúrate de que por lo menos un proceso de sidekiq está funcionando. Learn about Sidekiq here.' + queue_size_warning: 'El número de jobs en cola es %{queue_size}, se trata de una cifra alta. Esto podría indicar un problema en el proceso (o procesos) de Sidekiq, o quizá se deba añadir más Sidekiq workers.' memory_warning: 'Tu servidor está funcionando con menos de 1 GB de memoria total. Por lo menos 1 GB de memoria es recomendado.' google_oauth2_config_warning: 'El servidor está configurado para permitir el registro e inicio de sesión con Google OAuth2 (enable_google_oauth2_logins), pero los valores client id y client secret están vacíos. Ve a Ajustes del sitio y actualiza la configuración. Mira esta guía para saber más.' facebook_config_warning: 'El servidor está configurado para permitir crear una cuenta e ingresar utilizando Facebook (enable_facebook_logins), pero los valores id y secreto de la app no están configurados. Ingresa a la Configuración del Sitio y actualiza la configuración. Revisa la guía para aprender más.' @@ -604,7 +634,7 @@ es: s3_config_warning: 'El servidor está configurado para permitir actualizar los archivos a s3, pero por al menos una de las siguientes configuraciones no está realizada: s3_access_key_id, s3_secret_access_key o s3_upload_bucket. Ve a la Configuración del Sitio y actualiza la configuración. Revisa "How to set up image uploads to S3?" para aprender más.' 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 la Configuración del Sitio y actualiza la configuración. Revisa "How to set up image uploads to S3?" para aprender más.' 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 descárgate la última versión.' - failing_emails_warning: 'Hay %{num_failed_jobs} de tareas de email que fallaron. Revisa tu archivo config/discourse.conf y asegúrate que la configuración del servidor de email esté correcta. Revisa las tareas fallidas en Sidekiq.' + 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. Mira los jobs fallados en Sidekiq.' default_logo_warning: "Establece los imágenes del logo para tu sitio. Actualiza logo_url, logo_small_url, y favicon_url en la Configuración del Sitio." 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 Ajustes del sitio." contact_email_invalid: "La dirección email de contacto es inválida. Actualízala en la Configuración del Sitio." @@ -657,7 +687,7 @@ es: max_topic_title_length: "Extensión máxima del título de los temas, en número de caracteres" min_private_message_title_length: "Extensión mínima del título de los temas en mensajes, en número de caracteres" min_search_term_length: "Extensión mínima de una búsqueda válida, en número de caracteres" - allow_uncategorized_topics: "Permitir que se creen temas sin categoría." + allow_uncategorized_topics: "Permitir la creación de temas sin categoría. AVISO: Si ya hay algún tema sin categoría, debes recategorizarlo antes de activar esta opción." uncategorized_description: "La descripción de la categoría Sin categoría. Déjalo en blanco para no añadir descripción." allow_duplicate_topic_titles: "Permitir temas con títulos idénticos, duplicados." unique_posts_mins: "¿Cuántos minutos deben pasar antes de que un usuario pueda publicar el mismo contenido de nuevo?" @@ -680,16 +710,17 @@ es: category_featured_topics: "Número de temas mostrados por categoría en la página /categories. Este cambio puede tardar hasta 15 minutos en verse reflejado" show_subcategory_list: "Mostrar la lista de subcategorías en vez de la lista de temas cuando entras a una categoría." fixed_category_positions: "Si está marcado, podrás ordenar las categorías en un orden fijado. Si no, las categorías se mostrarán según su actividad reciente." + fixed_category_positions_on_create: "Al marcar esta opción, el orden de las categorías se mantendrá en el diálogo de creación de temas (requiere fixed_category_positions)." add_rel_nofollow_to_user_content: "Añadir la etiqueta rel nofollow a todo el contenido introducido por los usuarios, excepto por los enlaces entrantes (incluyendo dominios padre). Si cambias esto, deberás hacer un rebake de todos los posts con: \"rake posts:rebake\"" exclude_rel_nofollow_domains: "Una lista de dominios a cuyos enlaces no se les añadirá la etiqueta nofollow. dominio.com permitirá automáticamente sub.dominio.com también. Como mínimo, deberías añadir el dominio de este sitio para ayudar a los rastreadores web a encontrar todo el contenido. Si otras partes de este sitio web están en otros dominios, añádelos también." post_excerpt_maxlength: "Extensión máxima del resumen / extracto de un post." post_onebox_maxlength: "Extensión máxima en caracteres de un post de Discourse en formato Onebox." onebox_domains_whitelist: "Una lista de dominios a los que permitir el formato Onebox; estos dominios deberán soportar OpenGraph u oEmbed. Pruébalos en http://iframely.com/debug" - logo_url: "El logo situado en la esquina superior izquierda de tu sitio; si se deja en blanco, se mostrará un texto con el título del sitio." - digest_logo_url: "El logo alternativo que irá arriba en los emails de resumen de tu sitio. Si se deja en blanco, se utilizará `logo_url`. Ejemplo: http://example.com/logo.png" - logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, mostrado cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita." - favicon_url: "Un favicon para tu sitio, mira http://es.wikipedia.org/wiki/Favicon" - mobile_logo_url: "El logo con posición fija utilizado en la esquina superior izquierda de la versión móvil de tu sitio. Si se deja en blanco, se mostrará el campo introducido en `logo_url`." + logo_url: "El logo situado en la esquina superior izquierda de tu sitio, debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se mostrará un texto con el título del sitio." + digest_logo_url: "El logo alternativo que irá arriba en los emails de resumen de tu sitio. Debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se utilizará `logo_url`." + logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, debería encajar en las dimensiones de un cuadrado y se muestra cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita." + favicon_url: "Un favicon para tu sitio, mira más info en http://es.wikipedia.org/wiki/Favicon - para que funcione correctamente sobre un CDN debe ser un png" + mobile_logo_url: "El logo con posición fija utilizado en la esquina superior izquierda de la versión móvil de tu sitio. Debería encajar en las dimensiones de un cuadrado. Si se deja en blanco, se mostrará el campo introducido en `logo_url`. Ejemplo: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icono para los dispositivos táctiles de Apple. Se recomienda un tamaño de 144px por 144px." notification_email: "La dirección de correo electrónico \"remitente\", utilizada al enviar todos los emails esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los emails se reciban correctamente." email_custom_headers: "Lista de emails separados por una barra" @@ -707,8 +738,6 @@ es: polling_interval: "Cuando no este en 'long polling', ¿Qué tan frecuente debe los clientes con sesión iniciada hacer 'poll' en milisegundos?" anon_polling_interval: "¿Cuán a menudo deben hacer poll los usuarios anónimos en milisegundos" background_polling_interval: "Cada cuántos milisegundos debería hacerse cargarse información (mientras que la ventana esté en segundo plano)" - auto_track_topics_after: "Milisegundos en los que, por defecto, un tema se sigue automáticamente, los usuarios pueden reajustar este valor para sí (0 para siempre, -1 para nunca)" - new_topic_duration_minutes: "Minutos en los que, por defecto, un tema se considera nuevo, los usuarios pueden reajustar este valor para sí (-1 para siempre, -2 para la última visita)" flags_required_to_hide_post: "Número de reportes que causan que un post se oculte auomáticamente y le sea enviado un mensaje privado al usuario (0 para nunca)" cooldown_minutes_after_hiding_posts: "Número de minutos que un usuario debe esperar para poder editar un post oculto por los reportes de la comunidad" max_topics_in_first_day: "El número máximo de temas que un usuario puede crear en su primer día en el sitio" @@ -721,6 +750,7 @@ es: notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores." flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia." traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea." + allow_html_tables: "Permitir la inserción de tablas en Markdown usando etiquetas HTML como TABLE, THEAD, TD, TR o TH (requiere un rebake completo para todos los posts antiguos que contengan tablas)" post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)." must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!" ga_tracking_code: "Código de Google Analytics, ej: UA-12345678-9; visita http://google.com/analytics" @@ -750,6 +780,7 @@ es: email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas." email_token_grace_period_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas de periodo de gracia, después de ser redimidos." enable_badges: "Activar el sistema de distintivos" + enable_whispers: "Permitir a los usuarios enviar susurros a los moderadores" allow_index_in_robots_txt: "Especificar en robots.txt que este sitio puede ser indexado por los motores de búsqueda web." email_domains_blacklist: "Una lista de dominios de correo electrónico con los que los usuarios no se podrán registrar. Ejemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Una lista de dominios de email con los que los usuarios DEBERÁN registrar sus cuentas. AVISO: ¡los usuarios con un email con diferente dominio a los listados no estarán permitidos!" @@ -763,21 +794,23 @@ es: invite_passthrough_hours: "Durante cuánto tiempo, en horas, un usuario puede utilizar una clave de invitación redimida para iniciar sesión iniciar sesión" invite_only: "El registro público está deshabilitado, todos los nuevos usuarios deberán ser invitados explícitamente por otros miembros de la comunidad o por el staff." login_required: "Se requiere haber iniciado sesión para leer el contenido de este sitio, deshabilita el acceso anónimo." - min_username_length: "Longitud mínima del nombre de usuario en caracteres. ADVERTENCIA: TODOS LOS USUARIOS EXISTENTES CON NOMBRES MÁS CORTOS QUE ESTE VALOR NO PODRÁN ACCEDER AL SITIO" - max_username_length: "Longitud máxima del nombre de usuario en caracteres. ADVERTENCIA: TODOS LOS USUARIOS EXISTENTES CON NOMBRES MÁS LARGOS QUE ESTE VALOR NO PODRÁN ACCEDER AL SITIO" + min_username_length: "Longitud mínima del nombre de usuario en caracteres." + max_username_length: "Longitud máxima del nombre de usuario en caracteres." + reserved_usernames: "Nombres de usuario no permitidos en el registro." min_password_length: "Longitud mínima de contraseña." block_common_passwords: "No permitir contraseñas que están entre las 10.000 más comunes." enable_sso: "Activar single sign on a través de un sitio externo (AVISO: ¡LAS DIRECCIONES DE EMAIL SERÁN VALIDADAS POR EL SITIO EXTERNO!)" enable_sso_provider: "Implementar el protocolo del proveedor de SSO de Discourse en el endpoint /session/sso_provider requiere establecer un sso_secret" sso_url: "URL del endpoint para el single sign on" sso_secret: "Cadena secreta utilizada para autenticar criptográficamente la información del SSO, asegúrate de que es de 10 caracteres o más" - sso_overrides_email: "Reemplaza el email local con el email del sitio externo desde el payload del SSO (AVISO: pueden ocurrir discrepancias debido a la normalización de los correos electrónicos locales)" - sso_overrides_username: "Reemplaza el nombre de usuario local con el nombre de usuario del sitio externo desde el payload del SSO (AVISO: pueden ocurrir discrepancias debido a las diferencias de requirimientos/longitud en los nombres de usuario)" - sso_overrides_name: "Reemplaza el nombre completo local con el nombre completo desde el sitio externo especificado en el payload del SSO" + sso_overrides_email: "Sobreescribe el email local con el email que provea sitio externo desde el payload del SSO en cada registro, y previene cambios locales. (AVISO: pueden ocasionarse discrepancias debido a la normalización de los emails locales)" + sso_overrides_username: "Sobreescribe el usuario local con el usuario que provea el payload del SSO en cada registro, y previene cambios locales. (AVISO: pueden ocasionarse discrepancias debido a las diferencias en los requirimientos/longitud del usuario)" + sso_overrides_name: "Sobreescribe el nombre completo con el que provee el payload del SSO en cada registro, y previene cambios locales." sso_overrides_avatar: "Sustituye el avatar de usuario con el avatar proveniente del sitio externo configurado para el SSO. Si se activa esta opción, se recomienda encarecidamente deshabilitar allow_uploaded_avatars" sso_not_approved_url: "Redireccionar cuentas SSO sin aprobar a esta URL" enable_local_logins: "Habilitar las cuentas con nombre de usuario y contraseña de forma local. (Nota: esto debe estar habilitado para que funcionen las invitaciones)" allow_new_registrations: "Permitir el registro de nuevos usuarios. Desactiva esta opción para prevenir que nadie pueda crear una nueva cuenta." + enable_signup_cta: "Mostrar un aviso a los usuarios anónimos que vuelvan a visitar el sitio animándoles a registrarse." enable_yahoo_logins: "Activar autenticación por Yahoo" enable_google_oauth2_logins: "Habilita la autenticación con Google Oauth2. Este es el método de autenticación a la que Google da soporte actualmente. Requiere de una clave de cliente y una clave secreta." google_oauth2_client_id: "Client ID de tu aplicación Google." @@ -793,7 +826,8 @@ es: github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/applications" allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. " maximum_backups: "La cantidad máxima de copias de seguridad a tener en el disco. Las copias de seguridad más antiguas se eliminan automáticamente" - backup_daily: "Crear automáticamente una copia de seguridad del sitio una vez al día." + automatic_backups_enabled: "Ejecutar backups automáticos definidos por la opción de frecuencia de backups" + backup_frequency: "Con qué frecuencia, en días, crearemos un backup del sitio." enable_s3_backups: "Sube copias de seguridad a S3 cuando complete. IMPORTANTE: requiere credenciales validas de S3 puestas Archivos configuración." s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado." active_user_rate_limit_secs: "Con qué frecuencia actualizaremos el campo 'last_seen_at', en segundos" @@ -825,6 +859,8 @@ es: s3_region: "El nombre de región de Amazon S3 que se utilizará para subir imágenes." s3_cdn_url: "URL de un CDN a utilizar para todos los activos s3 (por ejemplo: https://cdn.somewhere.com). AVISO: después de cambiar esta opción debes hacer un rebake de todos los posts antiguos." avatar_sizes: "Lista de tamaños de avatar generados automáticamente." + external_system_avatars_enabled: "Usar un servicio externo para los avatares." + external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Sustituciones permitidas: {username} {first_letter} {color} {size}" enable_flash_video_onebox: "Habilitar el embebido de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad." default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados." default_trust_level: "Nivel de confianza por defecto (0-4) para los nuevos usuarios. ¡AVISO! Cambiar esto puede resultar en riesgo por spam." @@ -892,7 +928,7 @@ es: newuser_spam_host_threshold: "Cuántas veces un nuevo usuario puede publicar un enlace hacia mismo sitio dentro de `` newuser_spam_host_posts posts antes de ser considerado spam." white_listed_spam_host_domains: "Una lista de dominios a excluir de las pruebas de spam. A los nuevos usuarios no se les restringirá la posibilidad de crear posts con enlaces a estos dominios." staff_like_weight: "Qué ponderación extra otorgan los me gusta provenientes de los miembros del Staff." - topic_view_duration_hours: "Contar una nueva visita a un tema una vez por IP/Usuario cada N horas" + topic_view_duration_hours: "Contar una visita a un nuevo tema por IP/Usuario cada N horas" levenshtein_distance_spammer_emails: "Al revisar coincidencias por correos electrónicos de spammers, qué número de caracteres permiten una coincidencia parcial." max_new_accounts_per_registration_ip: "Si ya hay (n) cuentas con nivel de confianza 0 desde esta IP (y ninguna es de un miembro del staff o de nivel de confianza 2 o más), prohibir nuevos registros desde esa IP." min_ban_entries_for_roll_up: "Al hacer clic en el botón Agrupar, se crea un nuevo rango de entradas para banear si hay al menos (N) entradas." @@ -901,6 +937,10 @@ es: num_flaggers_to_close_topic: "Número mínimo de denunciantes únicos requerido para pausar un tema automáticamente para intervención" num_flags_to_close_topic: "Valor mínimo de reportes activos requerido para pausar un tema automáticamente para intervención" auto_respond_to_flag_actions: "Activar la respuesta automática al deshacer un reporte." + min_first_post_typing_time: "Mínimo período de tiempo en milisegundos en el que un usuario debe estar tecleando durante su primer post, si no se llega a este umbral entrará automáticamente a la cola de moderación. Establece esta opción a 0 para desactivarla (no recomendado)." + auto_block_fast_typers_on_first_post: "Bloquear automáticamente a usuarios que no cumplan el umbral establecido en min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Máximo nivel de confianza por debajo del cual se podrán bloquearán usuarios que escriban demasiado rápido en su primer post" + auto_block_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que el primer post de un usuario sea bloqueado y enviado a la cola de aprobacion. Ejemplo: raging|a[bc]a hará que todos los posts que contengan gaging, aba o aca sean bloqueados. Sólo tiene efecto en el primer mensaje de un usuario." reply_by_email_enabled: "Habilitar la respuesta a temas por email." reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com" disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail." @@ -913,6 +953,7 @@ es: pop3_polling_host: "El host utilizado para hacer polling de e-mails vía POP3." pop3_polling_username: "El nombre de usuario de la cuenta POP3 para hacer polling de e-mails." pop3_polling_password: "La contraseña de la cuenta POP3 para hacer polling de correos." + log_mail_processing_failures: "Registra todos los fallos de procesamiento de email a http://yoursitename.com/logs" email_in: "Permitir a los usuarios crear nuevos temas por email (requiere el polling pop3). Configura las direcciones en la pestaña \"Ajustes\" de cada categoría." email_in_min_trust: "El mínimo nivel de confianza requerido para poder publicar nuevos temas por email." email_prefix: "La [etiqueta] utilizada en el asunto de los emails. Si no está configurado, será por defecto el 'título'." @@ -924,18 +965,16 @@ es: username_change_period: "El número de días después de registrarse entre los cuales una cuenta puede cambiar su nombre de usuario (0 para deshabilitar esta opción)" email_editable: "Permitir a los usuarios cambiar su dirección de email después de registrarse." logout_redirect: "Ubicación a redirigir después que el usuario cierre sesión Ejem: (http://somesite.com/logout)" - allow_uploaded_avatars: "Permitir a los usuarios subir su propio avatar personalizado." - allow_animated_avatars: "Permitir a los usuarios usar avatares con imágenes animadas tipo gif. AVISO: ejecuta el rake task avatars:refresh después de cambiar esta opción." + allow_uploaded_avatars: "Permitir a los usuarios subir imágenes de perfil personalizadas." + allow_animated_avatars: "Permitir a los usuarios utilizar imágenes de perfil animadas en gif. AVISO: ejecuta la tarea rake avatars:refresh después de cambiar esta opción." allow_animated_thumbnails: "Generar miniaturas en movimiento de los gifs animados." default_avatars: "URLs de avatares que se utilizarán por defecto para nuevos usuarios." automatically_download_gravatars: "Descargar Gravatars para usuarios cuando se creen una cuenta o cambien el email." digest_topics: "El número máximo de temas a mostrar en el resumen por email." digest_min_excerpt_length: "La extensión mínima, en caracteres, del extracto de un post en el resumen por email." - default_digest_email_frequency: "Cada cuánto tiempo los usuarios recibirán emails con el resumen del sitio por defecto. Cada usuario puede cambiar esta opción para sí en sus preferencias." suppress_digest_email_after_days: "Suprimir los emails de resumen para aquellos usuarios que no han visto el sitio desde más de (n) días." disable_digest_emails: "Inhabilitar e-mails de resumen para todos los usuarios." - default_external_links_in_new_tab: "Abrir enlaces externos en una nueva pestaña. Los usuarios pueden cambiar esto en sus preferencias." - detect_custom_avatars: "Verificar o no que los usuarios han subido su propio avatar personalizado." + detect_custom_avatars: "Verificar o no que los usuarios han subido una imagen de perfil." max_daily_gravatar_crawls: "Máximo número de veces que Discourse comprobará Gravatar en busca de avatares personalizados en un día" public_user_custom_fields: "Una lista con campos personalizados para el usuario que pueden ser mostrados públicamente." staff_user_custom_fields: "Una lista con campos personalizados para el usuario que pueden ser mostrados a los moderadores o admin." @@ -947,25 +986,25 @@ es: sequential_replies_threshold: "Número de posts consecutivos que un usuario publicará en un mismo tema hasta mostrarle un recordatorio sobre demasiadas repuestas seguidas." enable_mobile_theme: "Los dispositivos móviles utilizan un tema adaptado, con la habilidad de cambiar al estilo de sitio completo. Deshabilita esta opción si quieres utilizar una plantilla personalizada que sea completamente adaptable." dominating_topic_minimum_percent: "Qué porcentaje de posts tiene que publicar un usuario en un mismo tema hasta mostrarle un recordatorio acerca de dominar en demasía un tema." + daily_performance_report: "Analizar registros de NGINX diariamente y publicar un tema para Administradores con los detalles" suppress_uncategorized_badge: "No mostrar la etiqueta de los temas sin categoría en la lista de temas." global_notice: "Mostrar una noticia de URGENCIA o EMERGENCIA para todos los visitantes, deja este campo en blanco para ocultarla (se puede utilizar código HTML)" disable_edit_notifications: "Inhabilitar editar notificaciones por el usuario system cuando 'download_remote_images_to_local' este activo." full_name_required: "Su nombre completo es un campo obligatorio de un perfil de usuario." enable_names: "Mostrar el nombre completo del usuario en su perfil, tarjeta de usuario y emails. Desactiva esta opción para ocultar el nombre completo en todas partes." display_name_on_posts: "Mostrar el nombre completo de un usuario en sus posts, además de su @usuario." + show_time_gap_days: "Si entre dos publicaciones han pasado este número de días, mostrar el lapso de tiempo en el tema." invites_per_page: "Número de invitaciones por defecto mostradas en la página de perfil del usuario." short_progress_text_threshold: "Después de que un número de posts en un tema alcance esta cifra, la barra de progreso sólo mostrará el número del post actual. Si cambias el ancho de la barra de progreso, deberías revisar este valor." default_code_lang: "Lenguaje de programación por defecto para aplicar el resaltado de la sintaxis en los bloques de código de GitHub (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "Cuando alguien publica en un tema cuya última respuesta fue hace este número de días o más, se le mostrará un aviso para desalentar el hecho de resucitar una antigua discusión. Deshabilita esta opción introduciendo el valor 0." autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código." highlighted_languages: "Incluye reglas resaltadas de sintaxis. (Advertencia: incluyendo demasiadas lenguages puede afectar al rendimiento) ver: https://highlightjs.org/static/demo/ para una demostración" - embeddable_host: "Host que puede incrustar los comentarios de este foro Discourse. Nombre de host solamente, no comienzan con http://" feed_polling_enabled: "SOLO PARA EMBEBER: embeber feeds RSS/ATOM como posts." feed_polling_url: "SOLO PARA EMBEBER: URL de los feeds RSS/ATOM a embeber." embed_by_username: "Nombre de usuario en Discourse del que crea los temas embebidos." embed_username_key_from_feed: "Clave para extraer el nombre de usuario en Discourse desde el feed." embed_truncate: "Truncar los posts embebidos." - embed_category: "Categoría de los temas embebidos." embed_post_limit: "Número máximo de posts a embeber." embed_whitelist_selector: "Selector CSS para los elementos que están permitidos en los embebidos." embed_blacklist_selector: "Selector CSS para los elementos que están eliminados desde los embebidos." @@ -973,6 +1012,7 @@ es: enable_cdn_js_debugging: "Permitir /logs mostrar los errores correctamente, añadiendo permisos crossorigin en todas las inclusiones de js" show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas." delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad. + show_logout_in_header: "Mostrar el botón para cerrar sesión en el desplegable de la cabecera" vacuum_db_days: "Correr VACUUM FULL ANALYZE para reclamar espacio en la base de datos después de las migraciones. (Poner en 0 para inhabilitar)" prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto." slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug." @@ -981,6 +1021,22 @@ es: enforce_square_emoji: "Forzar una relación de aspecto cuadrada para todos los emojis." approve_post_count: "La cantidad de posts de un nuevo usuario que deben ser aprobados" approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados" + notify_about_queued_posts_after: "Si hay posts esperando a ser revisados por este número de horas, se enviará un email al correo de contacto. Establece este valor a 0 para desactivar estos emails." + default_email_digest_frequency: "Frecuencia por defecto con la que se reciben los emails resumen." + default_email_private_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto." + default_email_direct: "Enviar un email cuando alguien cite/responda/mencione o invite al usuario por defecto." + default_email_mailing_list_mode: "Enviar un email por cada nuevo post por defecto." + default_email_always: "Enviar una notificación por email aunque el usuario esté activo por defecto." + default_other_new_topic_duration_minutes: "Condición por defecto para que un tema sea considerado nuevo" + default_other_auto_track_topics_after_msecs: "Tiempo por defecto hasta que un tema sea seguido automáticamente." + default_other_external_links_in_new_tab: "Abrir enlaces externos en una nueva pestaña por defecto." + default_other_enable_quoting: "Activar respuesta citando texto seleccionado por defecto." + default_other_dynamic_favicon: "Mostrar temas nuevos/actualizados en el icono del navegador por defecto" + default_other_disable_jump_reply: "No ir a un nuevo post tras publicarlo por defecto" + default_other_edit_history_public: "Hacer la lista de ediciones pública por defecto." + default_categories_watching: "Lista de categorías que están vigiladas por defecto." + default_categories_tracking: "Lista de categorías que están seguidas por defecto" + default_categories_muted: "Lista de categorías que están silenciadas por defecto." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " @@ -1029,13 +1085,14 @@ es: not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto en un tiempo. Estos son los temas mas populares desde que no has estado." move_posts: new_topic_moderator_post: - one: "He movido un post al nuevo tema: %{topic_link}" - other: "He movido %{count} posts a un nuevo tema: %{topic_link}" + one: "un post fue trasladado a un nuevo tema: %{topic_link}" + other: "%{count} posts fueron trasladados a un nuevo tema: %{topic_link}" existing_topic_moderator_post: - one: "He movido un post al tema: %{topic_link}" - other: "He movido %{count} posts al tema: %{topic_link}" + one: "Un post fue trasladado al siguiente tema: %{topic_link}" + other: "%{count} posts fueron trasladados al siguiente tema: %{topic_link}" change_owner: post_revision_text: "Se ha transferido la propiedad de %{old_user} a %{new_user}" + deleted_user: "un usuario eliminado" emoji: errors: name_already_exists: "Lo sentimos, el nombre '%{name}' ya está en uso por otro emoji." @@ -1089,6 +1146,8 @@ es: omniauth_error_unknown: "Algo ha salido mal procesando tu inicio de sesión, por favor, vuelve a intentarlo." new_registrations_disabled: "El registro de nuevas cuentas no está permitido en este momento." password_too_long: "Las contraseñas están limitadas a 200 caracteres" + email_too_long: "El email que has proporcionado es demasiado largo. Las direcciones de correo no deben tener más de 254 caracteres y los nombres de dominio no más de 253." + reserved_username: "Ese nombre de usuario no está permitido." missing_user_field: "No has completado todos los campos de usuario" close_window: "Autenticación completa. Cierra esta ventana para continuar." user: @@ -1099,7 +1158,10 @@ es: characters: "solo debe incluir números y letras" unique: "debe ser único" blank: "debe estar presente" - must_begin_with_alphanumeric: "debe comenzar con una letra o número" + must_begin_with_alphanumeric: "debe empezar con una letra, número o guión bajo" + must_end_with_alphanumeric: "debe terminar con una letra, número o guión bajo" + must_not_contain_two_special_chars_in_seq: "no debe contener una secuencia de 2 o más caracteres especiales (.-_)" + must_not_contain_confusing_suffix: "no debe contener un sufijo confuso como .json, .png, etc." email: not_allowed: "este proveedor de email no está permitido. Por favor, utiliza otra dirección de email." blocked: "no está permitido." @@ -1135,7 +1197,7 @@ es: Haz clic en el siguiente enlace para elegir una contraseña: %{base_url}/users/password-reset/%{email_token} - Si no recuerdas tu contraseña, o no tienes todavía, elige "Olvidé mi contraseña" cuando inicies sesión con tu dirección de email. + (Si el enlace anterior ha caducado, utiliza "Olvidé mi contraseña" cuando vayas a iniciar sesión con tu dirección de email.) test_mailer: subject_template: "[%{site_name}] Prueba de envío de email" text_body_template: | @@ -1178,33 +1240,33 @@ es: new_version_mailer: subject_template: "[%{site_name}] Nueva versión de Discourse, actualización disponible" text_body_template: | - Una nueva versión de [Discourse](http://www.discourse.org) esta disponible. + Está disponible una nueva versión de [Discourse](http://www.discourse.org). Tu versión: %{installed_version} Nueva versión: **%{new_version}** Tal vez quieras: - - Ver que hay de nuevo en el [GitHub changelog](https://github.com/discourse/discourse/commits/master). + - Ver qué hay de nuevo en el [historial de cambios de GitHub](https://github.com/discourse/discourse/commits/master). - - Actualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) y presionando el botón "Actualizar". + - Actualizar desde tu navegador en [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Visitar [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir, y apoyar Discourse. + - Visitar [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir u obtener soporte de Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] actualización disponible" text_body_template: | - Una nueva versión de [Discourse](http://www.discourse.org) esta disponible. + Está disponible una nueva versión de [Discourse](http://www.discourse.org). Tu versión: %{installed_version} Nueva versión: **%{new_version}** Tal vez quieras: - - Ver que hay de nuevo en el [GitHub changelog](https://github.com/discourse/discourse/commits/master). + - Ver qué hay de nuevo en el [historial de cambios de GitHub](https://github.com/discourse/discourse/commits/master). - - Actualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), y presionando el botón "Actualizar". + - Actualizar desde tu navegador en [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Visita [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir, y apoyar a Discourse. + - Visitar [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir u obtener soporte de Discourse. ### Notas de lanzamiento @@ -1219,6 +1281,14 @@ es: subject_template: one: "1 reporte esperando ser atendidos." other: "%{count} reportes esperando ser atendidos." + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 post esperando ser revisado" + other: "[%{site_name}] %{count} posts esperando ser revisados" + text_body_template: | + Hola, + + Hay posts de nuevos usuarios que están esperando a ser revisados. [Pueden aprobarse o rechazarse aquí](%{base_url}/queued-posts). flag_reasons: off_topic: "Tu post fue reportado como **off-topic**: la comunidad piensa que no se ajusta debidamente al tema, definido por el título o el primer post." inappropriate: "Tu post fue reportado como **inapropiado**: la comunidad piensa que es ofensivo, abusivo o que vulnera alguna de [nuestros consejos de uso](/guidelines)." @@ -1230,7 +1300,7 @@ es: disagreed: "Gracias por hacérnoslo saber. Estamos revisándolo." deferred: "Gracias por hacérnoslo saber. Estamos revisándolo." deferred_and_deleted: "Gracias por hacérnoslo saber. Hemos eliminado el post." - temporarily_closed_due_to_flags: "Este tema está cerrado temporalmente por un elevado número de denuncias por parte de la comunidad" + temporarily_closed_due_to_flags: "Este tema está temporalmente cerrado debido a un gran número de reportes de la comunidad." system_messages: post_hidden: subject_template: "Post oculto al haber sido reportado por la comunidad" @@ -1249,8 +1319,12 @@ es: Para más información, por favor consulta nuestras [directrices](%{base_url}/guidelines). usage_tips: - text_body_template: | - Este mensaje privado tiene algunos trucos rápidos para que puedas comenzar. ## Sigue deslizando No hay botones de página siguiente o números de página – para leer más, **¡simplemente sigue deslizando hacia abajo!** Mientras llegan nuevos temas, estos aparecerán automáticamente. ## ¿Dónde estoy? - Para buscar, tu página de usuario o el menú, usa los botones **icon ☰ en la parte superior derecha**. - Cualquier título de tema te llevará al siguiente mensaje no leído. Usa la hora de última actividad y la cuenta de mensaje para ir al principio o al final. - Mientras estás leyendo un tema, salta al inicio ↑ seleccionando el título del tema. Selecciona la barra de progreso verde en la parte inferior derecha para los controles completos de navegación o usa las teclas home "Inicio" y end; "Fin";. ## ¿Cómo respondo? - Para responder al mensaje general, usa el botón de Respuesta al final de la página. - Para responder a un mensaje en particular, usa el botón Respuesta en ese mensaje. - Para llevar la conversación en una dirección distinta, pero manteniendo un enlace, usa Responde como Tema enlazado a la derecha del mensaje. - Para citar a alguien en tu respuesta, selecciona el texto que quieras citar y presiona cualquier de los botones de Respuesta. Para dar un toque a alguien en tu respuesta, menciona su nombre. Escribe `@` y un cuadro de autocompletado aparecerá. Para [Emoji comunes](http://www.emoji.codes/), simplemente comienza escribiendo `:` o los tradicionales smileys `:)` :smile: ## ¿Qué más puedo hacer? Hay botones de acción al final de cada mensaje. Para hacer saber a cualquiera que te agradó su mensaje, usa el botón **me gusta**. Si tienes algún problema con un mensaje, házselo saber privadamente al autor o bien a nuestro equipo usando el botón **reportar**. También puedes **compartir** el enlace a un mensaje o añadirlo a **favoritos** para referencia futura en tu página de usuario. ## ¿Quién me está hablando? Cuando alguien responde a tu mensaje, cita tu mensaje o menciona tu `@nombre_de_usuario`, un número aparecerá de forma inmediata en la parte superior derecha de la página. Úsalo para acceder a tus **notificaciones**. No te preocupes si te pierdes una respuesta – se te enviará un correo electrónico con las respuestas directas (y mensajes privados) si no estas conectado cuando te lleguen. ## ¿Cuándo son nuevas las conversaciones? Por defecto todas las conversaciones con menos de dos días de antigüedad son consideradas nuevas, y cualquier conversación en la que hayas participado (respondido, creado o leído por un periodo extenso de tiempo) serán automáticamente monitorizadas. Verás indicadores azules y de números al lado de estos temas: Puedes cambiar el estado individual de notificación de cada tema a través del control al final del tema (también puede ajustarse por categoría). Para cambiar la forma en que monitorizas los temas, o definir una nueva, echa un vistazo a tus [preferencias de usuario](%{base_url}/my/preferences). ## ¿Por qué no puedo hacer ciertas cosas? Los nuevos usuarios están de alguna forma limitados por razones de seguridad. Conforme vayas participando, irá ganando la confianza de la comunidad, te convertirás en un ciudadano de pleno derecho y estas limitaciones se te quitarán automáticamente. Con un [nivel de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) suficientemente alto, incluso ganarás acceso a más habilidades para ayudarnos a administrar nuestra comunidad juntos. + text_body_template: "Aquí tienes unos breves consejos para empezar:\n\n## Lectura\n\nPara leer más, **¡tan solo tienes que hacer scroll!** \n\nTan pronto como se publiquen nuevas respuestas o temas, aparecerán automáticamente – sin necesidad de actualizar la página.\n\n## Navegación\n\n- Para la búsqueda, tu perfil de usuario, o el menú ☰;, usa los **botones con iconos de la esquina superior derecha**. \n\n- Entrar a un tema desde su título te llevará a la **última respuesta sin leer** del hilo. Para ir al primer o al último post, haz clic en el contador de respuestas o en la fecha de última respuesta.\n\n \n\n- Mientras lees un tema, selecciona la barra de progreso en la esquina inferior derecha para ver los controles de navegación. Podrás ir al inicio del hilo seleccionando su\ + \ título. Teclea ? para ver una lista de rápidos atajos de teclado.\n\n \n\n## Participando\n\n- Para responder al **tema en general**, utiliza al final del hilo. \n\n- Para responder a **una persona en específico**, utiliza en su post. \n\n- Para responder **creando un nuevo tema**, utiliza a la derecha del post. Tanto el tema original como el nuevo serán enlazados entre sí automáticamente. \n\nPara escribir una cita, selecciona el texto que quieres citar, después haz clic en el botón citar. ¡Puedes repetir para realizar\ + \ múltiples citas! \n\n\n\nPara notificar a alguien en tu respuesta, menciónale. Empieza a escribir `@` para elegir su nombre de usuario. \n\n \n\nPara usar [Emojis](http://www.emoji.codes/), teclea `:` para elegir por nombre, o usa los tradicionales smileys `;)` \n\n \n\n## Acciones\n\nHay algunos botones de acción al final de cada post: \n\n \n\nPara hacerle saber a alguien que has disfrutado o que aprecias su post, utiliza el botón de **Me gusta**. ¡Compartir es amor! \n\nSi ves algún problema en la publicación de\ + \ alguien, escríbele un privado, o házselo saber [a nuestros moderadores](%{base_url}/about), con el botón **reporte**. También puedes **compartir** un enlace a un post, o guardarlo en **marcadores** para tenerlo de referencia en tu página de perfil. \n\n## Notificaciones\n\nCuando alguien te responde, cita tu post, o bien menciona tu `@usuario`, inmediatamente aparecerá un número en la esquina superior derecha de la página. Usa ese botón para acceder a tus **notificaciones**. \n\n \n\nNo te preocupes si te pierdes alguna respuesta – te enviaremos un email con las notificaciones que lleguen cuando estés fuera.\n\n## Tus preferencias\n\n- Todos los temas creados hace menos de **dos días** se consideran nuevos. \n\n- Aquellos temas en los que hayas **participado activamente** (porque lo hayas creado,\ + \ o respondido o leído durante un período razonable) serán seguidos por tu usuario automáticamente. Verás los indicadores azules de temas nuevos o número de respuestas no leídas al lado de estos temas: \n\n \n\nPuedes cambiar tus notificaciones para cualquier tema mediante el control de notificaciones al final del tema. \n\n \n\nTambién puedes establecer el estado de notificación de una categoría entera, si quieres vigilar cualquier nuevo tema en una categoría específica. Para cambiar cualquiera de estas opciones, puedes ver [tus preferencias](%{base_url}/my/preferences). \n\n## Confianza \n\nAl participar aquí, con el tiempo te ganarás la confianza de la comunidad, te convertirás en usuario de\ + \ pleno derecho y te serán retiradas las limitaciones de nuevo usuario. Llegado a un punto de un alto [nivel de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), obtendrás además nuevas habilidades para ayudarnos a gestionar la comunidad juntos.\n" welcome_user: subject_template: "¡Bienvenido a %{site_name}!" text_body_template: | @@ -1287,7 +1361,7 @@ es: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "La copia de seguridad se completo exitosamente" - text_body_template: "La copia de seguridad fue exitosa.\nVisita la [sección admin > copia de seguridad](/admin/backups) para descargar tu nueva copia de seguridad." + text_body_template: "La copia de seguridad se completó con éxito.\nVisita la sección [admin > backup](%{base_url}/admin/backups) para descargar una nueva copia de seguridad." backup_failed: subject_template: "La copia de seguridad falló" text_body_template: | @@ -1349,7 +1423,12 @@ es: No hay una cuenta de usuario asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_empty: subject_template: "[%{site_name}] Problema con el correo electrónico -- Sin Contenido" - text_body_template: "Lo sentimos, pero tu email para %{destination} (titled %{former_title}) no funcionó. \n\nNo pudimos encontrar contenido en este e-mail. Asegúrate de que hayas escrito algo al inicio del e-mail -- no podemos analizar respuestas en una sola línea. \n\nSi estás teniendo este problema y _sí_ incluiste contenido, intenta otra vez con contenido HTML incluido en tu e-mail (no solo texto plano).\n" + text_body_template: | + Lo sentimos, pero tu email para %{destination} (titled %{former_title}) no funcionó. + + No pudimos encontrar contenido en este e-mail. + + Si estás teniendo este problema y _sí_ incluiste contenido, inténtalo de nuevo con un formato más simple. email_reject_parsing: subject_template: "[%{site_name}] Problema con el correo electrónico -- Contenido desconocido" text_body_template: | @@ -1464,7 +1543,10 @@ es: download_remote_images_disabled: subject_template: "Inhabilitar la descarga de imágenes remotas" text_body_template: "La opción `download_remote_images_to_local` ha sido inhabilitada porque se ha llegado al límite de espacio en disco configurado en `download_remote_images_threshold`." - unsubscribe_link: "Si quieres eliminar tu suscripción a estos emails, visita tu [user preferences](%{user_preferences_url})." + unsubscribe_link: | + Para dar de baja tu suscripción a estos emails, visita tus [preferencias](%{user_preferences_url}). + + Para dejar de recibir notificaciones sobre este tema en particular, [haz clic aquí](%{unsubscribe_url}). subject_re: "Re:" subject_pm: "[MP]" user_notifications: @@ -1623,7 +1705,7 @@ es: (Si necesitas comunicarte por privado con [algún miembro del staff](%{base_url}/about) como nuevo usuario, puedes responder a este mensaje.) signup: - subject_template: "[%{site_name}] Activa tu nueva cuenta" + subject_template: "[%{site_name}] Confirma tu nueva cuenta" text_body_template: | ¡Bienvenido a %{site_name}! @@ -1651,13 +1733,14 @@ es: unauthorized: "Lo sentimos, el archivo que estás intentando subir no está autorizado (extensiones autorizadas: %{authorized_extensions})." pasted_image_filename: "Imagen pegada" store_failure: "Falló el almacenamiento de la subida #%{upload_id} para el usuario #%{user_id}." + file_missing: "Lo sentimos, debes incluir un archivo a subir." attachments: too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)." images: too_large: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB). Por favor, modifica sus dimensiones y prueba otra vez." - fetch_failure: "Lo sentimos, hubo un error al recuperar la imagen." - unknown_image_type: "Lo sentimos, pero el archivo que estás intentado subir no parece ser una imagen." size_not_found: "Lo sentimos, pero no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?" + avatar: + missing: "Lo sentimos, pero el avatar que has elegido no está disponible en el servidor. ¿Puedes intentar subirlo de nuevo?" flag_reason: sockpuppet: "Un nuevo usuario ha creado un tema, y otro nuevo usuario con la misma dirección IP le ha respondido. Mira la opción flag_sockpuppets del sitio." spam_hosts: "Este nuevo usuario intentó crear varios posts con enlaces al mismo dominio. Mira la opción newuser_spam_host_threshold." @@ -1693,100 +1776,84 @@ es: title: "Términos de Servicio" privacy_topic: title: "Políticas de Privacidad" + body: "\n\n## [¿Qué información recolectamos?](#collect)\n\nRecolectamos información tuya cuando te registras en nuestra web, y recopilamos información cuando participas en ella leyendo, escribiendo y evaluando el contenido compartido aquí.\n\nAl registrarte en nuestra web, puede que se te pida que indiques tu nombre y tu email. Sin embargo, puedes visitarnos sin registrarte. Tu email será verificado a través de un mensaje que contendrá un enlace único. Si ese enlace es visitado, sabremos que controlas el email.\n\nCuando estés registrado y publiques, guardamos la dirección IP de donde el mensaje ha sido publicado. Puede que guardemos registros que incluyan la dirección IP de cada intercambio de datos con nuestro servidor.\n\n\n\n## [¿Para qué usamos tu información?](#use)\n\nCualquier información recolectada puede ser usada en una de las siguientes\ + \ maneras:\n\n* Para personalizar tu experiencia — tu información nos ayuda a responder a tus necesidades individuales.\n* Para mejorar nuestra web — intentamos continuamente mejorar nuestro sitio web ofreciéndote contenido basado en la información que recibimos de ti.\n* Para mejorar el servicio de soporte — tu información nos ayuda a responder de una forma más efectiva a tus dudas y problemas.\n* Para enviar emails cada cierto tiempo — La direccion de email que nos proporciones puede ser usada para enviarte información, notificaciones que tú solicites sobre cambios en temas, sobre respuestas a tu nombre, respuestas a consultas y/o cualquier otro tipo de solicitudes o cuestiones.\n\n\n\n## [¿Cómo protegemos tu información?](#protect)\n\nTenemos implementadas varias medidas de seguridad para mantener tu información personal segura cuuando la introduces\ + \ o accedes a ella.\n\n\n\n## [¿Cuál es la política de retención de datos?](#data-retention)\n\nIntentamos:\n\n* No retener los registros de los servidores conteniendo la dirección IP de todas las solicitudes durante más de 90 días.\n* No retener las direcciones IP asociadas con usuarios registrados y sus mensajes durante no más de 5 años.\n\n\n\n\n## [¿Usamos cookies?](#cookies)\n\nSí. Las cookies con pequeños archivos que una web o su proveedor de servicios transfiere a tu disco duro a través de tu navegador (si lo permites).\nEstas cookies permiten a la web reconocer tu navegador y, si tienes una cuenta registrada, asociarlo con ella.nt.\n\nUsamos cookies para entender y guardar tus preferencias para futuras visitas y para recolectar información sobre el tráfico y la interacción con este sitio web para que podamos ofrecer mejores experiencias\ + \ y herramientas en un futuro. Puede que nos asociemos con terceras personas para que nos asisten a entender mejor a nuestros visitantes. Estos proveedores de servicios no tienen permitido usar esta información para otro propósito que no sea ayudarnos a mejorar.\n\n\n\n## [¿Revelamos alguna información a terceros?](#disclose)\n\nNo vendemos, intercambiamos o transferimos a terceros tu información personal. Esto no incluye a terceros que nos ayuden a operar correctamente este sitio web, a administrar nuestro negocio o a ofrecerte un servicio, siempre y cuando acepten mantener esta información confidencial.\nPuede que revelemos tu información cuando creamos que sea apropiado para cumplir con la ley, hacer cumplir con nuestras políticas, derechos, propiedades, o seguridad nuestros o de terceros. Sin embargo, la información no personal de los visitantes puede que sea entregada\ + \ debidamente a terceros con propósitos de marketing, publicidad u otros usos. \n\n\n\n## [Enlaces de terceros](#third-party)\n\nOcasionalmente, es posible que incluyamos u ofrezcamos enlaces a productos o servicios de terceros en esta web. Estos sitios webs de terceros tienen otras políticas de privacidad, por lo que no nos hacemos responsables del contenido y actividades de estos sitios. Sin embargo, intentamos proteger la integridad de nuestra web y aceptamos opiniones sobre estos sitios de terceros.\n\n\n\n## [Cumplimiento del Acta de Protección de la Privacidad Online de los Niños de 1998](#coppa)\n\nNuestra web, sus productos y servicios están dirigidos a personas que tengan 13 o más años de edas. Si este servidor está en EEUU, y tienes menos de 13 años de edad, a causa del Acta de Protección de la Privacidad Online de los Niños de 1998\ + \ ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) de EEUU, no uses este sitio web.\n\n\n\n## [Política de privacidad online](#online)\n\nEsta política de privacidad sólo tiene validez para la información recolectada a través de nuestro sitio web, y no para aquella recolectada offline.\n\n\n\n## [Consentimiento](#consent)\n\nAl usar nuestra web, aceptas esta política.\n\n\n\n## [Cambios a nuestra política de privacidad](#changes)\n\nSi decidimos cambiar nuestra política de privacidad, publicaremos los cambios en esta misma página.\n\nEste documento tiene una licencia \"CC-BY-SA\". Última actualización: 31 de mayo del 2013.\n" static: search_help: | -

      Consejos

      +

      Consejos

        -
      • Las coincidencias de título están priorizadas, por lo que si tienes dudas, busca por títulos.
        • -
      • Las palabras únicas o poco comunes siempre producirán los mejores resultados.
        • -
      • Siempre que puedas, reduce el ámbito de tu búsqueda a una categoría en particular, usuario o tema
        • +
      • Las coincidencias por título tienen prioridad – de manera que si tienes dudas, mejor busca por títulos
        • +
      • Buscar palabras diferentes, no muy comunes, siempre dará mejores resultados
        • +
      • Cuando sea posible, centra tu búsqueda en una categoría, un tema o un usuario en concreto

      -

      Opciones

      +

      Opciones

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

      - arcoiris category:parks status:open order:latest buscará temas que contengan la palabra "rainbows" en la categoría "parks" que no estén cerrados o archivados, y se ordenarán por la fecha del último mensaje.

      + gatos category:parques status:open order:latest buscará temas que contengan la palabra "gatos" en la categoría "parques" que no estén cerrados o archivados, ordenados por fecha del último post. +

      badges: long_descriptions: autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah + Este distintivo se otorga por completar tu perfil de usuario y seleccionando una foto de perfil. Permitiendo a la comunidad saber más sobre ti y tus intereses hace que la comunidad sea mejor y esté más conectada. + first_like: "Este distintivo se otorga la primera vez que le das 'Me gusta' a un post usando el botón de :heart:. Dándole 'Me gusta' a posts es una manera estupenda de hacer saber al resto de compañeros de la comunidad que lo que han publicado te ha parecido interesante, útil, chulo o divertido. \n" first_link: | - Blah blah blah - Blah blah blah + Este distintivo se otorga la primera vez que incluyes un enlace a otro tema en una respuesta. Enlazar temas ayuda al resto de lectores a encontrar interesantes conversaciones relevantes al enseñar las conexiones que dos temas tienen. first_quote: | - Blah blah blah - Blah blah blah + Este distintivo se otorga la primera vez que citas un post en una respuesta. Citar secciones relevantes de posts anteriores en tus respuestas ayuda a mantener los debates centrados en el tema central. first_share: | - Blah blah blah - Blah blah blah + Este distintivo se otorga la primera vez que compartes un enlace a una respuesta o tema usando el botón de compartir. Compartir enlaces es una buena manera de mostrar contenido interesante de la comunidad al resto de gente, ayudando a su crecimiento. read_guidelines: | - Blah blah blah - Blah blah blah + Este distintivo se otorga por leer las directrices de la comunidad. Siguiendo y compartiendo estas simples directrices ayuda a construir una comunidad segura, divertida y sostenible. reader: | - Blah blah blah - Blah blah blah + Este distintivo se otorga por leer un tema largo. Leer es fundamental. Leer al detalle ayuda a seguir la conversación y hace que las respuestas sean mejores y más completas. editor: | - Blah blah blah - Blah blah blah - first_flag: "Los reportes son críticos para mantener saludable tu comunidad. Si detectas que alguna publicación pueda necesitar la atención de un moderador por favor \nno dudes en reportarlo. Tambien puedes usar el diálogo de reporte para enviar mensajes a los usuarios una vez alcances \nel nivel de confianza 1.\n" + Este distintivo se otorga por editar tu post. No dudes en editar tus posts en cualquier momento para mejorarlos, corregir pequeños errores o añadir algo que olvidaste. + first_flag: "Este distintivo se concede por reportar un post. Reportar es crítico para la salud de tu comunidad. Si detectas que alguna publicación requiere de la atención de un moderador por favor \nno dudes en reportarlo. También puedes usar el diálogo de reporte para enviar mensajes a otros usuarios.\n\n" nice_share: | - Blah blah blah - Blah blah blah + Este distintivo se concede por compartir un enlace a un post que ha recibido 25 visitantes nuevos. ¡Buen trabajo! Compartir enlaces a debates interesantes con amigos es una manera excelente de hacer crecer nuestra comunidad. welcome: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando recibes tu primer Me gusta en un post. ¡Enhorabuena, has publicado algo que la comunidad considera guay, útil o interesante! anniversary: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando cumples un año como miembro que ha publicado al menos un post. ¡Gracias por pasarte por aquí y contribuir a nuestra comunidad! good_share: | - Blah blah blah - Blah blah blah + Este distintivo se concede por compartir un enlace a un post que ha recibido 300 visitantes nuevos. ¡Genial! Has descubierto un debate interesante para mucha gente que no conocía el sitio y nos has ayudado a crecer. great_share: | - Blah blah blah - Blah blah blah + Este distintivo se concede por compartir un enlace a un post que ha recibido 1000 visitantes nuevos. ¡Bravo! Has promovido un debate interesante para una inmensa audiencia que no conocía el sitio y nos has ayudado a crecer muchísimo. nice_post: | - Blah blah blah - Blah blah blah + Este distintivo se concede al publicar una respuesta con 10 Me gusta. ¡Buen trabajo! nice_topic: | - Blah blah blah - Blah blah blah + Este distintivo se concede al crear un tema con 10 Me gusta. ¡Buen trabajo! good_post: | - Blah blah blah - Blah blah blah + Este distintivo se concede al publicar una respuesta con 25 Me gusta. ¡Genial! good_topic: | - Blah blah blah - Blah blah blah + Este distintivo se concede al crear un tema con 25 Me gusta. ¡Genial! great_post: | - Blah blah blah - Blah blah blah + Este distintivo se concede al publicar una respuesta con 50 Me gusta. ¡Excelente! great_topic: | - Blah blah blah - Blah blah blah + Este distintivo se concede al crear un tema con 50 Me gusta. ¡Excelente! basic: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí un momento y leer unos cuantos temas para ver de qué va esta comunidad. Las restricciones de nuevo usuario se eliminan y podrás usar las funcionalidades esenciales del sitio como enviar mensajes a otras personas, reportar posts, editar posts wiki y publicar imágenes o varios enlaces. member: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando alcanzas el nivel de confianza 2. Gracias por tu constante participación en la comunidad. Ahora puedes enviar invitaciones a otras personas desde tu perfil o temas individuales, enviar mensajes a grupos y dar más Me gusta por día. regular: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando alcanzas el nivel de confianza 3. Gracias por tomar parte activa de nuestra comunidad por tanto tiempo, ser uno de los más ávidos lectores y contribuir tanto a su crecimiento y calidad. Ahora puedes recategorizar o renombrar temas, acceder al área vip, reportar spam de forma más contundente y dar muchos más Me gusta por día. leader: | - Blah blah blah - Blah blah blah + Este distintivo se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todos los posts, dar muchísimos Me gusta por día y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o integrarlos. admin_login: success: "Email enviado" error: "¡Error!" @@ -1794,3 +1861,6 @@ es: submit_button: "Enviar email" discourse_hub: access_token_problem: "Avisa a un admin: Por favor actualiza los ajustes del sitio para incluir la discourse_org_access_key correctamente." + performance_report: + initial_post_raw: Este tema contiene informes diarios sobre el rendimiento de tu sito. + initial_topic_title: Informe sobre el rendimiento del sitio diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 7b80c9f829..92229021a8 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -126,6 +126,7 @@ fa_IR: rss_description: latest: "آخرین ارسال ها" hot: "جستارهای داغ" + posts: "آخرین نوشته‌ها" too_late_to_edit: "ارسالی مورد نظر مربوط به زمان بسیار گذشته می باشد. امکان ویرایش و حذف آن وجود ندارد." excerpt_image: "تصویر" queue: @@ -158,14 +159,6 @@ fa_IR: - Constructive criticism is welcome, but criticize *ideas*, not people. For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. - avatar: | - ### How about a new picture for your account? - - You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have. - - Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you? - - It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar! sequential_replies: | ### Consider replying to several posts at once @@ -229,7 +222,7 @@ fa_IR: no_info_other: "
      %{name}هنوز چیزی وارد نکرده درباره خودش در نمایه شان. " vip_category_name: "زبان" vip_category_description: "دسته مخصوص برای اعضا با سطح اعتماد 3 و بالاتر." - meta_category_name: "متا" + meta_category_name: "بازخورد از سایت" meta_category_description: "گفتگو در مورد سایت٬ این سازمان٬ چگونه کار می کنه٬ و چطور می توانیم آن را بهبود ببخشیم. " staff_category_name: "کارکنان" staff_category_description: "بخش خصوصی برای گفتگوی مدیران. جستارها فقط برای مدیران و گردانندگان قابل رویت است." @@ -343,7 +336,6 @@ fa_IR: almost_x_years: other: "حداقل %{count} سال قبل" password_reset: - no_token: "Sorry, that password change link is too old. Log in again and select 'I forgot my password' to get a new link." choose_new: "لطفا یک رمز عبور جدید وارد کنید" choose: "لطفا یک رمز عبور وارد کنید" update: 'به‌روز کردن گذرواژه' @@ -357,13 +349,12 @@ fa_IR: please_continue: "برو به %{site_name}" error: "در تغییر ایمیلتان خطایی روی داد. شاید آن نشانی از پیش در حال استفاده است؟" activation: - action: "حساب کاربریتان را فعال کنید" already_done: "متاسفیم٬‌ این پیوند تاییدیه حساب کاربری دیگر معتبر نیست. شاید حساب کاربری شما در حال حاضر فعال است." please_continue: "حساب کاربری جدید شما تایید شد; شما به صفحه اصلی هدایت می شوید. " continue_button: "برو به %{site_name}" welcome_to: "به %{site_name} خوش آمدید!" approval_required: "مدیر باید حساب کاربری را بصورت دستی تایید کند برای دسترسی به این انجمن. شما ایمیلی مبنی به تایید حساب کاربریتان دریافت می کنید. " - missing_session: "We can not detect if your account was created, please ensure you have cookies enabled." + missing_session: "ما نمی‌توانیم تشخیص دهیم که آیا حساب شما ایجاد شده است یا خیر، لطفا از فعال بودن کوکی‌ها اطمینان حاصل کنید." post_action_types: off_topic: title: 'جستار های قدیمی' @@ -425,6 +416,7 @@ fa_IR: regular: title: "موضوع عادی" banner: + title: "اعلان موضوع" message: make: "این موضوع در حال حاضر بنر است. این در بالای در تمام صفحه ها نمایش داده می شود تا زمانی که توسط کاربر رد بشود. " remove: "این موضوع دیگر در بنر نیست. دیگر در بالای در صفحه ها به نمایش در نمی آید. " @@ -532,6 +524,12 @@ fa_IR: title: "کل" xaxis: "روز" yaxis: "تمام درخواست API" + page_view_logged_in_mobile_reqs: + title: "وارد شده در درخواست های API" + xaxis: "روز" + page_view_anon_mobile_reqs: + title: "درخواست های ناشناس API" + xaxis: "روز" http_background_reqs: title: "پس زمینه" xaxis: "روز" @@ -556,6 +554,18 @@ fa_IR: title: "مجموع" xaxis: "روز" yaxis: "کل درخواست ها" + time_to_first_response: + title: "زمان ارسال اولین پاسخ" + xaxis: "روز" + yaxis: "زمان میانگین (ساعت)" + topics_with_no_response: + title: "عناوین بدون پاسخ" + xaxis: "روز" + yaxis: "مجموع" + mobile_visits: + title: "بازدید کاربران" + xaxis: "روز" + yaxis: "تعداد بازدید ها" dashboard: rails_env_warning: "سرور شما در حال اجراست در %{env} حالت " ruby_version_warning: "شما نسخه Ruby 2.0.0 را اجرا کرده اید که به مشکل دارا بودن شناخته شده است. به روز کنید به بخش 247 یا بعدتر" @@ -570,7 +580,6 @@ fa_IR: s3_config_warning: 'سرور تنظیم شده برای بارگزاری فایل به s3 ولی حداقل یکی از تنظیمات پیش رو تنظیم نشده است: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. برو به تنظیمات سایت و بروز رسانی و تنظیمات. این را ببین برای بارگزاری های عکس به S3؟" برای کسب اطلاعات بیشتر .' s3_backup_config_warning: 'سرور تنظیم شده برای بارگزاری نسخه پشتیبان به s3 ولی حداقل یکی از تنظیمات پیش رو تنظیم نشده است: : s3_access_key_id, s3_secret_access_key or s3_backup_bucket. برو به تنظیمات سایت و بروز رسانی و تنظیمات این را ببین برای تنظیم ارسال عکس ها به S3؟ " برای کسب اطلاعات بیشتر .' image_magick_warning: 'سرور تنظیم شده برای ساخت تامبنیل های عکس های بزرگ. ولی ImageMagick نصب نشده است. ImageMagick را نصب کن با استفاده از بسته مدیریت یا آخرین نسخه را دانلود کن. ' - failing_emails_warning: 'تعدادی %{num_failed_jobs} ایمیل کار هست که نا موفق شد. فایل config/discourse.conf را چک کن و مطمئن شو که تنظیمات سرور ایمیل درست است. کارهای ناموفق را در Sidekiq ببین .' default_logo_warning: "یک لوگوی گرافیکی برای سایت خود انتخاب نمایید. تگ های logo_url, logo_small_url, و favicon_url را بروز رسانی کنید. تنظیمات سایت" contact_email_missing: "ایمیل وب سایت را وارد کن که سریعا قابل دسترسی باشد برای مواقعی که مشکلی در وب سایت وجود دارد. به روز کن در تنظیمات سایت." contact_email_invalid: "ایمیل تماس با وب سایت اشتباه است. به روز کنید در تنظیمات سایت ." @@ -623,7 +632,7 @@ fa_IR: max_topic_title_length: "حداکثر طول مجاز عنوان جستار در کاراکتر" min_private_message_title_length: "حداقل طول مجاز عنوان برای پیام در کاراکتر" min_search_term_length: "حداقل طول واژه جستجوی معتبر در کاراکتر" - allow_uncategorized_topics: "به جستار اجازه ساخت بده بدون دسته بندی " + allow_uncategorized_topics: "اجازه ایجاد عناوین فاقد دسته‌بندی را بده. هشدار: درصورتی که عناوین فاقد دسته‌بندی وجود داشته باشد، بایستی قبل از غیر فعال کردن این قابلیت آن‌ها را دسته‌بندی کنید." uncategorized_description: "شرح دسته بندی های دسته بندی نشده. خالی بگذارید برای بدون شرح. " allow_duplicate_topic_titles: "جستارها را با عناوین یکسان و تکراری اجازه بده " unique_posts_mins: "چند دقیقه قبل از اینکه کاربر بتواند دوباره نوشته ای با محتویات یکسان را بگذارد." @@ -646,15 +655,12 @@ fa_IR: category_featured_topics: "تعداد جستارهای نمایش داداه شده به دسته بندی در صفحه دسته بندی ها. بعد از عوض کردن این مقدار٬ تا 15 دقیقه زمان می برد تا صفحه دسته بندی ها به روز شود. " show_subcategory_list: "نمایش زیر دسته بندی ها به جای لیست موضوع هنگام ورود به یک دسته بندی." fixed_category_positions: "اگر چک شده باشد٬ شما این امکان را دارید تا دسته بندی ها را به ترتیب در یک نظم ثابت قرار دهید. اگر چک نشده باشد٬ دسته بندی ها بر اساس فعالیتشان قرار می گیرند. " + fixed_category_positions_on_create: "اگر انتخاب شود بدین معنی است که ترتیب دسته‌ها در پنجره ایجاد یک عنوان جدید مدیریت خواهد شد (نیازمند fixed_category_positions است)." add_rel_nofollow_to_user_content: "nofollow REL را اضافه کن به تمام محتویات ارسال شده کاربر٬ بجر برای پیوندهای داخلی (به همراه دامنه های والد). اگر این را عوض کردی٬‌ باید تمام پست ها را rebake کنی با : \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "لیست دامنه‌هایی که مقدار nofollow نباید به لینک‌های آن‌ها اضافه شود. tld.com به صورت خودکار اجازه sub.tld.com را نیز می‌دهد. حداقل کاری که می‌توان انجام داد این است که سطح بالاترین دامنه این سایت به این لیست اضافه شود تا کراولرهای وب بتوانند محتوای موجود را پیدا کنند. اگر بعضی قسمت‌های سایت شما روی دامنه‌های دیگری است، آن‌ها نیز باید اضافه شوند." post_excerpt_maxlength: "حداکثر طول یک نوشته گزیده شده / خلاصه. " post_onebox_maxlength: " حداکثر طول به یک نوشته ایجاد گروه Discourse در کاراکتر. " onebox_domains_whitelist: "لیست دامنه ها تا اجازه دهد به oneboxing برای; این دامنه ها باید OpenGraph یا oEmbed را ساپورت کنندو امتحان کنید در http://iframely.com/debug" - logo_url: "لوگوی عکس در قسمت بالا سمت چپ سایتتان; اگر خالی باشد٬‌ عنوان وب سایت شما نشان داده می شود. " - digest_logo_url: "لوگوی جایگزین در بالای ایمیل دایجست سایت شما استفاده شد. اگر خالی بگذارید٬‌ این `logo_url` استفاده می شود. برای مثال : http://example.com/logo.png" - logo_small_url: "عکس لوگوی کوچک در قسمت چپ بالای سایت شما٬ وقتی دیده می شه که اسکرول به پایین کنید. اگر خالی بگذارید٬ علامت صفحه اصلی نشان داده می شود. " - favicon_url: "نماد دلخواه برای سایت شما٬ این را ببین http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "موقعیت لوگوی تصویر ثابت در بالای وب سایتنسخه موبایل شما استفاده شده است. اگر خالی بگذارید٬ این `logo_url` استفاده می شود. " apple_touch_icon_url: "آیکون استفاده شده برای دستگاه های لمسی اپل . سایز پیشنهادی 144px by 144px." notification_email: "از : ایمیل آدرس زمان ارسال تمام ایمیل های ضروری سیستم استفاده شد. .دامنه مشخص شده در اینجا باید SPF, DKIM داشته باشد و سوابق PTR معکوس به درستی برای ورود ایمیل تنظیم شده باشد. " email_custom_headers: "لیست pipe-delimited از هدر ایمیل سفارشی " @@ -672,8 +678,6 @@ fa_IR: polling_interval: "وقتی رای گیری طولانی نیست٬ هر چند مدت باید وارد سیستم شود برای نظرسنجی مشتری ها در هر میلی ثانیه." anon_polling_interval: "هر چند مدت باید مشتری های ناشناس نظرسنجی بشوند در هر میلی ثانیه" background_polling_interval: "هر چند وقت یکبار مشتری ها باید نظرسنجی بشوند در هر ثانیه ( وقتی پنجره در پس زمینه است)" - auto_track_topics_after: "پیش فرض سراسری میلی ثانیه قبل از اینکه نوشته بطور خودکار پی گیری شود٬‌ کاربران می توانند نادیده بگیرند (0 برای همیشه٬‌ -1 برای هرگز)" - new_topic_duration_minutes: "پیش فرض سراسری تعداد دقایقی که یک نوشته جدید محصوب می شود٬‌ کاربران می توانند نادیده بگیرند (-1 برای همیشه٬ -2 برای آخرین بازدید)" flags_required_to_hide_post: "تعداد پرچم هایی که ممکن است موجوب مخفی شدن خودکاز نوشته شود و پیام خصوصی به کاربر ارسال شود (0 برای هرگز)" cooldown_minutes_after_hiding_posts: "تعداد دقایقی که کاربر باید صبر کند قبل از ویرایش مخفی یک نوشته از طریق پرچم گزاری انجمن" max_topics_in_first_day: "حداکثر تعداد جستارهای یک کاربر که در روز اولشان در سایت می توانند ایجاد کنند. " @@ -728,17 +732,18 @@ fa_IR: invite_passthrough_hours: "برای چه مدت کاربر می تواند از کلید فراخوان بخشوده شده برای ورود به سیستم استفاده کند٬‌ در ساعت" invite_only: "ثبت نام عمومی از کار افتاده است٬ تمام کاربران جدید باید از توسط کاربران عضو دعوت شده شوند." login_required: "نیاز به تصدیق است برای خواندن محتوا در سایت٬ دسترسی ناشناس رد شود." - min_username_length: "حداقل طول نام کاربری در کاراکتر. اخطار: هر کاربر موجودی با اسمی کوتاه تر از این٬ دسترسی به سایت نخواهد داشت." - max_username_length: "حداکثر طول نام کاربری در کاراکتر. اخطار: هر کاربر موجودی با اسمی طولانی تر از این٬ دسترسی به سایت نخواهد داشت." + reserved_usernames: "نام های کاربری غیرمجاز جهت عضویت." min_password_length: "حداقل طول رمز عبور" block_common_passwords: "رمز عبوری که جزو 10,000 رمز عبور رایج است را قبول نکنید. " + enable_sso: "اجازه single sign on از طریق سایت‌های دیگر داده شود (هشدار: آدرس ایمیل کاربر *باید* توسط سایت دیگر معتبر تشخیص داده شود!)" enable_sso_provider: "پیاده سازی پروتکل ارائه دهنده SSO Discourse در /session/sso_provider endpoint, requires sso_secret to be set " sso_url: "URL برای ورود یکپارچه در درگاه" sso_secret: "رشته راز استفاده شده در تصدیق رمزنویسی اطلاعات SSO ٬ مطمئن شوید که 10 کاراکتر است یا بیشتر. " - sso_overrides_email: "لغو ایمیل محلی با ایمیل وب سایت خارجی از محموله SSO ( اخطار: تناقض ممکن است رخ دهد بعلت عادی سازی ایمیل های محلی)" - sso_overrides_username: "لغو نام کاربری محلی با نام کاربری وب سایت خارجی از محموله SSO ( اخطار: تناقض می تواند رخ دهد بعلت تفاوت در طول نام کاربری/ مقرارات)" - sso_overrides_name: "لغو اسم کامل محلی با اسم کامل سایت خارجی از محموله SSO" + sso_overrides_email: "آدرس ایمیل دریافت شده از طریق SSO را در هر بار ورود جایگزین آدرس ایمیل محلی کاربر می‌کند و از تغییر محلی آن نیز جلوگیری می‌نماید. (هشدار: این کار ممکن است به خاطر تغییر در ایمیل‌های محلی باعث بروز اختلاف و ناهماهنگی شود)" + sso_overrides_username: "نام کاربری دریافت شده از طریق SSO را در هر بار ورود جایگزین نام کاربری محلی کاربر کرده و از تغییر محلی آن نیز جلوگیری می‌نماید. (هشدار: این کار ممکن است به خاطر تغییر در طول یا سایر شرایط نام کاربری باعث بروز خطا و ناهماهنگی شود)" + sso_overrides_name: "نام کامل دریافت شده از طریق SSO را در هر بار ورود جایگزین نام کامل محلی کاربر می‌کند و از تغییر محلی آن نیز جلوگیری می‌نماید." sso_overrides_avatar: "لغو آواتار کاربر با آواتار سایت خارجی از محموله SSO. اگر فعال است٬ غیر فعال کردن allow_uploaded_avatars به شدت توصیه می شود" + sso_not_approved_url: "حساب‌های تأیید نشده SSO را به این URL بفرست" enable_local_logins: "نام کاربری و رمز ورود را فعال کن بر اسای حساب های کاربری. (نکته: این باید فعال باشد برای دعوتنامه ها به کار )" allow_new_registrations: "به کاربر جدید اجازه ثبت نام بده. لغو این انتخاب برای جلوگیری از ساخت حساب کاربری جدید. " enable_yahoo_logins: "احراز هویت یاهو را فعال کن " @@ -756,7 +761,6 @@ fa_IR: github_client_secret: "راز مشتری را برای احراز هویت Github@٬ ثبت نام در https://github.com/settings/applications" allow_restore: "اجازه بازیابی بده٬ که می تواند تمام اطلاعات سایت را جایگزین کند! نادرست را رها کن مگر اینکه قصد بازیابی نسخه پشتیبان را داری " maximum_backups: "حداکثر تعداد پشتیبان برای نگه داری بر روی دیسک. نسخه های پشتیبان قدیمی بطور خودکار پاک شده است" - backup_daily: "بصورت خودکار هر روز یک پشتیبان از سایت تهیه کن" enable_s3_backups: "نسخه پشتیبان را بارگزاری کن به S3 وقتی کامل شد. مهم: به S3 صحیح معتبر وارد شده در تنظیمات فایل نیاز است." s3_backup_bucket: "سطل سیار برای نگهداری نسخه های پشتیبان. اخطار: مطمئن شوید مه این یک سطل خصوصی است. " active_user_rate_limit_secs: "چگونه مکررا ما 'last_seen_at' را در فیلد به روز کنیم٬ در ثانیه " @@ -773,6 +777,7 @@ fa_IR: max_topics_per_day: "حداکثر تعداد موضوعاتی که هر کاربر در روز می توانند ایجاد کند" max_private_messages_per_day: "حداکثر تعداد پیام هایی که هر کاربر در روز می توانند ایجاد کند" max_invites_per_day: "حداکثر تعداد دعوت نامه هایی که هر کاربر در روز می توانندارسال کند" + max_topic_invitations_per_day: "حداکثر تعداد دعوت‌‌نامه‌هایی که یک کاربر می‌تواند برای عناوین در یک روز ارسال کند." suggested_topics: "نعداد موضوعات پیشنهادی در پایین هر موضوع" limit_suggested_to_category: "فقط جستارهایی از دسته بندی جاری نشان بده در جستارهای پیشنهادی. " clean_up_uploads: "بارگزاری های بدون ریشه و بدون رفرنس را پاک کن برای جلوگیری از میزبانی غیر قانونی. اخطار: شاید شما می خواهید از بارگزایتان نسخه پشتیبان بگیرید قبل از بکارگیری این تظیم. " @@ -785,6 +790,8 @@ fa_IR: s3_access_key_id: "IّD کلید درسترسی Amazon S3 که برای بارگزاری عکس ها استفاده می شود." s3_secret_access_key: "کلید درسترسی مخفی Amazon S3 که برای بارگزاری عکس ها استفاده می شود." s3_region: "اسم ناحیه ای Amazon S3 که برای بارگزاری عکس ها استفاده می شود." + s3_cdn_url: "آدرس CDN برای دسترسی به تمام دارایی‌های s3 (به طور مثال: https://cdn.somewhere.com). هشدار: بعد از تغییر این مقدار باید تمامی نوشته‌ها و مطالب قدیمی را rebake کنید." + avatar_sizes: "لیست اندازه‌های آواتار که به صورت خودکار تولید شده است." enable_flash_video_onebox: "بکارگیری جاسازی لینک های swf و flv (ادوبی فلاش Adobe Flash) در oneboxes. اخطار: شاید معرف خطرات امنیتی باشد." default_invitee_trust_level: "پیش فرض سطح اعتماد (0-4) برای دعوت کاربران" default_trust_level: "پیش فرض سطح اعتماد (0-4) برای تمام کاربران جدید. اخطار!‌ تغییر این ممکن است شما را در معرض خطر جدی هرزنامه قرار دهد." @@ -837,6 +844,9 @@ fa_IR: topic_views_heat_low: "بعد از این همه بازید٬‌ فیلد بازدید کمی برجسته شده. " topic_views_heat_medium: "بعد از این همه بازید٬‌ فیلد بازدید نسبتا برجسته شده. " topic_views_heat_high: "بعد از این همه بازید٬‌ فیلد بازدید شدیدا برجسته شده. " + cold_age_days_low: "بعد از این همه روز گفتگو، آخرین روز فعالیت کمی محو شده است." + cold_age_days_medium: "بعد از این همه روز گفتگو، آخرین روز فعالیت نسبتا محو شده است." + cold_age_days_high: "بعد از این همه روز گفتگو، آخرین روز فعالیت کاملا محو شده است." history_hours_low: "یک نوشته ویرایش شده با این همه ساعت دارای نشانگر ویرایش کمی برجسته شده" history_hours_medium: "یک نوشته ویرایش شده با این همه ساعت دارای نشانگر ویرایش نسبتا برجسته شده" history_hours_high: "یک نوشته ویرایش شده با این همه ساعت دارای نشانگر ویرایش شدیدا برجسته شده" @@ -849,7 +859,6 @@ fa_IR: newuser_spam_host_threshold: "چندبار کاربر جدید می تواند پیوندی را در یک فضا پست کند قبل از اینکه هرزنامه شناخته شوند. " white_listed_spam_host_domains: "لیست دامنه ها محروم از هرزنامه ی تست میزبان. هرگز از ساخت پست جدید با پیوند هایی از این دامنه ها محدود نمی شوند. " staff_like_weight: "چقدر عوامل بیشتر تا به مدیران پسند داده بشود." - topic_view_duration_hours: "بازدید از یک جستار جدید زا بشمار با IP/User هر N ساعت" levenshtein_distance_spammer_emails: "هنگامی که تطبیق ایمیل هرزنامه باشد٬ تعداد کاراکترهای متفاوت که هنوز هم به یک تطبق مبهم اجازه خواهد داد." max_new_accounts_per_registration_ip: "اگر در حال حاضر (n) حساب های کاربری با سطح اعتماد 0 از این IP هست ( و هیچ یک از کارمندان عضو یا با سطح اعتماد 2 یا بالاتر) ثبت نام را از این ‌IP متوقف کن. " min_ban_entries_for_roll_up: "وقتی بر روی کلید جمع کردن کلید کنید٬ یک ممنوعیت زیرشبکه ورودی جدید ساخته می شود اگر در آنجا حداقل (N) ورودی باشد. " @@ -881,18 +890,13 @@ fa_IR: username_change_period: "تعداد روزهایی که بعد از ثبت نام می توانند نام کاربری خود را عوض کنند ( 0 برای جلوگیری از عوض کردن نام کاربرایشان.)" email_editable: "به کاربران اجازه بده ایمیل آدرس خود را عوض کنند بعد از ثبت نام. " logout_redirect: "مکان برای جابجایی مرورگر بعد از خارج شدن EG: (http://somesite.com/logout)" - allow_uploaded_avatars: "اجازه دادن به کاربران برای بارگذاری آواتارهای سفارشی" - allow_animated_avatars: "به کاربران اجازه بده تا از تصاویر متحرک آواتار استفاده کنند. اخطار: avatars:refresh را اجرا کن از تسک جمع آوری عوض کردن این تنظیمات." allow_animated_thumbnails: "تولید ریز عکسهای متحرک از تصاویر GIF انیمیشن." default_avatars: "URLs برای آواتارهایی که کاربران جدید از آن بطور پیش فرض می توانند استفاده کنند قبل از اینکه آنها را عوض کنند. " automatically_download_gravatars: "آواتار را برای کاربران دریافت کن برای ساختن حساب کاربری یا ایمیل. " digest_topics: "حداکثر تعداد جستارهایی که در دایجست ایمیل نشان داده می شود " digest_min_excerpt_length: "حداقل نوشته های گزیده در ایمیل دایجست٬‌ در کاراکتر." - default_digest_email_frequency: "هر چند وقت یکبار کاربران ایمیل های دایجست دریافت کنند بطور پیش فرض. آنها می توانند آن را در بخش تنظیمات عوض کنند. " suppress_digest_email_after_days: "ایمیل های خلاصه را مهار کن برای کاربرانی که در وب سایت دیده نشده اند بیشتر از (n) روز " disable_digest_emails: "ایمیل های دایجست را برای تمام کاربران غیر فعال کن. " - default_external_links_in_new_tab: "پیوند های خارجی را در یک تب جدید باز کن. کاربران می توانند این را در قسمت تنظیماتشان تغییر دهند." - detect_custom_avatars: "خواه ناخواه برای چک کردن کاربرانی که آواتار سفارشی بارگزاری کرده اند. " max_daily_gravatar_crawls: "حداکثرتعداد زمانی که دیسکورس Gravatar را چک می کند برای آواتار سفارشی در هر روز. " public_user_custom_fields: "لیست مجاز فیلد سفارشی برای کاربر که می تواند به همه نشان داده شود." staff_user_custom_fields: "لیست مجاز فیلد سفارشی برای کاربر که می تواند به مدیران نشان داده شود." @@ -904,31 +908,32 @@ fa_IR: sequential_replies_threshold: "تعداد پست هایی که کاربر باید بسازد در یک ردیف در یک جستار قبل از یاآوری درباره پاسخ های پی در پی. " enable_mobile_theme: "دستگاه های موبایلی که از تم دوستانه موبایل استفاده می کنن٬‌ با قابلیت جابجایی به حالت تمام سایت. این را از کار بیانداز اگر می خواهی از شیوه سفارشی استفاده کنی که بطور کامل پاسخگو است." dominating_topic_minimum_percent: " پست های یک کاربر چند درصد باید درست کنند در یک جستار قبل از اینکه یادآوری بشن درباره بیش از اندازه بودن آن در یک جستار. " + daily_performance_report: "تحلیل لاگ‌های NGINX و ارسال یک پست شامل جزئیات ویژه مدیران" suppress_uncategorized_badge: "مدال برای جستارهای شناخته نشده در لیست جستارها نشان نده. " global_notice: "بنر فوری ٬‌ اضطراری را بصورت سراسری به تمام بازدیدکنندگان نشان بده٬ برای مخفی کردن آن را به خالی عوض کن (HTML allowed)." disable_edit_notifications: "آگاهی ساز ویرایش را از کار بینداز از طریق کاربر سیستم وقتی 'download_remote_images_to_local' فعال است " full_name_required: "اسم کامل برای کامل کردن نمایه کاربر مورد نیاز است." enable_names: "نام کامل کاربران را در نمایه، کارت کاربری و ایمیل‌هایشان نمایش بده. قابلیت پنهان کردن نام کامل را در هرجایی غیرفعال کن." display_name_on_posts: "نام کامل کاربران را در نوشته نشان بده بعلاوه ی نام کاربری @username." + show_time_gap_days: "اگر دو نوشته با این فاصله زمانی از هم نوشته شوند، فاصله زمانی را نشان بده." invites_per_page: "دعوتنامه های معمولی در صفحه کاربر نشان داده می شوند. " short_progress_text_threshold: "بعد از اینکه تعداد نوشته ها در این جستار از این تعداد پایین تر آمد٬ نوار پیشرفت تعداد نوشته ها را در حال حاضر نشان می دهد. اگر عرض نوار پیشرفت را تعویض کنید٬ شاید باید مقدار را هم عوض کنی. " default_code_lang: " پیش فرض برنامه نویسی زبان سینتکس برجسته شده به بلوک های کد GitHub اعمال بشه. (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "وقتی کسی شروع می کند با پاسخ دادن به جستاری که آخرین پاسخ برمی گردد به خیلی قبل یک هشدار نمایش داده می شود. نمایش با تنظیمات تا 0. " autohighlight_all_code: "اعمال زور برای برجسته کردن کد به تمام بلاک های کد تنظیم نشده حتی وقتی به صراحت زبان را مشخص نمی کنند. " highlighted_languages: "شامل نحوه قوانین برجسته شده. ( اخطار: شامل زبان های متفاوت ممکن است در نحوه اجرا تاثیر گذار باشد) ببین: https://highlightjs.org/static/demo/ برای دمو" - embeddable_host: "سروری که می تونه در نوشته ها جا سازی بشه از انجمن دیسکورس. فقط نام سروری که با http:// شروع می شود" feed_polling_enabled: "فقط جاسازی: چه جاسازی RSS/ATOM feed به عنوان نوشته" feed_polling_url: "فقط جاسازی: URL of RSS/ATOM feed to embed." embed_by_username: "نام کاربری دیسکورس کاربری که نوشته های جاسازی شده را ساخته." embed_username_key_from_feed: "کلیدی برای کشیدن نام کاربری دیسکورس از فید." embed_truncate: "کوتاه کردن نوشته های جاسازی شده " - embed_category: "دسته بندی موضوعات جاسازی شده." embed_post_limit: "حداکثر تعداد پست هایی که می توانید جا سازی کنید. " embed_whitelist_selector: "CSS انتخاب کننده برای المان های که اجازه دارند جاسازی شوند." embed_blacklist_selector: "CSS انتخاب کننده برای المان های که از جاسازی پاک شده اند. " notify_about_flags_after: "اگر پرچم هایی هست که به آنها بعد از چند ساعت رسیدگی نشده٬ ایمیلی ارسال کن به contact_email. برای از کار انداختن 0 را تنظیم کن." enable_cdn_js_debugging: "اجازه بده / logs به نمایش خطاهای مناسب با اضافه کردن مجوز crossorigin به همه آنها دارای js ." show_create_topics_notice: "اگر سایت کمتر از 5 جستار عمومی دارد٬ اطلاع بده به مدیران تا جستارهای بیشتری بسازند." + delete_drafts_older_than_n_days: پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن vacuum_db_days: " VACUUM FULL ANALYZE را اجرا کن برای پس گرفتن فضای DB بعد از مهاجرت کردن ( 0 برای غیر فعال کردن)" prevent_anons_from_downloading_files: "جلوگیری از دانلود کردن فایل پیوست توسط افراد ناشناس. اخطار: این جلوگیری می کنه از هر سایت دارای بدون عکسی. " slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." @@ -983,13 +988,9 @@ fa_IR: redirected_to_top_reasons: new_user: "به انجمن ما خوش آمدید! اینها بهترین جستارهای ما هستند. " not_seen_in_a_month: "خوش آمدید دوباره!‌ شما را برای مدت طولانی ندیده ایم. اینها بهترین جستارهاست از وقتی که شما نبودید." - move_posts: - new_topic_moderator_post: - other: "من {count}% تا از نوشته‌ها را به این موضوع جدید انتقال دادم: {topic_link}%" - existing_topic_moderator_post: - other: "من {count}% تا از نوشته‌ها را به این موضوع انتقال دادم: {topic_link}%" change_owner: post_revision_text: "حق مالکیت از کاربر {old_user}% به کاربر {new_user}% منتقل شد" + deleted_user: "یک کاربر حذف شده" emoji: errors: name_already_exists: "متأسفیم، در حال حاضر نام '{name}%' توسط ایموجی دیگری استفاده می‌شود." @@ -1029,6 +1030,7 @@ fa_IR: not_allowed_from_ip_address: "شما نمی‌توانید با این آی‌پی آدرس وارد حساب کاربری {username}% شوید." admin_not_allowed_from_ip_address: "شما نمی تواند با این اپی آدرس به عنوان مدیر وارد سیستم شوید." suspended: "شما تا تاریخ {date}% نمی‌توانید وارید سیستم شوید." + suspended_with_reason: "این حساب تا تاریخ %{date} مسدود شده است: %{reason}" errors: "{errors}%" not_available: "موجود نیست. این را امتحان کنید %{suggestion}?" something_already_taken: "ایرادی روی داد٬‌ شاید نام کاربری و ایمیل قبلا ثبت نام شده است. از پیوند پیش رو برای بازیابی رمز عبور استفاده کنید." @@ -1036,6 +1038,7 @@ fa_IR: omniauth_error_unknown: "یک چیزی برای پروسه وارد شدن شما به سیستم با مشکل مواجه شد٬‌ لطفا دوباره تلاش کنید." new_registrations_disabled: "ثبت حساب‌ کاربری جدید اکنون امکان‌پذیر نیست." password_too_long: "رمزهای عبور به 200 کاراکتر محدود شده‌اند." + reserved_username: "این نام کاربری مجاز نیست." missing_user_field: "شما تمام فیلد های کاربری را تکمیل نکرده اید" close_window: "احراز هویت تمام شد. پنجره را ببندید برای ادامه." user: @@ -1046,10 +1049,12 @@ fa_IR: characters: "باید شامل٬‌اعداد٬ حروف و زیر خط باشد" unique: "باید خاص باشد" blank: "باید حاضر باشد" - must_begin_with_alphanumeric: "حتما باید با حرف یا عدد شروع شود" email: not_allowed: "این قابل قبول نیست با این ایمیل ارائه شده. لطفا از یک ایمیل دیگر استفاده کنید. " blocked: "مجاز نیست." + ip_address: + blocked: "ثبت‌نام‌های جدید از آدرس IP شما ممنوع شده است." + max_new_accounts_per_registration_ip: "ثبت‌نام‌های جدید از آدرس IP شما ممنوع شده است (به حداکثر تعداد مجاز رسیده است). با یکی از مدیران تماس بگیرید." invite_mailer: subject_template: "%{invitee_name} شما را دعوت کرده به %{topic_title}' در %{site_domain_name}" text_body_template: "%{invitee_name} شما را دعوت کرده به یک گفتگو\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nدر \n\n> %{site_title} -- %{site_description}\n\nاگر علاقه مند هستید بر روی پیوند پایین کلیک کنید:‌\n\n%{invite_link}\n\nاین دعوتنامه از طرف یک کاربر قابل اعتماد است٬ پس شما نیازی به ورود ندارید. \n" @@ -1058,13 +1063,6 @@ fa_IR: text_body_template: "%{invitee_name} شما را دعوت کرده تا عضو شوید \n\n> **%{site_title}**\n>> %{site_description}\n\nاگر علاقه مند هستید بر روی پیوند پیش رو کلیک کنید: \n\n%{invite_link}\n\nاین دعوتنامه از طرف یک کاربر قابل اعتماد است٬ پس شما نیازی به ورود ندارید. \n" invite_password_instructions: subject_template: "تنظیم رمز عبور برای حساب کاربری {site_name}%" - text_body_template: | - Thanks for accepting your invitation to %{site_name} -- welcome! - - Click this link to choose a password now: - %{base_url}/users/password-reset/%{email_token} - - If you don't remember your password, or don't have one yet, choose "I forgot my password" when logging in with your email address. test_mailer: subject_template: "[%{site_name}] ایمیل تست دهش" text_body_template: | @@ -1106,10 +1104,21 @@ fa_IR: [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] نسخه جدید Discourse برای به روز رسانی موجود است" - text_body_template: "نسخه جدید [Discourse](http://www.discourse.org) آماده است. \n\nنسخه جدید %{installed_version}\n\nنسخه جدید: **%{new_version}**\n\nشاید شما بخواهید: \n\n- جدیدترین ها را ببینید در [GitHub changelog] (https://github.com/discourse/discourse/commits/master).\n\nبه روز رسانی با بازدید از [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), و فشار دادن دکمه \"به روز رسانی\". \n\nبازدید کن از [meta.discourse.org](http://meta.discourse.org) برای خبر٬ گفتگو٬ و کمک به دیسکورس.\n" + text_body_template: | + نسخه‌ جدیدی از [دیسکورس](http://www.discourse.org) موجود است. + + نسخه کنونی: %{installed_version} + نسخه جدید: **%{new_version}** + + شما می‌توانید: + + - تغییرات جدید را در [GitHub changelog](https://github.com/discourse/discourse/commits/master) ببینید. + + - از طریق مروگر خود به‌روزرسانی را انجام دهید [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - از [meta.discourse.org](http://meta.discourse.org) برای دسترسی به اخبار و پشتیبانی دیسکورس استفاده کنید. new_version_mailer_with_notes: subject_template: "[%{site_name}] بروزرسانی در دسترس" - text_body_template: "نسخه جدید [Discourse](http://www.discourse.org) آماده است. \n\nنسخه جدید %{installed_version}\nنسخه جدید: **%{new_version}**\n\nشاید شما بخواهید: \n\n- جدیدترین ها را در [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\nبه روز رسانی با بازدید از [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), و فشار دادن دکمه \"به روز رسانی\". \n\nبازدید کن از [meta.discourse.org](http://meta.discourse.org) برای خبر٬ گفتگو٬ و کمک به دیسکورس.\n\n### نکته های رها شده \n\n%{notes}\n" flags_reminder: flags_were_submitted: other: "این پرچم گزاری ها در %{count} ساعت پیش ارسال شده است." @@ -1118,6 +1127,13 @@ fa_IR: how_to_disable: 'شما می توانید تکرار یاد توسط این ایمیل را عوض کنید یا از کار بیندازید از طریق اعلام کردت بعد ازتنظیم پرچم گزاری .' subject_template: other: "%{count} نشانه ها منتظر استفاده" + queued_posts_reminder: + subject_template: + other: "[%{site_name}] %{count} نوشته منتظر بررسی است" + text_body_template: | + سلام، + + نوشته‌های کاربران جدید منتظر بررسی‌اند. [می‌توان آن‌ها را در اینجا تأیید یا رد نمود](%{base_url}/queued-posts). flag_reasons: off_topic: "نوشته شما به عنوان **بی ربط به جستار** پرچم گزاری شده. انجمن احساس خوبی برای جا دادن آن در جستار ندارد٬ آن طور که در عنوان و نوشته اول تعریف شده. " inappropriate: "نوشاه شما به عنوان ** نامناسب** پرچم گزاری شده. انجمن احساس کرده این تهاجمی، توهین آمیز، و یا نقض [دستورالعمل انجمن ما است](دستورعمل انجمن/)" @@ -1129,7 +1145,7 @@ fa_IR: disagreed: "ممنون از اینکه به ما اطلاع دادید. ما بهش نگاه می کنیم" deferred: "ممنون از اینکه به ما اطلاع دادید. ما بهش نگاه می کنیم" deferred_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما نوشته را پاک می کنیم." - temporarily_closed_due_to_flags: "این جستار بصورت موقت بسته است بخاطر پرچم گزاری های زیاد انجمن" + temporarily_closed_due_to_flags: "این عنوان به صورت موقت به خاطر تعداد فراوان گزارش‌های رسیده از کاربران بسته شده است." system_messages: post_hidden: subject_template: "پست مخفی شده بدلیل پرچم گزاری انجمن " @@ -1147,9 +1163,6 @@ fa_IR: However, if the post is hidden by the community a second time, it will remain hidden until handled by staff – and there may be further action, including the possible suspension of your account. For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines). - usage_tips: - text_body_template: "چند راهنمای کوتاه برای شروع کار: \n\n##همنیطور اسکرول کنید\n\nشماره صفحه یا کلیدی در صفحه وجود ندارد - برای خواندن بیشتر ٬ ** فقط همنیطور اسکرول کنید**! \n\nنوشته های جدید وقتی می آیند٬ بطور خودکار نمایش داده می شوند.\n\n## من کجا هستم ؟! \n\n- برای جستجو٬‌ صفحه کاربریت٬ یا منو از ** آیکون ☰ دکمه های بالا سمت راست استفاده کن**.\n\n-عنوان هر جستاری شما را به نوشته خوانده نشده ی بعدی می برد. از زمان آخرین فعالیتت و شمارنده نوشته ها برای وارد شدن به بالا یا پایین استفاده کن. \n\n-همزمان با خواندن جستار٬‌ بپرید به بالا یا uarr ; با انتخاب عنوان جستار. بار سبز رنگ در پایین سمت راست را انتخاب کنید برای کنترل تمام جابجایی ها. یا از خانه و پایانکلید استفاده کنید.\n\n\n\n## چگونه پاسخ دهم ؟ \n\n- - برای پاسخ با تمام جستار ها از کلید پاسخ استفاده کن در پایین ترین قسمت صفحه. \n\n- برای پاسخ به یک نوشته خاص از کلید پاسخ استفاده کن در همان نوشته.\n\n- برای بردن گفتگو در مسیری متفاوت ولی مرتبط بهم از این استفاده کنید٬ پاسخ به عنوان جستار مرتبط در بالا سمت راست نوشته.\n\nبرای اشاره کردن به شخصی در پاسخ٬ متنی را که علاقه دارید انتخاب کنید و بعد کلید پاسخ را فشار دهید.\n\n\n\nبرای پینگ شخصی در پاسخ از اسم آنها نام بربید. `@` را تایپ کنید و autocompleter (کامل کننده خودکار) بالا می آید.\n\n\n\nبرای [ Emoji استاندارد]٬ (http://www.emoji.codes/)٬ فقط تایپ کنید `:` یا از خنده های سنتی استفاده کنید `:)`\n\n## چه کارهای دیگری می توانم انجام دهم ؟ \n\nدکمه های فعالیت در پایین هر نوشته است. \n\n\n\nبرای اطلاع دادن به دیگران از اینکه شما نوشته آنها لذت بردید از کلید **like** استفاده کنید.\ - \ اگر در نوشته مشکلی را میبینید٬‌ بطور شخصی به آنها یا مدیران اطلاع دهید با کلید پرچم گزاری **flag**.\n\nهمچنین شما می توانید پیوند را در نوشته به **اشتراک** بگذارید٬ یا **نشانه گزاری** کنید برای مرجع بعد در صفحه کاربریتان. \n\n##چه کسی می تواند با من حرف بزند ؟ \n\nوقتی کسی به شما پاسخ داد در نوشته٬ نوشته شما را جایی ذکر کرد٬‌ یا کسی اسمی از شما برد `@username`, شماره ای به سرعت در بالای صفحه سمت راست نمایان می شود. استفاده کن برای دسترسی به **آگاه سازی ها**.\n\n\n\nنگران نباش اگر پاسخ دادن را فراموش کردی - اگر آنلاین نیستی پاسخ ها در ایمیل یا (و پیام ها ) برایت می آید وقتی آن ها می رسند. \n\n##گفتگو ها چه وقت جدید هستند ؟ \n\nبطور معمول تمام گفتگوهایی با عمر کمتر از دو روز جدید محسوب می شوند٬ و هر گفتگویی که شما در آن شرکت دارید (پاسخ دادن٬ ساختن٬ یا خواندن برای مدت طولانی) بطور خودکار دنبال می شوند.\n\nشما یک آبی جدید و شاخص تعداد را در مقابل آنها می بینید: \n\n\n\nشما می توانید تعداد آگهی سازها را در هر جستار تغییر دهید از طریق کنترل در پاییت جستار ( این می تواند در دسته تنظیم شود). برای تغییر دنبال کردن جستارها یا معنی جدید) نگاه کن به [تنظیمات کاربر](%{base_url}/my/preferences\n\n## چرا یک سری کارها خاص را نمی توانم انجام دهم ؟ \n\nکاربران جدید به تا حدودی محدودند به دلایل امنیتی. با بودنت در اینجا٬ تو اعتماد انجمن را بدست میاری و بعد شهروند اینجا می شی و اون محدودیت ها به مرور زمان بر داشته می شوند. در اندزه کافی [سطح اعتماد] ](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), شما اعتماد انجمن را بدست می آورید و قادر خواهید بود به ما کمک کنید تا با هم انجمن را مدیریت کنیم.\n" welcome_user: subject_template: "به %{site_name} خوش آمدید!" text_body_template: "ممنون برای عضویت%{site_name},٬ و خوش آمدید \n\n\n%{new_user_tips}\n\n\nما به [رفتار جامعه ای متمدن] همیشه اعتقاد داریم (%{base_url}/guidelines). \n\n\nاز بودنتان در انجمن لذت ببرید!\n\n\n(اگر نیاز به تماس با یکی از مدیران[staff members] را دارید(%{base_url}/about) به عنوان یک کاربر جدید٬ فقط به این پیام پاسخ دهید.)\n" @@ -1158,7 +1171,6 @@ fa_IR: text_body_template: "ممنون برای قبول دعتونامه به %{site_name} -- خوش آمدید!\n\n\nبرای شما یک حساب کاربری جدید ساختیم **%{username}** و شما الان در سیستم هستید. می توانید اسم خود را عوض کنید با مراجعه به [your user profile][prefs].\n\nبرای ورود بعدتر : \n\n\n1. همیشه برای ورود ** از ایمیل آدرسی استفاده کن که در دعوتنامه اصلی استفاده کردید**. در غیر اینصورت نمی تونیم بگوییم این شمایید! \n\n\n2. رمز عبور خیلی خوبی بساز برای [کاربری نمایه ات][prefs]٬ و برای ورود از آن استفاده کن.\n\n%{new_user_tips}\n\n\nما به [رفتار جامعه ای متمدن] همیشه اعتقاد داریم (%{base_url}/guidelines). \n\n\nاز بودنتان در انجمن لذت ببرید!\n\n\n(اگر نیاز به تماس با یکی از مدیران[staff members] را دارید(%{base_url}/about) به عنوان یک کاربر جدید٬ فقط به این پیام پاسخ دهید. )\n\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "پشتیبان گیری با موفقیت انجام شد" - text_body_template: "پشتیبان گیری با موفقیت انجام شد. \n\nبازدید کنید از [ ادیمین> قسمت پشتیبان گیری](/ادمین/پشتیبان گیری) برای دریافت پشتیبان جدید." backup_failed: subject_template: "پشتیبان گیری با شکست مواجه شد." text_body_template: "پشتیبان گیری ناموفق شد\n\nاینجا وارد سیستم شوید: \n\n```\n%{logs}\n\n```\n\n" @@ -1267,7 +1279,6 @@ fa_IR: download_remote_images_disabled: subject_template: "دانلود کردن عکس های سیار از کار افتاده" text_body_template: " تنظیمات `download_remote_images_to_local` غیرفعال شده زیرا به محدودیت فضای دیسک در `download_remote_images_threshold` رسیده شده است. " - unsubscribe_link: "برای لغو اشتراک ار ایمیل ها٬‌ بازدید کن از [تنظیمات کاربر] (%{user_preferences_url})." subject_re: "پاسخ:" subject_pm: "[PM] " user_notifications: @@ -1369,7 +1380,7 @@ fa_IR: subject_template: "شما تایید شدید %{site_name}! " text_body_template: "خوش آمدید به %{site_name}!\n\nیکی از مدیران حساب کاربری شما را تایید کرد در %{site_name}.\n\nبر روی پیوند پیش رو کلیک کنید تا حساب کاربری شما تایید شود: \n%{base_url}/users/activate-account/%{email_token}\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n\n%{new_user_tips}\n\n\nما به [رفتار انجمن متمدن] معتقدیم (%{base_url}/guidelines) برای همیشه. \n\nاز بودنتان در اینجا لذت ببرید! \n\n( اگر شما نیاز به ارتباط با مدیران را دارید[staff members](%{base_url}/about) به عنوان یک کاربر جدید٬ لطفا به این پیام پاسخ دهید.)\n" signup: - subject_template: "[%{site_name}] حساب کاربری جدیدتان را فعال کنید" + subject_template: "[%{site_name}] حساب کاربری جدید را تایید کنید" text_body_template: "خوش آمدید به %{site_name}!\n\n\nبرای فعال نمودن حساب کاربریتان بر روی پیوند پیش رو کلیک کنید: \n\n%{base_url}/users/activate-account/%{email_token}\n\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n" page_not_found: title: "صفحه ای که درخواست کردید وجود ندارد یا خصوصی است. " @@ -1393,14 +1404,13 @@ fa_IR: too_large: "متأسفم، پرونده‌ای که می‌خواهید بارگذاری کنید بسیار بزرگ است! ( حداکثر حجم پرونده باید {max_size_kb}% کیلوبایت باشد. )" images: too_large: "با عرض پوزش٬ عکسی را که تلاش برای بارگزاری آن دارید بسیار بزرگ است ( حداکثر اندازه %{max_size_kb}KB ) لطفا آن را تغییر اندازه دهید و دوباره امتحان کنید. " - fetch_failure: "متأسفیم، در هنگام کشیدن عکس خطایی رخ داده است." - unknown_image_type: "متأسفم، اما به نظر می‌رسد پرونده‌ای که می‌خواهید بارگذاری کنید، از نوع «تصویر» نیست." size_not_found: "با عرض پوزش٬ ولی ما نتوانستیم اندازه عکس را مشخص کنیم. شاید عکس شما خراب است. " flag_reason: sockpuppet: "یک کاربر جدید یک جستار جدید ساخته٬ و کاربر جدید دیگری با همان آدرس IP پاسخ داده. نگاه کن به گزارش٬ sockpuppets تنظیمات سایت " spam_hosts: "این کاربر جدید چند نوشته جدید بوجود آورده با پیوندهایی به همان دامنه. کارابران جدید را ببین _اسپم_میزبان_بخش تنظیمات سایت" email_log: no_user: "کاربری با این ID پیدا نمی شود%{user_id}" + anonymous_user: "کاربر ناشناس است" suspended_not_pm: "کاربر معلق شده٬ نه پیام " seen_recently: "کاربر به تازگی دیده شد" post_not_found: "نوشته ای با این ID پیدا نمی شود %{post_id}" @@ -1426,381 +1436,17 @@ fa_IR: نوشته اول این جستار را ویرایش کن برای عوض کردن محتویا ت%{page_name} صفحه. guidelines_topic: title: "پرسش و پاسخ / دستورالعمل" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Powered by You](#power) - - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "شرایط استفاده از خدمات" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "سیاست حفظ حریم خصوصی" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. - static: - search_help: | -

      راهنمایی

      -

      -

        -
      • Title matches are prioritized, so when in doubt, search for titles
        • -
      • Unique, uncommon words will always produce the best results
        • -
      • Whenever possible, scope your search to a particular category, user, or topic
        • -
      -

      -

      گزینه ها

      -

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

      -

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

      - badges: - long_descriptions: - autobiographer: "بلا بلا بلا \nبلا بلا بلا \n" - first_like: "بلا بلا بلا \nبلا بلا بلا \n" - first_link: "بلا بلا بلا \nبلا بلا بلا\n" - first_quote: "بلا بلا بلا \nبلا بلا بلا \n" - first_share: "بلا بلا بلا \nبلا بلا بلا \n" - read_guidelines: "بلا بلا بلا \nبلا بلا بلا \n" - reader: "بلا بلا بلا \nبلا بلا بلا \n" - editor: "بلا بلا بلا \nبلا بلا بلا \n" - first_flag: | - پرچم گزاری برای سلامت انجمن بسیار مهمه. اگر متوجه شدی که نوشته ای نیاز به مدیر داره لطفا اون را پرچم گزاری کن - - از پرچم گزاری دریغ نکن. شاید برای گفتگوی پرچم گزاری استفاده کنید برای ارسال پیام ها به کاربران وقتی - - سطح اعتماد 1 را بدست آوردند. - nice_share: "بلا بلا بلا \nبلا بلا بلا \n" - welcome: "بلا بلا بلا \nبلا بلا بلا \n" - anniversary: "بلا بلا بلا \nبلا بلا بلا \n" - good_share: "بلا بلا بلا \nبلا بلا بلا \n" - great_share: "بلا بلا بلا \nبلا بلا بلا \n" - nice_post: "بلا بلا بلا \nبلا بلا بلا \n" - nice_topic: "بلا بلا بلا \nبلا بلا بلا \n" - good_post: "بلا بلا بلا \nبلا بلا بلا \n" - good_topic: "بلا بلا بلا \nبلا بلا بلا \n" - great_post: "بلا بلا بلا \nبلا بلا بلا \n" - great_topic: "بلا بلا بلا \nبلا بلا بلا \n" - basic: "بلا بلا بلا \nبلا بلا بلا \n" - member: "بلا بلا بلا \nبلا بلا بلا \n" - regular: "بلا بلا بلا \nبلا بلا بلا \n" - leader: "بلا بلا بلا \nبلا بلا بلا \n" admin_login: success: "ایمیل ارسال شد " error: "خطا!" email_input: "ایمیل مدیر " submit_button: "ارسال ایمیل " + discourse_hub: + access_token_problem: "به یکی از مدیران بگویید: لطفا تنظیمات سایت را به‌روزرسانی نمایید تا شامل discourse_org_access_key صحیح باشد." + performance_report: + initial_post_raw: این مطلب شامل گزارش عملکرد روزانه سایت شماست. + initial_topic_title: گزارش عملکرد وب‌سایت diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 2d73da7ff6..8dd89d08fe 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -133,6 +133,7 @@ fi: rss_description: latest: "Tuoreimmat viestiketjut" hot: "Kuumat ketjut" + posts: "Uusimmat viestit" too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa." excerpt_image: "kuva" queue: @@ -176,13 +177,13 @@ fi: Saadaksesi lisätietoa, [käy tutkimassa palstan säännöt](/guidelines). Tämä ohje näytetään vain kirjoittaessasi %{education_posts_text}. avatar: | - ### Haluaisitko lisätä profiiliisi kuvan? + ### Miltä näyttäisi kuva käyttäjätilillesi? - Olet luonut jo muutaman ketjun ja viestin, mutta avatarisi ei ole yhtä uniikki kuin sinä -- se on sama oletuskuva, kuin kaikilla muillakin uusilla käyttäjillä + Olet luonut muutaman ketjun ja viestin, mutta profiilikuvasi ei ole yhtä uniikki kuin sinä -- se on pelkkä kirjain. - Oletko miettinyt oman kuvan lataamista **[käyttäjäprofiiliisi profile](%{profile_path})**? + Oletko ajatellut **[vierailla käyttäjäprofiilissasi](%{profile_path})** ja lisätä itsellesi kuvan? - On helpompaa seurata keskusteluita ja löytää mielenkiintoisia ihmisiä niistä, kun kaikilla on uniikki avatar! + On helpompaa seurata keskusteluita ja löytää niistä kiinnostavia ihmisiä, kun kaikilla on uniikki profiilikuva! sequential_replies: | ### Harkitse kaikkiin viesteihin vastaamista kerralla @@ -246,7 +247,7 @@ fi: no_info_other: "
      %{name} ei ole täyttänyt vielä mitään Minusta -kohtaan profiilissaan
      " vip_category_name: "Lounge" vip_category_description: "Alue luottamustason 3 ja ylemmille käyttäjille." - meta_category_name: "Meta" + meta_category_name: "Sivuston palaute" meta_category_description: "Keskustelua tästä sivustosta, sen järjestämisestä, siitä miten se toimii ja miten sitä voisi parantaa." staff_category_name: "Henkilökunta" staff_category_description: "Yksityinen alue henkilökunnan keskusteluille. Ketjut näkyvät ainoastaan ylläpitäjille ja valvojille." @@ -386,7 +387,7 @@ fi: one: "lähes vuosi sitten" other: "lähes %{count} vuotta sitten" password_reset: - no_token: "Pahoittelut, tämä linkki salasanan vaihtamiseksi on liian vanha. Kirjaudu sisään uudestaan ja valitse 'Unohdin salasanani' saadaksesi uuden linkin" + no_token: "Pahoittelut, tämä salasanan uusimisen linkki on liian vanha. Paina 'Kirjaudu sisään' nappia ja valitse 'Unohdin salasanani' saadaksesi uuden linkin." choose_new: "Valitse uusi salasana" choose: "Valitse salasana" update: 'Päivitä salasana' @@ -400,7 +401,6 @@ fi: please_continue: "Jatka sivustolle %{site_name}" error: "Sähköpostiosoitteen vaihdossa tapahtui virhe. Ehkäpä tämä sähköpostiosoite on jo käytössä?" activation: - action: "Vahvista käyttäjätilisi" already_done: "Pahoittelut, tämän tilin varmennuslinkki ei ole enää voimassa. Ehkäpä tili on jo varmennettu?" please_continue: "Tilisi on nyt varmennettu; sivu ohjautuu palstan etusivulle." continue_button: "Jatka sivustolle %{site_name}" @@ -468,6 +468,7 @@ fi: regular: title: "Tavallinen ketju" banner: + title: "Banneriketju" message: make: "Tämä ketju on nyt banneri. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi." remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun ylälaidassa." @@ -575,6 +576,14 @@ fi: title: "Yhteensä" xaxis: "Päivä" yaxis: "API-pyynnöt yhteensä" + page_view_logged_in_mobile_reqs: + title: "Kirjautuneiden API-pyynnöt" + xaxis: "Päivä" + yaxis: "Mobiiliin kirjautuneiden API-pyynnöt" + page_view_anon_mobile_reqs: + title: "Anonyymit API-pyynnöt" + xaxis: "Päivä" + yaxis: "Mobiilit anonyymit API-pyynnöt" http_background_reqs: title: "Taustajärjestelmä" xaxis: "Päivä" @@ -599,12 +608,25 @@ fi: title: "Yhteensä" xaxis: "Päivä" yaxis: "Pyyntöjä yhteensä" + time_to_first_response: + title: "Aika ensimmäiseen vastaukseen" + xaxis: "Päivä" + yaxis: "Keskimääräinen aika (tuntia)" + topics_with_no_response: + title: "Ketjut, joihin ei ole vastattu" + xaxis: "Päivä" + yaxis: "Yhteensä" + mobile_visits: + title: "Vierailut" + xaxis: "Päivä" + yaxis: "Vierailujen määrä" dashboard: rails_env_warning: "Palvelintasi ajetaan %{env} moodissa." ruby_version_warning: "Käytät Rubyn versiota 2.0.0 jonka kanssa on tunnettuja ongelmia. Päivitä patch level 247 tai uudempaan." host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusisäntänimeä. Päivitä se käyttämään sivuston isäntänimeä." gc_warning: 'Palvelimesi käyttää rubyn oletuksia roskienkeräyksessä, joka ei anna parasta mahdollista suorituskykyä. Lue tämä ketju: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq ei ole käynnissä. Monet tehtävät, kuten sähköpostien lähettäminen, suoritetaan asynkronisesti sidekiqin avulla. Varmista, että vähintään yksi sidekiq prosessi on käynnissä. Opiskele lisää Sidekiqista täältä.' + queue_size_warning: 'Jonossa olevien tehtävien määrä on %{queue_size}, joka on korkea. Tämä voi olla merkki ongelmista Sidekiq prosess(e)issa tai sinun voi täytyä lisätä Sidekiq workerien määrää.' memory_warning: 'Palvelimella on alle 1GB muistia. Vähintään 1 GB muistia on suositeltavaa.' google_oauth2_config_warning: 'Palvelin on konfiguroitu hyväksymään kirjautuminen Google OAuth2:n kautta (enable_google_oauth2_logins), mutta client id ja client secret arvoja ei ole asetettu. Päivitä arvot sivuston asetuksissa.Voit lukea lisätietoja tästä oppaasta.' facebook_config_warning: 'Palvelin on konfiguroitu hyväksymään kirjautuminen Facebookin kautta (enable_facebook_logins), mutta app id ja app secret arvoja ei ole asetettu. Päivitä arvot sivuston asetuksissa.Voit lukea lisätietoja tästä oppaasta.' @@ -613,7 +635,6 @@ fi: s3_config_warning: 'Palvelin on konfiguroitu tallentamaan tiedostot s3:een, mutta vähintään yksi arvoista s3_access_key_id, s3_secret_access_key tai s3_upload_bucket ei ole asetettu. Päivitä arvot sivuston asetuksissa.Voit lukea lisätietoja oppaasta "How to set up image uploads to S3?".' 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 sivuston asetuksissa.Voit lukea lisätietoja oppaasta "How to set up image uploads to S3?".' image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai lataamalla uusin versio.' - failing_emails_warning: 'Sähköpostitehtävä on epäonnistunut %{num_failed_jobs} kertaa. Tarkista config/discourse.conf tiedostosta, että sähköpostiasetukset ovat kunnossa. Tarkastele epäonnistuneita tehtäviä Sidekiqissa.' default_logo_warning: "Aseta sivustolle logot. Päivitä logo_url, logo_small_url, ja favicon_url sivuston asetuksissa." contact_email_missing: "Aseta yhteystietoihin sähköpostiosoite, josta sinut saa tavoitettua sivustoon liittyvissä kiireellisissä asioissa. Voit syöttää sen sivuston asetuksissa." contact_email_invalid: "Sivuston sähköpostiosoite ei kelpaa. Muokkaa sitä sivuston asetuksissa." @@ -666,7 +687,7 @@ fi: max_topic_title_length: "Viestin otsikon merkkien maksimimäärä" min_private_message_title_length: "Viestin otsikon merkkien minimimäärä viestille" min_search_term_length: "Haun merkkien minimimäärä" - allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta." + allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Sinun täytyy siirtää alueettomat ketjut jollekin alueelle, ennen tämän asetuksen poistamista käytöstä." uncategorized_description: "Alueettomien ketjujen alueen kuvaus. Jätä tyhjäksi, jos et halua käyttää kuvausta." allow_duplicate_topic_titles: "Salli ketjun luominen identtisellä otsikolla." unique_posts_mins: "Kuinka monta minuuttia, kunnes käyttäjä voi luoda uudestaan saman sisältöisen viestin" @@ -689,15 +710,16 @@ fi: category_featured_topics: "Näytettävien ketjujen lukumäärä alueittan Alueet-sivulla. Arvon muuttamisen jälkeen voi kestää jopa 15 minuuttia sivun päivittymiseen." show_subcategory_list: "Näytä sisempien alueiden lista ketjulistauksen sijaan alueelle saavuttaessa." fixed_category_positions: "Jos tämä on valittuna, voit muokata alueiden järjestystä. Jos tätä ei valita, alueet järjetsetään aktiivisuuden mukaan." + fixed_category_positions_on_create: "Jos tämä on valittuna, alueiden järjestys pysyy samana uuden ketjun luomisen dialogissa (edellyttää fixed_category_positions)" add_rel_nofollow_to_user_content: "Lisää rel nofollow kaikkeen käyttäjien lähettämään sisältöön, paitsi sivuston sisäisiin linkkeihin (sisältäen ylemmät verkkotunnukset). Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "Lista verkkotunnuksista, johon osoittaviin linkkeihin nofollow:ta ei lisätä. tld.com sallii automaattisesti myös sub.tld.comin. Sinun tulisi vähintäänkin lisätä tämän sivuston domain, jotta hakurobotit löytävät kaiken sisällön. Jos sivustosi muut osat ovat toisen domainin takan, lisää myös ne." post_excerpt_maxlength: "Viestin katkelman merkkien maksimimäärä." post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä." onebox_domains_whitelist: "Lista verkkotunnuksista, joilta sallitaan onebox-esikatselut; näiden tunnusten pitäisi tukea OpenGraphia tai oEmbedia. Testaa ne osoitteessa http://iframely.com/debug" - logo_url: "Logo sivun vasemmassa ylälaidassa. Jos jätetään tyhjäksi, näytetään sen tilalla palstan nimi." - digest_logo_url: "Vaihtoehtoinen logo, jota käytetään tiivistelmäsähköpostin yläreunassa. Jos asetus jätetään tyhjäksi 'logo_url' käytetään tämän sijaan. esim: http://esimerkki.fi/logo.png" - logo_small_url: "Logo sivun vasemmassa ylälaidassa, kun sivua on vieritetty alas. Jos jätetään tyhjäksi, näytetään koti-merkki." - favicon_url: "Palstan favicon, katso http://fi.wikipedia.org/wiki/Favicon" - mobile_logo_url: "Logo mobiilisivun vasemmassa ylälaidassa. Jos jätetään tyhjäksi, sen tilalla käytetään 'logo_url'." + logo_url: "Logo sivustosi vasemmassa yläkulmassa. Sen pitäisi olla leveä suorakulmio muodoltaan. Jos jätetään tyhjäksi, näytetään sivuston otsikkoteksti." + digest_logo_url: "Vaihtoehtoinen logo, jota käytetään sivustolta lähtevissä sähköpostitiivistelmissä. Sen pitäisi olle leveä suorakulmio muodoltaan. Jos jätetään tyhjäksi, sen tilalla käytetään 'logo_url'." + logo_small_url: "Pieni logo sivuston vasemmassa reunassa, joka näytettään rullattaessa alaspäin. Sen pitäisi olla neliö muodoltaan. Jos jätetään tyhjäksi, näytetään sen tilalla koti-merkki." + mobile_logo_url: "Logo mobiilisivun vasemmassa ylälaidassa. Sen pitäisi olla neliön muotoinen. Jos jätetään tyhjäksi, 'logo_url' käytetään sen tilalla. Esim: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Applen laitteiden käyttämä ikoni, Suositeltu koko on 144px kertaa 144px." notification_email: "Sähköpostiosoite, josta kaikki tärkeät järjestelmän lähettämät sähköpostiviestit lähetetään. Verkkotunnuksen SPF, DKIM ja reverse PTR tietueiden täytyy olla kunnossa, jotta sähköpostit menevät perille." email_custom_headers: "Pystyviivalla eroteltu lista mukautetuista sähköpostin tunnisteista" @@ -715,8 +737,6 @@ fi: polling_interval: "Kun long polling ei ole käytössä, kuinka usein kirjautuneet käyttäjät pollaavat, millisekunneissa." anon_polling_interval: "Kuinka usein anonyymit käyttäjät pollaavat millisekunneissa" background_polling_interval: "Kuinka usein asiakkaat pollaavat, millisekunneissa (kun ikkuna ei ole aktiivisena)" - auto_track_topics_after: "Missä ajassa ketjua aletaan seurata oletusarvoisesti millisekunneissa, käyttäjän muokattavissa (0 aina, -1 ei koskaan)" - new_topic_duration_minutes: "Kuinka kauan ketju lasketaan uudeksi oletusarvona minuuteissa, käyttäjän muokattavissa (-1 aina, -2 edellisen vierailun jälkeen luodut ketjut)" flags_required_to_hide_post: "Lippujen lukumäärä, joka automaattisesti piilottaa viestin ja lähettää YV:n sen kirjoittajalle (0 ei koskaan)" cooldown_minutes_after_hiding_posts: "Kuinka monta minuuttia käyttäjän tulee odottaa, ennen kuin hän voi muokata liputuksen seurauksena piilotettua viestiä" max_topics_in_first_day: "Kuinka monta ketjua uusi käyttäjä saa luoda ensimmäisenä päivänään sivustolla." @@ -771,17 +791,18 @@ fi: invite_passthrough_hours: "Kuinka pitkään käyttäjä voi käyttää vastatun kutsun avainta kirjautuakseen sisään, tunneissa" invite_only: "Julkinen rekisteröityminen on otettu pois käytöstä, uuden tilin luominen vaatii kutsun muilta käyttäjiltä tai henkilökunnalta." login_required: "Vaadi kirjautumista sivuston lukemiseen, epää anonyymi pääsy." - min_username_length: "Käyttäjänimen vähimmäispituus merkeissä. VAROITUS: OLEMASSA OLEVAT KÄYTTÄJÄT JOIDEN KÄYTTÄJÄTUNNUS ON LYHYEMPI KUIN TÄMÄ EIVÄT VOI ENÄÄ KIRJAUTUA SISÄÄN MUUTOKSEN JÄLKEEN." - max_username_length: "Käyttäjänimen enimmäispituus merkeissä. VAROITUS: KÄYTTÄJÄT JOIDEN KÄYTTÄJÄTUNNUS ON PIDEMPI KUIN TÄMÄ EIVÄT VOI ENÄÄ KIRJAUTUA SISÄÄN MUUTOKSEN JÄLKEEN." + reserved_usernames: "Käyttäjänimet, joiden rekisteröintiä ei sallita." min_password_length: "Salasanan vähimmäispituus." block_common_passwords: "Älä salli salasanoja, jotka ovat 10 000 yleisimmän salasanan joukossa." + enable_sso: "Ota käyttöön single sign on ulkopuolisen sivuston kautta (VAROITUS: ULKOPUOLISEN SIVUSTON TÄYTYY VALIDOIDA SÄHKÖPOSTIOSOITTEET!)" enable_sso_provider: "Ota käyttöön Discourse SSO provider -protokolla /session/sso_provider päätepisteessä, vaatii asetuksen sso_secret asettamista." sso_url: "single sign on endpointin URL" sso_secret: "Salausavain, jolla todennetaan SSO tiedot, varmista että se on vähintään 10 merkkiä pitkä" - sso_overrides_email: "Ohittaa paikallisen sähköpostiosoitteen SSO:n kautta saatavalla ulkopuolisella sähköpostillosoitteella (VAROITUS: eroavuuksia saattaa syntyä johtuen paikallisten sähköpostien normalisoinnista)" - sso_overrides_username: "Ohittaa paikallisen käyttäjänimen SSO:n kautta saatavalla ulkopuolisella käyttäjänimellä (VAROITUS: eroavuuksia saattaa syntyä johtuen eroavuuksista nimien pituuksissa/vaatimuksissa)" - sso_overrides_name: "Ohittaa paikallisen koko nimen SSO:n kautta ulkopuolelta saatavalla nimellä" + sso_overrides_email: "Ohittaa paikallisen sähköpostiosoitteen SSO:n kautta saatavalla ulkopuolisella osoitteella ja estää paikalliset muutokset (VAROITUS: eroavuuksia saattaa syntyä johtuen paikallisten sähköpostiosoitteiden normalisoinnista)" + sso_overrides_username: "Ohittaa paikallisen käyttäjänimen SSO:n kautta saatavalla ulkopuolisella nimellä ja estää paikalliset muutokset (VAROITUS: eroavuuksia saattaa syntyä johtuen erilaisista vaatimuksista ja pituudesta)" + sso_overrides_name: "Ohittaa paikallisen koko nimen SSO:n kautta saatavalla ulkopuolisella nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset" sso_overrides_avatar: "Syrjäyttää käyttäjän avatarin ulkopuolisella kertakirjautumisen kautta haetulla avatarilla. Jos tämä otetaan käyttöön, suositellaan samalla allow_uploaded_avatars -asetuksen poistamista käytöstä." + sso_not_approved_url: "Uudelleenohjaa hyväksymättömät SSO-tilit tähän osoitteeseen" enable_local_logins: "Ota käyttöön käyttäjätunnus/salasana -perusteinen kirjautuminen. (Huom: tämän täytyy olla käytössä kutsujen toimimiseksi)" allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen." enable_yahoo_logins: "Ota käyttöön Yahoo kirjautuminen" @@ -799,7 +820,7 @@ fi: github_client_secret: "Client secret Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications" allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota" maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti" - backup_daily: "Luo uusi varmuuskopio automaattisesti kerran päivässä." + backup_frequency: "Kuinka usein luodaan sivuston varmuuskopio, päivissä." enable_s3_backups: "Lataa varmuuskopiot S3:een niiden valmistuttua. TÄRKEÄÄ: edellyttää, että toimivat S3 kirjautumistiedot on syötetty asetuksiin." s3_backup_bucket: "Amazon S3 bucket johon varmuuskopiot ladataan. VAROITUS: Varmista, että se on yksityinen." active_user_rate_limit_secs: "Kuinka usein 'last_seen_at' kenttä päivitetään, sekunneissa" @@ -883,6 +904,9 @@ fi: topic_views_heat_low: "Näin monen katselun jälkeen katselut-saraketta korostetaan hieman." topic_views_heat_medium: "Näin monen katselun jälkeen katselut-saraketta korostetaan kohtalaisesti." topic_views_heat_high: "Näin monen katselun jälkeen katselut-saraketta korostetaan voimakkaasti." + cold_age_days_low: "Kun keskustelua on käyty näin monta päivää, viimeisimmän viestin päivämäärää himmennetään hieman.." + cold_age_days_medium: "Kun keskustelua on käyty näin monta päivää, viimeisimmän viestin aikaa himmennetään kohtalaisesti." + cold_age_days_high: "Kun keskustelua on käyty näin monta päivää, viimeisimmän viestin aikaa himmennetään paljon." history_hours_low: "Kun viestiä on muokattu näin monen tunnin sisällä, korostetaan muokkauksesta kertovaa ikonia hieman." history_hours_medium: "Kun viestiä on muokattu näin monen tunnin sisällä, korostetaan muokkauksesta kertovaa ikonia kohtalaisesti." history_hours_high: "Kun viestiä on muokattu näin monen tunnin sisällä, korostetaan muokkauksesta kertovaa ikonia voimakkaasti." @@ -895,7 +919,6 @@ fi: newuser_spam_host_threshold: "Kuinka monta kertaa uusi käyttäjä voi lisätä linkin samaan isäntään `newuser_spam_host_posts` viesteissään, kunnes se tulkitaan roskapostin lähettämiseksi." white_listed_spam_host_domains: "Lista verkkotunnuksista, joita ei oteta huomioon roskapostin tunnistamisessa. Uusilla käyttäjillä ei ole rajoituksia linkkaamisessa näihin tunnuksiin." staff_like_weight: "Kuinka suuri ylimääräinen arvo on henkilökunnan tykkäyksillä." - topic_view_duration_hours: "Laske uusi ketjun katselu kerran per IP/käyttäjä n tunnin välein" levenshtein_distance_spammer_emails: "Verrattaessa sähköpostiosoitteita tunnettuihin roskapostittajiin, näin monen merkin ero saa vielä aikaan löydöksen." max_new_accounts_per_registration_ip: "Jos samasta IP osoitteesta on jo (n) luottamustason 0 käyttäjätiliä (eikä yhtään henkilökunnan tai vähintään LT2), lakkaa hyväksymästä uusia rekisteröitymisiä tästä IP:stä." min_ban_entries_for_roll_up: "Kun Kääri-painiketta painetaan, luodaan IP-porttikielloista aliverkon kattavia kieltoja jos kieltoja on asettu vähintään (N) määrä." @@ -904,6 +927,10 @@ fi: num_flaggers_to_close_topic: "Minimimäärä uniikkeja liputtajia, joka vaaditaan ketjun automaattiseksi keskeyttämiseksi." num_flags_to_close_topic: "Minimimäärä aktiivisia lippuja, joka vaaditaan ketjun automaattiseksi keskeyttämiseksi." auto_respond_to_flag_actions: "Ota käyttöön automaattinen vastaus lippua poistettaessa." + min_first_post_typing_time: "Minimimäärä aikaa millisekunneissa, joka käyttäjän täytyy kirjoittaa ensimmäistä viestiään. Jos rajaa ei saavuteta, viesti lisätään automaattisesti hyväksyttävien jonoon. Aseta 0 ottaaksesi pois käytöstä (ei suositella)." + auto_block_fast_typers_on_first_post: "Estä automaattisesti käyttäjät, jotka eivät saavuta min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Suurin luottamustaso, jolla automaattisesti estetään nopeat kirjoittajat" + auto_block_first_post_regex: "Merkkikokoriippumaton regex joka aiheuttaa käyttäjän ensimmäisen viestin estämisen ja lisäämisen hyväksymisjonoon. Esimerkiksi raivoaminen|a[bc]a aiheuttaa kaikkien viestien, joissa on sanat raivoava, aba tai aca estämisen. Vaikuttaa vain ensimmäiseen viestiin." reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla." reply_by_email_address: "Saapuvan sähköpostin sapluuna sähköpostivastauksiin, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com" disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia" @@ -916,6 +943,7 @@ fi: pop3_polling_host: "POP3 pollauksen host." pop3_polling_username: "POP3 käyttäjänimi" pop3_polling_password: "POP3 käyttäjätilin salasana." + log_mail_processing_failures: "Kirjaa kaikki sähköpostin prosessoinnin virheet tänne http://sivustonnimi.com/logs" email_in: "Salli käyttäjien luoda uusia ketjuja sähköpostitse (vaatii pop3 pollauksen). Konfiguroi osoitteet erikseen jokaisen alueen \"Asetukset\" välilehdeltä. " email_in_min_trust: "Alin luottamustaso, jonka käyttäjä tarvitsee voidakseen luoda uusia ketjuja sähköpostitse." email_prefix: "Sähköpostin otsikossa käytettävä [tunniste]. Jos et aseta arvoa, oletusarvona käytetään 'otsikkoa'." @@ -927,18 +955,16 @@ fi: username_change_period: "Montako päivää aikaa käyttäjällä on vaihtaa käyttäjänimeä tilin luomisen jälkeen (0 poistaa nimen vaihdon käytöstä)." email_editable: "Salli käyttäjien vaihtaa sähköpostiosoitteensa tilin luomisen jälkeen." logout_redirect: "Sivu, jonne selain ohjataan uloskirjautumisen jälkeen, esim: (http://sivusto.com/logout)" - allow_uploaded_avatars: "Salli käyttäjien ladata oma avatar." - allow_animated_avatars: "Salli käyttäjien valita animoituja gif-avatareja. VAROITUS: aja avatars:refresh rake task tämän asetuksen muuttamisen jälkeen." + allow_uploaded_avatars: "Salli käyttäjien ladata oma profiilikuva." + allow_animated_avatars: "Salli käyttäjien valita animoituja gif-profiilikuvia. VAROITUS: aja avatars:refresh rake task tämän asetuksen muuttamisen jälkeen." allow_animated_thumbnails: "Luo animoidut esikatselukuvat animoiduista gif-tiedostoista." default_avatars: "Verkko-osoitteet profiilikuviin, joita käytetään oletuksena uusille käyttäjille." automatically_download_gravatars: "Lataa käyttäjille Gravatarit automaattisesti tilin luonnin ja sähköpostin vaihdon yhteydessä." digest_topics: "Sähköpostitiivistelmässä näytettävien ketjujen maksimimäärä." digest_min_excerpt_length: "Viestin katkelman vähimmäispituus sähköpostitiivistelmässä, merkeissä" - default_digest_email_frequency: "Kuinka usein käyttäjän saavat sähköpostitiivistelmän oletuksena. He voivat muuttaa asetusta omista asetuksistaan." suppress_digest_email_after_days: "Jätä lähettämättä tiivistelmäsähköpostit käyttäjille, joita ei ole nähty (n) päivän aikana." disable_digest_emails: "Ota tiivistelmäsähköpostit pois käytöstä kaikilta käyttäjiltä." - default_external_links_in_new_tab: "Avaa ulkoiset linkit uudessa välilehdessä. Käyttäjät voivat muuttaa tämän asetuksistaan." - detect_custom_avatars: "Tarkistetaanko, ovatko käyttäjät ladanneet oman avatarin." + detect_custom_avatars: "Tarkistetaanko, ovatko käyttäjät ladanneet oman profiilikuvan." max_daily_gravatar_crawls: "Korkeintaan kuinka monta kertaa Discourse tarkistaa avatarit Gravatarista päivässä" public_user_custom_fields: "Whitelist käyttäjän mukautetuista kentistä, jotka voidaan näyttää julkisesti." staff_user_custom_fields: "Whitelist käyttäjän mukautetuista kentistä, jotka voidaan näyttää henkilökunnalle." @@ -950,31 +976,32 @@ fi: sequential_replies_threshold: "Kuinka monen peräkkäisen viestin jälkeen yhdessä ketjussa käyttäjää muistutetaan peräkkäisistä vastauksista." enable_mobile_theme: "Mobiililaitteet käyttävät erillistä teemaa ja kahden välillä on mahdollista vaihtaa. Poista asetus käytöstä, jos haluat käyttää omaa tyylitiedostoa, joka on mukautuva eri laitteille." dominating_topic_minimum_percent: "Kuinka monta prosenttia ketjun viesteistä käyttäjän täytyy kirjoittaa, ennen kuin tulee muistutetuksi ketjun dominoinnista." + daily_performance_report: "Analysoi NGINX lokit päivittäin ja julkaise vain henkilökunnalle näkyvä ketju yksityiskohdista" suppress_uncategorized_badge: "Älä näytä alueettomille ketjuille tunnusta ketjujen listauksissa." global_notice: "Näytä KIIREELLISESTÄ HÄTÄTAPAUKSESTA kertova banneri kaikilla sivuilla kaikille käyttäjille, vaihda tyhjäksi piilottaaksesi sen (HTML sallittu)." disable_edit_notifications: "Poista muokkausilmoitukset system-käyttäjältä, kun 'download_remote_images_to_local' on asetettu." full_name_required: "Koko nimi on käyttäjäprofiilin vaadittu kohta" enable_names: "Näytä käyttäjän koko nimi profiilissa, käyttäjäkortissa ja sähköposteissa. Poista käytöstä piilottaaksesi koko nimen kaikkialla." display_name_on_posts: "Näytä käyttäjän pitkä nimi viesteissä @nimen lisäksi." + show_time_gap_days: "Jos kahden viestin välissä on kulunut näin monta päivää, näytä aikaväli ketjussa." invites_per_page: "Oletuksena montako kutsua näytetään käyttäjäsivulla." short_progress_text_threshold: "Kuinka monen viestin jälkeen ketjun edistyspalkissa näytetään vain nykyisen viestin numero. Jos muutat palkin leveyttä, voit joutua muuttamaan tätä arvoa." default_code_lang: "Oletusarvoinen ohjelmointikieli syntaksin korostukseen Github koodiblokeissa (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "Kun käyttäjä alkaa kirjoittamaan vastausta ketjuun, jonka uusin viesti on tätä vanhempi päivissä, näytetään varoitus. Poista käytöstä asettamalla arvoksi 0." autohighlight_all_code: "Pakota koodin korostus kaikkiin esimuotoiltuihin tekstiblokkeihin, vaikka käyttäjä ei määrittelisi kieltä." highlighted_languages: "Syntaksin korostamisen säännöt. (Varoitus: liian monen kielen sisällyttäminen voi vaikuttaa suorituskykyyn) katso demo: https://highlightjs.org/static/demo/" - embeddable_host: "Isäntä, joka voi upottaa kommentteja tältä palstalta. Pelkkä isäntänimi, älä aloita http://" feed_polling_enabled: "VAIN UPOTUS: Upotetaanko RSS/ATOM syöte viesteinä." feed_polling_url: "VAIN UPOTUS: RSS/ATOM syötteen URL." embed_by_username: "Sen käyttäjän Discourse käyttäjänimi, joka luo upotetut ketjut." embed_username_key_from_feed: "Avain, jolla erotetaan Discourse-käyttäjänimi syötteestä." embed_truncate: "Typistä upotetut viestit." - embed_category: "Alue upotettujen ketjuille." embed_post_limit: "Upotettavien viestien maksimimäärä." embed_whitelist_selector: "CSS valitsin elementeille, jotka sallitaan upotetuissa viesteissä." embed_blacklist_selector: "CSS valitstin elementeille, jotka poistetaan upotetuista viesteistä." notify_about_flags_after: "Jos liputuksia ei ole käsitelty näin moneen tuntiin, lähetä sähköposti contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä." enable_cdn_js_debugging: "Salli /logs näyttää kunnolliset virheilmoitukset lisäämällä crossorigin permissions kaikkiin sisällytettyihin js-kirjastoihin." show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, huomauta ylläpitäjiä ketjujen luonnista." + delete_drafts_older_than_n_days: Poista yli (n) päivää vanhat luonnokset. vacuum_db_days: "Aja VACUUM FULL ANALYZE vapauttaaksesi tilaa tietokantaan migraatioiden jälkeen (aseta 0 ottaaksesi pois käytöstä)" prevent_anons_from_downloading_files: "Estä kirjautumattomia käyttäjiä lataamasta liitetiedostoja. VAROITUS: tämä estää viestin liitettyjen muiden tiedostojen, kuin kuvien käyttämisen sivustolla." slug_generation_method: "Valitse polkulyhenteen luomisen metodi. 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkulyhenteet käytöstä." @@ -983,6 +1010,7 @@ fi: enforce_square_emoji: "Pakota neliö kuvasuhteeksi kaikille emojille." approve_post_count: "Viestien lukumäärä, joka tarkastetaan uusilta käyttäjiltä" approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan" + notify_about_queued_posts_after: "Jos hyväksyntää odottavia viestejä on odottanut näin monta tuntia, lähetä sähköposti contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä." errors: invalid_email: "Sähköpostiosoite ei kelpaa." invalid_username: "Tällä nimellä ei löydy käyttäjää." @@ -1031,13 +1059,14 @@ fi: not_seen_in_a_month: "Tervetuloa takaisin! Emme ole nähneet sinua vähään aikaan. Tässä ovat suosituimmat viestiketjut sitten viime näkemän." move_posts: new_topic_moderator_post: - one: "Siirsin yhden viestin uuteen ketjuun: %{topic_link}" - other: "Siirsin %{count} viestiä uuteen ketjuun: %{topic_link}" + one: "Yksi viesti siirrettiin uuteen ketjuun: %{topic_link}" + other: "%{count} viestiä siirrettiin uuteen ketjuun: %{topic_link}" existing_topic_moderator_post: - one: "Siirsin viestin ketjuun: %{topic_link}" - other: "Siirsin %{count} viestiä ketjuun: %{topic_link}" + one: "Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}" + other: "%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}" change_owner: post_revision_text: "Omistus vaihdettu käyttäjältä %{old_user} käyttäjälle %{new_user}" + deleted_user: "poistettu käyttäjä" emoji: errors: name_already_exists: "Pahoittelut, nimi '%{name}' on jo käytössä toisella emojilla." @@ -1083,6 +1112,7 @@ fi: not_allowed_from_ip_address: "Et voi kirjautua käyttäjätunnuksella %{username} tästä IP-osoitteesta." admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta." suspended: "Et voi kirjautu sisään ennen %{date}." + suspended_with_reason: "Tämä käyttäjätili on hyllytetty %{date} asti: %{reason}" errors: "%{errors}" not_available: "Ei saatavissa. Kokeile %{suggestion}?" something_already_taken: "Jotain meni pieleen. Ehkäpä tämä käyttäjänimi tai sähköpostiosoite on jo rekisteröity. Kokeile salasana unohtui -linkkiä." @@ -1090,6 +1120,8 @@ fi: omniauth_error_unknown: "Jotain meni pieleen kirjautumisesti käsittelyssä, ole hyvä ja yritä uudelleen." new_registrations_disabled: "Uusien tilien luonti ei ole tällä hetkellä sallittu." password_too_long: "Salasanan enimmäispituus on 200 merkkiä." + email_too_long: "Antamasi sähköpostiosoite on liian pitkä. Mailbox nimi ei saa olla yli 254 merkkiä pitkä, eikä domain nimi yli 253 merkkiä pitkä." + reserved_username: "Käyttäjänimi ei ole sallittu." missing_user_field: "Et ole täyttänyt kaikkia kenttiä" close_window: "Kirjautuminen onnistui. Sulje tämä ikkuna jatkaaksesi." user: @@ -1100,10 +1132,12 @@ fi: characters: "täytyy koostua vain numeroista, kirjaimista ja alaviivoista" unique: "täytyy olla uniikki" blank: "pakollinen kenttä" - must_begin_with_alphanumeric: "täytyy alkaa kirjaimella tai numerolla" email: not_allowed: "ei sallita tältä sähköpostin palvelunatarjoajalta. Ole hyvä, ja käytä toista sähköpostiosoitetta." blocked: "ei ole sallittu." + ip_address: + blocked: "Uusien tilien luonti tästä IP-osoitteesta ei ole sallittu." + max_new_accounts_per_registration_ip: "Rekisteröitymisiä ei oteta vastaan IP-osoitteestasi (maksimimäärä saavutettu). Ota yhteyttä henkilökuntaan." invite_mailer: subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}" text_body_template: | @@ -1139,11 +1173,12 @@ fi: invite_password_instructions: subject_template: "Aseta salasana %{site_name} -tunnuksellesi" text_body_template: | - Kiitos kun hyväksyit kutsun sivustolle %{site_name} -- tervetuloa! + Kiitos, kun hyväksyit kutsun sivustolle %{site_name} -- tervetuloa! - Klikkaa tätä linkkiä valitaksesi uuden salasanan nyt: %{base_url}/users/password-reset/%{email_token} + Avaa tämä linkki valitaksesi salasanan nyt: + %{base_url}/users/password-reset/%{email_token} - Jos et muista salasanaasi, tai et ole vielä asettanut sellaista, valitse "Unohdin salasanani" kirjautuessasi siään sähköpostiosoitteellasi. + (jos yllä oleva linkki on vanhentunut, valitse "unohdin salasanani" kirjautuessasi sisään sähköpostiosoitteellasi) test_mailer: subject_template: "[%{site_name}] Sähköpostin toimitettavuustesti" text_body_template: | @@ -1190,14 +1225,14 @@ fi: text_body_template: |+ Uusi versio [Discoursesta](http://www.discourse.org) on saatavilla - Sinun käyttämäsi versio: %{installed_version} + Sinun versiosi: %{installed_version} Uusin versio: **%{new_version}** Voit haluta: - - Tarkastella mitä uutta on [GitHub muutoslokissa](https://github.com/discourse/discourse/commits/master). + - Tarkastella mitä uutta on [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master). - - Asentaa päivityksen osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) klikkaamalla "Päivitä" painiketta. + - Asentaa päivityksen vierailemalla osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Vierailla osoitteessa [meta.discourse.org](http://meta.discourse.org) englanninkielisten uutisten, keskustelun ja tuen Discourselle vuoksi. @@ -1206,14 +1241,14 @@ fi: text_body_template: | Uusi versio [Discoursesta](http://www.discourse.org) on saatavilla - Sinun versio: %{installed_version} + Sinun versiosi: %{installed_version} Uusin versio: **%{new_version}** Voit haluta: - - Tarkastella mitä uutta on [GitHub muutoslokissa](https://github.com/discourse/discourse/commits/master). + - Tarkastella mitä uutta on [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master). - - Asentaa päivityksen osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) klikkaamalla "Päivitä" painiketta. + - Asentaa päivityksen vierailemalla osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Vierailla osoitteessa [meta.discourse.org](http://meta.discourse.org) englanninkielisten uutisten, keskustelun ja tuen Discourselle vuoksi. @@ -1230,6 +1265,14 @@ fi: subject_template: one: "Yksi liputus odottaa käsittelyä" other: "%{count} liputusta odottaa käsittelyä" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 viesti odottaa hyväksyntää" + other: "[%{site_name}] %{count} viestiä odottaa hyväksyntää" + text_body_template: | + Hei, + + Uusilta käyttäjiltä on hyväksyntää odottavia viestejä. [Niitä voi hyväksyä tai hylätä täällä](%{base_url}/queued-posts). flag_reasons: off_topic: "Viestisi liputettiin **asiaan kuulumattomaksi**: se ei kuulu tähän ketjuun, jonka aiheen määrittelee aloitusviesti ja otsikko." inappropriate: "Viestisi liputettiin **asiattomaksi**: se on loukkaava, herjaava tai rikkoo [palstan sääntöjä](/guidelines)." @@ -1241,7 +1284,7 @@ fi: disagreed: "Kiitos kun toit asian tietoomme. Selvitämme asiaa." deferred: "Kiitos kun toit asian tietoomme. Selvitämme asiaa." deferred_and_deleted: "Kiitos kun toit asian tietoomme. Olemme poistaneet kyseisen viestin." - temporarily_closed_due_to_flags: "Tämä ketju on väliaikaisesti suljettu suuren lippumäärän vuoksi" + temporarily_closed_due_to_flags: "Tämä ketju on väliaikaisesti suljettu, johtuen suuresta määrästä liputuksia." system_messages: post_hidden: subject_template: "Viesti on piilotettu liputuksen johdosta" @@ -1261,73 +1304,89 @@ fi: Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines). usage_tips: text_body_template: | - Tässä muutama pikaohje, joiden avulla pääset alkuun. + Tässä muutama nopea ohje, joiden avulla pääset alkuun: - ## Jatka vierittämistä + ## Lukeminen - Palstalla ei ole sivunumeroita tai 'Seuraava'-painikkeita – lukeaksesi lisää, **jatka vain sivun vierittämistä alaspäin!** + Lukeaksesi lisää, **jatka vain sivun vierittämistä alaspäin!** - Kun uusia viestejä lähetetään, nekin ilmestyvät näkyviin automaattisesti. + Kun uusia vastauksia tai ketjuja luodaan, ne ilmestyvät näkyviin automaattisesti - ei tarvitse ladata sivua uudelleen. - ## Missä olen? + ## Navigointi - - Jos haluat käyttää hakua, päästä käyttäjäsivullesi tai avata päävalikon, klikkaa **oikeassa yläkulmassa olevia painikkeita**. + - Käyttääksesi hakua, päästäksesi käyttäjäsivullesi tai avataksesi ☰ valikon, käytä **oikeassa yläkulmassa olevia painikkeita**. - - Ketjun otsikkoa klikkaamalla pääset uusimpaan lukemattomaan viestiin. Klikkaa uusinta toimintaa tai viestien lukumäärrää hypätäksesi ketjun alkuun tai loppuun. + - Ketjun otsikkoa klikkaamalla pääset aina **uusimpaan lukemattomaan viestiin** ketjussa. Hypätäksesi ketjun alkuun tai loppuun, klikkaa sen sijaan uusinta toimintaa tai viestien lukumäärää. - - Kun olet lukemassa viestiketjua, pääset takaisin ylös ↑ klikkaamalla otsikkoa. Klikkaa vihreää edistymispalkkia oikealla alhaalla tuodaksesi esiin navigaatiopainikkeet, tai käytä home ja end näppäimiä. + - + - Kun olet lukemassa viestiketjua, valitse edistymispalkki oikealla alhaalla tuodaksesi esiin täydet navigaatiopainikkeet. Paina ? tuodaksesi esiin listan näppäimistöoikoteistä. - ## Kuinka vastaan viesteihin? + - - Vastataksesi ketjuun yleisesti, käytä Vastaa-painiketta sivun alalaidassa. + ## Vastaaminen - - Vastataksesi tiettyyn viestiin, käytä kyseisen viestin Vastaa-painiketta . + - Vastataksesi **ketjuun yleisesti**, käytä ketjun lopussa. - - Jos haluat viedä keskustelun uuteen suuntaan, mutta säilyttää yhteyden aiempaan keskusteluun, käytä Aloita uusi yhdistetty ketju -painiketta viestin oikealla puolella. + - Vastataksesi **tiettylle henkilölle**, käytä heidän viestissään. - Lainataksesi toista käyttäjää viestissäsi, valitse teksti jota haluat lainata ja klikkaa mitä hyvänsä Vastaa-painiketta. + - Vastataksesi **uudessa ketjussa**, käytä viestin oikealla puolella. Sekä vanha, että uusi ketju yhdistetään toisiinsa automaattisesti. - + Lainataksesi toista käyttäjää, valitse teksti jota haluat lainata ja klikkaa mitä hyvänsä Vastaa-painiketta. Toista lisätäksesi useampia lainauksia. - Tavoittaaksesi toisen käyttäjän viestissäsi, mainitse hänen nimensä. Kirjoita `@` ja automaattinen täydennys tulee esiin. + - + Jos haluat, että toinen käyttäjä saa ilmoituksen viestistäsi, mainitse hänen nimensä. Aloita kirjoittamaan `@` ja voit valita käyttäjänimen listasta. - [Tavallisia Emojia](http://www.emoji.codes/), voit lisätä vain aloittamalla kirjoittamaan `:` tai perinteisiä hymiöitä `:)` :smile: + - ## Mitä muuta voin tehdä? + Käyttääksesi [tavallisia Emojia](http://www.emoji.codes/), kirjoita vain `:` lisätäksesi nimellä tai käytä perinteisiä hymiöitä `:)` - Jokaisen viestin alalaidassa on rivi painikkeita. + - + Luodaksesi lyhennelmän linkistä, liitä se omalle rivilleen: - Käytä **tykkää** painiketta osoittaaksesi kirjoittajalle, että olet pitänyt hänen viestistään. Jos huomaat viestissä ongelman, saata asia kirjoittajan tai palstan henkilökunnan tietoon yksityisesti **liputa** painikkeella. + - Voit myös **jakaa** linkin viestiin tai **lisätä sen kirjanmerkkeihin** käyttäjäsivullesi myöhempää tarkastelua varten. + ## Toiminnot - ## Kuka minulle puhuu? + Jokaisen viestin alalaidassa on joukko painikkeita: - Kun toinen käyttäjä vastaa viestiisi, lainaa viestiäsi tai mainitsee `@käyttäjänimesi`, numero ilmestyy sivun oikeaan yläkulmaan. Sieltä pääset katselemaan **ilmoituksiasi**. + - + Osoittaaksesi kirjoittajalle, että olet pitänyt hänen viestistään, käytä **tykkää** painiketta. Laita hyvä kiertämään! - Älä murehdi siitä, että et huomaisi uusi vastauksia. Saat sähköposti-ilmoituksen uusista vastauksista (ja viesteistä) jos et ole paikalla, kun ne saapuvat. + Jos huomaat jonkun viestissä ongelman, saata asia yksityisesti kirjoittajan tai [palstan henkilökunnan](%{base_url}/about) tietoon **liputa** painikkeella. Voit myös **jakaa** linkin viestiin tai **lisätä sen kirjanmerkkeihin** käyttäjäsivullesi myöhempää tarkastelua varten. - ## Milloin keskustelut ovat uusia? + ## Ilmoitukset - Oletuksena kaikki alle kaksi päivää vanhat keskustelut tulkitaan uusiksi ja kaikki keskustelut joihin olet ottanut osaa (vastannut, luonut tai lukenut pitkään) asetetaan automaattisesti seurantaan. + Kun joku vastaa viestiisi, lainaa viestiäsi tai mainitsee `@käyttäjänimesi`, ilmestyy sivun oikeaan yläkulmaan numero. Sieltä pääset tarkastelemaan **ilmoituksiasi**. - Näet siniset uusien ketjujen ja viestien ilmaisimet näiden ketjujen yhteydessä: + - + Eikä tarvitse murehtia siitä, että et huomaisi uusi vastauksia. Saat sähköposti-ilmoituksen uusista ilmoituksista jos et ole paikalla, kun ne saapuvat. - Voit vaihtaa yksittäisen viestiketjun ilmoitusasetuksia ketjun alalaidassa olevalla painikkeella (asetuksen voi muuttaa myös aluekohtaisesti). Vaihtaaksesi asetuksia siitä, kuinka seuraat ketjuja tai mitkä ketjut tulkitaan uusiksi, katso [käyttäjäasetukset](%{base_url}/my/preferences). + ## Omat asetukset - ## Miksi en voi tehdä jotain? + - Oletuksena kaikki alle kaksi päivää vanhat keskustelut ovat uusia. - Uusien käyttäjien oikeuksia rajoitetaan turvallisussyistä. Osallistumalla ansaitset yhteisön luottamuksen ja rajoitukset poistuvat automaattisesti. Korkeammilla [luottamustasoilla](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) saat vielä enemmän valtuuksia joiden avulla voit auttaa yhteisön ylläpitämisessä. + - Kaikkia keskusteluita **joissa olet ollut mukana** (luomalla, vastaamalla tai lukemalla pitkään) seurataan automaattisesti. + + Näet siniset uusien ja lukemattomien lukumäärän ilmaisimet näiden ketjujen yhteydessä. + + + + Voit vaihtaa minkä tahansa viestiketjun ilmoitusasetuksia ketjun alalaidassa olevalla painikkeella. + + + + Voit myös asettaa ilmoitusasetuksen aluekohtaisesti, jos haluat seurata jokaista ketjua tietyllä alueella. + + Voit muuttaa näitä asetuksia [käyttäjäasetuksissasi](%{base_url}/my/preferences). + + ## Yhteisön luottamus + + Sitä mukaa, kun osallistut palstan keskusteluihin, keräät yhteisön luottamusta ja uuden käyttäjän rajoitukset poistuvat automaattisesti. Korkeammilla [luottamustasoilla](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) saat vielä enemmän valtuuksia, joiden avulla voit auttaa yhteisön ylläpitämisessä. welcome_user: subject_template: "Tervetuloa sivustolle %{site_name}!" text_body_template: | @@ -1364,7 +1423,7 @@ fi: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Varmuuskopiointi suoritettu onnistuneesti" - text_body_template: "Varmuuskopiointi onnistui.\nVoit ladata varmuuskopioin avaamalla valikon [ylläpito > varmuuskopiot](/admin/backups)." + text_body_template: "Varmuuskopiointi onnistui.\nSiirry [ylläpito > varmuuskopiot](%{base_url}/admin/backups) ladataksesi varmuuskopion." backup_failed: subject_template: "Varmmuskopiointi epäonnistui" text_body_template: | @@ -1428,6 +1487,10 @@ fi: subject_template: "[%{site_name}] Sähköpostiongelma -- Ei sisältöä" email_reject_parsing: subject_template: "[%{site_name}] Sähköpostiongelma -- Tunnistamaton sisältö" + text_body_template: | + Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut. + + Emme tunnistaneet sähköpostiviestistäsi sisältöä. **Varmista, että kirjoitit viestisi sähköpostiviestin alkuun** - emme pysty käsittelemään lainausten sekaan kirjoitettuja vastauksia. email_reject_invalid_access: subject_template: "[%{site_name}] Sähköpostiongelma -- Pääsy estetty" text_body_template: | @@ -1464,10 +1527,22 @@ fi: Mitään sähköpostin kohdeosoitteista ei tunnistettu. Varmista, että sähköpostiosoite on "Vastaanottaja:"-rivillä (ei CC tai BCC) ja että yrität lähettää sähköpostia osoitteeseen, jonka palstan henkilökunta on antanut. email_reject_topic_not_found: subject_template: "[%{site_name}] Sähköpostiongelma -- Ketjua ei löytynyt" + text_body_template: | + Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + + Ketjua, johon vastaat ei enää ole. Ehkäpä se on poistettu? Jos uskot, että on tapahtunut virhe, ota yhteys palstan henkilökuntaan. email_reject_topic_closed: subject_template: "[%{site_name}] Sähköpostiongelma -- Suljettu ketju" + text_body_template: | + Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + + Ketju, johon yritit vastata on tällä hetkellä suljettu, eikä siihen voi vastata. Jos uskot, että on tapahtunut virhe, ota yhteyttä palstan henkilökuntaan. email_reject_auto_generated: subject_template: "[%{site_name}] Sähköpostiongelma -- Automaattivastaus" + text_body_template: | + Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + + Sähköpostiasi epäillään automaattisesti generoiduksi, jota emme hyväksy. Jos uskot, että on tapahtunut virhe, ota yhteys palstan henkilökuntaan. email_error_notification: subject_template: "[%{site_name}] Sähköpostiongelma -- POP-autentikoinnin virhe" text_body_template: | @@ -1531,7 +1606,6 @@ fi: download_remote_images_disabled: subject_template: "Linkattujen kuvien lataaminen on otettu pois käytöstä" text_body_template: "Asetus `download_remote_images_to_local` on otettu pois käytöstä, koska vapaan tilan rajoitus `download_remote_images_threshold` saavutettiin." - unsubscribe_link: "Muokkaa [käyttäjäasetuksiasi](%{user_preferences_url}) lopettaaksesi nämä viestit." subject_re: "VS:" subject_pm: "[YV]" user_notifications: @@ -1690,7 +1764,7 @@ fi: (Jos haluat keskustella [henkilökunnan jäsenten](%{base_url}/about) kanssa, vastaa vain tähän viestiin) signup: - subject_template: "[%{site_name}] Vahvista uusi tilisi" + subject_template: "[%{site_name}] Vahvista uusi käyttäjätilisi" text_body_template: | Tervetuloa sivustolle %{site_name}! @@ -1722,8 +1796,6 @@ fi: too_large: "Pahoittelut, tiedosto jonka latausta yritit on liian suuri ( suurin tiedostokoko on %{max_size_kb}KB)." images: too_large: "Pahoittelut, kuva jonka yritit ladata on liian suuri (suurin sallittu kuvakoko on %{max_size_kb}KB), pienennä kuvaa ja yritä uudestaan." - fetch_failure: "Pahoittelut, kuvan hakemisessa tapahtui virhe." - unknown_image_type: "Pahoittelut, mutta tiedosto jota yrität ladata ei vaikuta olevan kuva." size_not_found: "Pahoittelut, mutta emme pystyneet selvittämään kuvan kokoa. Ehkä kuvatiedosto on vahingoittunut?" flag_reason: sockpuppet: "Uusi käyttäjä loi ketjun ja toinen uusi käyttäjä samasta IP osoitteesta vastasi siihen. Katso asetus flag_sockpuppets." @@ -1760,104 +1832,6 @@ fi: title: "Käyttöehdot" privacy_topic: title: "Rekisteriseloste" - static: - search_help: | -

      Vinkkejä

      -

      -

        -
      • Otsikon vastaavuutta korostetaan, joten jos olet epävarma, etsi otsikkoa
        • -
      • Uniikit, harvinaiset sanat tuovat aina parhaan lopputuloksen
        • -
      • Rajoita hakusi tietylle alueelle, tiettyyn käyttäjään tai ketjuun aina kun mahdollista.
        • -
      -

      -

      Komennot:

      -

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

      -

      - sateenkaari category:puistot status:open order:latest etsii ketjuja, joissa mainitaan sana "sateenkaari" alueella "puistot" joita ei ole suljettu tai arkistoitu, järjestettynä viimeisen viestin mukaan. -

      - badges: - long_descriptions: - autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah - first_link: | - Blah blah blah - Blah blah blah - first_quote: | - Blah blah blah - Blah blah blah - first_share: | - Blah blah blah - Blah blah blah - read_guidelines: | - Blah blah blah - Blah blah blah - reader: | - Blah blah blah - Blah blah blah - editor: | - Blah blah blah - Blah blah blah - first_flag: | - Liputus on tärkeää yhteisön elinvoimaisuuden kannalta. Jos huomaat viestejä, jotka kaipaavat moderaattorin toimenpiteitä, - älä epäröi liputtaa niitä. Voit myös käyttää liputuspainiketta lähettääksesi viestejä muille käyttäjille, kun olet saavuttanut - luottamustason 1. - nice_share: | - Blah blah blah - Blah blah blah - welcome: | - Blah blah blah - Blah blah blah - anniversary: | - Blah blah blah - Blah blah blah - good_share: | - Blah blah blah - Blah blah blah - great_share: | - Blah blah blah - Blah blah blah - nice_post: | - Blah blah blah - Blah blah blah - nice_topic: | - Blah blah blah - Blah blah blah - good_post: | - Blah blah blah - Blah blah blah - good_topic: | - Blah blah blah - Blah blah blah - great_post: | - Blah blah blah - Blah blah blah - great_topic: | - Blah blah blah - Blah blah blah - basic: | - Blah blah blah - Blah blah blah - member: | - Blah blah blah - Blah blah blah - regular: | - Blah blah blah - Blah blah blah - leader: | - Blah blah blah - Blah blah blah admin_login: success: "Sähköposti lähetetty" error: "Virhe!" @@ -1865,3 +1839,6 @@ fi: submit_button: "Lähetä sähköposti" discourse_hub: access_token_problem: "Kerro ylläpitäjälle: päivitä toimiva discourse_org_access_key." + performance_report: + initial_post_raw: Tämä ketju sisältää päivittäisiä suorituskykyrapotteja sivustoltasi + initial_topic_title: Sivuston suorituskykyraportit diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 6eba5d754d..0d25be8244 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -65,6 +65,12 @@ fr: other: '%{count} erreurs empêchent ce %{model} d''être sauvegardé' embed: load_from_remote: "Il y a eu une erreur lors du chargement de ce message." + site_settings: + min_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus court qu'un pseudo qui existe déjà." + min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum." + max_username_length_exists: "Il n'est pas possible de définir une longeur maximale de pseudo qui soit plus court qu'un pseudo qui existe déjà." + max_username_length_range: "Vous ne pouvez pas mettre le maximum sous le minimum" + default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste." bulk_invite: file_should_be_csv: "Le fichier envoyé doit être au format csv ou txt." backup: @@ -133,6 +139,7 @@ fr: rss_description: latest: "Sujets récents" hot: "Sujets populaires" + posts: "Messages récents" too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé." excerpt_image: "image" queue: @@ -176,13 +183,13 @@ fr: Pour plus d'informations, [consulter le règlement de la communauté](/guidelines). Cet encart apparaîtra pour votre premier %{education_posts_text}. avatar: | - ### Pourquoi pas une nouvelle photo pour votre compte ? + ### Avez-vous pensé à une photo de profil ? - Vous avez posté quelques sujets et réponses, mais votre avatar n'est pas aussi unique que vous -- c'est le même avatar qu'ont tous les nouveaux utilisateurs. + Vous avez posté quelques sujets et réponses, mais votre photo de profil n'est pas unique comme vous -- c'est juste une lettre. - Avez-vous envisagé de **[visiter votre profil utilisateur](%{profile_path})** et d'envoyer une image personnalisée qui vous représente ? + Avez-vous pensé à **[visiter votre profil utilisateur](%{profile_path})** et télécharger une photo qui vous représente ? - Il est plus facile de suivre les discussions d'une communauté et de trouver des personnes intéressantes quand tout le monde a un avatar unique ! + C'est plus facile de suivre les discussions et de rencontrer des personnes intéressantes dans les conversations lorsque tout le monde a une photo de profil unique ! sequential_replies: | ### Envisagez de répondre à plusieurs messages en même temps @@ -241,7 +248,7 @@ fr: no_info_other: "
      %{name} n'a pas encore renseigné le champ A Propos de Moi de son profil
      " vip_category_name: "Salon" vip_category_description: "Une catégorie réservée aux membres avec un niveau de confiance 3 et plus." - meta_category_name: "Meta" + meta_category_name: "Retours sur le Site" meta_category_description: "Discussion à propos du site, son organisation, son fonctionnement, et comment nous pouvons l'améliorer." staff_category_name: "Staff" staff_category_description: "Catégorie privée pour les discussions de l'équipe du forum. Les sujets ne sont visibles que pour les admins et les modérateurs." @@ -381,7 +388,7 @@ fr: one: "il y a presque un an" other: "il y a presque %{count} ans" password_reset: - no_token: "Désolé, ce lien de modification de mot de passe est trop vieux. Connectez-vous à nouveau et sélectionnez \"J'ai oublié mon mot de passe\" afin d'obtenir un nouveau lien." + no_token: "Désolé, le lien pour le changement de mot de passe est trop ancien. Cliquez sur Connexion puis redemandez un mot de passe afin d'obtenir un nouveau lien. " choose_new: "Veuillez choisir un nouveau mot de passe" choose: "Veuillez choisir un mot de passe" update: 'Mettre à jour le mot de passe ' @@ -395,7 +402,7 @@ fr: please_continue: "Continuer vers %{site_name}" error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?" activation: - action: "Activer votre compte" + action: "Cliquer ici pour activer votre compte" already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre compte est peut-être déjà activé ?" please_continue: "Votre nouveau compte est confirmé; vous allez être redirigé vers la page d'accueil." continue_button: "Continuer vers %{site_name}" @@ -463,6 +470,7 @@ fr: regular: title: "Sujet normal" banner: + title: "Bannière de sujet" message: make: "Ce sujet est maintenant un gros titre. Il sera affiché en haut de chaque page jusqu’à qu'il soit ignoré par un utilisateur." remove: "Ce sujet n'es plus un gros titre. Il ne sera plus affiché en haut de chaque page." @@ -570,6 +578,14 @@ fr: title: "Total" xaxis: "Jour" yaxis: "Requêtes API total" + page_view_logged_in_mobile_reqs: + title: "Requêtes API connectées" + xaxis: "Jour" + yaxis: "Requêtes API connectées mobiles" + page_view_anon_mobile_reqs: + title: "Requêtes API anonymes" + xaxis: "Jour" + yaxis: "Requêtes API anonymes mobiles" http_background_reqs: title: "Arrière plan" xaxis: "Jour" @@ -594,12 +610,25 @@ fr: title: "Total" xaxis: "Jour" yaxis: "Total des requêtes" + time_to_first_response: + title: "Délai de première réponse" + xaxis: "Jour" + yaxis: "Temps moyen (heures)" + topics_with_no_response: + title: "Sujets sans réponses" + xaxis: "Jour" + yaxis: "Total" + mobile_visits: + title: "Visites utilisateurs" + xaxis: "Jour" + yaxis: "Nombre de visites" dashboard: rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}." ruby_version_warning: "Vous exécutez une version de Ruby 2.0.0 qui est connu pour avoir des problèmes. Migrez vers le patch 247 ou supérieur." host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte." gc_warning: 'Votre serveur utilise les paramètres par défaut de collection du GC de ruby, ce qui ne vous donnera pas les meilleures performances. Merci de lire ce sujet sur l''optimisation des performances de Ruby et Rails pour Discourse.' sidekiq_warning: 'Sidekiq n''est pas lancé. De nombreuses tâches, comme l''envoi des courriels, sont exécutées de manière asynchrone par sidekiq. Assurez-vous d''avoir au moins un processus sidekiq de lancé. En savoir plus sur sidekiq.' + queue_size_warning: 'Le nombre de jobs dans la file d''attente est de %{queue_size}, ce qui est assez élevé. Cela peut indiquer un problème avec le(s) process Sidekiq, ou la nécessité d''ajouter davantage de workers.' memory_warning: 'Votre serveur dispose de moins de 1 Go de mémoire vive. Au moins 1 Go de RAM est recommandé.' google_oauth2_config_warning: 'Le serveur est configuré pour permettre l''authentification via Google Oauth2 (enable_google_oauth2_logins), mais les paramètres client id et client secret ne sont pas renseignés. Allez dans les Paramètres du Site et mettez les à jour. Voir le guide pour en savoir plus.' facebook_config_warning: 'Le serveur est configuré pour permettre l''authentification par Facebook (enable_facebook_logins), mais les paramètres facebook_app_id et facebook_app_secret ne sont pas renseignés. Allez dans les Paramètres et mettez les à jour. Voir le guide pour en savoir plus.' @@ -608,7 +637,6 @@ fr: s3_config_warning: 'Le serveur est configuré pour charger les fichiers vers s3, mais au moins un de ces paramètre n''est pas configuré : s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Allez dans les Paramètres pour les renseignés. Voir le guide "Comment charger les images sur S3 ?" pour en savoir plus' 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 Paramètres et mettez les à jour. Voir "Comment mettre en place une sauvegarde sur S3?" pour en savoir plus.' 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 pour télécharger la dernière version.' - failing_emails_warning: 'Il y a %{num_failed_jobs} tâches d''envois de courriel en erreur. Vérifiez votre fichier config/discourse.conf et assurez-vous de la conformité des paramètres du serveur de courriel. Regarder les processus en échec dans Sidekiq.' default_logo_warning: "Modifier le logo de votre site. Mettez à jour les paramètres du site 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 Paramètres du site." contact_email_invalid: "L'adresse courriel de contact du site est invalide. Mettez-le à jour dans les paramètre du site." @@ -661,7 +689,7 @@ fr: max_topic_title_length: "Longueur maximale autorisée des titres de sujet en nombre de caractères" min_private_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères" min_search_term_length: "Longueur minimale autorisée du texte saisie avant de lancer une recherche en nombre de caractères" - allow_uncategorized_topics: "Autoriser la création de sujet sans catégorie." + allow_uncategorized_topics: "Autorise la création de sujets sans catégorie. ATTENTION : S'il existe des sujets non-catégorisés, vous devez les catégoriser avant de désactiver cette fonction." uncategorized_description: "La description de la catégorie Sans catégorie. Laissez vide pour ne pas avoir de description." allow_duplicate_topic_titles: "Autoriser la création de sujet avec le même titre." unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse poster le même contenu à nouveau" @@ -684,16 +712,17 @@ fr: category_featured_topics: "Nombre de sujets affichés par catégorie sur la page /categories. Après avoir modifié cette valeur, il faut jusqu'à 15 minutes pour que la page des catégories soit mise à jour." show_subcategory_list: "Voir les sous-catégories à la place de la liste des sujets lorsqu'on entre dans la catégorie." fixed_category_positions: "Si coché, vous pourrez modifier l'ordre des catégories. Si décoché, elle seront triées par ordre d'activité." + fixed_category_positions_on_create: "Si coché, le classement des catégories sera maintenu dans la fenêtre de création de sujet (nécessite fixed_category_positions)." add_rel_nofollow_to_user_content: "Ajouter rel nofollow à tous les contenus des utilisateurs, sauf les liens internes (incluant les domaines parents). Si vous modifier ceci, vous devez exécuter la commande \"rake posts:rebake\"" exclude_rel_nofollow_domains: "Une liste de domaines pour lesquels l'attribut nofollow ne sera pas ajouté aux liens. tld.com autorisera automatiquement sub.tld.com également. Au minimum, vous devriez ajouter le domaine de premier niveau (TLD) de ce site pour aider les robots d'indexation à trouver tout le contenu. Si d'autres parties du site sont sur d'autre domaines, ajoutez-les aussi." post_excerpt_maxlength: "Longueur maximale d'un extrait / résumé de message." post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères." onebox_domains_whitelist: "Liste des noms de domaines autorisés pour les 'onebox'. Ces domaines doivent supporter OpenGraph or oEmbed. Testez les sur http://iframely.com/debug" - logo_url: "L'image logo en haut à gauche de votre site ; si vide, le titre du site sera affiché." - digest_logo_url: "Le logo alternatif qui sera utilisé dans les courriels de votre site. Si non renseigné, alors `logo_url` sera utilisé, par exemple : http://example.com/logo.png" - logo_small_url: "La petite image logo affiché en haut à gauche du site quand la page est défilée vers le bas. Si vide, une glyphe 'maison' sera affichée." - favicon_url: "Le favicon de votre site, voir http://fr.wikipedia.org/wiki/Favicon" - mobile_logo_url: "Le logo fixé en haut à gauche de votre site mobile. Si vide, `logo_url` sera utilisé." + logo_url: "L'image de votre logo situé en haut à gauche de votre site doit être de forme rectangulaire large. Si vous laissez ce champ vide, le nom de votre site apparaitra." + digest_logo_url: "Le logo alternatif sera utilisé en haut des notifications par e-mail. Il doit être de forme rectangulaire large. Si vous laissez ce champ vide, `logo_url` sera utilisé." + logo_small_url: "Le petit logo situé en haut à gauche de votre site doit être de forme carré. Si vous laissez ce champ vide, un logo de maison apparaîtra." + favicon_url: "Un favicon pour votre site, voir http://fr.wikipedia.org/wiki/Favicon, pour fonctionner correctement à travers un CDN il doit être PNG." + mobile_logo_url: "L'image fixe utilisée tout en haut à gauche de votre site mobile. Devrait-être de forme carrée. Si laissé vide, `logo_url` sera utilisé. ex: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icône utilisée pour les appareils d'Apple. Taille recommandée 144 px par 144 px." notification_email: "L'adresse de courriel dans le champs De qui sera utilisée pour envoyer les courriels systèmes essentiels. Le nom de domaine spécifié doit avoir les informations SPF, DKIM et PTR inversé renseignés correctement pour que le courriel arrive à destination." email_custom_headers: "Une liste délimité par des (|) pipes d'entêtes de courriel" @@ -711,8 +740,6 @@ fr: polling_interval: "À quelle fréquence les clients connectés devraient-ils requêter le serveur, en millisecondes (sans utiliser les requêtes longues)" anon_polling_interval: "À quelle fréquence les clients anonymes doivent-ils requêter le serveur, en millisecondes" background_polling_interval: "À quelle fréquence les clients devraient-ils requêter le serveur, en millisecondes (lorsque la fenêtre est en arrière-plan)" - auto_track_topics_after: "Combien de millisecondes avant qu'un sujet soit automatiquement suivie (0 pour toujours, -1 pour jamais)" - new_topic_duration_minutes: "Combien de millisecondes avant qu'un sujet soit considéré comme nouveau (-1 pour toujours, -2 pour dernière visite)" flags_required_to_hide_post: "Les messages seront automatiquement cachés lorsque le compteur de signalements atteint cette limite (0 pour jamais)" cooldown_minutes_after_hiding_posts: "Nombre de minutes qu'un utilisateur doit attendre avant de pouvoir modifier un message masqué via un signalement de la communauté" max_topics_in_first_day: "Le nombre maximum de sujets qu'un utilisateur est autorisé à créer lors de son premier jour sur le site" @@ -725,6 +752,7 @@ fr: notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs." flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse I¨P que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam." traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne." + allow_html_tables: "Permet le rendu des tableaux HTML au sein de Markdown, les balises TABLE, THEAD, TD, TR, TH sont autorisées (nécessite un full rebake sur tous les anciens sujets contenant des tableaux)" post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (j'aime, signaler, etc.)" must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !" ga_tracking_code: "Google Analytics (ga.js) code de suivi, par exemple: UA-12345678-9; voir http://google.com/analytics" @@ -767,17 +795,18 @@ fr: invite_passthrough_hours: "Combien de temps un utilisateur peut encore utilisé une clé d'invitation après son expiration, en heure" invite_only: "L'inscription publique est désactivée, tous les nouveaux utilisateurs doivent explicitement être invités par les membres ou l'équipe du forum." login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme." - min_username_length: "Longueur minimum des pseudos en nombre de caractères. ATTENTION : TOUS LES UTILISATEURS QUI SONT EN DESSOUS DE CETTE LIMITE NE POURRONS PLUS ACCÉDER AU SITE. " - max_username_length: "Longueur maximum des pseudos en caractères. ATTENTION : TOUS LES UTILISATEURS QUI DÉPASSE CETTE LIMITE NE POURRONS PLUS ACCÉDER AU SITE. " + min_username_length: "Longueur minimum des pseudos en caractères." + max_username_length: "Longueur maximum des pseudos en nombre de caractères." + reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée." min_password_length: "Longueur minimale du mot de passe." block_common_passwords: "Ne pas autoriser les mots de passe qui font parti des 10 000 les plus utilisés." enable_sso: "Activer l'authentification unique via un site externe (ATTENTION: LES ADRESSES EMAIL *DOIVENT* ÊTRE VALIDÉES PAR LE SITE EXTERNE !)" enable_sso_provider: "Implémenter le procotole Discourse de provider SSO à /session/sso_provider, requiert sso_secret" sso_url: "URL de l'authentification unique" sso_secret: "Chaîne de caractères secrète utilisée pour authentifier les informations SSO par cryptographie, assurez-vous qu'elle est de 10 caractères ou plus" - sso_overrides_email: "Surcharger les adresses de courriel locales avec les adresses de courriel externes d'un SSO (ATTENTION: Des écarts peuvent se produire due aux règles locales sur les adresses de courriel)" - sso_overrides_username: "Surcharger les pseudos avec les pseudos du SSO (ATTENTION: Des écarts peuvent se produire due aux règles locales sur les pseudos)" - sso_overrides_name: "Surcharger les noms locaux avec les noms du site fournissant l'authentification unique" + sso_overrides_email: "Surcharger les emails locaux avec les emails externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION : Des écarts peuvent se produire dus aux règles locales sur les emails)" + sso_overrides_username: "Surcharger les pseudos locaux avec les pseudos externes d'un SSO à chaque connexion, et prévenir les modifications locales. (ATTENTION: Des écarts peuvent se produire dus aux différences de longueur et d'exigences sur les pseudos)" + sso_overrides_name: "Surcharger les noms complets locaux avec les noms complets externes d'un SSO à chaque connexion, et prévenir les modifications locales." sso_overrides_avatar: "Surcharge les avatars des utilisateurs avec les avatars d'un SSO. Si activé, il est fortement recommandé de désactiver allow_uploaded_avatars." sso_not_approved_url: "Rediriger les comptes SSO non validés vers cette URL" enable_local_logins: "Activer l'authentification traditionnelle, avec pseudo local et mot de passe. (Note: Doit être activé pour que les invitations fonctionnent)" @@ -797,7 +826,8 @@ fr: github_client_secret: "Secret client pour l'authentification Github, enregistré sur https://github.com/settings/applications" allow_restore: "Autoriser la restauration, qui peut remplacer TOUTES les données du site ! Laissez à faux, sauf si vous envisagez de faire restaurer une sauvegarde" maximum_backups: "Nombre maximum de sauvegardes à conserver sur le disque. Les anciennes sauvegardes seront automatiquement supprimées" - backup_daily: "Créer automatiquement une sauvegarde du site chaque jour." + automatic_backups_enabled: "Activer les sauvegardes automatiques tels que définis dans les fréquences de sauvegarde" + backup_frequency: "Fréquence de création des sauvegardes du site, en jours." enable_s3_backups: "Envoyer vos sauvegardes à S3 lorsqu'elles sont terminées. IMPORTANT: Vous devez avoir renseigné vos identifiants S3 dans les paramètres de fichiers." s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION: Vérifiez que c'est un bucket privé" active_user_rate_limit_secs: "A quelle fréquence mettre à jour le champ 'last_seen_at' (Dernière vu à), en secondes." @@ -896,7 +926,6 @@ fr: newuser_spam_host_threshold: "Limite du nombre de liens vers un même host compris dans `newuser_spam_host_posts` qu'un nouvel utilisateur peut insérer dans un message avant d'être considérer comme un spam." white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais restreint dans la création de message contenant des liens vers ses domaines. " staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe." - topic_view_duration_hours: "Considérer un IP/utilisateur qui retourne sur un sujet comme une nouvelle vue seulement au bout de N heures" levenshtein_distance_spammer_emails: "Lorsque des courriels correspondent à des spammer, la différence du nombre de caractère permettra toujours une correspondance floue." max_new_accounts_per_registration_ip: "S'il y a déjà (n) Niveau de confiance 0 comptes à partir de cette adresse IP ( et aucun n'est un membre du personnel ou au NC2 ou ultérieure), ne plus accepter de nouvelles inscriptions de cette IP." min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau." @@ -905,6 +934,10 @@ fr: num_flaggers_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention" num_flags_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention" auto_respond_to_flag_actions: "Activer réponse automatique lors du traitement d'un signalement." + min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)" + auto_block_fast_typers_on_first_post: "Bloque automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Niveau de confiance maximum pour bloquer automatiquement les 'dactylo rapides'" + auto_block_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, bloquera le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple: rageux|a[bc]a bloquera les premiers messages contenant rageux ou aba ou aca." reply_by_email_enabled: "Activer les réponses aux sujets via courriel." reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com" disable_emails: "Désactiver l'envoi de les courriels depuis Discourse." @@ -917,6 +950,7 @@ fr: pop3_polling_host: "L'hôte pour le pooling des courriels via POP3." pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels." pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels." + log_mail_processing_failures: "Enregistrer tous les problèmes de mails sur\nhttp://yoursitename.com/logs" email_in: "Autoriser les utilisateurs à poster de nouveaux sujets par courriel (requêtes via pop3 requise). Configurer les adresses dans l'onglet \"Paramètres\" de chaque catégorie." email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à poster de nouveaux sujets par courriel." email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'." @@ -928,18 +962,16 @@ fr: username_change_period: "Le nombre de jours après l'enregistrement pour pouvoir modifier le pseudo (0 pour empêcher la modification de pseudo)." email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription." logout_redirect: "Adresse de redirection après déconnexion, ex: http://monsite.com/logout" - allow_uploaded_avatars: "Autoriser les utilisateurs à envoyer leurs propres avatars." - allow_animated_avatars: "Autoriser les utilisateurs à utiliser des avatars ens gif animés. ATTENTION: il est hautement recommandé d'exécuter la tâche rake avatars:refresh après avoir changé ce paramètre." + allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé." + allow_animated_avatars: "Autoriser les utilisateurs à télécharger une photo de profil de type gif animé. ATTENTION: lancer la commande rake avatars:refresh après avoir modifié ceci." allow_animated_thumbnails: "Créer des aperçus animés pour les gifs animés." default_avatars: "URLs des avatars qui seront utilisés par défaut pour les nouveaux utilisateurs jusqu'à ce qu'ils les modifient." automatically_download_gravatars: "Télécharger les gravatars pour les utilisateurs lors de la création de compte ou de la modification de courriel." digest_topics: "Nombre maximum de sujets à afficher dans le courriel de résumé." digest_min_excerpt_length: "Taille minimum du résumé des messages dans les courriels, en caractères." - default_digest_email_frequency: "A quelle fréquence les utilisateurs reçoivent-ils les courriels par défaut. Ils peuvent modifier ce paramétrage dans leur préférences." suppress_digest_email_after_days: "Ne pas envoyer de résumés courriel aux utilisateurs qui n'ont pas visité le site depuis (n) jours." disable_digest_emails: "Désactiver les résumés par courriels pour tous les utilisateurs." - default_external_links_in_new_tab: "Les liens externes s'ouvrent dans un nouvel onglet. Les utilisateurs peuvent modifier ceci dans leurs préférences." - detect_custom_avatars: "Vérifier ou pas que les utilisateurs ont envoyés des avatars personnalisés." + detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée." max_daily_gravatar_crawls: "Nombre maximum de fois que Discourse vérifiera Gravatar pour des avatars personnalisés en une journée." public_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être affichés publiquement." staff_user_custom_fields: "Une liste blanche des champs personnalisés pour un utilisateur qui peuvent être vus par l'équipe." @@ -951,25 +983,26 @@ fr: sequential_replies_threshold: "Nombre de messages qu'un utilisateur doit poster d'affilé dans un sujet avant d'être rappelé à l'ordre pour multiple réponses." enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client." dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre." + daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails" suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets." + permalink_normalizations: "Appliquer l'expression régulière suivante avant de faire correspondre les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les query strings des routes des sujets. Le format est regex+string, utilisez \\1 etc. pour accéder aux captures" global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)." disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée." full_name_required: "Le nom complet est requis dans le profil utilisateur." enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout." display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son @pseudo." + show_time_gap_days: "Si deux messages sont publiés à ce nombre de jours d'écart, affichez cette durée dans le sujet." invites_per_page: "Afficher les invitations sur la page de l'utilisateur." short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse ce nombre, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur." default_code_lang: "Coloration syntaxique par défaut appliquée à la syntaxe des langages de programmation des blocs de code GitHub (lang-auto, Ruby, Python, etc)" warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactiver la fonctionnalité en indiquant: 0." autohighlight_all_code: "Forcer la mise en évidence de tout les textes dans les balises code, même si ils ne correspondent à aucun langage de programmation." highlighted_languages: "Include les règles de mise en surbrillance de syntaxe. (Avertissement: l'ajout de trop de langages peut impacter les performances) voir l'exemple https://highlightjs.org/static/demo/" - embeddable_host: "Hôte qui peut incorporer des messages de ce forum Discourse. Nom d'hôte seulement, sans http://" feed_polling_enabled: "EMBARQUER UNIQUEMENT: Embarqué le flux RSS/ATOM en tant que messages." feed_polling_url: "EMBARQUER UNIQUEMENT: Url du flux RSS/ATOM à embarqué." embed_by_username: "Pseudo de l'utilisateur Discourse qui crée les sujets embarqués." embed_username_key_from_feed: "Clé pour extraire le pseudo du flux." embed_truncate: "Tronquer les messages embarqués." - embed_category: "Catégorie des sujets embarqués." embed_post_limit: "Nombre maximum de messages à embarquer." embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus embarqués." embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus embarqués." @@ -977,6 +1010,7 @@ fr: enable_cdn_js_debugging: "Autoriser /logs à afficher correctement les erreurs en ajoutant des permissions de crossorigin sur toutes les inclusions de js." show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets." delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours. + show_logout_in_header: "Afficher le lien de déconnexion dans la liste utilisateur du header" vacuum_db_days: "Exécuter VACUUM FULL ANALYZE pour récupérer de l'espace dans la base de donnée après une migration (0 pour désactivé) " prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux utilisateurs anonymes. ATTENTION: cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images." slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants." @@ -985,6 +1019,20 @@ fr: enforce_square_emoji: "Forcer tous les emojiis à être carrés." approve_post_count: "Le nombre de messages d'un nouvel utilisateur qui doivent être approuvés" approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés" + notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, un email sera envoyé à l'email de contact. Désactivez ces emails en indiquant 0." + default_email_digest_frequency: "A quelle fréquence les utilisateurs reçoivent-ils les courriels par défaut." + default_email_private_messages: "Envoyer un courriel quand quelqu'un envoie un message à un utilisateur." + default_email_direct: "Envoyer un courriel quand quelqu'un cite/répond à/mentionne ou invite un utilisateur." + default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message." + default_email_always: "Envoyer une notification courriel même quand l'utilisateur est actif." + default_other_external_links_in_new_tab: "Par défaut, ouvrir tous les liens externes dans un nouvel onglet" + default_other_enable_quoting: "Par défaut, proposer la citation du texte surligné." + default_other_dynamic_favicon: "Par défaut, faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur." + default_other_disable_jump_reply: "Par défaut, ne pas se déplacer au nouveau message après avoir répondu." + default_other_edit_history_public: "Par défaut, rendre publiques les révisions de message." + default_categories_watching: "Liste de catégories surveillées par défaut." + default_categories_tracking: "Liste de catégories suivies par défaut." + default_categories_muted: "Liste de catégories silencées par défaut." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -1033,13 +1081,14 @@ fr: not_seen_in_a_month: "Bienvenue à nouveau! Nous ne vous avons pas vu depuis un moment. Voici les meilleurs sujets de discussions depuis votre absence." move_posts: new_topic_moderator_post: - one: "J'ai déplacé un message dans un nouveau sujet : %{topic_link}" - other: "J'ai déplacé %{count} messages dans un nouveau sujet : %{topic_link}" + one: "Un message a été envoyé vers un nouveau sujet : %{topic_link}" + other: "%{count} messages ont été envoyés vers un nouveau sujet : %{topic_link}" existing_topic_moderator_post: - one: "J'ai déplacé un message dans le sujet : %{topic_link}" - other: "J'ai déplacé %{count} messages dans le sujet : %{topic_link}" + one: "Un message a été intégré dans un sujet existant : %{topic_link}" + other: "%{count} messages ont été intégrés dans un sujet existant : %{topic_link}" change_owner: post_revision_text: "Auteur du message modifié de %{old_user} vers %{new_user}" + deleted_user: "un utilisateur supprimé" emoji: errors: name_already_exists: "Désolé, le nom '%{name}' est déjà utilisé par un autre emoji." @@ -1093,6 +1142,8 @@ fr: omniauth_error_unknown: "Quelque chose s'est mal passé lors de votre connexion, merci de réessayer." new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment." password_too_long: "Les mots de passe sont limités à 200 caractères." + email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères." + reserved_username: "Ce pseudo n'est pas autorisé." missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur" close_window: "Identification terminée. Fermez cette fenêtre pour continuer." user: @@ -1103,7 +1154,10 @@ fr: characters: "doit inclure uniquement des chiffres, lettres et caractères de soulignement" unique: "doit être unique" blank: "doit être présent" - must_begin_with_alphanumeric: "doit commencer par une lettre ou un nombre" + must_begin_with_alphanumeric: "doit débuter par une lettre ou un nombre ou un underscore" + must_end_with_alphanumeric: "doit terminer par une lettre, un chiffre ou un caractère souligné (underscore)" + must_not_contain_two_special_chars_in_seq: "ne doit pas contenir une séquence de 2 caractères spéciaux ou plus (.-_)" + must_not_contain_confusing_suffix: "ne doit pas contenir un sufix déroutant comme .json ou .png etc." email: not_allowed: "n'est pas autorisé pour ce fournisseur de courriels. Merci d'utiliser une autre adresse." blocked: "n'est pas autorisé." @@ -1145,12 +1199,12 @@ fr: invite_password_instructions: subject_template: "Renseignez le mot de passe pour votre compte utilisateur %{site_name} " text_body_template: | - Merci d'accepter votre invitation à %{site_name} -- bienvenue ! + Merci d'avoir accepté l'invitation sur %{site_name} -- Bienvenue ! - Cliquez sur ce lien pour choisir un mot de passe maintenant : + Cliquer sur ce lien pour choisir un mot de passe maintenant : %{base_url}/users/password-reset/%{email_token} - Si vous ne vous souvenez plus de votre mot de passe ou que vous n'en avez pas encore, choisissez "J'ai oublié mon mot de passe" lors de votre connexion avec votre adresse électronique. + (Si le lien est expiré, choisissez "J'ai oublié mon mot de passe" lorsque vous essayez de vous connecter avec votre adresse mail.) test_mailer: subject_template: "[%{site_name}] Test de délivrabilité d'un courriel" text_body_template: | @@ -1193,31 +1247,31 @@ fr: new_version_mailer: subject_template: "[%{site_name}] Nouvelle version de Discourse, mise à jour disponible" text_body_template: | - Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. + Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. - Votre version : %{installed_version} + Votre version: %{installed_version} Nouvelle version: **%{new_version}** Vous voulez peut-être: - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). - - Mettre à jour en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) en appuyant sur le bouton "Upgrade". + - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] mise à jour disponible" text_body_template: | - Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. + Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. - Votre version : %{installed_version} + Votre version: %{installed_version} Nouvelle version: **%{new_version}** Vous voulez peut-être: - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). - - Mettre à jour en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) et en appuyant sur le bouton "Upgrade". + - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. @@ -1234,6 +1288,14 @@ fr: subject_template: one: "un signalement en attente de traitement" other: "%{count} signalements en attente de traitement." + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 message en attente de modération" + other: "[%{site_name}] %{count} messages en attente de modération" + text_body_template: | + Bonjour, + + Des messages de nouveaux utilisateurs sont en attente de modération. [Ils peuvent être approuvés ou rejetés ici](%{base_url}/queued-posts). flag_reasons: off_topic: "Votre message a été signalé comme étant **hors sujet**: la communauté considère qu'il ne correspond au sujet en discussion, qui est fixé par son titre et son premier message." inappropriate: "Votre message a été signalé comme étant **inapproprié**: la communauté considère que son contenu est offensif, abusif ou enfreint notre [règlement interne](/guidelines)." @@ -1245,7 +1307,7 @@ fr: disagreed: "Merci de nous en informer. Nous travaillons à sa résolution." deferred: "Merci de nous en informer. Nous travaillons à sa résolution." deferred_and_deleted: "Merci de nous en informer. Nous avons supprimé le message." - temporarily_closed_due_to_flags: "Ce sujet est temporairement clos dû à un trop grand nombre de signalements" + temporarily_closed_due_to_flags: "Ce sujet est temporairement fermé à cause d'un grand nombre de signalements de la communauté." system_messages: post_hidden: subject_template: "Message caché suite à un signalement par la communauté" @@ -1265,10 +1327,95 @@ fr: Afin d'être guider, merci de vous référer à notre [guide de bonne conduite](%{base_url}/guidelines). usage_tips: - text_body_template: "Quelques astuces pour vous aider à démarrer rapidement.\n\n## Continuez de descendre\n\nIl n'y a pas de bouton Page Suivante ni de numéro de page – pour en lire plus, **il vous suffit de descendre !**\n\nLorsque de nouvelles réponses arrivent, elles apparaissent automatiquement. \n\n## Où suis-je ?\n\n- Pour la recherche, votre page d'utilisateur, ou le menu, utiliser les **boutons icônes ☰ en haut à droite**.\n\n- Dans la liste des sujets, le titre vous emmènera toujours vers le prochain message non lu. Utiliser les colonnes Activité ou Messages pour allez au premier ou au dernier message. \n\n- Lorsque vous lisez un sujet, retournez en haut de celui ↑ en cliquant sur le titre. Cliquez sur la barre de progression en bas à droite pour avoir une navigation complète, ou utilisez les touches Home et Fin. \n\n \n\n## Comment je réponds ?\n\n- Pour répondre au sujet dans sa globalité, utilisez le bouton \"Répondre\" tout en bas de la page.\n\n- Pour répondre à un message spécifique, utilisez le bouton \"Répondre\" \ - \ sur le message.\n\n - Si vous voulez continuer le sujet dans une section différente, mais garder le lien entre votre sujet et le message qui vous l'a inspiré, utilisez la fonction Répondre en créant un nouveau sujet à droite de chaque message.\n\nPour citer quelqu'un dans votre message, sélectionnez le texte que vous voulez citer et appuyez sur un des boutons Répondre.\n\n\n\nPour mentionner le pseudo d'un utilisateur, commencez à taper `@` et une liste d'auto-complétion apparaîtra.\n\n\n\nConcernant les [icones Emoji](http://www.emoji.codes/), commencez par écrire `:` ou le traditionnel smiley `:)` :smile: \n\n## Que puis-je faire d'autre ?\n\nÀ la fin de chaque message il y a un ensemble de boutons pour les différentes actions possibles.\n\n\n\nPour faire savoir à quelqu'un que vous avez apprécié son message, cliquez sur le bouton *j'aime** en bas du message. Si vous voyez un problème avec un message, n'hésitez pas à cliquer sur le bouton **signaler** pour avertir\ - \ en privé l'auteur ou les modérateurs du contenu de ce message.\n\nVous pouvez aussi **partager** un liens vers un message ou l'ajouter à vos **signets** pour le retrouver sur votre page d'utilisateur. \n\n## Qui me parle ?\n\nQuand quelqu'un répond à votre message, vous cite, ou mentionne votre `@pseudo`, un nombre apparaitra immédiatement en haut à droite de la page. Utilisez-le pour consulter vos **notifications**.\n\n\n\nNe soyez pas inquiêt de manquer des notifications – \nLes réponses (et les messages directs) vous seront envoyés par courriel si vous n'êtes pas présent sur le site lorsqu'ils sont envoyés. \n\n## Quand est-ce qu'une conversation est nouvelle ?\n\nPar défaut, toutes les conversations de moins de deux jours sont considérées comme nouvelles, et chaque sujets auxquels vous avez participé (répondus, créés ou lu pendant un long moment) seront automatiquements suivis. \n\nVous verrez le badge bleu de nouveauté et le nombre de nouveaux messages au côté de ces discussions:\n\n\n\nVous pouvez modifier l'état du suivi des notifications d'une discussion en utilisant les boutons en bas de la discussion (vous pouvez également\ - \ le modifier au niveau des catégories). Pour changer la façon dont vous suivez les discussions, ou pour définir de nouveaux suivis, consultez [vos préférences utilisateurs](%{base_url}/my/preferences). \n\n## Quelles sont les choses que je ne peux pas faire ?\n\nLes nouveaux utilisateurs sont limités pour des raisons de sécurité. Plus vous participerez, plus vous gagnerez la confiance de la communauté et les restrictions disparaîtrons. A plus haut [niveau de confiance](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), vous gagnerez de nouvelles compétences pour nous aider à gérer la communauté.\n" + text_body_template: | + Vous trouverez ci-dessous quelques astuces pour vous aider à démarrer : + + ##Lire + + Pour en lire plus, **faites défiler vers le bas !** + + Lorsqu'une nouvelle réponse ou un nouvel article sont publiés, ils apparaissent automatiquement - pas besoin de rafraîchir la page. + + ##Navigation + + - Pour effectuer une recherche, sur votre page profil ou le menu ☰, utilisez l'icône en haut à droite. + + - Sélectionner un titre de l'article, vous dirigera toujours vers **la nouvelle réponse non lue** dans celui-ci. Pour entrer au début ou à la fin, sélectionnez le compteur de réponse ou alors la date de la dernière réponse. + + + + - Pendant la lecture d'un article, sélectionnez la barre de progression au fond à droite pour utiliser les contrôles de navigation. Revenez directement au début en cliquant sur le titre de l'article. Utilisez '?' pour avoir la liste des raccourcis clavier super rapide. + + + + ##Répondre + + - Pour répondre **de manière générale à une conversation**, utilisez tout en bas de celui-ci. + + - Pour répondre à **une personne en particulier**, utilisez sur leur message. + + - Pour répondre à **une nouvelle conversation**, utilisez qui se trouve à la droite du message. L'ancien et le nouveau sujet seront alors automatiquement liés. + + Pour insérer une citation, sélectionnez le texte que vous souhaitez citer, cliquez sur n’importe quel bouton **Répondre**. Répétez autant de fois que nécessaire. + + + + Pour signaler à quelqu'un votre réponse, mentionnez son nom. Mettez un '@' au début de son pseudo pour choisir un utilisateur. + + + + Pour utiliser [standard Emoji](http://www.emoji.codes/) (les émoticones), utilisez le caractère ':' et tapez son nom ou insérez des smileys de manière traditionnelle ;) + + + + Pour générer l'aperçu d'un lien, collez-le simplement dans la zone de texte : + + + + ##Actions + + Il y a des boutons d'actions en bas de chaque commentaire : + + + + Pour prévenir quelqu'un que vous appréciez son commentaire, cliquez **sur le coeur**. Partagez votre amour ! + + Si le commentaire de quelqu'un vous pose problème, prévenez [l'équipe de modération](%{base_url}/about) ou l'auteur en privé grâce au bouton **drapeau**. Vous pouvez aussi partager un lien vers le post ou le marquer comme **favori*** pour le mentionner plus tard dans votre page utilisateur. + + ##Notifications + + Quand quelqu’un vous répond, vous cite ou vous mentionne '@pseudo', un numéro apparaitra immédiatement en haut à droite de la page. Cliquez dessus pour accéder aux **notifications**. + + + + Pas de soucis si vous manquez une réponse, vous serez notifié par email de toutes les notifications pendant que vous n’êtes pas connecté. + + ##Vos préférences + + - Tout article de **moins de 2 jours** est considéré comme nouveau. + + - Toute conversation à laquelle vous avez **participé** (création, réponses ou lecture pendant une période prolongée) sera automatiquement suivie. + + Vous verrez “nouveau” en bleu et l’indicateur de quantité de notifications non lues en face de chaque article : + + + + Vous pouvez changer les paramètres de notification de chaque article par le système de contrôle de notification accessible en bas de chaque article. + + + + Vous pouvez aussi configure l’état des notifications par catégorie si vous voulez voir chaque nouvel article dans une catégorie spécifique. + + Pour changer n’importe lequel de ces paramètres, allez dans [vos préférences](%{base_url}/my/preferences). + + ##Une communauté basé sur la confiance + Par votre participation sur ici, au fur et à mesure vous gagnerez la confiance de la communauté, vous deviendrez un membre à part entière et les limitations fonctionnelles propres à chaque nouvel utilisateur seront levées. A un niveau de confiance [suffisamment élevé](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), vous aurez accès à de nouvelles fonctionnalités pouvant nous aider à gérer la communauté tous ensemble. + + Nous croyons au comportement communautaire civilisé en tous temps. + + Amusez-vous bien ! + + (Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un responsable, répondez simplement à ce message.) welcome_user: subject_template: "Bienvenue sur %{site_name} !" text_body_template: "Merci d'avoir rejoint %{site_name} et bienvenue ! \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps. \n\nAmusez-vous bien ! \n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.)\n" @@ -1277,7 +1424,7 @@ fr: text_body_template: "Merci d'avoir accepté votre invitation sur %{site_name} et bienvenue !\n\nNous avons créé un nouveau compte : **%{username}**, et vous y êtes connecté. Vous pouvez changer votre pseudo en allant sur [votre profil][prefs].\n\nPour vous reconnecter :\n\n1. Toujours **utiliser la même adresse de courriel que celle de l'invitation** que vous avez reçue. Autrement, nous ne pourrons pas vous reconnaître.\n\n2. Créer un mot de passe unique sur votre [sur votre profil][prefs] et connectez-vous avec. \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps.\n\nAmusez-vous bien !\n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message).\n\n[prefs] : %{user_preferences_url}\n" backup_succeeded: subject_template: "Sauvegarde terminée avec succès" - text_body_template: "La sauvegarde a été un succès.\nVisitez la section [Administration > sauvegardes](/admin/backups) pour télécharger votre dernière sauvegarde." + text_body_template: "La sauvegarde a bien réussie.\nVisitez [la section admin > sauvegarde](%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde." backup_failed: subject_template: "Échec de la sauvegarde" text_body_template: | @@ -1339,12 +1486,6 @@ fr: Aucun compte d'utilisateur avec cette adresse existe. Essayez de l'envoyer depuis une autre adresse, ou contactez un membre de l'équipe. email_reject_empty: subject_template: "[%{site_name}] Problème de courriel - sans contenu" - text_body_template: | - Nous sommes désolés, mais votre email à %{destination} (titled %{former_title}) n'a pas été envoyé. - - Nous n'avons pu trouver aucun contenu dans votre email. Assurez-vous que votre réponse se trouve au début de l'email -- nous ne pouvons pas traiter les réponses en ligne. - - Si vous recevez cette erreur et que vous _avez_ inclus du contenu, ré-essayez avec du contenu HTML (et pas uniquement du texte). email_reject_parsing: subject_template: "[%{site_name}] Problème de courriel - contenu non reconnu." text_body_template: | @@ -1466,7 +1607,10 @@ fr: download_remote_images_disabled: subject_template: "Téléchargement d'images distantes désactivé" text_body_template: "Le paramètre `download_remote_images_to_local` a été désactivé car la limite (`download_remote_images_threshold`) d'espace disque utilisé par les images vient d'être dépassée." - unsubscribe_link: "Si vous ne souhaitez plus recevoir ces courriels, visitez vos [préférences utilisateur](%{user_preferences_url})." + unsubscribe_link: | + Pour ne plus recevoir ces courriels, visitez vos [préférences utilisateur](%{user_preferences_url}). + + Pour ne plus recevoir de notifications pour ce sujet en particulier, [cliquer ici](%{unsubscribe_url}). subject_re: "Re:" subject_pm: "[MP]" user_notifications: @@ -1593,7 +1737,7 @@ fr: (Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.) signup: - subject_template: "[%{site_name}] Activer votre nouveau compte" + subject_template: "[%{site_name}] Confirmer votre nouveau compte" text_body_template: | Bienvenue sur %{site_name} ! @@ -1621,12 +1765,11 @@ fr: unauthorized: "Désolé, le fichier que vous essayer d'envoyer n'est pas autorisé (extensions autorisés : %{authorized_extensions})." pasted_image_filename: "Image collée" store_failure: "Erreur lors du stockage de #%{upload_id} pour l'utilisateur #%{user_id}." + file_missing: "Désolé, il faut fournir un fichier à télécharger." attachments: too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (la taillle maximale est %{max_size_kb}Ko)." images: too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximum de %{max_size_kb}Ko), merci de le redimensionner et de réessayer." - fetch_failure: "Désolé, il y a eu une erreur lors de la récupération de l'image." - unknown_image_type: "Désolé, mais le fichier que vous avez essayé d'envoyer ne semble pas être une image." size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?" flag_reason: sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP a répondu. Voir le paramétrage flag_sockpuppets." @@ -1659,385 +1802,148 @@ fr: Modifier le premier message de ce sujet pour changer le contenu de la page %{page_name}. guidelines_topic: title: "FAQ/Règlement" - body: |+ - - - ## [Ceci est un endroit civilisé, merci de le respecter](#civilized) - - Merci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté — un endroit pour partager des compétences, savoirs et intérêts au travers de conversations. - - Il ne s'agit pas de règles absolues, uniquement des aides au bon sens de notre communauté. Suivez ces instructions pour garder cet endroit propre et bien éclairé pour un débat public civilisé. - - - - ## [Améliorez la discussion](#improve) - - Aidez nous à faire de cette endroit un endroit idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard. - - Les sujets abordés ici sont importants pour nous, et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit. - - Une façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Essayez de passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts. - - - - ## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable) - - La critique peut-être constructive. Vous pouvez répondre à une personne en étant en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. À évitez: - - * Injures. - * Attaques ad hominem. - * Répondre à la tonalité d'un poste plutôt qu'à son contenu réel. - * Contradiction réflexe. - - Au lieu de cela, fournir des contre-arguments motivés qui améliorent la conversation. - - - - ## [Votre participation compte](#participate) - - Les conversations que nous avons ici donnent le ton pour tout le monde. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant, et en évitant celles qui n'en ont pas. - - Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions: favoris, signets, des *J'aime*, des signalements, des réponses, des vérifications, et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience, et celle de tous les autres aussi. - - Essayons de laisser notre parc mieux que nous l'avons trouvé. - - - - ## [Si vous voyez un problème, signaler le](#flag-problems) - - Les modérateurs ont une rôle spécial; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté, et pas seulement des concierges ou des policiers. - - Quand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez le*. Si suffisamment de signalements s'accumulent, des mesures seront prises, automatiquement ou par l'intervention d'un modérateur. - - Afin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte d'utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne disposent pas d'un aperçu des nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté. - - - - ## [Soyez toujours civilisé](#be-civil) - - Rien ne sabote une conversation saine mieux que la grossièreté : - - * Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux. - * Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite. - * Se respecter mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant. - * Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme. - - Il ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avec un doute, demandez-vous comment vous vous sentiriez si votre post était publié sur la première page du Monde. - - Il s'agit d'un forum public, et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis. - - - - ## [Gardez cet endroit propre](#keep-tidy) - - Faites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps à discuter et moins à ranger. Ainsi : - - * Ne commencez pas un sujet dans la mauvaise catégorie. - * Ne postez pas le même contenu dans plusieurs discussions. - * Ne postez pas de message sans contenu. - * Ne pas détourner un sujet en le changeant en cours de route. - * Ne signez pas vos messages — chaque post dispose d'informations sur le profil qui s'y rattachent. - - Plutôt que de poster "+1", "lol", "mdr" ou "d'accord", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez "Répondre en créant un sujet lié". - - - - ## [Postez seulement vos propres trucs](#stealing) - - Vous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi. - - - - ## [Powered by You](#power) - - Ce site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about). - - - - ## [Lisez les conditions générales d'utilisation](#tos) - - Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger – et par extension, vous et vos données – contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement, et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos). - + body: "\n\n## [Ceci est un endroit civilisé, merci de le respecter](#civilized)\n\nMerci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté — un endroit pour partager des compétences, savoirs et intérêts au travers de conversations.\n\nIl ne s'agit pas de règles absolues, uniquement d'aide au bon sens de notre communauté. Suivez ces instructions pour garder cet endroit propre et bien éclairé pour un débat public civilisé.\n\n\n\n## [Améliorez la discussion](#improve)\n\nAidez nous à faire de cet endroit un lieu idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion\ + \ ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard.\n\nLes sujets abordés ici sont importants pour nous et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit.\n\nUne façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Essayez de passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts.\n\n\n\n## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable)\n\nLa critique peut être constructive. Vous pouvez répondre à une personne en étant\ + \ en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. Merci d'éviter :\n\n* les injures,\n* les attaques ad hominem,\n* de répondre à la tonalité d'un sujet plutôt qu'à son contenu réel,\n* les contradictions primaires.\n \nAu lieu de cela, fournissez des contre-arguments motivés qui améliorent la conversation.\n\n\n\n## [Votre participation compte](#participate)\n\nLes conversations que nous avons ici donnent le ton pour tout le monde. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant — et en évitant celles qui n'y participent pas.\n\nDiscourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions\ + \ : favoris, signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi.\n\nEssayons de laisser notre parc mieux que nous l'avons trouvé.\n\n\n\n## [Si vous voyez un problème, signaler le](#flag-problems)\n\nLes modérateurs ont un rôle spécial ; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté et pas seulement des concierges ou des policiers.\n\nQuand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez-le*. Si suffisamment de signalements s'accumulent, des\ + \ mesures seront prises, automatiquement ou par l'intervention d'un modérateur.\n\nAfin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne disposent pas d'un aperçu des nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté.\n\n\n\n## [Soyez toujours civilisé](#be-civil)\n\nRien ne sabote une conversation saine mieux que la grossièreté :\n\n* Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux.\n* Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite.\n* Se respecter\ + \ mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant.\n* Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme.\n \nIl ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avez un doute, demandez-vous comment vous vous sentiriez si votre sujet était publié sur la première page du Monde.\n\nIl s'agit d'un forum public et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis.\n\n\n\n## [Gardez cet endroit propre](#keep-tidy)\n\nFaites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps\ + \ à discuter et moins à ranger. Ainsi :\n\n* Ne commencez pas un sujet dans la mauvaise catégorie.\n* Ne postez pas le même contenu dans plusieurs discussions.\n* Ne postez pas de message sans contenu.\n* Ne pas détourner un sujet en le changeant en cours de route.\n* Ne signez pas vos messages — chaque message dispose d'informations sur le profil qui s'y rattache.\n\nPlutôt que de poster \"+1\", \"lol\", \"mdr\" ou \"d'accord\", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez \"Répondre en créant un sujet lié\". \n\n\n\n## [Postez seulement vos propres trucs](#stealing)\n\nVous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster\ + \ des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi.\n\n\n\n## [Powered by You](#power)\n\nCe site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en ! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about). \n\n\n\n## [Lisez les conditions générales d'utilisation](#tos)\n\nOui, le jargon juridique est ennuyeux, mais nous devons nous protéger – et par extension, vous et vos données – contre des gens\ + \ hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos).\n" tos_topic: title: "Conditions générales d'utilisation" - body: | - Les termes et conditions suivants régissent toute utilisation du site %{company_domain} et de son contenu, les produits et services disponibles sur ou via le site, y compris, mais sans s'y limiter, le logiciel du forum %{company_domain}, les forums du support %{company_domain} et le service d'hébergement %{company_domain} («Hébergement»), (qui constitue le site). Le site est détenu et exploité par %{company_full_name} ("%{company_name}"). Le site est offert sous réserve de votre acceptation sans modification de l'ensemble des termes et conditions du présent Contrat et toutes les autres règles de fonctionnement, les politiques (y compris, sans limitation, la [Politique de Confidentialité](/privacy) et les [Règles de la Communauté](/faq) de %{company_domain}) et des procédures qui peuvent être publiées de temps à autre sur ce site par %{company_name} (communément nommé, le « Contrat »). - - S'il vous plaît lisez attentivement cet accord avant d'accéder ou d'utiliser le Site. En accédant ou en utilisant n'importe quelle partie du site, vous acceptez d'être lié par les termes et conditions de cet accord. Si vous n'acceptez pas tous les termes et conditions de cet accord, alors vous ne pouvez pas accéder au site Web ou utiliser ses services. Si ces conditions sont considérées comme une offre de %{company_name}, l'acceptation est expressément limitée à ces termes. Le site Web est disponible uniquement aux personnes qui ont au moins 13 ans. - - - - ## [1. Votre compte %{company_domain}](#1) - - Si vous créez un compte sur le site, vous êtes responsable du maintien de la sécurité de votre compte et vous êtes entièrement responsable de toutes les activités qui se produisent sous votre compte. Vous devez informer immédiatement %{company_name} de toute utilisation non autorisée de votre compte ou de toute autre atteinte à la sûreté. %{company_name} notre site ne sera pas responsable des actes ou omissions de votre part, y compris des dommages de toute nature engagés à la suite de tels actes ou omissions. - - - - ## [2. Responsabilité des contributeurs](#2) - - Si vous soumettez du contenu sur le Site, des liens sur le Site, ou que vous rendez (ou permettez à un tiers de rendre) du contenu disponible grâce aux moyens du Site ("Contenu"), Vous êtes entièrement responsable dudit contenu, et de tout dommage résultant de ce Contenu. C'est indifféremment le cas, que le Contenu en question soit de type texte, image, audio ou logiciel. En rendant ce Contenu disponible, vous déclarez et garantissez que : - - * le téléchargement, la copie et l'utilisation du contenu ne porte pas atteinte aux droits de propriété, y compris, mais sans s'y limiter les droits d'auteur, brevets, marques de commerce ou les secrets commerciaux, d'un tiers; - * si votre employeur a des droits de propriété intellectuelle sur ce que vous créez, vous devez soit (i) avoir reçu la permission de votre employeur pour poster ou rendre disponible le contenu, y compris mais non limité à tout logiciel, ou (ii) avoir obtenu de votre employeur une renonciation à tous les droits ou au contenu; - * vous vous êtes entièrement conformée aux licences tierces relatives au contenu, et que vous avez fait toutes les choses nécessaires pour vous conformer aux termes des conditions d'utilisateurs finaux; - * le contenu ne contient pas ou ni installe des virus, vers, logiciels malveillants, chevaux de Troie ou tout autre contenu nuisible ou destructeur; - * le contenu n'est pas du spam, n'est pas généré aléatoirement ou par une machine, et ne contient pas de contenu commercial contraire à l'éthique ou non désirés conçu pour générer du trafic vers des sites tiers ou de stimuler les classements des moteurs de recherche de sites de tiers, ou des actes à caractères illégaux (par exemple comme le phishing) ou induire en erreur les destinataires quant à la source du matériel (comme l'usurpation d'identité); - * le contenu n'est pas pornographique, ne contient pas de menaces ou n'incite pas à la violence, et ne viole pas la vie privée ou les droits d'un tiers; - * votre contenu n'est pas publié via des messages électroniques indésirables tels que les liens de spam sur les groupes de discussion, listes de courriel, des blogs et des sites Web, et les méthodes de promotion similaires non sollicitées; - * votre contenu n'est pas nommé d'une manière qui induit en erreur vos lecteurs en pensant que vous êtes une autre personne ou de la société, et - * vous avez, dans le cas de contenu qui inclut du code informatique, classé avec précision et/ou décrit le type, la nature, les usages et les effets de ce code, si %{company_name} vous le demande ou si la justice le demande. - - - - ## [3. Licence du contenu utilisateur](#3) - - Les contributions utilisateurs sont soumises à la licence [Creative Commons Attribution - Pas d’Utilisation Commerciale - Partage dans les Mêmes Conditions 3.0 France](http://creativecommons.org/licenses/by-nc-sa/3.0/fr/). Sans limiter la portée de ces déclarations ou garanties, %{company_name} a le droit (néanmoins pas l'obligation) de, (i) refuser ou retirer tout contenu à la seule discrétion de %{company_name}, qui selon l'opinion raisonnable de %{company_name}, ne respecte pas la politique de %{company_name} ou est peut être considéré comme dangereux ou répréhensible, (ii) ou mettre fin ou empêcher l'accès au site web à n'importe quelle personne ou entité pour n'importe quel raison, et ce à la seule discrétion de %{company_name}. %{company_name} n'a pas obligation de rembourser les montants précédemment payés. - - - - ## [4. Paiement et Renouvellement](#4) - - ### Conditions générales - - Des services ou mises à jour payantes en option peuvent être disponibles sur le site Web. Lors de l'utilisation d'un service payant en option ou de mise à niveau, vous acceptez de payer à %{company_name} les frais de souscription mensuels ou annuels indiqués. Les paiements seront facturés sur une base pré-payé le jour où vous commencer à utiliser le service ou la mise à niveau et couvrira l'utilisation de ce service ou de mise à niveau pour une période mensuelle ou annuelle de souscription comme indiqué. Ces frais ne sont pas remboursables. - - ### Renouvellement automatique - - Sauf si vous informez %{company_name} avant la fin de la période de souscription applicable que vous souhaitez annuler un service ou une mise à niveau, votre abonnement sera renouvelé automatiquement et vous nous autorisez à recueillir les frais d'abonnement annuel ou mensuel, alors en vigueur (ainsi que toutes les taxes) en utilisant n'importe quel carte de crédit ou autre moyen de paiement que nous avons conservé pour vous. Les abonnements peuvent être annulés à tout moment. - - - - ## [5. Services](#5) - - ### Hébergement, Support - - Des services d'hébergement et de support optionnels peuvent être fournis par %{company_name} selon les termes et conditions pour chacun de ces services. En vous inscrivant à un compte de services d'hébergement / de support, vous vous engagez à respecter les termes et conditions. - - - - ## [6. Responsabilité des visiteurs du site](#6) - - %{company_name} n'a pas révisé et ne peut examiner, tout le contenu, y compris les logiciels, posté sur le site Web , et ne peut donc pas être tenu responsable du contenu, de l'utilisation ou des effets de ce contenu. En opérant le site %{company_name}, ne représente pas ou n'implique pas qu'il approuve le contenu diffusé, ou qu'il croit que ce contenu est précis, utile ou non nuisible. Vous êtes responsable de prendre les précautions nécessaires pour que vous et vos systèmes informatiques soit protégés contre les virus, vers, chevaux de Troie et d'autres contenus nuisibles ou destructeurs . Le Site peut contenir du contenu qui est offensant, indécent , ou autrement répréhensible , ainsi que du contenu contenant des inexactitudes techniques, erreurs typographiques et d'autres erreurs. Le Site peut également contenir du matériel qui viole la vie privée ou aux droits de publicité, ou porte atteinte à la propriété intellectuelle et autres droits de propriété de tiers, ou le téléchargement, la copie ou l'utilisation sont soumis à des termes et conditions supplémentaires, déclaré ou non déclaré. %{company_name} décline toute responsabilité pour tout dommage résultant de l'utilisation par les visiteurs du site Web, ou de tout téléchargement par les visiteurs du contenu posté ici. - - - - ## [7. Contenu publié sur d'autres sites](#7) - - Nous n'avons pas examiné, et ne pouvons pas examiner, tout le contenu, y compris les logiciels, mises à disposition par des sites et des pages Web vers lesquels %{company_domain} pointe et qui pointe vers %{company_domain}, %{company_name} n'a pas le contrôle sur ces sites Web et ces sites Web "non-%{company_domain}", et ne sommes pas responsable de leur contenu ou de leur utilisation. En vous connectant à un site "non-%{company_domain}" ou page web, %{company_name} ne représentent pas ou n'implique pas qu'il approuve tel site ou tel page Web. Vous êtes responsable de prendre les précautions nécessaires pour que vous et vos systèmes informatiques soit protégé contre les virus, vers, chevaux de Troie et d'autres contenus nuisibles ou destructeurs. %{company_name} décline toute responsabilité pour tout dommage résultant de votre utilisation de site "non-%{company_domain}" et autres pages web. - - - - ## [8. Violation du droit d'auteur et de la politique DADVSI](#8) - - %{company_name} demande aux autres de respecter ses droits de propriété intellectuelle, il respecte les droits de propriété intellectuelle d'autrui. Si vous croyez que le contenu situé sur ou lié par %{company_domain} viole vos droits d'auteur, et si ce site réside en France, vous êtes encouragés à le signaler à %{company_name}, conformément au '[Droit d'auteur et aux droits voisins dans la société de l'information](http://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000266350&dateTexte=&categorieLien=id)' (« DADVSI »). %{company_name} répondra à toutes les notifications, y compris si nécessaire ou approprié par enlèvement du contenu contrefait ou de désactiver tous les liens vers les documents de contrefaçon. %{company_name} mettra fin à l'accès d'un visiteur et l'utilisation du site Web si, dans des circonstances appropriées, le visiteur est déterminé à être un récidiviste violation des droits d'auteur ou autres droits de propriété intellectuelle de %{company_name} ou autres. Dans le cas d'une telle résiliation, %{company_name} n'aura aucune obligation de fournir un remboursement des sommes déjà versées à %{company_name}. - - - - ## [9. Propriété Intellectuelle](#9) - - Le présent accord ne transfère pas de %{company_name} à vous aucune propriété intellectuelle de %{company_name} ou d'un tiers, et tout droit, titre et intérêt dans et pour ces biens restera (entre les parties) uniquement %{company_name}. %{company_name}, %{company_domain}, le logo %{company_domain}, et toutes les autres marques commerciales, marques de services, graphismes et logos utilisés dans le cadre de %{company_domain}, ou le site Web sont des marques commerciales ou des marques déposées de %{company_name} ou des concédants de %{company_name}. D'autres marques commerciales, marques de services, graphismes et logos utilisés dans le cadre du site Web peuvent être des marques de commerce de tierces parties. Votre utilisation du Site ne vous accorde aucun droit ou licence pour reproduire ou utiliser tout ou partie des marques de %{company_name} ou celles des tiers. - - - - ## [10. Publicités](#10) - - %{company_name} se réserve le droit d'afficher des publicités sur votre contenu, sauf si vous avez acheté une mise à niveau sans publicité ou un compte des services. - - - - ## [11. Attribution](#11) - - %{company_name} se réserve le droit d'afficher les liens d'attribution tels que «Propulsé par %{company_domain},' auteur du thème, et la police attribution dans votre contenu en pied de page ou en barre d'outils. Le crédits de pied de page et de la barre d'outils %{company_domain} ne peuvent pas être retirés quelques soient les mises à niveau achetées. - - - - ## [12. Changements](#12) - - %{company_name} se réserve le droit, à sa seule discrétion, de modifier ou de remplacer une partie de cet accord. Il est de votre responsabilité de vérifier périodiquement la présente convention pour les modifications. Votre utilisation continue ou l'accès au site Web après l'affichage de toute modification au présent accord constitue une acceptation implicite de ces changements. %{company_name} peut également, à l'avenir, offrir de nouveaux services et / ou fonctionnalités sur le site Web (y compris, la sortie de nouveaux outils et de ressources). Ces nouvelles fonctionnalités et / ou services sont soumis aux termes et conditions du présent Contrat. - - - - ## [13. Résiliation](#13) - - %{company_name} peut résilier votre accès à tout ou partie du Site à tout moment, avec ou sans motif, avec ou sans préavis, avec effet immédiat. Si vous souhaitez résilier le présent Contrat ou votre compte %{company_domain} (si vous en avez un), vous pouvez tout simplement cesser d'utiliser le Site. Toutes les dispositions du présent Accord qui, par leur nature, doivent survivre à la résiliation survivront à la résiliation, y compris, sans limitation, les dispositions de propriété, exclusions de garantie, indemnité et limitations de responsabilité. - - - - ## [14. Exclusion de garanties](#14) - - Le Site est fourni "tel quel". %{company_name} et ses fournisseurs et concédants de licence déclinent toute garantie de toute nature, expresse ou implicite, y compris, sans limitation, les garanties de qualité marchande, d'adéquation à un usage particulier et de non-contrefaçon. Ni %{company_name} ni ses fournisseurs et concédants de licence, ne donnent aucune garantie que le site sera exempt d'erreurs ou que le service y sera continue ou ininterrompue. Si vous êtes en train de lire ceci, voici un peu de [lecture](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html) (en anglais). Vous comprenez que vous téléchargez à partir de, ou autrement obtenir contenus ou services par le biais, le site Internet à vos propres risques et périls. - - - - ## [15. Limitation de responsabilité](#15) - - En aucun cas %{company_name}, ses fournisseurs ou ses concédants ne seront responsables à l'égard de tout objet de la présente entente en vertu de tout contrat, négligence, responsabilité stricte ou autre théorie juridique ou équitable pour: (i) des dommages spéciaux, indirects ou consécutifs; (ii) le coût des achats de produits ou de services de substitution, (iii) pour l'interruption de l'utilisation ou de la perte ou la corruption des données; ou (iv) pour des montants qui dépassent les frais payés par vous à %{company_name} en vertu du présent accord au cours de la période de douze (12) mois précédents la cause du litige. %{company_name} n'assume aucune responsabilité pour toute panne ou retard en raison de questions qui échappent à leur contrôle raisonnable. Ce qui précède ne se substitue pas à ce qu'interdit la loi en vigueur. - - - - ## [16. Représentation générale et garantie](#16) - - Vous déclarez et garantissez que (i) votre utilisation du site web sera en stricte conformité avec la [Politique de Confidentialité](/privacy) et les [Règles de la communauté](/guidelines) de %{company_name}, avec le présent accord et avec tous lois et règlements applicables (y compris, sans s'y limiter, les lois ou réglementations locales dans votre pays, état, ville, ou une autre zone gouvernementale, en ce qui concerne la conduite en ligne et le contenu acceptable et notamment toutes les lois applicables concernant la transmission de données techniques exportées du pays dans lequel ce site réside ou le pays dans lequel vous résidez) et (ii) votre utilisation du site ne sera pas de contrefaire ou détourner les droits de propriété intellectuelle d'un tiers. - - - - ## [17. Dédommagement](#17) - - Vous acceptez d'indemniser et de dégager de toute responsabilité %{company_name}, ses sous-traitants, et ses concédants de licence, et leurs administrateurs, dirigeants, employés et agents contre toute réclamation et de tous les frais, y compris les frais d'avocat, découlant de votre utilisation du site Web, y compris mais non limité à la violation du présent Contrat. - - - - ## [18. Divers](#18) - - Le présent document a pour objet de définir les modalités et conditions dans lesquelles d’une part, %{company_name}, ci-après dénommé l’EDITEUR, met à la disposition de ses utilisateurs le site, et les services disponibles sur le site et d’autre part, la manière par laquelle l’utilisateur accède au site et utilise ses services. - - Toute connexion au site est subordonnée au respect des présentes conditions. - - Pour l’utilisateur, le simple accès au site de l’EDITEUR à l’adresse URL suivante %{company_domain} implique l’acceptation de l’ensemble des conditions décrites ci-après. - - ### Liens hypertextes - - Le site %{company_domain} peut contenir des liens hypertextes vers d’autres sites présents sur le réseau Internet. Les liens vers ces autres ressources vous font quitter le site %{company_domain}. - - Il est possible de créer un lien vers la page de présentation de ce site sans autorisation expresse de l’EDITEUR. Aucune autorisation ou demande d’information préalable ne peut être exigée par l’éditeur à l’égard d’un site qui souhaite établir un lien vers le site de l’éditeur. Il convient toutefois d’afficher ce site dans une nouvelle fenêtre du navigateur. Cependant, l’EDITEUR se réserve le droit de demander la suppression d’un lien qu’il estime non conforme à l’objet du site %{company_domain}. - - ### Responsabilité de l’éditeur - - Les informations et/ou documents figurant sur ce site et/ou accessibles par ce site proviennent de sources considérées comme étant fiables. - - Toutefois, ces informations et/ou documents sont susceptibles de contenir des inexactitudes techniques et des erreurs typographiques. - - L’EDITEUR se réserve le droit de les corriger, dès que ces erreurs sont portées à sa connaissance. - - Il est fortement recommandé de vérifier l’exactitude et la pertinence des informations et/ou documents mis à disposition sur ce site. - - Les informations et/ou documents disponibles sur ce site sont susceptibles d’être modifiés à tout moment, et peuvent avoir fait l’objet de mises à jour. En particulier, ils peuvent avoir fait l’objet d’une mise à jour entre le moment de leur téléchargement et celui où l’utilisateur en prend connaissance. - - L’utilisation des informations et/ou documents disponibles sur ce site se fait sous l’entière et seule responsabilité de l’utilisateur, qui assume la totalité des conséquences pouvant en découler, sans que l’EDITEUR puisse être recherché à ce titre, et sans recours contre ce dernier. - - L’EDITEUR ne pourra en aucun cas être tenu responsable de tout dommage de quelque nature qu’il soit résultant de l’interprétation ou de l’utilisation des informations et/ou documents disponibles sur ce site. - - ### Accès au site - - L’éditeur s’efforce de permettre l’accès au site 24 heures sur 24, 7 jours sur 7, sauf en cas de force majeure ou d’un événement hors du contrôle de l’EDITEUR, et sous réserve des éventuelles pannes et interventions de maintenance nécessaires au bon fonctionnement du site et des services. - - Par conséquent, l’EDITEUR ne peut garantir une disponibilité du site et/ou des services, une fiabilité des transmissions et des performances en terme de temps de réponse ou de qualité. Il n’est prévu aucune assistance technique vis à vis de l’utilisateur que ce soit par des moyens électronique ou téléphonique. - - La responsabilité de l’éditeur ne saurait être engagée en cas d’impossibilité d’accès à ce site et/ou d’utilisation des services. - - Par ailleurs, l’EDITEUR peut être amené à interrompre le site ou une partie des services, à tout moment sans préavis, le tout sans droit à indemnités. L’utilisateur reconnaît et accepte que l’EDITEUR ne soit pas responsable des interruptions, et des conséquences qui peuvent en découler pour l’utilisateur ou tout tiers. - - ### Droit applicable - - Tant le présent site que les modalités et conditions de son utilisation sont régis par le droit français, quel que soit le lieu d’utilisation. En cas de contestation éventuelle, et après l’échec de toute tentative de recherche d’une solution amiable, les tribunaux français seront seuls compétents pour connaître de ce litige. - - Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mise à jour le 27 juillet 2014. - - A l'origine adapté des [Conditions d'utilisation de WordPress](http://fr.wordpress.com/tos/). privacy_topic: title: "Protection des données" - body: "\n\n## [Quelles sont les informations que nous recueillons ?](#collect)\n\nNous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici.\n\nLorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel.\n\nUne fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent l'adresse IP de chaque demande à notre serveur.\n\n\n\n## [Comment utilisons-nous vos informations ?](#use)\n\nToute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes :\n\n* Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels.\n* Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les\ - \ informations et les commentaires que nous recevons de votre part.\n* Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support.\n* Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions.\n\n\n\n## [Comment protégeons-nous vos informations ?](#protect)\n\nNous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels.\n\n\n\n## [Quelle est votre politique de conservation des données ?](#data-retention)\n\nNous ferons un effort de bonne foi pour :\n* Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours.\n* Conserver les adresses IP associées à des utilisateurs enregistrés et leurs messages pas plus de 5 ans.\n\n\n\n## [Utilisons-nous des cookies\ - \ ?](#cookies)\n\nOui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré.\n\nNous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise.\n\n\n\n## [Divulguons-nous des informations à des tiers?](#disclose)\n\nNous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations\ - \ confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations.\n\n\n\n## [Liens vers des tiers](#third-party)\n\nParfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. \n\n\n\n## [Protection des mineurs](#coppa)\n\nNotre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](http://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. ## [Politique de confidentialité en ligne](#online) Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. ## [Votre consentement](#consent) En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web.\n\n\n\n## [Changements à notre politique de confidentialité](#changes)\n\nSi nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page.\n\nCe document est soumis à la licence creative commons CC-BY-SA.\n" - static: - search_help: | -

      Astuces

      -

      -

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

      -

      Paramètres

      -

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

      -

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

      + body: | + + + ## [Quelles sont les informations que nous recueillons ?](#collect) + + Nous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici. + + Lorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel. + + Une fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent l'adresse IP de chaque demande à notre serveur. + + + + ## [Comment utilisons-nous vos informations ?](#use) + + Toute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes : * Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels. + + * Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les informations et les commentaires que nous recevons de votre part. + * Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support. + * Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions. + + + + ## [Comment protégeons-nous vos informations ?](#protect) + + Nous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels. + + + + ## [Quelle est votre politique de conservation des données ?](#data-retention) + + Nous ferons un effort de bonne foi pour : + + * Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours. + * Conserver les adresses IP associées à des utilisateurs enregistrés et leurs messages pas plus de 5 ans. + + + + ## [Utilisons-nous des cookies ?](#cookies) + + Oui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré. + + Nous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise. + + + + ## [Divulguons-nous des informations à des tiers?](#disclose) + + Nous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations. + + + + ## [Liens vers des tiers](#third-party) + + Parfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. + + + + ## [Protection des mineurs](#coppa) + + Notre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. + + + + ## [Politique de confidentialité en ligne](#online) + + Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. + + + + ## [Votre consentement](#consent) + + En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web. + + + + ## [Changements à notre politique de confidentialité](#changes) + + Si nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page. Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mis à jour le 31 mai 2013. badges: long_descriptions: autobiographer: | - Bla bla bla - Bla bla bla + Ce badge est accordé au remplissage de votre profil utilisateur et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. first_like: | - Bla bla bla - Bla bla bla + Ce badge est accordé la première fois que vous aimez un message en utilisant le bouton :heart:. Aimer des messages est le moyen parfait pour dire aux autres membres de la communauté que ce qu'ils ont posté était intéressant, utile, cool, ou amusant. first_link: | - Bla bla bla - Bla bla bla + Ce badge est accordé la première fois que vous placez un lien vers un autre sujet dans une de vos réponses. Lier des sujets aide les autres lecteurs à trouver des conversations proches potentiellement intéressantes, en montrant les connexions entre sujets dans les deux directions. first_quote: | - Bla bla bla - Bla bla bla + Ce badge est accordé la première fois que vous citez un message dans une de vos réponses. Citer des passages pertinents des messages précédents dans votre réponse aide à garder les discussions ciblées et à rester dans le sujet. first_share: | - Bla bla bla - Bla bla bla + Ce badge est accordé la première fois que vous partagez un lien vers une réponse ou un sujet en utilisant le bouton de partage. Partager des liens est un très bon moyen de diffuser des discussions intéressantes auprès du reste du monde et de faire grandir votre communauté. read_guidelines: | - Bla bla bla - Bla bla bla + Ce badge est accordé après lecture des règles de la communauté. Respecter et partager ces règles simples permet de construire une communauté sure, agréable et durable. reader: | - Bla bla bla - Bla bla bla + Ce badge est accordé après lecture d'un long sujet. Lire est fondamental. Lire attentivement vous aide à suivre une conversation et mène à des réponses meilleures et plus complètes. editor: | - Bla bla bla - Bla bla bla + Ce badge est accordé après édition d'un de vos messages. N'hésitez pas à éditer vos messages à n'importe quel moment pour les améliorer, corriger de petites erreurs, ou ajouter quelque chose que vous auriez oublié. first_flag: | - Les signalements sont essentiels à la santé de la communauté. Si vous remarquez des messages qui requièrent l'attention d'un modérateur, s'il vous plaît, - n'hésitez pas à les signaler. À partir du niveau de confiance 1, vous pouvez également utiliser le formulaire de signalement pour envoyer des messages directs aux autres utilisateurs. + Ce badge est accordé après signalement d'un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des messages à d'autres utilisateurs. nice_share: | - Bla bla bla - Bla bla bla + Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Bien joué ! Partager des liens vers des discussions intéressantes auprès de vos amis est un excellent moyen de faire grandir votre communauté. welcome: | - Bla bla bla - Bla bla bla + Ce badge est accordé lorsque vous recevez votre premier "J'aime" sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile ! anniversary: | - Bla bla bla - Bla bla bla + Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! good_share: | - Bla bla bla - Bla bla bla + Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à beaucoup de nouvelles personnes et nous avez aidés à grandir. great_share: | - Bla bla bla - Bla bla bla + Ce badge est accordé après le partage d'un lien vers un message consulté par 100 visiteurs extérieurs. Wow ! Vous avez fait la promotion d'une discussion intéressante auprès d'une énorme nouvelle audience pour le compte de cette communauté, et nous avez beaucoup aidé à grandir. nice_post: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'une réponse ayant reçu 10 "J'aime". Bien joué ! nice_topic: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'un sujet ayant reçu 10 "J'aime". Bien joué ! good_post: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'une réponse ayant reçu 25 "J'aime". Bon travail ! good_topic: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'un sujet ayant reçu 25 "J'aime". Bon travail ! great_post: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'un message ayant reçu 50 "J'aime". Wow ! great_topic: | - Bla bla bla - Bla bla bla + Ce badge est accordé après la création d'une réponse ayant reçu 50 "J'aime". Wow ! basic: | - Bla bla bla - Bla bla bla + Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin un petit moment et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Vos restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens. member: | - Bla bla bla - Bla bla bla + Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, des messages groupés, et quelques "J'aime" supplémentaires chaque jour. regular: | - Bla bla bla - Bla bla bla + Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais recatégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de "J'aime" en plus chaque jour. leader: | - Bla bla bla - Bla bla bla + Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité d'éditer tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et réunir, ainsi que des tonnes de "J'aime" par jour. admin_login: success: "Courriel envoyé" error: "Erreur !" @@ -2045,3 +1951,6 @@ fr: submit_button: "Envoyer un courriel" discourse_hub: access_token_problem: "En informer un administrateur : Veuillez mettre à jour les paramètres du site afin de renseigner une clé discourse_org_access_key correcte." + performance_report: + initial_post_raw: Ce sujet comprend des rapports de performance journaliers concernant votre site. + initial_topic_title: Rapports de performances du site diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 4b89ec7e52..7cc94cc1f9 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -65,6 +65,12 @@ he: other: '%{count} שגיאות מנעו מ-%{model} להישמר.' embed: load_from_remote: "ארעה שגיאה בטעינת ההודעה הזו." + site_settings: + min_username_length_exists: "לא ניתן לקבוע את אורך שם המשתמש המינימלי לארוך יותר משם משתמש שקיים כבר. " + min_username_length_range: "לא ניתן לקבוע את המינימום מעל המקסימום" + max_username_length_exists: "לא ניתן לקבוע את אורך שם המשתמש המקסימלי לקצר יותר משם משתמש שקיים כבר. " + max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום." + default_categories_already_selected: "לא ניתן לבחור קטגוריה שהשתמשו בה ברשימה אחרת" bulk_invite: file_should_be_csv: "הקובץ המועלה צריך להיות בפורמט csv או txt." backup: @@ -133,11 +139,15 @@ he: rss_description: latest: "נושאים מדוברים" hot: "נושאים חמים" + posts: "פרסומים אחרונים" too_late_to_edit: "ההודעה הזו נוצרה לפני זמן רב מידי. לא ניתן יותר לערוך או למחוק אותה." excerpt_image: "תמונה" + queue: + delete_reason: "נמחק באמצעות בקרה על תור הפרסומים" groups: errors: can_not_modify_automatic: "אתה לא יכול לשנות קבוצה אוטומטית" + member_already_exist: "'%{username}' הוא כבר חבר בקבוצה הזו." default_names: everyone: "כולם" admins: "מנהלים ראשיים" @@ -152,6 +162,7 @@ he: until_posts: one: "הודעה אחת" other: "%{count} הודעות" + new-topic: "ברוכים באים ל%{site_name} — **תודה שהתחלת שיחה חדשה! **\n-הכותרת נשמעת מעניינת כשאת/ה קורא/ת אותה בקול רם? האם היא תקציר טוב?\n-מי יתעניין בזה? איזה סוג של תגובות את/ה רוצה?\n-השתמש/י במילים נפוצות בכותרת שלך כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושא שלך עם נושאים קשורים בחר קטגוריה.\n-לעוד טיפים, [ראה את כללי התנהלות בקהילה] (/guidelines). \nהפנל הזה יופיע רק עבור %{education_posts_text}. הראשונים.\n" new-reply: | ברוכים באים ל %{site_name} — ** תודה על תרומתך! ** @@ -163,13 +174,10 @@ he: למידע נוסף [ראו את הכללים המנחים שלנו]/guidelines). פאנל זה יופיע רק ב-%{education_posts_text} תגובות הראשונות שלך. avatar: | - ### מה לגבי תמונה חדשה לחשבון שלך? - - פרסמת מגוון של נושאים ותגובות, אבל האוואטר שלך אינו ייחודי כמו -- הוא זהה לאוואטר ברירת המחדל שיש לכל המשתמשים. - - האם שקלת **[לבקר בעמוד הפרופיל שלך](%{profile_path})** ולהעלות תמונה אישית שמייצגת אותך? - - יותר קל לעקוב אחרי דיוני הקהילה ולמצוא אנשים מעניינים בשיחות כשלכולם יש אוואטר ייחודי! + ###מה דעתך להוסיף תמונה לחשבון שלך? + כבר פרסמת כמה נושאים ותגובות, אבל תמונת הפרופיל שלך לא מיוחדת- היא רק אות. + שקלת **[להכנס לפרופיל משתמש שלך ](%{profile_path})** ולהעלות תמונה שמייצגת אותך? + יותר קל לעקוב אחרי שיחות ולמצוא אנשים מעניינים כשלכולם יש תמונת פרופיל יחודית! sequential_replies: "### שקלו להשיב לכמה פרסומים בבת אחת\n\nבמקום להשיב בתגובות עוקבות לנושא, שקלו בבקשה לפרסם תגובה אחת שכוללת ציטוטים מהפרסומים הקודמים או הפניות ל@שם_משתמש/ת.\n\nתוכל/י לערוך תגובה קודמת שלך כדי להוסיף ציטוט על ידי הדגשת הטקסט ובחירה בכפתור ציטוט התגובה שיופיע.\n\nקל יותר לכולם לקרוא נושאים עם מספר נמוך יחסית תגובות מעמיקות מאשר הרבה תגובות קצרות ונפרדות.\n \n" dominating_topic: | ### אפשר לאחרים להצטרף לשיחה @@ -226,7 +234,7 @@ he: no_info_other: "
      %{name} עדיין לא הזין דבר בשדה אודות של הפרופיל שלהם
      " vip_category_name: "לאונג' (סלון הכבוד)" vip_category_description: "קטגוריה אקסקלוסיבית למשתמשים עם רמת אמון 3 או יותר." - meta_category_name: "מטא" + meta_category_name: "פידבק לאתר" meta_category_description: "דיון אודות אתר זה, הארגון שמאחוריו, איך הוא פועל ואיך נוכל לשפר אותו." staff_category_name: "צוות" staff_category_description: "קטגוריה פרטית לדיוני הצוות. נושאים נראים רק למנהלים ומנהלים ראשיים." @@ -261,6 +269,7 @@ he: uncategorized_parent: "נטול קטגוריה לא יכול להיות עם קטגוריית אם" self_parent: "קטגוריית אם לא יכולה להיות הקטגוריה עצמה" depth: "לא ניתן להניח תת-קטגוריה תחת תת-קטגוריה אחרת" + email_in_already_exist: "דוא\"ל '%{email_in}' כבר בשימוש עבור קטגוריה '%{category_name}' ." cannot_delete: uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה" has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות." @@ -364,6 +373,7 @@ he: one: "לפני כמעט שנה" other: "לפני כמעט %{count} שנים" password_reset: + no_token: "מצטערים, הקישור לשינוי הסיסמא ישן מדי. לחץ על כפתור הכניסה ובחר ב\"שכחתי את הסיסמא שלי\" כדי לקבל קישור חדש." choose_new: "אנא בחר סיסמה חדשה" choose: "אנא בחר סיסמה" update: 'עדכן סיסמה' @@ -377,12 +387,13 @@ he: please_continue: "המשך ל-%{site_name}" error: "הייתה שגאיה בעדכון כתובת הדואר האלקטרוני. אולי היא כבר בשימוש?" activation: - action: "הפעל/י את חשבונך" + action: "לחץ כאן להפעיל את חשבונך" already_done: "סליחה, כתובת אישור החשבון הזו אינה זמינה יותר. אולי החשבון שלך כבר פעיל?" please_continue: "חשבונך החדש אושר; הנכם מועברים לעמוד הבית." continue_button: "המשך ל-%{site_name}" welcome_to: "ברוכים הבאים ל-%{site_name}!" approval_required: "מנהל צריך לאשר את החשבון שלך ידנית לפני שתוכל להיכנס לפורום הזה. יישלח אליך דואר אלקטרוני כשהחשבון שלך יאושר!" + missing_session: "אנחנו לא יכולים לזהות אם החשבון שלך נוצר, בבקשה בדוק שאפשרת עוגיות (cookies)." post_action_types: off_topic: title: 'אוף-טופיק' @@ -438,11 +449,13 @@ he: email_title: 'הנושא "%{title}" דורש תשומת לב של מנהל' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

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

      ' user_must_edit: '

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

      ' archetypes: regular: title: "נושא רגיל" banner: + title: "נושא הבאנר" message: make: "נושא זה הוא כעת באנר. הוא יופיע בראש כל עמוד עד שישוחרר על ידי המשתמשים." remove: "נושא זה כבר אינו באנר. הוא לא יופיע יותר בראש כל עמוד." @@ -550,10 +563,18 @@ he: title: "סה\"כ" xaxis: "יום" yaxis: "סך כל בקשות ה-API" + page_view_logged_in_mobile_reqs: + title: "בקשות API עם חיבור" + xaxis: "יום" + yaxis: "בקשות API להתחברות עם מובייל " + page_view_anon_mobile_reqs: + title: "בקשות API אנונימיות" + xaxis: "יום" + yaxis: "בקשות API להתחברות עם מובייל אנונימות" http_background_reqs: title: "רקע" xaxis: "יום" - yaxis: "בשקות שמשמשות לעדכונים חיים ולמעקב" + yaxis: "בקשות שמשמשות לעדכונים חיים ולמעקב" http_2xx_reqs: title: "סטטוס 2xx (OK)" xaxis: "יום" @@ -574,12 +595,25 @@ he: title: "סה\"כ" xaxis: "יום" yaxis: "סה\"כ הבקשות" + time_to_first_response: + title: "זמן לתגובה הראשונה" + xaxis: "יום" + yaxis: "זמן ממוצע (שעות)" + topics_with_no_response: + title: "נושאים ללא תגובות" + xaxis: "יום" + yaxis: "סה\"כ" + mobile_visits: + title: "ביקורי משתמשים" + xaxis: "יום" + yaxis: "מספר ביקורים" dashboard: rails_env_warning: "השרת שלך רץ במצב %{env}." ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later." host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname." gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' + queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' google_oauth2_config_warning: 'השרת מכוון לאפשר הרשמות והתחברות עם OAuth2 של גוגל (enable_google_oauth2_logins), אבל ערכי זהות הלקוח (client id) וסיסאת הלקוח (client secret) אינם מוגדרים. לכו ל הגדרות האתר ועדכנו את הגדרות האתר. ראו מדריך זה כדי ללמוד עוד.' facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' @@ -588,7 +622,6 @@ he: 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your config/discourse.conf file and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' default_logo_warning: "כוונו את הסמלילים הגרפיים לשימוש באתר שלך. עדכנו את כתובת ה-URL של הלוגו, כתובת ה-URL ללוגו המוקטן, וכתובת ה-URL של ה-favicon. " contact_email_missing: "הזינו כתובת דוא\"ל ליצירת קשר, בה ניתן יהיה ליצור עמכם קשר בנושאים דחופים בנוגע לאתר שלכם. עדכנו אותה בהגדרות האתר." contact_email_invalid: "כתובת הדוא\"ל ליצירת קשר של האתר אינה תקינה. עדכנו אותה ב הגדרות האתר." @@ -599,10 +632,10 @@ he: notification_email_warning: "מיילים ליידוע אינם נשלחים מכתובת תקינה בדומיין שלכם; משלוח דוא\"ל יהיה בעייתי ולא אמין. אנא כוונו את כתובת המייל למשלוח התראות לכתובת מקומית תקינה בהגדרות האתר." content_types: education_new_reply: - title: "New User Education: First Replies" + title: "הדרכת משתמש חדש: תגובות ראשונות" description: "Pop up just-in-time guidance automatically displayed above the composer when new users begin typing their first two new replies." education_new_topic: - title: "New User Education: First Topics" + title: "הדרכת משתמש חדש: נושאים ראשונים" description: "Pop up just-in-time guidance automatically displayed above the composer when new users begin typing their first two new topics." usage_tips: title: "הדרכה למשתמש/ת חדשים" @@ -641,7 +674,7 @@ he: max_topic_title_length: "מספר התווים המקסימלי המותר לכותרת נושא" min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים" min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש" - allow_uncategorized_topics: "Allow topics to be created without a category." + allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה.\nאזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. " uncategorized_description: "תיאור הקבוצה \"ללא קטגוריה\". השאירו ריק אם אין צורך בתיאור." allow_duplicate_topic_titles: "אשר/י נושאים עם כותרות זהות או משוכפלות." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -664,15 +697,17 @@ he: category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." show_subcategory_list: "הצגת רשימת תת-הקבוצות במקום רשימת הנושאים בעת הכניסה לקטגוריה." fixed_category_positions: "אם אפשרות זו מסומנת, תוכלו לארגן את הקטגוריות כך שיופיעו בסדר קבוע. אם האופציות אינן מסומנות, הקטגוריות יסודרו על פי סדר הפעילות שהתבצעה בהן." + fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)." add_rel_nofollow_to_user_content: "הוספת התווית rel nofollow לכ תוכן ששודר על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל דומיין הורה parent domains). אם תשנו אפשרות זו, עליכם \"לאפות מחדש\" את כל הפרסומים עם: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too." post_excerpt_maxlength: "אורך מקסימלי של פרסום קטע / סיכום." post_onebox_maxlength: "מספר תוים מקסימאלי מותר כאורך פרסום Discourse אחד בקופסא (oneboxed Discourse post)." onebox_domains_whitelist: "רשימת מתחמים (דומיינים) מותרים לאריזה (oneboxing); על דומיינים אלה לתמוך ב-OpenGraph או ב-oEmbed. בדקו אותם ב-http://iframely.com/debug." - logo_url: "תמונת הלוגו שתופיע בצד שמאל למעלה באתר שלך; אם ישאר ריק, תוצג כותרת האתר הטקסטואלית." - digest_logo_url: "הסמליל (לוגו) האלטרנטיבי שיופיע בראש מייל התקציר של האתר שלך. אם תשאירו משבצת זו ריק יופיע שם 'logo_url' במקום. לדוגמא: http://example.com/logo.png" - logo_small_url: "תמונת הלוגו הקטנה שתופיע בצד שמאל למעלה של האתר שלך, ומוצגת בגלילה למטה. אם ישאר ריק, תוצג גלופה בצורה של בית." - favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "מיקומה הקבוע של תמונת הלוגו בצד השמאלי העליון של האתר הנייד שלך. אם יושאר ריק 'logo_url' ישמש כאן." + logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown." + digest_logo_url: "The alternate logo image used at the top of your site's email digest. Should be a wide rectangle shape. If left blank `logo_url` will be used. " + logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown." + favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png" + mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px." notification_email: "הטופס: נעשה שימוש בכתובת הדוא\"ל כאשר שולחים את כל הודעות המערכת הנדרשות. כדי שהודעות הדוא\"ל יגיעו, המתחם (domain) המצויין כאן חייב לכלול SPF, DKIM ורשומות reverse PTR מוגדרים כהלכה." email_custom_headers: "A pipe-delimited list of custom email headers" @@ -690,18 +725,21 @@ he: polling_interval: "כאשר לא מבצעים תשאול ארוך (long polling), כל כמה זמן לקוחות מחוברים למערכת יבצעו poll, במילי-שניות" anon_polling_interval: "How often should anonymous clients poll in milliseconds" background_polling_interval: "באיזו תכיפות צריכים לקוחות לבצע תשאול (poll) במילישניות (כאשר החלון נמצא ברקע)" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "מספר הדקות שמשתמש/ת חייבים לחכות לפני שהם יכולים לערוך פרסום מוסתר דרך סימון קהילתי" max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site" + tl2_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl2 (משתמש) באמצעות הכפלה במספר זה. " + tl3_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl3 (רגיל) באמצעות הכפלה במספר זה. " + tl4_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl4 (מנהיג) באמצעות הכפלה במספר זה. " num_flags_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי num_users_to_block_new_user משתשמים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל." num_users_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי num_flags_to_block_new_user משתמשים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל." notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." flag_sockpuppets: "אם משתמש/ת חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפרסומים של שניהם כספאם פוטנציאלי." traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה." + allow_html_tables: "Allow tables to be entered in Markdown using HTML tags, TABLE, THEAD, TD, TR, TH are whitelisted (requires full rebake on all old posts containing tables)" post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפרסום (לייק, סימון, וכו')." + must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים." ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -730,6 +768,8 @@ he: email_token_grace_period_hours: "סיסמאות שכחת סיסמא / הפעלת חשבון עדיין זמינים לזמן חסד של (n) שעות לאחר שהופקו." enable_badges: "הפעלת מערכת התגים (badges)" allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש." + email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" + email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" forgot_password_strict: "אל תעדכנו משתמשים על קיום חשבון כאשר הם משתמשים ב\"שכחתי סיסמא\"." log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמ/ת בכל המכשירים" version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה של האדמין" @@ -740,16 +780,20 @@ he: invite_passthrough_hours: "כמה זמן, בשעות, יכול/ה משתמשים לעשות שימוש בהזמנה שנשלחה כדי להתחבר " invite_only: "הרשמה פתוחה מבוטלת, על כל המשתמשים החדשים להיות מוזמנים על ידי חבר/ת בצוות." login_required: "דרשו הזדהות לקריאת תוכן באתר זה, אל תאפשרו גישה אנונימית." - min_username_length: "מספר התווים המינימלי לאורך שם המשתמש/ת המינימלי. אזהרה: משתמשים קיימים עם שמות הקצרים מערך זה לא יוכלו להתחבר לאתר." - max_username_length: "מספר תווים מקסימלי המותר לשם משתמש/ת. אזהרה: משתמשים קיימים עם שמות הארוכים מערך זה לא יוכלו להתחבר לאתר." + min_username_length: "אורך שם משתמש מינימילי בתווים. " + max_username_length: "אורך שם משתמש מקסימלי בתווים." + reserved_usernames: "שמות משתמש שלא ניתן להירשם איתם." min_password_length: "Minimum password length." block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר." + enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)" enable_sso_provider: "הטמיעו את פרוטוקול הספק Discourse SSO בנקודת הקצה /session/sso_provider, דורש כיוון של sso_secret" sso_url: "URL of single sign on endpoint" sso_secret: "מחרוזת סודית המשמשית לאמת באופן קרפיטוגרפי מידע SSO, וודאו שהיא באורך 10 תווים ומעלה" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)" + sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes." sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתרחיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר." + sso_not_approved_url: "Redirect unapproved SSO accounts to this URL" enable_local_logins: "אפשרו שם חשבונות מבוססים על שן משתמש מקומי וסיסמאת התחברות. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)" allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים." enable_yahoo_logins: "Enable Yahoo authentication" @@ -767,7 +811,8 @@ he: github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" allow_restore: "אפשר שחזור, אשר יכול להחליף את כל(!) המידע באתר! הותירו על \"שלילי\"/false אלא אם כן אתם מתכננים לשחזר גיבוי." maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted" - backup_daily: "צור גיבוי אוטומטי לאתר פעם ביום." + automatic_backups_enabled: "הרץ גיבויים אוטומטים כמו שמוגדר בתדירות הגיבויים" + backup_frequency: "How frequently we create a site backup, in days." enable_s3_backups: "העלאת גיבויים ל-S3 לאחר השלמתם. חשוב: דורש הזנת הרשאות S3 תקפות להגדרות הקבצים." s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket." active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" @@ -784,6 +829,7 @@ he: max_topics_per_day: "מספר מקסימלי של נושאים שמשתמש/ת יכולים ליצור ביום." max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמש/ת יכולים ליצור ביום." max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמש/ת לשלוח ביום." + max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמש יכול לשלוח ביום. " suggested_topics: "מספר הנושאים המוצעים שיופיעו בתחתית הנושא המוצג." limit_suggested_to_category: "הצגת רק נושאים מהקטגוריה הנוכחית ברשימת הנושאים המומלצים." clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו." @@ -796,8 +842,13 @@ he: s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות." s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות." s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות." + s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts." + avatar_sizes: "רשימה של גדלי אווטרים שנוצרת אוטומטית. " + external_system_avatars_enabled: "Use external system avatars service." + external_system_avatars_url: "URL of the external system avatars service. Allowed substitions are {username} {first_letter} {color} {size}" enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר." default_invitee_trust_level: "ברירת מחדל של דרגת אמון (0-4) של משתמשים מוזמנים." + default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam." tl1_requires_topics_entered: "כמה נושאים משתמש חדש צריך להתחיל למערכת עד שישודרג לרמת אמון 1." tl1_requires_read_posts: "כמה פרסומים משתמש צריך לקרוא לפני שישודרג לרמת אמון 1." tl1_requires_time_spent_mins: "כמה דקות משתמש חדש צריך לקרוא פרסומים לפני שישודרג לרמת אמון 1." @@ -847,6 +898,9 @@ he: topic_views_heat_low: "לאחר כמות זו של צפיות,שדה הצפיות יהיה קצת יותר בהיר." topic_views_heat_medium: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בינוני." topic_views_heat_high: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בולט." + cold_age_days_low: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מאופר." + cold_age_days_medium: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מואפר יותר." + cold_age_days_high: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מאופר ממש." history_hours_low: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת קלות." history_hours_medium: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן בינוני." history_hours_high: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן חזק." @@ -867,6 +921,10 @@ he: num_flaggers_to_close_topic: "מספר מינימלי של מסמנים שונים שנדרש כדי להשהות באופן אוטומטי אפשות להתערב בנושא" num_flags_to_close_topic: "מספר מינימלי של סימונים פעילים שנדרש כדי להשהות באופן אוטומטי את היכולת להתערב בנושא" auto_respond_to_flag_actions: "אפשרו תגובה אוטמטית עם הסרת סימון." + min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)" + auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers" + auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post." reply_by_email_enabled: "אפשרו תגובה לנושאים באמצעות הדוא\"ל." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" disable_emails: "מנעו מ-Discourse ממשלו דוא\"ל כלשהו." @@ -879,6 +937,7 @@ he: pop3_polling_host: "השרת המארח (Host) למשיכת דוא\"ל דרך POP3." pop3_polling_username: "שם המשתמש/ת לחשבון ה-POP3 למשיכת דוא\"ל." pop3_polling_password: "הסיסא לחשבון ה-POP3 למשיכת הדוא\"ל." + log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs" email_in: "אפשרו למשתמשים לפרסם נושאים חדשים באמצעות דוא\"ל (דורש משיכה באמצעוצ pop3). הגדירו את הכתובת בלשונית \"הגדרות\" עבור כל קטגוריה." email_in_min_trust: "רמת האמון המינימלית הנדרשת למשתמש/ת כדי שיוכלו להעלות נושאים חדשים באמצעות הדוא\"ל." email_prefix: "ה[תווית] שתשמש בנושא הודעות הדוא\"ל. אם לא יוגדר, ברירת המחדל תכוון ל'כותרת' אם לא יוגדר אחרת." @@ -890,18 +949,16 @@ he: username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)." email_editable: "Allow users to change their e-mail address after registration." logout_redirect: "מיקום להכוונת הדפדפן לאחר ההתנתקות לדוגמא: (http://somesite.com/logout)" - allow_uploaded_avatars: "אפשרו למשתמשים להעלות אווטרים מותאמים אישית." - allow_animated_avatars: "אפשרו למשתמשים להשתמש באווטרים מסוג GIF אנימציה. אזהרה: הריצו את האווטרים: רעננו לאחר שינוי הגדרה זו." + allow_uploaded_avatars: "Allow users to upload custom profile pictures." + allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting." allow_animated_thumbnails: "יצירת תמונות אנימציה מוקטנות קטנות של קבצי אנימציית gif." default_avatars: "כתובות URL לאווטרים אשר ישמשו כברירת מחדל למשתמשים חדשים עד אשר ישנו אותם." automatically_download_gravatars: "הורדת גראווטרים למשתמשים בעת יצירת החשבון או שינוי כתובת הדוא\"ל." digest_topics: "מספר הנושאים המקסימלי להצגה במייל סיכום." digest_min_excerpt_length: "מספר התווים המינימלי למובאות מתוך הפרסום במייל הסיכום." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." suppress_digest_email_after_days: "השהיית מיילים מסכמים עבור משתמשים שלא נראו באתר במשך יותר מ(n) ימים." disable_digest_emails: "נטרול דוא\"ל סיכום לכל המשתמשים." - default_external_links_in_new_tab: "Open external links in a new tab. Users can change this in their preferences." - detect_custom_avatars: "האם לבדוק אם משתמשם העלו אווטרים מותאמים אישית." + detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures." max_daily_gravatar_crawls: "מספר הפעמים המקסימלי ש-Discourse יבדוק אווטרים ב-Gravatar ביום" public_user_custom_fields: "רשימה לבנה (whitelist) של שדות מותאמים למשתמש שיכולים להיות מוצגים באופן פומבי." staff_user_custom_fields: "רשימה לבנה (whitelist) של שדות מותאמים למשתמש שיכולים להיות מוצגים לאנשי צוות." @@ -913,36 +970,58 @@ he: sequential_replies_threshold: "מספר הפרסומים שעל משתמש להכין ברצף בפרסום לפני שיקבל תזכורת בנוגע ליותר מידי תגובות עוקבות." enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive." dominating_topic_minimum_percent: "איזה אחוז מהפרסומים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שליטת/שתלטנות יתר על הנושא." + daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details" suppress_uncategorized_badge: "אל תציגו את התג (badge) לנושאים נטולי קטגוריה ברשימת הנושאים." + permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures" global_notice: "הציגו הודעת אזהרה דחופה כללית לכל המבקרים, החליפו לריק כדי להסתיר אותה (ניתן להשתמש ב-HTML)." disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל." full_name_required: "שם מלא הוא שדה נדרש לפרופיל משתמש/ת." enable_names: "הצגת השם המלא של המשתמש/ת בעמודי הפרופיל שלהם, בכרטיסי המשתמ ובדוא\"ל שלהם. נטרול הסתרת השם המלא בכל מקום." display_name_on_posts: "הצגת שמם המלא של משתמשים בפרסומיהם, בנוסף ל@שם_המשתמש שלהם." + show_time_gap_days: "If two posts are made this many days apart, display the time gap in the topic." invites_per_page: "ברירת המחדל, הזמנות המוצגות בעמוד המשתמש." short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value." default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "כאשר מישהו/מישהי מתחילים להגיב לנושא שבו התגובה האחרונה היא בת יותר מכמה ימים, אזהרה תוצג. בטלו אפשרות זו באמצעות הזנה של 0." autohighlight_all_code: "לחייב שימוש בקוד הדגשה לכל קוד מעוצב מראש (preformatted code blocks) אפילו אם הם אינם מציינים את השפה." highlighted_languages: "הכללת הדגשת שגיאות תחביר. (אזהרה: הכללת שפות רבות מידי עשוי להשפיע על הביצוע) ראו: https://highlightjs.org/static/demo/ להדגמה" - embeddable_host: "מארח (Host) אשר יכול להטמיע את התגובות מפורום Discourse זה. שם מארח בלבד, ללא http:// בהתחלה" feed_polling_enabled: "הטמעה בלבד: האם לעמבד פידים של RSS/ATOM כפרסומים." feed_polling_url: "הטמעה בלבד: URL של פיד RSS/ATOM להטמעה." embed_by_username: "שם המשתמש של המשתמש/ת שיוצר את הנושאים המוטמעים." embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד." embed_truncate: "חיתוך הפרסומים המוטמעים." - embed_category: "הקטגוריה של הנושאים המוטמעים." embed_post_limit: "מספר מקסימלי של פרסומים להטמעה." embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע." embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות." notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send an email to the contact_email. Set to 0 to disable." enable_cdn_js_debugging: "אפשרו ל-/logs להציג שגיאות בצורה נכונה באמצעות הוספת הרשאות לגישה בין אתרים (crossorigin permissions) בכל ה-js הכלולים." show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו הודעה המבקשת מן המנהלים/מנהלות ליצור עוד נושאים." + delete_drafts_older_than_n_days: Delete drafts older than (n) days. + show_logout_in_header: "Show log out in user dropdown in header" vacuum_db_days: "הריצו VACUUM FULL ANALYZE כדי להשיב שטח בסיס הנתונים אחרי העברות (כוונו ל-0 כדי לנטרל)" prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד." + slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." enable_emoji: "אפשרו emoji" emoji_set: "איך אתם אוהבים את ה-emoji שלכם?" enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis." + approve_post_count: "The amount of posts from a new user that must be approved" + approve_unless_trust_level: "Posts for users below this trust level must be approved" + notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails." + default_email_digest_frequency: "באיזה תדירות משתמשים מקבלים מייל עדכון בתור ברירת מחדל. " + default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל." + default_email_direct: "שלח מייל כשמישהו מצטט/ מגיב ל/מזכיר או מזמין משתמש, בתור ברירת מחדל. " + default_email_mailing_list_mode: "שלח מייל עבור כל פרסום חדש בתור ברירת מחדל. " + default_email_always: "שלח התרעות למייל גם כאשר המשתמש פעיל, בתור ברירת מחדל." + default_other_new_topic_duration_minutes: "Global default condition for which a topic is considered new." + default_other_auto_track_topics_after_msecs: "Global default time before a topic is automatically tracked." + default_other_external_links_in_new_tab: "פתח קישורים חיצונים בטאב חדש, בתור ברירת מחדל. " + default_other_enable_quoting: "Enable quote reply for highlighted text by default." + default_other_dynamic_favicon: "Show new/updated topic count on browser icon by default." + default_other_disable_jump_reply: "Don't jump to user's post after they reply by default." + default_other_edit_history_public: "Make the post revisions public by default." + default_categories_watching: "List of categories that are watched by default." + default_categories_tracking: "List of categories that are tracked by default." + default_categories_muted: "List of categories that are muted by default." errors: invalid_email: "כתובת דוא\"ל לא קיימת." invalid_username: "אין משתמש/ת עם שם משתמש כזה." @@ -951,10 +1030,12 @@ he: invalid_integer_max: "הערך חייב לא יכול להיות גדול מ- %{max}." invalid_integer: "הערך חייב להיות מספר שלם." regex_mismatch: "הערך אינו תואם את המבנה הנדרש." + must_include_latest: "Top menu must include the 'latest' tab." invalid_string: "ערך לא תקין." invalid_string_min_max: "חייב להיות בין %{min} ל- %{max} תווים." invalid_string_min: "חייב להיות לפחות %{min} תווים." invalid_string_max: "נדרשים לא יותר מ-%{max} תווים." + invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email." notification_types: mentioned: "%{display_username} אזכר אותך ב %{link}" liked: "%{display_username} נתן לייק להודעה שלך ב %{link}" @@ -963,6 +1044,9 @@ he: edited: "%{display_username} ערך הודעה שלך ב %{link}" posted: "%{display_username} פרסם ב %{link}" moved_post: "%{display_username} העביר את ההודעה שלך ל %{link}" + private_message: "%{display_username} שלח/ה לך הודעה: %{link}" + invited_to_private_message: "%{display_username} הזמין אותך להודעה: %{link}" + invited_to_topic: "%{display_username} הזמין אותך לנושא: %{link}" invitee_accepted: "%{display_username} קיבל את הזמנתך" linked: "%{display_username} קישר אליך ב %{link}" granted_badge: "הרווחת %{link}" @@ -986,13 +1070,14 @@ he: not_seen_in_a_month: "ברוך שובך! לא ראינו אותך כבר כמה זמן, אה? הנה כמה נושאים פופולאריים שהתווספו מאז שהיית כאן." move_posts: new_topic_moderator_post: - one: "העברתי הודעה לנושא חדש: %{topic_link}" - other: "העברתי %{count} הודעות לנושא חדש: %{topic_link}" + one: "תגובה פוצלה לנושא חדש: %{topic_link}" + other: "%{count} תגובות פוצלו לנושא חדש: %{topic_link}" existing_topic_moderator_post: - one: "העברתחי הודעה לנושא קיים: %{topic_link}" - other: "העברתי %{count} הודעות לנושא קיים: %{topic_link}" + one: "תגובה אוחדה לנושא קיים: %{topic_link}" + other: "%{count}תגובות אוחדו לנושא קיים: %{topic_link}" change_owner: post_revision_text: "בעלות הועברה מהמשתמש %{old_user} אל %{new_user}" + deleted_user: "משתמש שנמחק" emoji: errors: name_already_exists: "מצטערים, השם '%{name}' כבר תפוס על ידי emoji אחר." @@ -1033,15 +1118,21 @@ he: incorrect_username_email_or_password: "שם משתמש, דואר אלקטרוני או סיסמה לא נכונים" wait_approval: "תודה על שנרשמת. אנחנו ניידע אותך כשהחשבון שלך יאושר." active: "החשבון שלך הופעל ומוכן לשימוש." - activate_email: "

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

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

      " + activate_email: "

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

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

      " not_activated: "אינך יכול להתחבר עדיין. שלחנו לך הודעת דואר אלקטרוני לאישור. בבקשה עקוב אחר ההוראות בהודעה כדי להפעיל את חשבונך." + not_allowed_from_ip_address: "אינך יכול/ה להתחבר כ-%{username} מכתובת IP זו. " + admin_not_allowed_from_ip_address: "אינך יכול/ה להתחבר כמנהל מערכת מכתובת IP זו." suspended: "אינך יכול להתחבר עד %{date}." + suspended_with_reason: "חשבון הושעה עד %{date}: %{reason}" errors: "%{errors}" not_available: "לא זמין. נסה %{suggestion}?" something_already_taken: "משהו השתבש, אולי שם המשתמש או כתובת הדאור האלקטרוני כבר בשימוש. נסה את קישור שכחתי סיסמה." + omniauth_error: "סליחה, הייתה שגיאה בוידוא חשבונך. אולי לא אישרת את הוידוא? " omniauth_error_unknown: "משהו השתבש במהלך עיבוד ההתחברות שלך, אנא נסה שנית." new_registrations_disabled: "הוספת חשבונות חדשים אינה מותרת בעת זו." password_too_long: "סיסמאות מוגבלות ל-200 תווים." + email_too_long: "המייל שהזנת ארוך מדי. שמות מייל צריכים להכיל לכל היותר 254 תוים, ושמות דומיין צריכים להכיל לכל היותר 253 תוים." + reserved_username: "שם משתמש זה אסור. " missing_user_field: "לא מילאת את כל שדות המשתמש/ת" close_window: "האימות הושלם. סגרו חלון זה כדי להמשיך." user: @@ -1052,10 +1143,16 @@ he: characters: "חייב לכלול מספרים, אותיות ומקפים תחתונים בלבד." unique: "חייב להיות ייחודי" blank: "חייב להיות מלא" - must_begin_with_alphanumeric: "חייב להתחיל עם אות או מספר" + must_begin_with_alphanumeric: "חייב להתחיל עם אות, מספר או קו תחתון" + must_end_with_alphanumeric: "חייב להסתיים עם אות, מספר, או קו תחתון" + must_not_contain_two_special_chars_in_seq: "לא יכול להכיל רצף של 2 או יותר תווים מיוחדים (.-_)" + must_not_contain_confusing_suffix: "לא יכול להכיל סיומת מבלבלת כמו png." email: not_allowed: "לא מורשה מכתובת הדואר האלקטרוני הזו. בבקשה השתמש בכתובת אחרת." blocked: "לא מורשה." + ip_address: + blocked: "הרשמות חדשות אסורות מכתובת ה-IP שלך. " + max_new_accounts_per_registration_ip: "הרשמות חדשות אסורות מכתובת ה-IP שלך. (עברת את הסף המותר) צרו קשר עם מנהל." invite_mailer: subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}" text_body_template: | @@ -1084,32 +1181,57 @@ he: > > %{site_description} - אם אינכם מעוניינים לחצו על הקישור הבא: + אם הינכם מעוניינים לחצו על הקישור הבא: %{invite_link} הודעה זו נשלחה על ידי משתמש/ת מוכרים כך שאינך חייב/ת להתחבר. invite_password_instructions: subject_template: "צרו סיסמא עבור חשבון ה-%{site_name} שלכם." + text_body_template: | + תודה שקיבלת את ההזמנה שלך ל %{site_name} -- ברוך הבא! + לחץ על הקישור בשביל לבחור סיסמא: %{base_url}/users/password-reset/%{email_token} + (אם הקישור פג תוקף, בחר ב"שכחתי אץ הסיסמא שלי" בהתחברות.) test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" + text_body_template: | + This is a test email from + [**%{base_url}**][0] + + Email deliverability is complicated. Here are a few important things you should check first: + + - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**. + + - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail. + + - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered. + + - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF. + + - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here. + If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. + + + (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) + + We hope you received this email deliverability test OK! + + Good luck, + + Your friends at [Discourse](http://www.discourse.org) + [0]: %{base_url} + [1]: http://www.kitterman.com/spf/validate.html + [2]: http://mxtoolbox.com/ReverseLookup.aspx + [3]: http://www.dkim.org/ + [4]: http://whatismyipaddress.com/blacklist-check + [7]: http://dkimcore.org/tools/dkimrecordcheck.html + [8]: http://www.openspf.org/SPF_Record_Syntax + [md]: http://mandrill.com + [mg]: http://www.mailgun.com/ + [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] גרסת Discourse חדשה, עדכון זמין." - text_body_template: | - גרסא חדש של [Discourse] (http://www.discourse.org) זמינה. - הגרסא שלכם: %{installed_version} - גרסא חדשה: **%{new_version}** - - ייתכן שתרצו: - - - לראות מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master). - - - לשדרג דרך בחיקור ב[%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) ולחיצה על כפתור ה"Upgrade". - - - ביקור ב[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse. - new_version_mailer_with_notes: - subject_template: "[%{site_name}] update available" - text_body_template: | + text_body_template: |+ גרסה חדש של [Discourse](http://www.discourse.org) זמינה. הגרסה שלכם: %{installed_version} @@ -1119,12 +1241,25 @@ he: - לראות מה חדש ב- [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - לעדכן באמצעות ביקור ב- [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), ולחיצה על כפתור ה-"Upgrade". + - לעדכן דרך הדפדפן ב [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - ביקור ב-[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse. + - לבקר ב-[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse. - ### פרטי הגרסה המשוחררת + new_version_mailer_with_notes: + subject_template: "[%{site_name}] update available" + text_body_template: | + גרסא חדש של [Discourse] (http://www.discourse.org) זמינה. + הגרסא שלכם: %{installed_version} + גרסא חדשה: **%{new_version}** + ייתכן שתרצו: + + - לראות מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master). + + - לעדכן דרך הדפדפן ב- [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) + + - לבקר ב[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse. + ### Release notes %{notes} flags_reminder: flags_were_submitted: @@ -1136,23 +1271,53 @@ he: subject_template: one: "סימון אחד ממתין לטיפול" other: "%{count} סימונים ממתינים לטיפול" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] תגובה אחת מחכה לבדיקה" + other: "[%{site_name}] %{count} תגובות ממתינים לבדיקה" + text_body_template: | + שלום, + יש תגובות ממשתמשים חדשים שממינות לתגובה [ניתן לאשר או לדחות אותן כאן] (%{base_url}/queued-posts). + flag_reasons: + off_topic: "הפרסום שלך סומן כ **מחוץ לנושא**: הקהילה מרגישה שהוא לא מתאים לנושא, כפי שמוגדר על ידי הכותרת והפרסום הראשון. " + inappropriate: "התגובה שלך סומנה כ**לא מתאימה**: הקהילה מרגישה שהוא פוגעני או הפרה של [our community guidelines](/guidelines)" + spam: "הפרסום שלך סומן כ**ספאם**: הקהילה מרגישה שזה פרסומת, דבר שהוא קידום מכירות באופיו במקום להיות שימושי או רלוונטי לנושא. " + notify_moderators: "הפרסום שלך סומן **לתשומת לב מנהל**: הקהילה מרגישה שמשהו בפרסום דורש התערבות ידנית של צוות האתר. " flags_dispositions: agreed: "תודה שעדכנת אותנו. אנחנו מסכימים שיש כאן בעיה ואנחנו מנסים לבדוק את העניין." agreed_and_deleted: "תודה שעדכנת אותנו. אנחנו מסכימים שישנה בעיה והסרנו את הפרסום." disagreed: "תודה שעדכנת אותנו. אנחנו בודקים את זה." deferred: "תודה שעדכנתםאותנו. אנחנו בודקים את העניין." deferred_and_deleted: "תודה שעדכנתם אותנו. הסרנו את הפרסום." - temporarily_closed_due_to_flags: "נושא זה סגור באופן זמני בעקבות מספר גדול של סימונים מצד הקהילה" + temporarily_closed_due_to_flags: "נושא זה סגור באופן זמני בעקבות מספר רב של סימונים של הקהילה. " system_messages: post_hidden: subject_template: "הודעה הוסתרה בעקבות סימון" + text_body_template: "שלום,\n\nזו הודעה אוטומטית מ %{site_name} לידע אותך שהפרסום שלך הוסתר. \n\n%{base_url}%{url}\n\n%{flag_reason}\n\nמספר חברי קהילה סימנו את הפרסום הזה לפני שהוסתר, אז בבקשה תשקול איך תוכל לשנות את הפרסום בהתאם להערותיהם. \n\n**תוכל לערוך את הפרסום אחרי %{edit_delay} דקות, והוא יוצג באופן אוומטי**\n\nאולם, אם הפרסום יוסתר על ידי הקהילה פעם נוספת, הוא ישאר מוסתר עד לטיפול של צוות האתר, ותתכן תגובה נוספת, כולל השהייה של חשבונך. \n\nלהדכה נוספת, [קווים מנחים](%{base_url}/guidelines).\n" + usage_tips: + text_body_template: "הינה מספר טיפים קצרים לעזור לך להתחיל:\n\n## קריאה\n\nלקרוא יותר, **פשו המשך לגלול למטה**\n\nכשתגובות או נושאים חדשים יגיעו, הם יופיעו באוםן אוטומטי – אין צורך לרענן את העמוד.\n\n##ניווט\n\n-לחיפוש השתמש בעמוד משתמש או בתפריט ☰, השתמש ב**כפתורי אייקון משמשאל למעלה**\n\n-בחירת כותרת נושא תמיד תקח אותך ל**תגובה אחרונה שלא נקראה** בנושא. להכנס ללמעלה או למטה, בחר בספירת תגובות או תאריך פרסום אחרון.\n\n\n\n-בעת קריאה נושא, בחר בסרגל התקדמות מימין למטה לשליטה מלאה בניווט. עבור במהירות חזרה למעלה על ידי בחירה בכותרת הנושא. לחץ ? לרשימה של קיצורי מקלדת מהירים. \n\n\n## תגובה\n\n-להגיב ל**נושא באופן כללי**, השתמש בתחתית הנושא.\n\n-להגיב ל**אדם מסוים**, השתמש בפרסום שלהם. \n\n-להגיב עם **נושא חדש** השתמש ב מימין לתגובה. הנושא החדש והישן יקושרו ביחד. \n\nלהכניס ציטוט, בחר בטקסט שברצונך לצטט, ואז בחר בכל כפתור תגובה. חזור על כך שוב למספר ציטוטים!\n\n\n\nלידע מישהו בנוגע לתגובה שלך, הזכר את שמם. הקלד @ להתחיל\ + \ בבחירת שם משתמש. \n\n\n\nלהשתמש ב [standard Emoji](http://www.emoji.codes/), הקלד ':' להתאים על ידי שם, או השתמש בסמיילים סטנדרטים ';)'\n\n\n\nליצר תקציר לקישור, הדבק אותו בשורה משל עצמו:\n\n\n\n##פעולות\n\nישנם כפתורי פעולות בתחתית כל פרסום:\n\n\n\nבשביל לידע מישהו/י שנהנת מפרסום שלו/ה, השתמש בכפתור **לייק**. \n\nאם יש בעיה בפרסום של מישהו/י ידע\ + \ אותם או [צוות האתר](%{base_url}/about) באופן פרטי באמצעות כפתור **דגל**. תוכל/י גם **לחלוק** קישור לפרסום, או **לסמן** לשימוש עתידי בעמוד המשתמש שלך.\n\n## התראות\n\nכשמגיבים לך, מצטטים את הפרסום שלך או מזכירים את '@שם המשתמש' שלך, מספר יופיע ישר בחלק השמאלי העליון של העמוד. השתמש בו לגשת ל**התראות**\n\n\n\nאל תדאגו בנוגע לפספוס תגובה, ישלח אליכם מייל עם התראות שהגיעו כשלא היית באתר.\n\n- כל הנושאים בני פחות מ**יומיים** נחשבים חדשים. \n\n- כל נושא שהשתתפת בו באופן אקטיבי יוגדר למעקב – רגיל+ באופן אוטומטי. \n\n- תראו את המספרים הכחולים לנושאים חדשים ושלא נקראו ליד נושאים אלו:\n\n \n\nתוכלו לשנות את ההתראות שלכם לכל נושא דרך שליטה בהתראות שתחתית הנושא. \n\n\n\nתוכלו גם לקבוע מצב התראות עבור קטגוריה, אם ברצונכם לעקוב אחרי כל נושא חדש בקטגוריה מסוימת. \n\nבשביל לשנות אחד מההגדרות האלה, גש ל [your user preferences](%{base_url}/my/preferences).\n\n\n## אמון קהילתי\n\nככל שתשתתפו כאן, לאורך הזמן תצברו את אמון הקהילה, תהפכו לאזרח מן השורה, והגבלות למשתמשים חדשים יוסרו. [בדרגת אמון ](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) גבוהה, תקבלו יכולות לעזור לנו בטיפוח הקהילה. \n" welcome_user: subject_template: "ברוכים הבאים ל %{site_name}!" + text_body_template: | + תודה שהצטרפת ל %{site_name}! + + %{new_user_tips} + + אנו מאמינים ומאמינות ב [התנהגות קהילתית מתורבתת ](%{base_url}/guidelines) בכל זמן. + + תהנו! + + (אם ברצונך לתקשר עם [מנהל אתר](%{base_url}/about) כמשתמשת חדשה, השיבי להודעה הזו. ) welcome_invite: subject_template: "Welcome to %{site_name}!" + text_body_template: "תודה שקיבלת את ההזמנה שלך ל %{site_name} - ברוכים הבאים!\n\nיצרנו חשבון חדש **%{username}** בשבילך, ואת/ה מחובר/ת. תוכל/י תמיד לשנות את שמך באמצעות ביקור [ בפרופיל שלך ][prefs].\n\nעל מנת להתחבר שוב:\n\n1. השתמשו תמיד **באותו חשבון מייל מההזמנה המקורית** בעת ההתחברות. אחרת לא נוכל לדעת שזה את/ה!\n\n2. צרו סיסמא יחודית עבור [ הפרופיל שלך] [prefs] והשתמשו בה בשביל להתחבר. \n\n%{new_user_tips}\n\nאנו מאמינים ומאמינות ב [התנהגות קהילתית מתורבתת] (%{base_url}/guidelines) בכל זמן. \n\nתהנו!\n\n(אם ברצונך לתקשר עם [מנהלת אתר] (%{base_url}/about) כמשתמש/ת חדש/ה השיבי להודעה זו.)\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "הגיבוי הושלם בהצלחה." - text_body_template: "הגיבוי הושלם בהצלחה.\nבקרו ב-[admin > backup section] (/admin/backups) כדי להוריד את הגיבוי החדש." + text_body_template: "הגיבוי נוצר בהצלחה!\nבקר ב [admin > backup section](%{base_url}/admin/backups) על מנת להוריד את הגיבוי החדש שלך." backup_failed: subject_template: "הגיבוי נכשל." text_body_template: |+ @@ -1191,25 +1356,41 @@ he: ``` csv_export_succeeded: subject_template: "יצוא הנתונים הושלם" + text_body_template: "הנתונים שלך יוצאו בהצלחה! :dvd:\n\n%{file_name} (%{file_size})\n\nלינק ההורדה יהיה זמין במשך 48 שעות. \n" csv_export_failed: subject_template: "ייצוא הנתונים נכשל" text_body_template: "צר לנו, אך ייצוא הנתונים שלכם נכשל. אנא בדקו את רישומי המערכת או צרו קשר עם איש/אשת צוות." email_reject_trust_level: + subject_template: "[%{site_name}] בעיית מייל -- רמת אמון לא מספיקה. " text_body_template: | אנו מצטערים, אבל הודעת הדוא"ל שלך אל %{destination} (titled %{former_title}) לא עברה. אין לחשבון שלך את רמון האמון הנדרשת כדי לפרסם נושאים חדשים לכתובת דוא"ל זו. אם אתם מאמינים כי זוהי שגיאה, צרו קשר עם אחד מאנשי הצוות. email_reject_no_account: + subject_template: "[%{site_name}] בעיית מייל -- חשבון לא מזוהה" text_body_template: | אנחנו מצטערים, אך הודעת הדוא"ל שלכם אל %{destination} (titled %{former_title}) לא עברה. לא ידוע לנו על חשבון משתמש/ת עם כתובת כזו. נסו לשלוח מכתובת דוא"ל אחרת, או צרו קשר עם אנשי הצוות שלנו. + email_reject_empty: + subject_template: "[%{site_name}] בעיית מייל -- ללא תוכן" + email_reject_parsing: + subject_template: "[%{site_name}] בעיית מייל -- תוכן לא זוהה." + text_body_template: "אנחנו מתנצלים, אבל הודעת המייל שלך ל- %{destination} (titled %{former_title}) לא עבדה. \n\nלא מצאנו תוכן במייל שלך. אנא ודא שהתגובה שלך בראש המייל, אנחנו לא יכולים לעבד תגובות בין השורות. \n" + email_reject_invalid_access: + subject_template: "[%{site_name}] בעיית מייל -- גישה לא תקינה" + text_body_template: | + אנו מצטערים, אבל הודעת הדוא"ל שלך אל %{destination} (titled %{former_title}) לא עברה. + + אין לחשבון שלך את רמון האמון הנדרשת כדי לפרסם נושאים חדשים בקטגוריה הזו. אם אתם חושבים שזוהי שגיאה, צרו קשר עם אחד מאנשי הצוות. email_reject_post_error: + subject_template: "[%{site_name}] בעיית מייל -- שגיאת פרסום" text_body_template: | אנו מצטערים, אך מסר הדוא"ל שלך ל-%{destination} (שכותרתו %{former_title}) לא עבר. סיבות אפשריות לעניין: מבנה מורכב, המסר ארוך מידי, המסר קצר מידי. אנא נסו שוב, או פרסמו באמצעות האתר עם הבעיה נמשכת. email_reject_post_error_specified: + subject_template: "[%{site_name}] בעיית מייל -- שגיאת פרסום" text_body_template: | אנחנו מצטערים, אבל הודעת הדוא"ל שלך אל %{destination} (titled %{former_title}) לא עברה. @@ -1226,16 +1407,37 @@ he: If you can correct the problem, please try again. email_reject_reply_key: + subject_template: "[%{site_name}] בעיית מייל -- תו תגובה לא מוכר" text_body_template: | אנו מצטערים, אבל הודעת הדוא"ל שלך אל %{destination} (titled %{former_title}) לא עברה. מפתח התגובה לא קיים או לא מוכר, כך שאיננו יודעים לאיזה פרסום המייל הזה אמור להגיב. אנא צרו קשר עם אנשי הצוות. email_reject_destination: + subject_template: "[%{site_name}] בעיית מייל -- כתובת יעד לא מזוהה" text_body_template: | מצטערים, אבל הודעת הדוא"ל שלך ל-%{destination} עם הכותרת %{former_title} לא הצליחה. לא הצלחנו לזהות כתובות יעד. אנא ודא שכתובת האתר נמצאת בשדה "אל:", ולא ב-"עותק" או "עותק מוחבא (CC / BCC), ושאתה שולח לכתובת אימייל שסופקה בידי הצוות. + email_reject_topic_not_found: + subject_template: "[%{site_name}] בעיית מייל -- לא נמצא נושא" + text_body_template: | + אנחנו מצטערים, אך הודעת הדוא"ל ששלחת אל %{destination} (בנושא %{former_title}) לא עברה. + + הנושאחושבים שהגבתם אליו כבר לא קיים, אולי הוא נמחק? אם אתם שמדובר בתקלה, צרו קשר עם איש/אשת צוות. + email_reject_topic_closed: + subject_template: "[%{site_name}] בעיית מייל -- נושא נסגר" + text_body_template: | + אנחנו מצטערים, אך הודעת הדוא"ל שלך אל %{destination} (בנושא %{former_title}) לא נשלחה. + + הנושא שהשבתם אליו נסגר ולכן לא ניתן להשיב לו יותר. אם אתם מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות. + email_reject_auto_generated: + subject_template: "[%{site_name}] בעיית מייל -- תגובה נוצרה אוטומטית" + text_body_template: | + אנחנו מצטערים, אך הודעת הדוא"ל ששלחת אל %{destination} (בנושא %{former_title}) לא עברה. + + המייל שלך סומן כ"נוצר אוטומטית", ולכן לא ניתן לקבל אותו. אם אתם מאמינים שמדובר בתקלה, צרו קשר עם איש/אשת צוות. email_error_notification: + subject_template: "[%{site_name}] בעיית מייל -- בעיית אימות POP" text_body_template: | התרחשה תקלת אימות בזמן שבדקנו הודעות מייל בשרת ה-POP. @@ -1289,7 +1491,10 @@ he: download_remote_images_disabled: subject_template: "הורדת תמונות מרחוק מנוטרלת" text_body_template: "האפשרות \"הורדת תמונות מרוחקות\" נוטרלה בגלל שכל שטח האכסון שמוקצה ל\"תמונות שהורדו מרחוק\" נוצל." - unsubscribe_link: "To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url})." + unsubscribe_link: | + להסרה מרשימת התפוצה, בקר ב [הגדרות משתמש/ת](%{user_preferences_url}). + + בשביל להפסיק לקבל התראות בנוגע לשיחה הזאת [לחץ כאן](%{unsubscribe_url}). subject_re: "תגובה: " subject_pm: "[PM] " user_notifications: @@ -1300,6 +1505,12 @@ he: reply_by_email: "To respond, reply to this email or visit %{base_url}%{url} in your browser." visit_link_to_respond: "To respond, visit %{base_url}%{url} in your browser." posted_by: "Posted by %{username} on %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} הזמין אותך להודעה '%{topic_title}'" + text_body_template: "\n%{username} הזמינ/ה אותך להודעה. \n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nב\n\n> %{site_title} -- %{site_description}\n\nתלחץ על הלינק בשביל לראות את ההודעה %{base_url}%{url}\n" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} הזמין אותך לנושא '%{topic_title}'" + text_body_template: "\n%{username} הזמינ/ה אותך לשיחה. \n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nב\n\n> %{site_title} -- %{site_description}\n\nתלחץ על הלינק בשביל לראות את ההודעה %{base_url}%{url}\n" user_replied: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -1347,6 +1558,7 @@ he: %{respond_instructions} digest: why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}" + subject_template: "[%{site_name}] תקציר" new_activity: "New activity on your topics and posts:" top_topics: "Recent posts the community enjoyed:" other_new_topics: "Other New Topics:" @@ -1374,6 +1586,9 @@ he: Click the following link to choose a password: %{base_url}/users/password-reset/%{email_token} + admin_login: + subject_template: "[%{site_name}] התחברות" + text_body_template: "מישהו ביקש להתחבר לחשבונך ב [%{site_name}](%{base_url}).\nאם לא ביקשת זאת, תוכל להתעלם מהמייל הזה. \nלחץ על הקישור הבא להתחבר:\n%{base_url}/users/admin-login/%{email_token}\n" account_created: subject_template: "[%{site_name}] החשבון החדש שלך" text_body_template: | @@ -1389,8 +1604,9 @@ he: %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "You've been approved on %{site_name}!" + text_body_template: "ברוכים הבאים ל%{site_name}!\n\nחבר צוות אישר את החשבון שלך ב %{site_name}. \n\nלחץ על הקישור הבא לאשר והפעיל את החשבון החדש שלך:\n%{base_url}/users/activate-account/%{email_token}\n\nאם הלינק לא לחיץ, נסה להעתיק ולהדביק אותו לסרגל הכתובת בראש הדפדפן. \n\n%{new_user_tips}\n\nאנו מאמינים ב [civilized community behavior](%{base_url}/guidelines) בכל זמן.\n\nתהנה מהביקור!\n\n(אם אתה צריך ליצור קשר עם [staff members](%{base_url}/about) כחבר חדש, רק השב להודעה זאת. )\n\n" signup: - subject_template: "[%{site_name}] Activate your new account" + subject_template: "[%{site_name}] אשר את חשבונך החדש" text_body_template: | Welcome to %{site_name}! @@ -1418,9 +1634,11 @@ he: unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})." pasted_image_filename: "Pasted image" store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}." + file_missing: "סליחה, עליך לספק קובץ להעלות. " + attachments: + too_large: "מצטערים, הקובץ שאתם מנסים להעלות גדול מידי (הגודל המקסימלי המותר הוא %{max_size_kb}KB)." images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." + too_large: "סליחה, אך התמונה שאתה מנסה להעלות גדולה מידי. (הגודל המקסימלי הוא %{max_size_kb}KB), אנא שנה את הגודל ונסה שנית." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -1428,6 +1646,7 @@ he: email_log: no_user: "Can't find user with id %{user_id}" anonymous_user: "המשתמש הוא אנונימי" + suspended_not_pm: "המשתמש מושהה, לא הודעה" seen_recently: "User was seen recently" post_not_found: "Can't find a post with id %{post_id}" notification_already_read: "The notification this email is about has already been read" @@ -1454,101 +1673,28 @@ he: title: "שאלות נפוצות / כללים מנחים" tos_topic: title: "תנאי השימוש" - body: "הכללים והתנאים הבאים חלים על כל שימוש באתר %{company_domain} וכל התוכן, השירותים והמוצרים הזמנים בו או דרכו, כולל, ולא רק, תוכנת הפורום %{company_domain, פורום התמיכה של %{company_domain ושירותי האירוח של %{company_domain (\"אירוח\") (להלן, \"האתר\"). האתר הוא בבעלות ומופעל על ידי %{company_full_name} (\"%{company_name}\").. האתר נתון להסכמתך ללא שינוי של כל הכללים והתנאים הכלולים כאן וכל כלל ומדיניות (כולל, וללא מגבלה, [מדיניות הפרטיות] (/privacy)של %{company_domain} ו[כללי ההתנהגות הקהילתיים] (/faq)ונהלים אשר אשויים להתפרסם מעת לעת באתר זה על ידי %{company_name} (להלן, \"ההסכם\").\n\nאנא קראו הסכם זה בזהירות לפני גישה או שימוש באתר. בגישה או שימוש בכל חלק של האתר, הנכם מסכימים להיות מחוייבים לכללים והתנאים שבהסכם זה. אם אינכם מסכימים לכל הכללים והתנאים של הסכם זה, אז אינכם רשאים לגשת לאתר או להשתמש באיזהשהו שירות. אם הכללים והתנאים האלה נחשבים הצעה מטעם %{company_name}, קבלתה מוגבלת לכללים אלה. האתר זמין רק ליחידים בני 13 ומעלה.\n\n\n\n## [1. חשבון %{company_domain} שלך](#1)\n \nאם את/ה יוצרים חשבון באתר, את/ה אחראים לתחזר את האבטחה של החשבון שלך ואתם נושאים באחריות המלאה לכל הפעילויות שיתבצעו תחת החשבון. אתם חייבים ליידע באופן מיידי את %{company_name} על כל שימוש לא מאושר שנעשה בחשבונך או כל פרצה אחרת. %{company_name} לא יהיו אחראיים לפעולה כל שהיא או למחדל שלך, כולל כל סוג של נזק שיגרם כתוצאה מפעיולות כאלה או מחדלים.\n\n\n\n## [2. אחריות התורמים](#2)\n\nאם אתם מפרסמים חומר לאתר, מפרסמים קישורים באתר, או הופכים (או מאפשר לכל צד שלישי אחר להפוך) חומר לזמין\ - \ באמצעות האתר (כל סוג של חומר, \"תוכן\"), אתם אחראיים באופן מלא לתוכן ולכל סוג של פגיעה כתוצאה ממנו. זה יהיה המקרה בלי קשר להאם התוכן המדובר מכיל טקסט, גרפיקה, קובץ אודיו או תוכנת מחשב. על ידי הפיכת התוכן לזמין אתם מצהירים ומסכימים ש:\n\n* ההורדה, העתה והשימוש בתוכן לא פוגעים בזכויות קניין, כולל אבל לא רק זכויות היוצרים, פטנט, סימן רשום או זכויות סודיות מסחרית של צד שלישי כל שהוא;\n\n* אם למעסיק שלכם יש זכויות על קניין רוחני שיצרתם עליכם לפעול באחת הדרכים: (1) לקבל רשות מהמעסיק לפרסם או להפוך את התוכן לזמין, כולל אבל לא רק לכל תוכנה, או (2) להבטיח קבלה של כתב ויתור על כל הזכויות על או במסגרת התוכן;\n\n* אתם פועלים בהתאמה מלאה עם כל רשיונות צד שלישי בנוגע לתוכן ועומדים בהצלחה בכל הכללים והתנאים הנדרשים כדי להעבירו למשתמשי קצה;\n\n* התוכן אינו כולל או מתקין וירסום, תוכלעות, רוגלות, סוסים טרויאנים או תוכן פוגעני או הרסני אחר כלשהו;\n\nהתוכן אינו ספאם, אינו מופק על ידי מכונה או מופק בצורה רנדומאלית, ואינו כולל תוכן לא אתי או לרצוי שנועד למשוך תנועת גולשים לאתרי צד שלישי או להשפר את דירוגם של אתרים כאלה בתוצאות מנועי חיפוש, או כל פעולה בלתי חוקית אחרת (כגון phishing) או מטעה את המקבלים אותו בנוגע למקור החומר (למשל זיוף);\n\n* התוכן אינו פורונוגרפי, אינו כולל איומים או מעודד אלימות ואינו מפר את זכויות פרטיות וציבוריות של צד שלישי כלשהו;\n\n* התוכן שלכם אינו מפורסם באמצעות מסרים אלקטרוניים לא רצויים דוגמאת קישורי (links) ספאם בקבוצות דיון, קבוצות דיוור, בלוגים ואתרים ואמצעי קידום לא מוזמנים אחרים;\n\n* התוכן שלכם אינו נקרא או מתאר בצורה שמטעה אתת הקוראים למחשבה שאתם אדם אחר או חברה אחרת; ו\n\n* במקרה שהתוכן\ - \ שלך כולל קוד מחשב, תיארתם בצורה מתאימה את הסוג ו/או הקטגוריה שלו, אופיו, שימושיו והשפעתו על החומרים – הן אם התבקשתם לעשות כן על ידי %{company_name} וגם אם לא.\n \n\n \n## [3. רישיון תוכן משתמש ](#3)\n\nתרומותיהם של משתמשים הנן תחת רישיון [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). ללא מגבלה כלשהי על הצהרות או התחייבויות אלה, שמורה ל%{company_name} הזכות (אך לא החובה) על פי שיקול דעת בלבדי (1) לסרב או להסיר כל תוכן אשר על פי הדעה הסבירה של %{company_name} מפר את מדיניות %{company_name} או פוגע או מעורר התנגדות, או (2) להשמיד או למנוע גישה ושימוש באתר מכל פרט או יישות מכל סיבה שהיא על פי שקול הדעת הבלבדי של %{company_name}. ל %{company_name}לא תהיה שום התחייבות לספק החזר מכל סכום שהוא ששולם בעבר.\n\n\n\n## [4. תשלומים והחזרים](#4)\n\n### כללים כלליים. \n\nשירותים אופציונאליים בתשלום או שדרוגים עשוים להיות זמינים באתר. בשימוש בשירות אופציונאלי בתשלום או שדרוג אתם מסכימים לשלם ל%{company_name} את עלות המנוי החודשי או השנתי המצויינים. התשלומים יחוייבו על בסיס יומי על בסיס היום בו התחלתם לעשות שימוש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג כתקופת מנוי חודשי או שנתי כפי שיצויין. סכומים אלה אינם ניתנתים להחזרה.\n\n### חידוש אוטומטי\n\nאלא אם כן תודיעו ל%{company_name} לפני סוף תקופת המנוי המיושם שהנכם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יחודש באופן אוטומטי והנכם מסמיכים אותנו לגבות את סכום המנוי החודש או השנתי הרלוונטי אז (כמו גם את המסים הנלווים) באמצעות\ - \ כל כרטיס אשראי או אמצעי תשלום אחר שמופיע ברשומותינו כקשור אליכם. מנויים ניתנים לביטול בכל עת.\n\n\n\n## [6. אחריות המבקרים באתר]\n\nל%{company_name} לא בדק/ה, ולא מסוגל/ת לבדוק, את כל התוכן, כולל תוכנת המחשב, המפורסמם באתר ולא יכול/ה להיות אחראיים לתוכן, לשימוש או לתוצאות של שימוש בתכנים אלה. בהפעלת האתר %{company_name} אינה מצהירה או מרמזת שהיא מאשרת את התוכן המפורסם, או מאמינ/ה כי חומר זה נכון, שמוש או בלתי-מזיק. אתם אחראיים לנקיטת האמצעים הנדרשים להגן על עצמכם ומערכות המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים ותוכן פוגעני או הרסני אחר. אתר זה עלול להכיל תוכן פוגעני, לא ישר או מעורר התנגדות, כמו גם תוכן הכולל אי דיוקים טכניים, טעויות טיפוגרפיות ושגיאות אחרות. האתר עלול להכיל חומר שמפר זכויות פרטיות או פומביות או מפר קניין רוחני וזכויות יוצרים אחרות של צדדים שלישיים, שהאפשרות להורדה, העתקה או שימוש בהם מותנה בכללים או תנאים נוספים, מוצהרים ובלתי מוצהרים. %{company_name} מתנער/ת מכל אחריות לכל פגיעה כתוצאה מהשימוש שעושים המבקרים באתר, או מהורדה של תוכן שפורסם על ידי מבקרים.\n\n\n\n## [7. תוכן שפורסם באתרים אחרים](#7)\nלא בדקנו, ואיננו מסוגלים לבדוק, את כל התוכן כולל תוכנות מחשב, שנהיה זמין דרך האתרים והדפים אליהם מקשרים הקישורים מ-%{company_name}. ל%{company_name} אין שום שליטה על האתרים ועמודים שאינם של %{company_name} ואינו/ה\ - \ אחראי/ת לתכניהם או לשימוש בהם. בקישור לאתר או עמוד שאינו של %{company_name} אינה מצהירה או רמוזת לכך שהיא תומכת באתר או בעמוד. אתם אחראיים לנקטית האמצעים הנדרשים כדי להגן על עצמכם או מערכת המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים וכל תוכן פוגעני או הרסני אחר. %{company_name} מסיר/ה מעצמם כל אחריות לכל נזק שיגרם משימוש שתעשו באתרים ועמודים שאינם של %{company_name}.\n\n\n\n## [8. הפרת זכויות יוצרים ומדיניות ](#8)\n\nכפי ש%{company_name} מבקש/ת ומצפה מאחרים לכבד את כויות הקניינו/ה הרוחני, היא/הוא גם מכבד/ת את הקניין הרוחני של אחרים. אם אתם מאמינים שחומר הממוקם או מקושר אל %{company_name} מפר את זכויות היוצרים שלכם ואם אתר זה יושב בארה\"ב אנו מעודדים אתכם ליידע את %{company_name}, בהתאם למדיניות[Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") של %{company_name}. %{company_name} יגיבו לכל פניה שכזו, כולל הסרה של החומר המפר או ניטרול כל הקישורים לחומר המפר, כנדרש או כראוי. %{company_name} תמנע גישה ושימוש של מבקר/ת באתר אם, תחת נסיבות מתאימות, המבקר/ת נחושים להמשיך בהפרה של זכויות יוצרים או זכויות קניין אחרות של %{company_name} או של אחרים. במקרה של מחיקה שכזו, ל%{company_name} לא תהיה המחוייבות לספק החזר של סכום כלשהו ששולם ל%{company_name} בעבר.\n\n\n\n## [9. קניין רוחני](#9)\n\nהסכם זה אינו מעביר מ%{company_name} אליך או לצד שלישי זכות קניינית כלשהי וכל זכות, כותרת ועניין בנוגע לקניין כזה ישארו (בין הצדדים) רק עם %{company_name}.\n%{company_name}, %{company_domain} הלוגו של %{company_domain} וכל סימן רשום\ - \ אחר, סימוני שירות, גרפיקה וסמלילים המשמשים בתקשורת עם %{company_domain} אם עם האתר הם סימנים מסחריים או סימנים רשומים של %{company_name} או מחזיקי רישיונות מטעם %{company_name}. סימנים מסחריים אחרים, סימני שירותים, גרפיקות וסממלילים המשתמשים בתקשורת עם האתר עשויים להיות סימנים מסחריים של צד ג'. השימוש שלך באתר אינו מבטיח לך שום זכות או רישיון להפיץ או לעשות כל שימוש אחר בסימנים מסחריים של %{company_name}או של צד שלישי.\n\n\n\n## [10. פרסומות](#10)\n\n%{company_name} שומר/ת לעצמם את הזכות להציג פרסומות על התוכן שלך אלא אם כן רכשת שדרוג או שירות להסרת פרסומות. \n\n\n\n## [11. ייחוס](#11)\n\n%{company_name} שומר/ת לעצמו/ה את הזכות להציג קישורים עם ייחוס, כמו למשל 'מופעל באמצעות %{company_domain}', מחבר/ת נושא, וייחוס פונטים בכותרות העליונות והתחתונות של התוכן שלך. קרדיט בתחתית העמוס וסרגיל הכלים של %{company_domain} לא יוסר אלא אם כן נרכשו שדרוגים.\n\n\n\n## [12. שינויים](#12)\n\n%{company_domain} שומר/ת לעצמם את הזכות, על פי החלטה בלבדית, לשנות או להחליף כל חלק מהסכם זה. זוהי אחריותך לבדוק את ההסכם מידי תקופה ולבדוק אם נערכו בו שינויים. המשך השימוש והגישה באתר לאחר פרסום כל שינוי בסכם זה מהווה הסכמה לקבלת שינויים אלו. %{company_domain} עשוי/ה גם להציע בעתיד שירותים ו/או תכונות דרך האתר (כולל שחרור כלים ומשאבים חדשים). מאפיינים חדשים כאלו יהיו נתונים לכללים ולהגדרות שבהסכם זה.\n\n\n\n## [13. הפסקת ההסכם](#13)\n\n%{company_domain} עשוי/ה להפסיק את הגישה שלך לכל או לחלק מהאתר בכל זמן, עם או ללא סיבה, עם או ללא ידוע, באופן אפקטיבי\ - \ ומיידי. אם אתם מעוניינים להפסיק הסכם זה או את החשבון ב%{company_domain} (אם יש לכם אחד כזה), אתם יכולים פשוט להפסיק להשתמש באתר. כל ההוראות של הסכם זה שבאופיין תקפות ,לאחר ביטול ימשיכו להתקיים לאחר הביטול, כולל, וללא מגבלה, הוראות הבעלות, הצהרות הסרת האחריות, שיפוי ומגבלות האחריות.\n\n\n\n## [14. הסרת אחריות](#14)\n\nהאתר מוגש כפי שהוא. %{company_name} והספקים שלו/ה ומחזיקי הרישון מטעמם מסירים בזאת מעצמם אחריות מכל סוג, מפורש או משתמע, כולל וללא מגבלות, אחריות לגבי מסחר, התאמה למטרה מסוימת ואי הפרה. %{company_name} ו/או ספקיו/ה ו/או בעלי רשיונות מטעמה אינם מתחייבים שהאתר הינו נטול תקלות או שחלקים שהוכנסו בו יהיו המשכיים וללא הפרעות. אם אתם ממש קוראים את זה, היה [ממתק](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאם אתם מורידים, צורכים תוכן או שירות בדרך אחרת מהאתר אתם עושים זאת על פי שיקול דעתכם ועל אחריותכם בלבד.\n\n\n\n## [15. הגבלת האחריות](#15)\nבשום מקרה לא יהיה/תהיה %{company_name} או ספקיו/ה או מחזיקים ברשיון מטעמם אחראיים בנוגע לכל נושא הקשור להסכם זה תחת שום חוזה, רשלנות, אחריות ישירה או כל תיאוריה משפטית אחרת עבור: (1) כל נזק מיוחד, מקרי או תוצאתי; (2) עלות הרכש עבור מוצרים שירותים חלופיים; (3) עבור הפרעה בשימוש או אובד או פגיעה בנתונים; או (4) כל סכום שעולה על התעריפים ששולמו על ידך ל%{company_name} במסגרת הסכם זה במהלך שנים-עשר (12) החודשים שקדמו לסיבת העניין. %{company_name} לא ישא/תישא באחריות בנוגע לשום כישלון או ההשהיה בשל עניינים שמעבר לשליטתם בהסתכלות הגיונית. כל האמור לעיל לא יחול\ - \ על איסורים על פי החוק התקף.\n\n\n\n## [16. הצהרה כללית ואחריות](#16)\n\nהנכם מצהירים ולוקחים אחריות על כך ש(1) השימוש שלכם באתר יהיה בהתאם ל[מדיניות הפרטיות](/privacy) של %{company_name}, [כללי ההתנהגות הקהילתיים](/guidelines), הסכם זה וכל החוקים והתקנות התקפים (כולל וללא מגבלה כל חוק מקומי או תקנה בארצך, במדינה, בעיר או באזור ממשלתי אחר, ביחס להתנהלות וקבלת תוכן מקוון, וכולל כל החוקים התקפים ביחס להעברת מידע טכני המיוצא מתוך המדינה בה שוכן אתר זה או המדינה בה אתם נמצאים), וש(2) השימוש שלך באתר לא יפגע או ימעל בזכויות הקניין הרוחני של כל צד שלישי.\n\n\n\n## [17. שיפוי](#17)\n\nאתם מסכימים לשפות ולמנוע פגיעה ב%{company_name}, קבלנים ומחזיקים ברשיונות מטעמו והדירקטורים, פקידים, מועסקים וסוכנים מטעמם כנגד כל טענה ונזק, כולל תביעות בנושאי תעריפים, העולות כתוצאה משימוש שלך באתר, כולל, אך ללא מגבלה, הפרה של הסכם זה מצדכם.\n\n\n\n## [18. שונות](#18)\n\nהסכם זה מהווה את ההסכם השלם בין %{company_name} וביניכם בנוגע לנושאים הנדונים, וניתן לשנותם רק על ידי הסכם כתוב החתום על ידי מנהל/ת מוסמכים מטעם %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסא מתוקנת. פרט למידה בה הדין החל, אם ישנו כזה, פוסק אחרת, הסכם זה, כל גישה או שימוש באתר יהיה על פי החוקים של מדינת קליפורניה, ארה\"ב, למעט התנגשויות עם תיקונים בחוק, והמקום הראוי לכל מחלוקת הנובעת מעניינים אלו יבוררו בבתי המשפט המדינתי והפדראלי הממוקמים במחוז סן-פרנסיסקו, קליפורניה. מלבד טעות לסעד או שוויוניות או טענות ביחס לזכויות קניין רוחני (אשר עשויות לעלות בכל בית משפט מוסמך ללא הפקדת ערבות),\ - \ כל מחלוקת שעולה תחת הסכם זה תבורר בסופו של דבר בהתאם לכללי בוררות מקיפים של הבוררות השיפוטית ושירות הגישור (Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”)), על ידי שלושה בוררים שימונו לכללים אלה. הבוררות תתקיים בסן-פרנסיסקו, קליפורניה, בשפה האנגלית והחלטת הבוררות תמומש בכל בית מספר. הצד המוביל בכל פעולה או הליך לאכיפת הסכם זה יהיה זכאי להוצאות ושכר טרחת עורכי הדין. אם חלק כלשהו של הסכם זה אינו תקף או אינו בר-אכיפה, חלק זה יפורש בדרך שתשקף את הכוונה המקונית של הצדדים והחלקים האחרים יישארו בתוקף מלא. כתב ויתור של מי מהצדדים על כלל או תנאי של חוזה זה או הפרה אחד מסעיפים, לא תבטל או תוותר תנאי או כלל זה, או על כל הפרה בעקבותיו. אתם רשאים להעביר את זכויותיכם בהסכם זה לכל צד שמסכים ומקבל עליו את המגבלות, התנאים והכללים; %{company_name} רשאים להעביר את זכויותיהם תחת הסכם זה ללא תנאי. הסכם זה יהיה מחייב ופעיל כלפי הצדדים, יורשיהם ומורשי חתימה מטעמם. \n\nמסמך זה מופץ תחת רישוי CC-BY-SA. הוא עודכן לאחרונה ב-31.3.2013. הגרסא המקורית אומצה מ[תנאי השימוש והשירות של וורדפרס](http://en.wordpress.com/tos/).\n" privacy_topic: title: "מדיניות פרטיות" - body: | - - - ## [איזה מידע אנחנו אוספים?](#collect) - - אנחנו אוספים מכם מידע כאשר אתם נרשמים לאתרנו ואוספים מידע כאשר אתם משתתפים בפורום בקריאה, כתיבה ובהערכת התוכן שנחלק אתכם. - - כאשר אתם נרשמים לאתר שלנו ייתכן ותתבקשו להזין את שמכם וכתובת הדוא"ל שלכם. אתם יכולים, עם זאת, לבקר באתר ללא הרשמה. כתובת הדוא"ל שלכם תיבדק באמצעות מייל שכולל קישור (link) ייחדוי. אם תבקרו בקישור זה, נדע שאתם שוטלים בכתובת הדוא"ל. - - כאשר אתם נרשמים ומפרסמים, אנחנו רושמים את כתובת ה-IP שממנה נוצר הפרסום. אנחנו גם עשויים לשמור רישומי שרת אשר כוללים את כתובת ה-IP של כל בבקשה מהשרת שלנו. - - - - - ## [למה אנחנו משתמשים במידע אודותיך?](#use) - - כל סוג של מידע שאנחנו אוספים אודותיכם עשוי לשמש באחת הדרכים הבאות: - - * כדי להתאים אישית את חוויית השימוש שלך mdash; המידע שלך עוזר לנו להגיב טוב יותר לצריכך האישיים. - * לשפר את האתר שלנו mdash; אנחנו שואפים ללהמשיך ולשפר את מה שמציע האתר על בסיס המידע והפידבקים שנקבל מכם. - * לשפר את שירות הלקוחות mdash; המידע שלכם עוזר לנו להגיב בצורה אפקטיבית יותר לבקשות שירות הלקוחות שלכם ולתמוך בצרכים. - * לשלוח מיילים תקופתיים mdash; כתובת המייל שתספקו עשויה לשמש לשלוח לכם מידע, התראות שתבקשו על שינויים בנושא או שאלות. - - - - ## [איך אנו מגנים על המידע שלכם](#protect) - - אנחנו נוקטים במספר אמצעים בטיחות כדי לתחזק את בטחון המידע האישי אליו תגשו, אותו שתזינו תשלחו. - - - - - ## [מהי מדיניות החזקת המידע שלנו?](#data-retention) - - אנחנו נעשה מאמץ כנה ל: - * לשמור רישומי יומן השרת שמכילים כתובות IP של כל הבקשות משרת זה לא יותר מ-90 יום. - * לשמור את כתובות ה-IP המקושרות למשתמשים רשומים והפרסומים שלהם לא יותר מ-5 שנים. - - - - - ## [האם אנחנו משתמשים ב"עוגיות"?](#cookies) - - כן. עוגיות הן קבצים קטנים שאתר או שספק השירותים שלו מעביר לכונן הקשיח במחשב שלכם באמצעות דפדפן הרשת (אם אתם מאפשרים זאת). עוגיות אלו ממאפשרות לאתר לזהות את הדפדפן שלכם ואם יש לכם חשבון רשום, מקשרת את הדפדפן עם החשבון הרשום. - - אנו משתמשים בעוגיות כדי להבין ולשמור את העדפותיכם לביקורים עתידיים וכדי לאסוף נתונים על תנועה מצטברת באתר ואינטרקציה באתר כך שנוכל להציע חוויית משתמשים טובה יותרו וכלים נוספים בעתיד. אנחנו עשויים להתקשר בחוזה עם ספקי שירות צד שלישי כדי לסייע לנו להבין טוב יותר את קהל המבקרים באתר. ספקים אלו לא יורשו להשתמש במידע הנאסף על ידנו מלבד לסייע לנו לקיים ולקדם את עניינינו. - - - - - ## [האם אנחנו מוסרים איזהשהו מידע לגופים חיצוניים?](#disclose) - - איננו מוכרים, סוחרים או מעבירים באופן אחר מידע אישי מזהה אודותיך. זה אינו כולל גופים שלישיים אמינים אשר מסייעים לנו בהפעלת האתר, קידום העסק שלנו או מתן השרות, כל עוד גופים אלה מסכימים לשמור על המידע חסוי. אנחנו עשויים גם לשחרר את המידע אודותיך כאשר נאמין שהשחרור ראוי במסגרת הציות לחוק, אכיפת כללי האתר או הגנה על זכויות, רכוש או בטיחות שלנו של אחרים. בכל אופן, מידע בלתי מזהה אישית אודות מבקרים באתר עשוי להיות מועבר או מסופק לצדדים אחרים לשם שיווק, פרסום או שימושים אחרים. - - - ## [קישורים לצד שלישי](#third-party) - - מידי פעם, על פי החלטתנו, אנו עשויים לכלול הצעות למוצרים של צד שלישי או שירותים באתר שלנו. לאתרי צד שלישי כאלה יש מדיניות פרטיות נפרדת. לכן, אין לנו שום אחריות לתוכן ולפעילויות של האתרים המקשורים האלה. זאת ועוד, אנו שואפים להגן על האמינות של האתר שלנו ונשמח לכל משוב אודות אתריםא לו. - - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - האתר שלנו, המוצרים והשירותים, מכוונים לאנשים בני 13 ומעלה. אם שרת זה נמצא בארה"ב ואתם תחת גיל 13, על פי הדרישות של COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), אל תשתמשו באתר זה. - - - - ## [מדיניות פרטיות מקוונת בלבד](#online) - - מדיניות פרטיות מקוונת זו תקפה רק ביחס למידע שנאסף דרך האתר שלנו ולא ביחס למידע שנאסף בצורות לא מקוונות. - - - - ## [Your Consent](#consent) - - בשימוש באתר שלנו אתם מקבלים את מדיניות הפרטיות של האתר שלנו. - - - - ## [שינויים במדיניות הפרטיות](#changes) - - א0 נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בעמוד זה. - - מסמך זה מפורסם תחת רשיון CC-BY-SA. הוא עודכן לאחרונה ב-31 למאי, 2013. - static: - search_help: "

      טיפים

      \n

      \n

        \n
      • כותרות מוצגות על פי סדר עדיפות, כך שכשיש ספק, חפשו: titles
        • \n
      • מלים ייחודיות ולא מקובלות יציגו תמיד את התוצאות הטובות ביותר
        • \n
      • כאשר זה אפשרי, צמצמו את החיפוש שלכם לקטגוריה, משתמש או נושא
        • \n
      \n

      \n

      אפשרויות

      \n

      \n \n \n \n \n \nin:private\n\n\n
      order:viewsorder:latest
      status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
      category:foouser:foo
      in:likesin:postedin:watchingin:tracking
      in:bookmarks
      \n

      \n

      \n rainbows category:parks status:open order:latest \nיחפש נושאים הכוללים את המילה \"rainbows\" בקטגוריה \"parks\" שאינם סגורים או מאורכבים, על פי סדר תאריך הפרסום האחרון.

      \n" + badges: + long_descriptions: + autobiographer: "אות יוענק לך כשתמלא את פרופיל המשתמש שלך ותבחר תמונת פרופיל. לשתף את הקהילה לגבי מי אתה ובמה אתה מעוניין עוזר ליצור קהילה יותר טובה ומחוברת. \n" + first_like: | + אות מוענק בפעם הראשונה שאתה עושה "לייק" לפרסום בעזרת כפתור ה :heart: . לעשות לייק לפרסומים היא דרך מעולה לידע את חברך בקהילה שמה שהם פרסמו היה מעניין, שימושי או מגניב. חלוק את האהבה! + first_link: | + תג זה מוענק בפעם הראשונה ששמים קישור לנושא אחר בתגובה. קישור נושאים עוזר לקוראים למצוא שיחות מעניינות קשורות לנושא. + first_quote: | + תג זה מוענק בפעם הראשונה שמצטטים פרסום בתגובה. ציטוט חלקים רלוונטים של פרסומים קודמים בתגובתך עוזר לשמור על דיונים מפוקסים. + first_share: | + תג זה מוענק בפעם הראשונה שמשתפים קישור לתגובה או נושא באמצעות כפתור השיתוף. שיתוף קישורים היא דרך מעולה להראות דיונים מעניינים עם שאר העולם ולהגדיל את הקהילה. + read_guidelines: | + תג זה מוענק על קריאת נהלי הקהילה. מעקב ושיתוף של הקוים המנחים עוזר ליצור קהילה בטוחה, כיפית ובת קימא. + admin_login: + success: "דוא\"ל נשלח" + error: "שגיאה!" + email_input: "מייל של המנהל" + submit_button: "שלח מייל" + discourse_hub: + access_token_problem: "תגיד לאדמין שיעדכן את הגדרות האתר שיכללו את המזהה discourse_org_access_key הנכון." + performance_report: + initial_post_raw: 'נושא זה כולל דוחות פעילות יומיים עבור האתר שלך. ' + initial_topic_title: דוחות פעילות לאתר diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml index 0cf8b47b30..19c8c01db5 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -136,8 +136,6 @@ id: posted_by: "Dipost oleh %{username} pada %{post_date}" upload: images: - fetch_failure: "Maaf, terjadi kesalahan saat memuat gambar." - unknown_image_type: "Maaf, berkas yang Anda unggah bukan gambar" size_not_found: "Maaf, kami tidak dapat mendeteksi ukuran dari gambar. Apa berkas gambar yang Anda unggah rusak?" email_log: no_user: "Tidak dapat menemukan pengguna dengan id %{user_id}" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 1ec2f56550..f2f2729300 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -65,6 +65,9 @@ it: other: '%{count} errori hanno impedito il salvataggio di questo %{model}' embed: load_from_remote: "Si è verificato un errore nel caricamento del messaggio." + site_settings: + min_username_length_range: "Non puoi impostare il minimo più grande del massimo." + default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista." bulk_invite: file_should_be_csv: "Il file caricato deve essere in formato csv o txt." backup: @@ -133,8 +136,11 @@ it: rss_description: latest: "Argomenti più recenti" hot: "Argomenti caldi" + posts: "Ultimi messaggi" too_late_to_edit: "Questo messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato." excerpt_image: "immagine" + queue: + delete_reason: "Cancellato attraverso la coda di moderazione" groups: errors: can_not_modify_automatic: "Non puoi modificare un gruppo automatico" @@ -164,7 +170,6 @@ it: - Le critiche costruttive sono benvenute, ma critica le *idee* non le persone. Per maggiori informazioni, [guarda le nostre linee guida delle community](/guidelines). Questo pannello sarà visualizzato soltanto per i primi %{education_posts_text}. - avatar: "### Che ne dici di una nuova immagine per il tuo account?\n\nHai pubblicato alcuni argomenti e messaggi, ma il tuo avatar tanto unico quanto te -- è lo stesso avatar di default che hanno tutti i nuovi utenti. \n\nPerché non **[accedi al tuo profilo utente](%{profile_path})** e carichi un'immagine personale che ti rappresenta?\n\nÈ più facile seguire le discussioni della comunità e trovare persone interessanti se tutti hanno un avatar unico!\n" sequential_replies: "### Considera la possibilità di rispondere a più messaggi contemporaneamente\n\nPiuttosto che inviare più risposte di seguito ad un messaggio, considera la possibilità di inserire un'unica risposta con citazioni o riferimenti @nome ai messaggi precedenti. \n\nPuoi modificare la tua precedente risposta per aggiungere una citazione evidenziando il testo e selezionando il bottone Rispondi citando che compare. \n\nE' più facile per chiunque leggere argomenti che hanno poche risposte più dettagliate, rispetto a molte brevi risposte individuali.\n" dominating_topic: | ### Permetti agli altri di partecipare alla conversazione @@ -221,7 +226,7 @@ it: no_info_other: "
      %{name} non ha ancora compilato il campo \"Su di me\" del suo profilo
      " vip_category_name: "Lounge" vip_category_description: "Una categoria esclusiva per i membri con livello di esperienza 3 o superiore." - meta_category_name: "Meta" + meta_category_name: "Feedback Sito" meta_category_description: "Discussioni su questo sito, la sua organizzazione, come funziona e come come noi possiamo migliorarlo." staff_category_name: "Staff" staff_category_description: "Categoria privata per discussioni dello staff. Gli argomenti sono visibili solo agli amministratori e ai moderatori." @@ -237,6 +242,7 @@ it: uncategorized_parent: "La categoria \"Non classificato\" non può avere una categoria superiore." self_parent: "La categoria-genitore di una sottocategoria non può essere se stessa." depth: "Non puoi annidare una sottocategoria sotto un'altra" + email_in_already_exist: "L'indirizzo email in ingresso '%{email_in}' è già stato usato per la categoria '%{category_name}'." cannot_delete: uncategorized: "Non puoi eliminare la categoria \"Non classificato\"" has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie." @@ -340,6 +346,7 @@ it: one: "quasi 1 anno fa" other: "quasi %{count} anni fa" password_reset: + no_token: "Spiacenti, il collegamento per il cambio password è scaduto. Seleziona il bottone Log In e usa 'Ho dimenticato la password' per ottenere un nuovo collegamento." choose_new: "Per favore scegli una nuova password." choose: "Per favore scegli una password" update: 'Aggiorna Password' @@ -353,12 +360,13 @@ it: please_continue: "Procedi su %{site_name}." error: "Si è verificato un errore durante la modifica del tuo indirizzo email. Forse l'indirizzo è già in uso?" activation: - action: "Attiva il tuo account" + action: "Clicca qui per attivare il tuo account" already_done: "Spiacenti, questo collegamento di attivazione non è più valido. Forse il tuo account è già attivo?" please_continue: "Il tuo nuovo account è confermato; verrai ora rediretto alla pagina iniziale." continue_button: "Procedi su %{site_name}." welcome_to: "Benvenuto su %{site_name}!" approval_required: "Un moderatore deve approvare manualmente il tuo account prima che tu possa accedere al forum. Riceverai un'email quando il tuo account sarà approvato!" + missing_session: "Non possiamo verificare se il tuo account è stato creato, per favore assicurati di avere abilitato i cookie." post_action_types: off_topic: title: 'Fuori Tema' @@ -420,6 +428,7 @@ it: regular: title: "Argomento Normale" banner: + title: "Argomento Annuncio" message: make: "Questo argomento è ora uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente." remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina." @@ -527,6 +536,10 @@ it: title: "Totali" xaxis: "Giorno" yaxis: "Richieste API Totali" + page_view_logged_in_mobile_reqs: + xaxis: "Giorno" + page_view_anon_mobile_reqs: + xaxis: "Giorno" http_background_reqs: title: "Background" xaxis: "Giorno" @@ -551,6 +564,18 @@ it: title: "Totali" xaxis: "Giorno" yaxis: "Richieste totali" + time_to_first_response: + title: "Tempo per la prima risposta" + xaxis: "Giorno" + yaxis: "Tempo medio (ore)" + topics_with_no_response: + title: "Argomenti senza risposta" + xaxis: "Giorno" + yaxis: "Totali" + mobile_visits: + title: "Visite Utente" + xaxis: "Giorno" + yaxis: "Numero di visite" dashboard: rails_env_warning: "Il tuo server è in modalità %{env}." ruby_version_warning: "Stai eseguendo la versione 2.0.0 di Ruby che ha problemi noti. Effettua l'upgrade alla patch livello 247 o seguenti." @@ -565,7 +590,6 @@ it: s3_config_warning: 'Il server è configurato per caricare file su s3, ma almeno uno dei seguenti parametri non è impostato: s3_access_key_id, s3_secret_access_key, s3_upload_bucket. Vai nelle Impostazioni Sito e aggiorna i parametri. Leggi anche "How to set up image uploads to S3?" per saperne di più.' 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 Impostazioni Sito e aggiorna le impostazioni. Leggi anche "How to set up image uploads to S3?" per saperne di più.' 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 scarica la versione più recente.' - failing_emails_warning: 'Ci sono %{num_failed_jobs} job di email falliti. Controlla il file config/discourse.conf e accertati che le impostazioni del mail server siano corrette. Guarda i job falliti in Sidekiq.' default_logo_warning: "Non hai personalizzato il logo del tuo sito. Aggiorna logo_url, logo_small_url e favicon_url nelle Impostazioni Sito." 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 Impostazioni Sito." contact_email_invalid: "La email di contatto non è valida. Aggiornala nelle Impostazioni Sito." @@ -618,7 +642,7 @@ it: max_topic_title_length: "Numero massimo di caratteri per i titoli degli argomenti" min_private_message_title_length: "Numero minimo di caratteri per un messaggio" min_search_term_length: "Numero minimo di caratteri per le parole cercate" - allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria." + allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria. ATTENZIONE: se ci sono argomenti senza categoria, devi ricategorizzarli prima di disabilitare questa opzione." uncategorized_description: "La descrizione della categoria \"Non classificato\". Lascia vuoto per nessuna descrizione." allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo" unique_posts_mins: "Quanti minuti prima che un utente possa inviare un altro argomento con lo stesso contenuto" @@ -641,15 +665,12 @@ it: category_featured_topics: "Numero di argomenti mostrati per categoria nella pagina /categories. Dopo il cambiamento di questo valore, la pagina delle categorie impiega fino a 14 minuti per aggiornarsi." show_subcategory_list: "Quando si accede ad una categoria, mostra l'elenco di sottocategorie anziché l'elenco di argomenti. " fixed_category_positions: "Se attivo, potrai ordinare le categorie. Se non attivo, le categorie vengono elencate in ordine di attività." + fixed_category_positions_on_create: "Se spuntato, verrà mantenuto l'ordinamento delle categorie nella finestra di creazione argomenti (richiede fixed_category_positions)." add_rel_nofollow_to_user_content: "Aggiungi l'attributo rel nofollow a tutti i contenuti degli utenti, tranne per i link interni (compresi i domini di livello superiore). Se modifichi questa opzione devi aggiornare tutti i messaggi con il comando \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "Una lista di domini a cui non aggiungere \"nofollow\" ai collegamenti. Inoltre tld.com autorizzerà automaticamente sub.tld.com. Dovresti perlomeno aggiungere il dominio di primo livello di questo sito, per aiutare i motori di ricerca a trovare tutto il contenuto. Se parti del tuo sito si trovano su altri domini, aggiungi anche quelli." post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio." post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox." onebox_domains_whitelist: "Lista di domini per i quali consentire la funzione di onebox; questi domini devono supportare OpenGraph o oEmbed. Testali su http://iframely.com/debug" - logo_url: "L'immagine del logo in alto a sinistra sul tuo sito; se non impostato verrà mostrato il testo del titolo del sito." - digest_logo_url: "Il logo alternativo usato in cima alla email di riepilogo. Se lasciato vuoto, sarà utilizzato il campo `logo_url`. es: http://example.com/logo.png" - logo_small_url: "La piccola immagine del logo in alto a sinistra sul tuo sito, che appare quando si scorre in giù. Se non impostato, verrà mostrato l'icona di una casa." - favicon_url: "La favicon del tuo sito, vedi http://it.wikipedia.org/wiki/Favicon" - mobile_logo_url: "L'immagine del logo a posizione fissa usata in alto a sinistra del sito mobile. Se non impostato, verrà usato `logo_url`." apple_touch_icon_url: "Icona usata per dispositivi touch Apple. La dimensione consigliata è 144 x 144 pixel." notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi." email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)" @@ -667,12 +688,13 @@ it: polling_interval: "Se non si esegue il long polling, quanto spesso i client autenticati devono fare poll in millisecondi" anon_polling_interval: "Frequenza in millisecondi con cui client anonimi effettuano il poll" background_polling_interval: "Quanto spesso i client devono fare poll in millisecondi (quando la finestra è in background)" - auto_track_topics_after: "Valore globale in millisecondi prima che un argomento venga automaticamente seguito, modificabile dagli utenti (0 sempre, -1 mai)" - new_topic_duration_minutes: "Valore globale in minuti per i quali un argomento è considerato come nuovo, modificabile dagli utenti (-1 sempre, -2 ultima visita)" flags_required_to_hide_post: "Numero di segnalazioni che rendono un argomento automaticamente nascosto. L'utente riceve un messaggio privato. (0 mai)" cooldown_minutes_after_hiding_posts: "Quanti minuti l'utente deve attendere prima di poter modificare un messaggio che è stato nascosto a causa di segnalazioni" max_topics_in_first_day: "Numero massimo di argomenti che l'utente può creare nel suo primo giorno di forum" max_replies_in_first_day: "Numero massimo di risposte che un utente può pubblicare nel suo primo giorno sul sito" + tl2_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 2 (Assiduo), moltiplicando per questo numero" + tl3_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 3 (Esperto) moltiplicando per questo numero" + tl4_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 4 (Veterano), moltiplicando per questo numero" num_flags_to_block_new_user: "Se i messaggi di un nuovo utente ricevono segnalazioni di spam da num_users_to_block_new_user diversi utenti, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità." num_users_to_block_new_user: "Se i messaggi di un nuovo utente ricevono num_flags_to_block_new_user segnalazioni di spam da così tanti utenti diversi, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità." notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori." @@ -707,6 +729,7 @@ it: email_token_grace_period_hours: "I messaggi di password dimenticata / attivazione account sono ancora validi per un periodo di grazia di (n) ore dopo essere stati convalidati." enable_badges: "Attiva il sistema a targhette" allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca." + email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net" forgot_password_strict: "Non informare gli utenti dell'esistenza dell'account quando richiamano la finestra per la password dimenticata." log_out_strict: "Quando si fa logout, esci da TUTTE le sessioni dell'utente su tutti i dispositivi" version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin" @@ -717,17 +740,16 @@ it: invite_passthrough_hours: "Per quanto tempo un utente può usare una chiave d'invito per fare login, in ore" invite_only: "La registrazione pubblica è disabilitata, tutti i nuovi utenti devono essere invitati esplicitamente da altri membri o dallo staff." login_required: "E' richiesta l'autenticazione per leggere contenuti su questo sito, disabilita l'accesso anonimo." - min_username_length: "Lunghezza minima del nome utente in caratteri. ATTENZIONE: GLI UTENTI GIÀ ESISTENTI CON NOMI PIÙ CORTI DI QUESTO NON RIUSCIRANNO AD ACCEDERE AL SITO." - max_username_length: "Lunghezza massima del nome utente in caratteri. ATTENZIONE: GLI UTENTI GIÀ ESISTENTI CON NOMI PIÙ LUNGHI DI QUESTO NON RIUSCIRANNO AD ACCEDERE AL SITO." + min_username_length: "Lunghezza minima del nome utente in caratteri." + max_username_length: "Lunghezza massima del nome utente in caratteri. " + reserved_usernames: "Nomi utente ai quali non è permesso l'accesso." min_password_length: "Minima lunghezza della password." block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni." enable_sso_provider: "Implementa il protocollo SSO Discourse nell'endpoint /session/sso_provider, richiede che sia impostata l'opzione sso_secret" sso_url: "URL per l'endpoint del single sign on " sso_secret: "Stringa segreta utilizzata per autenticare crittograficamente le informazioni SSO, assicurati che sia lunga almeno 10 caratteri" - sso_overrides_email: "Sostituisce le email locali con quelle del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle direttive per le email locali)" - sso_overrides_username: "Sovrascrive il nome utente locale con quello del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero verificarsi discrepanze a causa delle differenze tra lunghezza effettiva e richiesta del nome utente)" - sso_overrides_name: "Sovrascrive il nome locale con quello del sito esterno con cui ci si è connessi tramite SSO " sso_overrides_avatar: "Sostituisce l'avatar dell'utente con un avatar su un sito esterno usando SSO. Se abilitato, si raccomanda di disabilitare allow_uploaded_avatars" + sso_not_approved_url: "Ridirigi a questa URL gli account SSO non approvati" enable_local_logins: "Abilita account basati su login con nome utente e password locali. (Nota: deve essere abilitato affinché funzionino gli inviti)" allow_new_registrations: "Abilita la registrazione di nuovi utenti. Se deselezionato, non sarà possibile creare nuovi account." enable_yahoo_logins: "Abilita l'autenticazione con Yahoo" @@ -745,7 +767,8 @@ it: github_client_secret: "Client secret per autenticazione Github, come registrata su https://github.com/settings/applications" allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup." maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati." - backup_daily: "Crea automaticamente un backup del sito una volta al giorno." + automatic_backups_enabled: "Esegui backup automatici come definito nella frequenza di backup" + backup_frequency: "Con che frequenza, in giorni, effettuiamo il backup del sito." enable_s3_backups: "Carica i backup su S3 quando completati. IMPORTANTE: richiede che siano inserite valide credenziali S3 nelle impostazioni File." s3_backup_bucket: "Il bucket remoto che contiene i backup. ATTENZIONE: assicurati che sia un bucket privato." active_user_rate_limit_secs: "Ogni quanti secondi viene aggiornato il campo 'last_seen_at'" @@ -762,6 +785,7 @@ it: max_topics_per_day: "Massimo numero di argomenti che un utente può creare al giorno." max_private_messages_per_day: "Numero massimo di messaggi che gli utenti possono creare al giorno." max_invites_per_day: "Numero massimo di inviti che un utente può inviare in un giorno." + max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno." suggested_topics: "Numero di argomenti suggeriti mostrati in fondo ad un argomento." limit_suggested_to_category: "Negli argomenti suggeriti, mostra soltanto argomenti della categoria corrente. " clean_up_uploads: "Elimina i caricamenti orfani per evitare l'hosting di materiale illegale. ATTENZIONE: prima di attivare questa impostazione è meglio effettuare un backup della cartella /uploads." @@ -773,8 +797,10 @@ it: s3_access_key_id: "La access key id Amazon S3 che verrà usata per caricare le immagini." s3_secret_access_key: "La access key secret Amazon S3 che verrà usata per caricare le immagini." s3_region: "La region name Amazon S3 che verrà usata per caricare le immagini." + avatar_sizes: "Elenco delle dimensioni degli avatar, generate automaticamente." enable_flash_video_onebox: "Attiva l'inserimento di collegamenti swf e flv (Adobe Flash) in onebox. ATTENZIONE: comporta rischi per la sicurezza." default_invitee_trust_level: "Livello di esperienza (0-4) assegnato di default agli utenti invitati." + default_trust_level: "Livello di esperienza (da 0 a 4) assegnato ai nuovi utenti. ATTENZIONE! Modificare questa opzione ti espone ad un serio rischio di ricevere posta indesiderata." tl1_requires_topics_entered: "Quanti argomenti deve inserire un utente per essere promosso a livello di esperienza 1." tl1_requires_read_posts: "Quanti messaggi deve leggere un utente per essere promosso al livello di esperienza 1." tl1_requires_time_spent_mins: "Per quanti minuti un utente deve leggere i messaggi per essere promosso al livello di esperienza 1." @@ -824,6 +850,9 @@ it: topic_views_heat_low: "Dopo tale numero di visualizzazioni, il campo visualizzazioni è evidenziato leggermente." topic_views_heat_medium: "Dopo tale numero di visualizzazioni, il campo visualizzazioni è evidenziato mediamente." topic_views_heat_high: "Dopo tale numero di visualizzazioni, il campo visualizzazioni è evidenziato fortemente." + cold_age_days_low: "Dopo tale numero di giorni di conversazione, la data di ultima attività viene leggermente oscurata." + cold_age_days_medium: "Dopo tale numero di giorni di conversazione, la data di ultima attività viene mediamente oscurata." + cold_age_days_high: "Dopo tale numero di giorni di conversazione, la data di ultima attività viene fortemente oscurata." history_hours_low: "Un messaggio modificato entro tale numero di ore ha l'indicatore di modifica evidenziato leggermente." history_hours_medium: "Un messaggio modificato entro tale numero di ore ha l'indicatore di modifica evidenziato mediamente." history_hours_high: "Un messaggio modificato entro tale numero di ore ha l'indicatore di modifica evidenziato fortemente." @@ -836,7 +865,6 @@ it: newuser_spam_host_threshold: "Quante volte un nuovo utente può inviare un collegamento verso lo stesso host compreso nei messaggi `newuser_spam_host_posts` prima che venga considerato spam." white_listed_spam_host_domains: "Una lista di domini esclusi dal controllo antispam. Ai nuovi utenti non verrà mai impedito di creare messaggi con collegamenti a tali domini." staff_like_weight: "Peso extra attribuito ai \"mi piace\" dati dallo staff." - topic_view_duration_hours: "Conta una nuova visita all'argomento una volta sola per IP/Utente ogni N ore" levenshtein_distance_spammer_emails: "Quanti caratteri di differenza faranno comunque scattare una corrispondenza approssimativa nell'analisi delle email di spam. " max_new_accounts_per_registration_ip: "Se vi sono già (n) account con livello di esperienza 0 da questo IP (e nessuno è membro dello staff o TL2 o superiore), non accettare nuove registrazioni utente da questo IP." num_flaggers_to_close_topic: "Il numero minimo di segnalatori univoci richiesto affinché un argomento venga messo in pausa fino all'intervento di un moderatore" @@ -852,6 +880,7 @@ it: pop3_polling_host: "L'host a cui collegarsi per ricevere email via POP3." pop3_polling_username: "Il nome utente dell'account POP3 per la ricezione di email." pop3_polling_password: "La password dell'account POP3 per la ricezione di email." + log_mail_processing_failures: "Traccia all'indirizzo http://yoursitename.com/logs tutti i fallimenti di processamento delle email" email_in: "Permetti agli utenti di pubblicare nuovi argomenti per email (richiede il pop3 polling). Configura gli indirizzi nella scheda \"Impostazioni\" di ciascuna categoria." email_in_min_trust: "Livello di esperienza minimo necessario affinché un utente possa pubblicare nuovi argomenti via email." email_prefix: "La [etichetta] utilizzata nell'oggetto delle email. Se non impostata sarà 'titolo'." @@ -861,20 +890,22 @@ it: username_change_period: "Numero di giorni dall'iscrizione dopo i quali è possibile modificare il nome utente (imposta a 0 per non permettere il cambio del nome utente)." email_editable: "Permetti agli utenti di cambiare l'indirizzo email dopo la registrazione." logout_redirect: "Dove redirigere il browser dopo aver effettuato il logout, es.: (http://qualchesito.com/logout)" - allow_uploaded_avatars: "Permetti agli utenti di caricare un avatar personale." + allow_uploaded_avatars: "Permetti agli utenti di caricare immagini di profilo personalizzate." + allow_animated_avatars: "Permetti agli utenti di utilizzare gif animate come immagini di profilo. ATTENZIONE: lanciare il comando rake \"avatars:refresh\" dopo aver cambiato questa impostazione." + allow_animated_thumbnails: "Genera miniature animate delle gif animate." + default_avatars: "URL degli avatar che verranno utilizzati come predefiniti per tutti i nuovi utenti, fintanto che non li cambieranno esplicitamente." + automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email" digest_topics: "Numero massimo di argomenti da mostrare nel riassunto email." - default_digest_email_frequency: "Quanto spesso gli utenti ricevono email di riepilogo. Gli utenti possono modificare questa impostazione nelle loro preferenze." - default_external_links_in_new_tab: "Apri i collegamenti esterni in una nuova scheda. Gli utenti possono modificare questa impostazione nelle loro preferenze." allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo." enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo." suppress_uncategorized_badge: "Non mostrare la targhetta per gli argomenti senza categoria nell'elenco degli argomenti." global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)." + full_name_required: "Il nome completo è un campo obbligatorio del profilo utente." invites_per_page: "Inviti predefiniti mostrati nella pagina utente." short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero di messaggi attuale. Se modifichi l'ampiezza della barra di avanzamento, potresti dover cambiare questo valore." default_code_lang: "Ai blocchi di codice GitHub viene applicata l'evidenziazione della sintassi del linguaggio di programmazione di default (lang-auto, ruby, python ecc.)" embed_by_username: "Nome utente Discourse dell'utente che crea gli argomenti incorporati." embed_truncate: "Tronca i messaggi incorporati." - embed_category: "Categoria degli argomenti incorporati." embed_post_limit: "Numero massimo di messaggi da incorporare." notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo un tale numero di ore, invia un'email al contact_email. Imposta a 0 per disattivare." show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento." @@ -920,13 +951,6 @@ it: redirected_to_top_reasons: new_user: "Benvenuto nella nostra comunità! Questi sono gli argomenti recenti più popolari." not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via." - move_posts: - new_topic_moderator_post: - one: "Ho spostato un messaggio in un nuovo argomento: %{topic_link}" - other: "Ho spostato %{count} messaggi in un nuovo argomento: %{topic_link}" - existing_topic_moderator_post: - one: "Ho spostato un messaggio in un argomento esistente: %{topic_link}" - other: "Ho spostato %{count} messaggi in un argomento esistente: %{topic_link}" change_owner: post_revision_text: "Proprietà trasferita da %{old_user} a %{new_user}" topic_statuses: @@ -985,7 +1009,6 @@ it: characters: "deve includere solo numeri, lettere e trattini bassi" unique: "deve essere univoco" blank: "deve essere presente" - must_begin_with_alphanumeric: "deve iniziare con una lettera o un numero" email: not_allowed: "non è permesso da quel fornitore di email. Per favore usa un altro indirizzo email." blocked: "non è permesso." @@ -1023,79 +1046,9 @@ it: disagreed: "Grazie per averci informato. Stiamo provvedendo." deferred: "Grazie per averci informato. Stiamo provvedendo." deferred_and_deleted: "Grazie per averci informato. Abbiamo rimosso il messaggio." - temporarily_closed_due_to_flags: "Questo argomento è temporaneamente chiuso a causa di numerose segnalazioni della comunità." system_messages: post_hidden: subject_template: "Messaggio nascosto a causa di segnalazioni dalla comunità" - usage_tips: - text_body_template: | - Ecco alcuni veloci consigli per cominciare. - - ## Continua a scorrere la pagina - - Non ci sono pulsanti o numeri delle pagine successive - per leggere di più, **scorri semplicemente in giù la pagina** - - I nuovi post compariranno automaticamente man mano. - - ## Dove mi trovo? - - - Per fare una ricerca, per la tua pagina utente o per il menu, **usa i pulsanti icona ☰ in alto a destra**. - - - Il titolo di una discussione porta sempre al prossimo post non letto. Usa la data dell'ultima attività per saltare rapidamente al primo o ultimo post in una discussione. - - - Quando leggi una discussione, vai in cima ↑ selezionando il titolo della discussione. Seleziona la barra di avanzamento verde che si trova in basso a destra per mostrare tutti i controlli di navigazione, o usa i tasti inizio e fine della tastiera. - - - - ## Come faccio a rispondere? - - - Per rispondere alla discussione generale, usa il pulsante Rispondi in fondo alla pagina. - - - Per rispondere a un post specifico, usa il pulsante Rispondi su quel messaggio. - - - Per portare la conversazione in una nuova direzione, ma mantenendole collegate, usa Rispondi come nuovo argomento alla destra del messaggio. - - Per citare qualcuno nella tua risposta, seleziona il testo che desideri citare e fai clic su uno dei pulsanti Rispondi. - - - - Per mandare una notifica a qualcuno nella tua risposta, menziona il suo nome. Scrivere `@` ed apparirà un completatore automatico. - - - - For [standard Emoji](http://www.emoji.codes/), just start typing `:` or the traditional smileys `:)` :smile: - - ## Che altro posso fare? - - In fondo a ogni messaggio ci sono dei pulsanti attivi. - - - - Per dire a qualcuno che ti è piaciuto il suo messaggio, usa il bottone **Mi piace** in fondo al messaggio. Se trovi un messaggio con dei problemi, usa subito il bottone **Segnala** in fondo al post e fallo sapere privatamente all'autore o allo staff. - - Puoi anche **condividere** un link a un messaggio, o fare un **segnalibro** di un messaggio per usarlo più tardi sulla tua pagina utente. - - ## Chi sta parlando con me? - - Quando qualcuno risponde a un tuo post, lo cita o menziona il tuo `@nome`, comparirà un numero sul pulsante delle conversazioni in alto a destra nella pagina. Usalo accedere alle tue **notifiche**. - - - - Non preoccuparti di perdere delle risposte – se non sei online quando arrivano, ti verranno inviate per email le risposte dirette (e i messaggi privati) che arrivano. - - ## Quand'è che le conversazioni sono nuove? - - Di norma tutte le conversazioni più recenti di due giorni si considerano nuove, e verrà seguita automaticamente ogni conversazione a cui tu abbia partecipato (risposto, creato, o letto per un certo tempo). - - Vedrai gli indicatori blu "nuovo" e "numero" accanto a queste conversazioni: - - - - Puoi modificare le impostazioni di notifica di ciascuna discussione con i controlli in fondo al topic (questa impostazione si può anche definire per ciascuna categoria). Per modificare il modo in cui segui le discussioni, o la definizione di nuovo, vedi le [tue preferenze utente](/my/preferences). - - ## Perché non posso fare certe cose? - - Per ragioni di sicurezza i nuovo utenti hanno alcune limitazioni. Man mano che parteciperai guadagnerai la fiducia della comunità, ne diverrai partecipante a pieno titolo e questi limiti verranno rimossi automaticamente. Ad un [livello di fiducia](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) sufficientemente alto guadagnerai ulteriori capacità per aiutarci a gestire insieme questa comunità. welcome_user: subject_template: "Benvenuto su %{site_name}!" welcome_invite: @@ -1139,6 +1092,8 @@ it: Ci dispiace, ma il tuo messaggio email per %{destination} (con il titolo %{former_title}) non è stato processato. Il tuo utente non ha il livello di esperienza richiesto per inviare nuovi argomenti a questo indirizzo email. Se credi che ciò sia un errore, contatta un membro dello staff. + email_reject_topic_not_found: + subject_template: "[%{site_name}] Problema relativo all'email -- Argomento Non Trovato" too_many_spam_flags: subject_template: "Nuovo account bloccato" text_body_template: "Ciao, \n\nil presente è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati automaticamente nascosti perché segnalati dalla comunità. \n\nCome 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. \n\nPer ulteriori informazioni, ti rimandiamo alle [Linee guida della comunità](%{base_url}/guidelines).\n" @@ -1187,7 +1142,6 @@ 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`." - unsubscribe_link: "Se vuoi annullare l'iscrizione a queste email, visita le tue [preferenze utente](%{user_preferences_url})." subject_re: "R:" subject_pm: "[MP]" user_notifications: @@ -1271,6 +1225,8 @@ it: set_password: subject_template: "[%{site_name}] Imposta Password" text_body_template: "Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul seguente collegamento per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n" + admin_login: + subject_template: "[%{site_name}] Login" account_created: subject_template: "[%{site_name}] Il Tuo Nuovo Account " text_body_template: | @@ -1288,7 +1244,6 @@ it: subject_template: "Sei stato ammesso su %{site_name}!" text_body_template: "Benvenuto su %{site_name}! \n\nUn membro dello staff ha approvato il tuo account su %{site_name}. \n\nClicca sul seguente collegamento per confermare e attivare il tuo nuovo account:\n%{base_url}/users/activate-account/%{email_token} \n\nSe il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser. \n\n%{new_user_tips}\n\nNoi crediamo fermamente in un [comportamento comunitario civile](%{base_url}/guidelines) sempre.\n\nBuona permanenza!\n\n(Se hai bisogno di comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio privato.)\n" signup: - subject_template: "[%{site_name}] Attiva il tuo nuovo account" text_body_template: | Benvenuto su %{site_name}! @@ -1320,14 +1275,13 @@ it: too_large: "Spiacenti, ma il file che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB)." images: too_large: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB), per favore ridimensionala e riprova." - fetch_failure: "Spiacenti, si è verificato un errore nel recupero dell'immagine." - unknown_image_type: "Spiacenti, ma il file che hai provato a caricare non sembra un'immagine." size_not_found: "Spiacenti, ma non riusciamo a determinare la dimensione dell'immagine. E' forse danneggiata?" flag_reason: sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto con lo stesso indirizzo IP. Controlla le impostazioni di flag_sockpuppets." spam_hosts: "Questo nuovo utente ha tentato di creare più messaggi con collegamenti allo stesso dominio. Guarda l'impostazione newuser_spam_host_threeshold." email_log: no_user: "Non trovo l'utente con l'id %{user_id}" + anonymous_user: "L'utente è anonimo" suspended_not_pm: "L'utente è sospeso, non è un messaggio" seen_recently: "L'utente è stato visto di recente" post_not_found: "Non trovo un messaggio con id %{post_id}" @@ -1353,65 +1307,10 @@ it: Modifica il primo messaggio in questo argomento per cambiare il contenuto della pagina %{page_name}. guidelines_topic: title: "FAQ/Linee Guida" - body: "\n\n## [Questo è un luogo civile per discussioni pubbliche](#civilized)\n\nFrequenta questo forum di discussione con lo stesso rispetto che avresti in un parco pubblico. Anche questo è un bene pubblico — un luogo dove condividere competenze, conoscenza e interessi tramite la discussione.\n\nQueste non sono leggi ferree, ma solo un sostegno al giudizio della nostra comunità. Usa queste linee guida per mantenere questo un luogo sereno e piacevole di discorso pubblico civile. \n\n\n\n## [Migliora la discussione](#improve)\n\nAiutaci a migliorare questo luogo cercando sempre di migliorare in qualche modo, anche piccolo, la discussione. Se non sei sicuro che il tuo messaggio possa migliorare la conversazione, ripensa a quel che vuoi dire e riprovaci più tardi. \n\nAbbiamo a cuore gli argomenti che si discutono qui, e vorremmo che stessero a cuore anche a te. Rispetta le discussioni e le persone che vi partecipano, anche quando sei in disaccordo con ciò che viene detto.\n\nUn modo per migliorare la conversazione è scoprire discussioni già in corso. Ti preghiamo di passare qualche tempo a leggere gli altri argomenti prima di rispondere o di iniziare un nuovo argomento, sarà più facile incontrare altre persone coi tuoi stessi interessi. \n\n\n\n## [Sii cortese, anche quando non sei d'accordo](#agreeable)\n\nTalvolta vorresti rispondere a qualcosa con cui non sei d'accordo: fai pure. Ricorda però di _criticare le idee, non le persone_. Per favore evita:\n\n* Insulti.\n* Attacchi personali.\n* Risposte al tono invece che al contenuto di un messaggio.\n* Contraddire per partito preso.\n\nPorta invece delle obiezioni ragionate che migliorino la conversazione.\n\n\n\n## [La tua partecipazione è importante](#participate)\n\nIl clima di questo forum dipende dal tono delle conversazioni. Aiutaci a costruire il futuro di questa comunità partecipando alle conversazioni più costruttive e interessanti — ed evita quelle che non lo sono.\n\nDiscourse ha degli strumenti che\ - \ aiutano la comunità a identificare i migliori (e i peggiori) contributi: preferiti, segnalibri, mi piace, segnalazioni, risposte, modifiche eccetera. Usa questi strumenti per migliorare la tua esperienza e quella di tutti.\n\nCerchiamo di lasciare il parco meglio di come l'abbiamo trovato.\n\n\n\n## [Se vedi un problema, segnalalo](#flag-problems)\n\nI moderatori hanno una speciale autorità e sono responsabili di questo forum. Proprio come te: col tuo aiuto i moderatori possono diventare dei facilitatori della comunità, non semplici guardiani o poliziotti.\n\nSe vedi dei comportamenti scorretti, non rispondere. Incoraggerebbe il comportamento negativo dandogli riconoscimento, esaurirebbe le tue energie e sprecherebbe il tempo di tutti. _Segnalalo e basta_. Se arrivano abbastanza segnalazioni verranno presi provvedimenti, automatici o con l'intervento del moderatore.\n\nPer mantenere la comunità i moderatori si riservano il diritto di rimuovere qualsiasi contenuto e qualsiasi account utente per qualsiasi ragione, in qualsiasi momento. I moderatori non controllano anticipatamente i nuovi messaggi in alcun modo; i moderatori ed i gestori di questo sito non si assumono alcuna responsabilità per i contenuti pubblicati dagli utenti.\n\n\n\n## [Sii sempre civile](#be-civil)\n\nNulla rovina una conversazione come la maleducazione: \n\n - Sii civile. Non pubblicare nulla che una persona possa ragionevolmente considerare offensivo, ingiurioso, discriminatorio, odioso.\n - Sii adulto. Non pubblicare cose oscene o sessualmente esplicite.\n - Rispetto reciproco. Non molestare o minacciare nessuno, non impersonare altre persone, non pubblicare informazioni personali altrui.\n - Rispetta questo forum. Non pubblicare spam e vandalismo\n\nQuesti non sono regolamenti precisi con definizioni esatte — evita addirittura di dare l'_apparenza_ di qualcuno di questi comportamenti di queste cose. Se non sei sicuro, prova a chiederti come ti sentiresti se il tuo messaggio comparisse sulla prima pagina del Corriere della Sera. \n\nQuesto è un\ - \ forum pubblico e viene indicizzato dai motori di ricerca. Fai che il linguaggio, i link e le immagini siano adatti ad amici e familiari.\n\nThis is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n\n\n\n## [Tieni in ordine](#keep-tidy)\n\nSforzati di mettere ogni cosa al posto giusto, così che passiamo più tempo a conversare e meno a riordinare. Quindi per favore:\n\n - Non iniziare un argomento nella categoria sbagliata\n - Non ripubblicare la stessa cosa su più categorie.\n - Non pubblicare risposte vuote.\n - Non deviare un argomento cambiandolo a metà strada.\n - Non firmare i tuoi messaggi — ogni messaggio contiene le informazioni complete sul tuo profilo.\n\nInvece di rispondere “+1” or “D'accordo”, usa il pulsante Mi Piace. Invece di deviare un argomento esistente in una direzione completamente diversa, usa rispondi come argomento collegato.\n\n\n\n## [Pubblica solo cose tue](#stealing)\n\nNon puoi pubblicare alcun materiale digitale che appartenga a qualcun altro senza il suo permesso. Non puoi pubblicare descrizioni, link, metodi che consentano di violare la proprietà intellettuale altrui (software, audio, video, immagini) o di infrangere la legge.\n\n\n\n## [fatto da Te](#power)\n\nQuesto sito è gestito dal tuo [simpatico staff locale](/about) e da *te*, dalla comunità. Se hai altre domande sul funzionamento apri un nuovo argomento nella [ categoria meta](/c/meta) e parliamone! Se c'è un problema urgente e importante che non si può affrontare in un argomento meta o con una segnalazione,contattaci tramite la [pagina staff](/about).\n\n\n\n## [Termini del Servizio](#tos)\n\nIl linguaggio legale è noioso, ma dobbiamo tuterale noi stessi – e per estensione te ed i tuoi dati – contro persone poco amichevoli. Abbiamo dei [Termini di Servizio](/tos) che descrivono il tuo (e nostro) comportamento e i diritti sui contenuti, la privacy e le leggi. Per usare questo servizio devi acconsentire\ - \ ai nostri [TDS](/tos).\n" tos_topic: title: "Termini del Servizio" - body: "I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting (\"Hosting\") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} (\"%{company_name}\"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain} e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).\n\nLeggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.\n\n\n\n## [1. Il tuo Account su %{company_domain}](#1)\n\nSe crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.\n\n \n\n## [2. Responsabilità dei Collaboratori](#2)\n\nSe\ - \ pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:\n\n* il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;\n* se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;\n* sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;\n* il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;\n* il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);\n* il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze\ - \ parti;\n* il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;\n* il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e\n* nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.\n\n\n\n## [3. Licenza sui contenuti utente](#3)\n\nI contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name} (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.\n\n\n\n## [4. Pagamento e rinnovo](#4)\n\n### Termini Generali\n\nPotrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.\n\n### Rinnovo Automatico\n\nA meno che non invii una notifica a %{company_name} prima della\ - \ scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.\n\n\n\n## [5. Servizi](#5)\n\n### Servizi di Hosting e di supporto \n\nPossono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.\n\n\n## [6. Responsabilità dei visitatori del Sito](#6)\n\n%{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.\n\n\n\n## [7. Contenuto\ - \ pubblicato su altri siti Web](#7)\n\nNon abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.\n\n\n\n## [8. Violazione del copyright e della politica DMCA](#8)\n\n%{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza ad %{company_name}.\n\n\n\n## [9. Proprietà intellettuale](#9)\n\ - \nIl presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.\n\n\n\n## [10. Annunci pubblicitari](#10)\n\n%{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.\n\n\n\n## [11. Attribuzione](#11)\n\n%{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.\n\n\n\n## [12. Modifiche](#12)\n\n%{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato di %{company_domain} implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni\ - \ di questo Contratto.\n\n\n\n## [13. Rescissione del contratto](#13)\n\n%{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.\n\n\n\n## [14. Esclusione di garanzie](#14)\n\nIl Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.\n\n\n\n## [15. Limitazione di responsabilità](#15)\n\nIn nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate ad %{company_name} ai sensi del presente contratto nel corso\ - \ del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.\n\n\n\n## [16. Garanzia e dichiarazione generale](#16)\n\nTu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.\n\n\n\n## [17. Indennizzo](#17)\n\nTu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.\n\n\n\n## [18. Varie](#18)\n\nIl presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi\ - \ controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.\n\nQuesto documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.\n\nAdattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/). \n" privacy_topic: title: "Politica della Privacy" - body: "\n\n## [Quali informazioni memorizziamo?](#collect)\nQuando ti registri sul nostro sito memorizziamo alcune informazioni e raccogliamo dati quando partecipi al forum leggendo, scrivendo e valutando il contenuto qui condiviso.\n\nQuando ti registri sul sito, ti potrebbe venir chiesto di inserire il tuo nome e il tuo indirizzo email. Puoi comunque visitare il sito senza registrarti. Il tuo indirizzo email sarà verificato attraverso l’invio di una email che contiene un collegamento univoco. Se il collegamento viene visitato, sapremo che sei tu ad avere il controllo di quell'indirizzo email.\n\nUna volta registrato, quando invii del contenuto noi registriamo l’indirizzo IP da cui il tuo messaggio ha avuto origine. Potremmo anche mantenere dei log sul server che contengono gli indirizzi IP di ogni richiesta effettuata verso il nostro server.\n\n\n\n## [A che ci servono le tue informazioni?](#use)\n\nQualunque tua informazione che memorizziamo può essere usata in uno dei modi seguenti:\n\n * Per personalizzare l’esperienza — tali informazioni ci servono a rispondere meglio alle esigenze individuali.\n * Per migliorare il nostro sito — ci sforziamo continuamente di migliorare il nostro sito usando le informazioni e i ritorni ricevuti.\n * Per inviare email periodiche — l’indirizzo email che fornisci può essere usato per inviarti informazioni, notifiche da te richieste circa modifiche agli argomenti o in risposta al tuo nome utente, rispondere a domande e/o altre richieste o domande.\n\n\n\n## [Come proteggiamo le tue informazioni?](#protect)\n\nImplementiamo diverse misure di sicurezza per salvaguardare le tue informazioni personali, ogni volta che le inserisci, le modifichi o vi accedi.\n\n\n\n## [Qual è la vostra politica di conservazione dei dati?](#data-retention)\n\nCi impegniamo a:\n\n * Conservare i log contenenti gli indirizzi IP di tutte le richieste giunte sui nostri server per non più di 90 giorni.\n * Conservare gli indirizzi IP associati agli utenti registrati\ - \ ed ai loro messaggi per non più di 5 anni.\n\n\n\n## [Usate i cookie?](#cookies)\n\nSì. I cookie sono dei piccoli file che un sito copia sul tuo disco fisso attraverso il browser web (se lo permetti). Tali cookie permettono al sito di riconoscere il browser e di associarlo con il tuo account registrato, se presente. \n\nUsiamo i cookie per comprendere e memorizzare le tue preferenze per le visite future e per raccogliere dati aggregati circa il traffico sul sito e le interazioni, in modo da offrire successivamente una migliore esperienza di navigazione e migliori strumenti. Potremmo accordarci con fornitori di servizio terzi che per aiutarci a comprendere meglio i visitatori del nostro sito. Tali fornitori di servizi non hanno il permesso di usare le informazioni raccolte per nostro conto, tranne quando lo scopo è aiutarci a portare avanti e migliorare la nostra attività.\n\n \n\n## [Rivelate informazioni a terze parti?](#disclose)\n\nNon vendiamo, scambiamo né trasferiamo a terze parti le informazioni che ti identificano personalmente. Ciò ad esclusione di quelle parti che ci aiutano gestire il sito, a portare avanti le attività o i servizi, fintanto che tali parti acconsentano a mantenere le informazioni confidenziali. Potremmo inoltre rilasciare le informazioni quando pensiamo che il rilascio sia appropriato per il rispetto della legge, per far rispettare le regole del sito, o per proteggere i nostri o gli altrui diritti, la proprietà o la sicurezza. Tuttavia, informazioni dei visitatori che non personalmente identificanti potrebbero essere fornite ad altri soggetti per fini di marketing, pubblicità, o per altri usi.\n\n\n\n## [Collegamenti con terze parti](#third-party)\n\nA volte, a nostra discrezione, potremmo includere sul nostro sito offerte di prodotti o servizi di terze parti. I siti delle terze parti hanno politiche sulla privacy separate ed indipendenti dalle nostre. Pertanto non ci assumiamo alcuna responsabilità per il contenuto e le attività di tali siti collegati. Tuttavia, cercheremo\ - \ di proteggere l'integrità del nostro sito pertanto accettiamo eventuali riscontri negativi sui siti terzi.\n\n\n\n\n## [Rispetto della legge sulla protezione della privacy online dei minori - Children's Online Privacy Protection Act Compliance - COPPA](#coppa)\n\nIl nostro sito, nonché i prodotti ed i servizi ad esso collegati, sono tutti diretti a persone maggiorenni. Se non si è maggiorenni secondo le leggi del proprio Paese, per il rispetto della COPPA ([Legge sulla protezione della privacy online dei minori]( http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act)), non usare questo sito.\n\n\n\n## [Politica sulla privacy online](#online)\n\nLa presente politica sulla privacy online si applica soltanto alle informazioni raccolte attraverso il nostro sito e non alle informazioni fuori linea.\n\n\n\n## [Consenso](#consent)\n\nUsando il nostro sito, accetti senza riserve la presente politica sulla privacy.\n\n\n\n## [Cambiamenti alla politica sulla privacy](#changes)\n\nQualora decidessimo di cambiare la nostra politica sulla privacy, invieremo tali modifiche su questa pagina.\n\nQuesto documento è CC-BY-SA (http://it.wikipedia.org/wiki/Licenze_Creative_Commons). \nAggiornato il 31 maggio 2013.\n" - static: - search_help: "

      Suggerimenti

      \n

      \n

        \n
      • La ricerca nei titoli è prioritaria, perciò, in caso di dubbi, cerca per titolo
        • \n
      • I risultati migliori si ottengono sempre con parole uniche e non comuni
        • \n
      • Quando possibile, circoscrivi l'ambito della ricerca a una categoria, a un utente o a un argomento in particolare
        • \n
      \n

      \n

      Opzioni

      \n

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

      \n

      \narcobaleni category:parchi status:open order:latest ricercherà gli argomenti contenenti la parola \"arcobaleni\" nella categoria \"parchi\" che non siano chiusi o archiviati, ordinati secondo la data dell'ultimo messaggio.

      \n" - badges: - long_descriptions: - autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah - first_link: | - Blah blah blah - Blah blah blah - first_quote: | - Blah blah blah - Blah blah blah - first_share: | - Blah blah blah - Blah blah blah - read_guidelines: | - Blah blah blah - Blah blah blah - reader: | - Blah blah blah - Blah blah blah - editor: | - Blah blah blah - Blah blah blah - first_flag: "Le segnalazioni sono importanti per il benessere della tua comunità. Se noti dei messaggi che richiedono l'attenzione dei moderatori, non esitare a segnalarli. Puoi anche usare la finestra di segnalazione per inviare un messaggio agli utenti, una volta che avrai raggiunto il \nlivello di esperienza 1.\n" - nice_share: | - Blah blah blah - Blah blah blah - welcome: | - Blah blah blah - Blah blah blah - anniversary: "Bla bla bla \nBla bla bla \n" - good_share: "Bla bla bla \nBla bla bla\n" - great_share: "Bla bla bla \nBla bla bla \n" - nice_post: "Bla bla bla \nBla bla bla \n" admin_login: success: "email Inviata" error: "Errore!" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 2a20f5ba6d..d786fa759c 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -17,7 +17,7 @@ ja: powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "ログイン" via: "%{username} via %{site_name}" - is_reserved: "is reserved" + is_reserved: "は予約されています" purge_reason: "アクティブでないアカウントは放棄されたとして削除されました" disable_remote_images_download_reason: "ディスク容量が不足しているため、リモートでの画像ダウンロードは無効になっています。" anonymous: "匿名" @@ -44,7 +44,7 @@ ja: not_a_number: は数値で入力してください not_an_integer: は整数で入力してください odd: は奇数にしてください - record_invalid: 'バリデーションに失敗しました。 %{errors}' + record_invalid: 'バリデーションに失敗しました： %{errors}' restrict_dependent_destroy: one: "%{record}が存在しているので削除できません" many: "%{record}が存在しているので削除できません。" @@ -121,16 +121,20 @@ ja: author_wrote: "%{author} の投稿:" num_posts: "ポスト:" num_participants: "参加者:" - read_full_topic: "Read full topic" + read_full_topic: "完全なトピックを読む" private_message_abbrev: "メッセージ" rss_description: latest: "最新トピック" hot: "ホットトピック" - too_late_to_edit: "この投稿の編集・削除期間が過ぎまして、編集・削除が出来ません。" + posts: "最近の投稿" + too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。" excerpt_image: "画像" + queue: + delete_reason: "ポスト承認待ちで削除" groups: errors: can_not_modify_automatic: "自動作成グループの変更はできません" + member_already_exist: "'%{username}'はすでにこのグループのメンバーです。" default_names: everyone: "みなさん" admins: "管理者" @@ -144,13 +148,15 @@ ja: education: until_posts: other: "%{count} 投稿" + new-topic: | + %{site_name} へようこそ！— ** 新たなトピックの作成ありがとうございます！** + + - タイトルはトピックの内容を正しく説明していますか？他の人にとって興味深いタイトルになっていますか？ + + - このトピックは何をカバーするものですか？このトピックに興味を示しそうなのは誰でしょう？なぜこのトピックは重要なのでしょうか？コミュニティよりどのような回答を期待していますか？ + + - トピックに適切な検索用ワードを含めると、他の人がトピックを *発見* しやすくなります。詳細は [コミュニティガイドライン](/guidelines) を参照してください。このパネルは最初から %{education_posts_text} 回目までの投稿のときにだけ表示されます。 new-reply: "%{site_name} へようこそ — **コミュニティへの貢献ありがとうございます!** \n- あなたの回答は議論に何らかの形で貢献していますか?\n - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。\n - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。 \n詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。\n" - avatar: | - ### アカウント用の画像を用意してみては? - - コミュニティへの貢献ありがとうございます。アバターがデフォルトのままのようですが、**[ユーザプロファイル](%{profile_path})** にてアバター画像をアップロードしてみてはいかがでしょう? - - ユニークなアバターは、コミュニティにおける議論の活性化にもつながりますので、ぜひご検討ください! sequential_replies: | ### 一度に複数のポストに回答する @@ -214,7 +220,7 @@ ja: no_info_other: "
      %{name} は、まだプロフィールの自己紹介フィールドに何も書いていません
      " vip_category_name: "ラウンジ" vip_category_description: "トラストレベル3以上のメンバーのみが参加できるカテゴリ" - meta_category_name: "Meta" + meta_category_name: "サイトフィードバック" meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it." staff_category_name: "スタッフ" staff_category_description: "スタッフのためのプライベートカテゴリです。トピックは管理者とモデレータのみが閲覧できます" @@ -229,12 +235,13 @@ ja: uncategorized_parent: "未分類カテゴリは親カテゴリに設定出来ません。" self_parent: "自分自身がサブカテゴリの親になることはできません" depth: "他のサブカテゴリの下にサブカテゴリを作成することはできません" + email_in_already_exist: "受信メールアドレス '%{email_in}' は '%{category_name}' カテゴリですでに使用されています。" cannot_delete: uncategorized: "未分類カテゴリは削除出来ません" - has_subcategories: "サブカテゴリを持っているため、カテゴリを削除できません" + has_subcategories: "サブカテゴリを持っているため、このカテゴリを削除できません。" topic_exists: - other: "%{count}個のトピックを持っているため、カテゴリを削除できません。一番古いトピックは%{topic_link}です" - topic_exists_no_oldest: "%{count}個のトピックを持っているため、カテゴリを削除できません" + other: "%{count}個のトピックを持っているため、このカテゴリを削除できません。一番古いトピックは%{topic_link}です。" + topic_exists_no_oldest: "%{count}個のトピックを持っているため、このカテゴリを削除できません。" trust_levels: newuser: title: "新規ユーザ" @@ -258,7 +265,7 @@ ja: other: "%{count} 秒" datetime: distance_in_words: - half_a_minute: "< 1m" + half_a_minute: "< 1分" less_than_x_seconds: other: "< %{count} 秒" x_seconds: @@ -306,6 +313,7 @@ ja: almost_x_years: other: "だいたい %{count} 年前" password_reset: + no_token: "申し訳ありません。パスワード変更のためのリンクは古いようです。ログインボタンを選択し、再度パスワード変更を行ってください" choose_new: "新しいパスワードを選択してください" choose: "パスワードを入力ください" update: 'パスワード更新' @@ -319,12 +327,12 @@ ja: please_continue: "%{site_name}へ" error: "メールアドレスの更新に失敗しました。アドレスが既に使用されているかもしれません。" activation: - action: "アカウントを有効する" already_done: "申し訳ありませんが、このアカウント認証リンクは無効です。既にアカウントがアクティブになっていませんか?" please_continue: "あなたのアカウントは確認されました。ホームにリダイレクトされます" continue_button: "%{site_name} へ" welcome_to: "%{site_name} へようこそ!" approval_required: "このフォーラムにアクセスするにはモデレータによる承認が必要です。承認されるとメールにて通知されます!" + missing_session: "アカウントの作成を検出できません。クッキーが有効になっているか確認してください。" post_action_types: off_topic: title: '関係ない話題' @@ -341,7 +349,9 @@ ja: description: 'この投稿は、誹謗中傷、恫喝、名誉毀損、わいせつ、犯罪行為など他人を不快にさせる内容を含んでいる。' long_form: '不適切フラグをたてる' notify_user: + title: 'メッセージ @{{username}}' description: 'この投稿やトピックを書いた人に、直接メッセージを送る。（フラグを付けません）' + long_form: 'メッセージが送られたユーザ' email_title: '「%{title}」にの投稿' email_body: "%{link}\n\n%{message}" notify_moderators: @@ -378,11 +388,13 @@ ja: email_title: 'トピック"%{title}" は不適切な可能性があるため、管理人による確認を必要とする。' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

      投稿がコミュニティによってフラグがつけられました。投稿したメッセージを確認してください。

      ' user_must_edit: '

      この投稿はコミュニティにフラグを付けられまして、非表示されています。

      ' archetypes: regular: title: "通常のトピック" banner: + title: "バナートピック" message: make: "このトピックはバナートピックに設定されています。ユーザが解除しない限り、ページ毎の一番上に表示されます" remove: "このトピックはバナーではなくなりました。トップページには表示されなくなります" @@ -390,7 +402,7 @@ ja: title: '購読解除' description: "購読解除されました。メールの送信をストップしました。" oops: "誤って購読解除した場合は、下をクリックしてください。" - error: "購読エラー" + error: "購読解除エラー" preferences_link: "あなたの 設定画面からの確認メールでも解除することができます" different_user_description: "確認メールを送ったユーザとは別のユーザでログインしています。ログアウトしてから試してください" not_found_description: "申し訳ありませんが購読解除に失敗しました。メール内のリンクの有効期限が切れているのかもしれません。" @@ -442,18 +454,23 @@ ja: user_to_user_private_messages: title: "ユーザ to ユーザ" xaxis: "日" + yaxis: "メッセージ数" system_private_messages: title: "システム" xaxis: "日" + yaxis: "メッセージ数" moderator_warning_private_messages: title: "モデレータ警告" xaxis: "日" + yaxis: "メッセージ数" notify_moderators_private_messages: title: "管理人に通知" xaxis: "日" + yaxis: "メッセージ数" notify_user_private_messages: title: "ユーザ通知" xaxis: "日" + yaxis: "メッセージ数" top_referrers: title: "トップリファラ" xaxis: "ユーザ" @@ -485,6 +502,14 @@ ja: title: "全体" xaxis: "日" yaxis: "Total API Requests" + page_view_logged_in_mobile_reqs: + title: "ログインAPIリクエスト" + xaxis: "日" + yaxis: "モバイルログインAPIリクエスト" + page_view_anon_mobile_reqs: + title: "匿名APIリクエスト" + xaxis: "日" + yaxis: "モバイル匿名APIリクエスト" http_background_reqs: title: "背景" xaxis: "日" @@ -509,26 +534,40 @@ ja: title: "全体" xaxis: "日" yaxis: "全リクエスト" + time_to_first_response: + title: "最初の返答までの時間" + xaxis: "日" + yaxis: "平均時間(時間)" + topics_with_no_response: + title: "返答のないトピック" + xaxis: "日" + yaxis: "合計" + mobile_visits: + title: "訪問ユーザ" + xaxis: "日" + yaxis: "訪問者数" dashboard: rails_env_warning: "サーバは %{env} モードで起動中です。" ruby_version_warning: "現在起動中の Ruby 2.0.0 にはいくつか問題があります。パッチレベル p247 以降にアップグレードしてください。" host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。" gc_warning: '現在サーバはデフォルトの ruby ガベージコレクションパラメータを使用しており、パフォーマンスが最適化されていません。パフォーマンス・チューニングの方法についてはこちらのトピックを参考にしてください: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq が起動していません。メール送信等、多くのタスクが sidekiq により非同期に実行されます。少なくとも sidekiq のプロセスを1つは起動してください。Sidekiq についてはこちらを参考にしてください。' + queue_size_warning: 'キューイングされたジョブの数は %{queue_size} で、これは多いです。SIdekiqのプロセスに問題があるか、Sidekiqのworkerを増やす必要があります' memory_warning: '現在サーバが 1GB 未満の総メモリで起動しています。推奨メモリサイズは 1GB 以上です。' + google_oauth2_config_warning: 'サーバが Google OAuth2 アカウントによるサインアップ・ログイン可能な設定 (enable_google_oauth2_logins) になっていますが、client id と secret が設定されていません。サイトの設定 にて設定を更新してください。詳しくはこちらを参考にしてください。' facebook_config_warning: 'サーバが Facebook アカウントによるサインアップ・ログイン可能な設定 (enable_facebook_logins) になっていますが、app id と app secret が設定されていません。サイトの設定 にて設定を更新してください。詳しくはこちらを参考にしてください。' twitter_config_warning: 'サーバが Twitter アカウントによるサインアップ・ログイン可能な設定 (enable_twitter_logins) になっていますが、key と secret が設定されていません。サイトの設定 にて設定を更新してください。詳しくはこちらを参考にしてください。' github_config_warning: 'サーバが Github アカウントによるサインアップ・ログイン可能な設定 (enable_github_logins) になっていますが、client id と secret が設定されていません。サイトの設定 にて設定を更新してください。詳しくはこちらを参考にしてください。' s3_config_warning: 'サーバが S3 にファイルをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key or s3_upload_bucket。サイトの設定 にて設定を更新してください。詳しくは "How to set up image uploads to S3?" を参考にしてください。' s3_backup_config_warning: 'サーバが S3 にバックアップをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key or s3_upload_bucket。サイトの設定 にて設定を更新してください。詳しくは "How to set up image uploads to S3?" を参考にしてください' image_magick_warning: 'サーバが大きな画像のサムネイルを作成する設定になっていますが、ImageMagick がインストールされていません。お好きなパッケージマネージャを使って ImageMagick をインストールするか、最新のリリースをダウンロードしてください。' - failing_emails_warning: '%{num_failed_jobs}個のメールジョブが失敗しています。config/environments/production.rb ファイルを確認して config.action_mailer の設定が正しいか確認してください。Sidekiq で失敗したジョブを確認。' default_logo_warning: "あなたのサイトのロゴを設定しましょう。サイトの設定で logo_url, logo_small_url, favicon_url を更新してください。" contact_email_missing: "サイトに関する緊急連絡が行えるように、連絡先メールアドレスを入力してください。サイトの設定で更新できます" contact_email_invalid: "サイトの連絡先メールアドレスが正しくありません。サイトの設定で更新してください" title_nag: "サイトの名前が正しくありません。サイトの設定で更新してください" site_description_missing: "検索結果に表示される説明文を入力してください。サイトの設定で更新してください" consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。Gmail で送信可能なメール数には制限があります。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。" + site_contact_username_warning: "重要な自動メッセージを送信するフレンドリースタッフユーザーアカウントの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\nサイトの設定で更新してください" content_types: education_new_reply: @@ -542,8 +581,10 @@ ja: description: "新規ユーザのための重要な情報とガイダンス" welcome_user: title: "ウェルカムメッセージ: 新規ユーザ" + description: "サインアップ時にすべての新規ユーザに自動送信されるメッセージ。" welcome_invite: title: "ウェルカムメッセージ: 招待ユーザ" + description: "他のユーザからの招待を受け入れたときにすべての新しい招待ユーザに自動送信されるメッセージ" login_required_welcome_message: title: "ウェルカムメッセージ: 要ログイン" description: "'login required' 設定有効時に、ユーザに対してログインを促すメッセージの内容。" @@ -566,11 +607,13 @@ ja: allow_user_locale: "ユーザーが各自の言語設定を選択できるようにする" min_post_length: "投稿を許可する最少の文字数" min_first_post_length: "最初の投稿(投稿本文)を許可する最少の文字数" + min_private_message_post_length: "メッセージに投稿可能な最少の文字数" max_post_length: "投稿を許可する最大の文字数" min_topic_title_length: "トピックタイトルとして許可する最小の文字数" max_topic_title_length: "トピックタイトルとして許可する最大の文字数" + min_private_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数" min_search_term_length: "検索ワードとして有効にする最小の文字数" - allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。" + allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。" uncategorized_description: "未分類カテゴリについての説明。存在しない場合は空白のままにします" allow_duplicate_topic_titles: "トピックタイトルの重複を許可" unique_posts_mins: "同じ内容のポストを再投稿可能にする時間 (分)" @@ -593,14 +636,16 @@ ja: category_featured_topics: "/categories ページに表示されるカテゴリ毎のトピック数" show_subcategory_list: "カテゴリを表示する際にトピック一覧の代わりにサブカテゴリ一覧を表示" fixed_category_positions: "チェックすると、カテゴリの表示順をコントロールできます。チェックしない場合、アクティビティ順に表示されます" + fixed_category_positions_on_create: "チェックすると、トピック作成ダイアログ上でカテゴリの順序が維持されます(fixed category positions が必要)。" add_rel_nofollow_to_user_content: " 内部リンク(親ドメインを含む)を除き、投稿されたすべてのユーザコンテンツに rel nofollow を追加する。この設定を反映するには \"rake posts:rebake\" を実行して baked markdown をすべて更新する必要があります" + exclude_rel_nofollow_domains: "nofollowを付与すべきではないドメインのリスト。tld.comは、sub.tld.com も許可します。最低でもクローラーが全てのコンテンツを見つけるために、このサイトのトップレベルドメインを追加する必要があります。このサイトの他の部分が別ドメインに存在している場合、それも追加します" post_excerpt_maxlength: "投稿の引用/サマリの最大文字数" post_onebox_maxlength: "Discourse OneBoxポストの最大文字数" onebox_domains_whitelist: "OneBoxを許可するドメインのリスト。これらのドメインはOpenGraphかoEmbedをサポートしている必要があります。http://iframely.com/debug でテストできます" - logo_url: "トップ左上のロゴ画像です。空白の場合、サイトタイトルが表示されます" - digest_logo_url: "サイトのメールに使用されるロゴです。空白の場合`logo_url`が使用されます。 eg: http://example.com/logo.png" - logo_small_url: "スクロールしたときに表示されるトップ左上のロゴ画像です。空白の場合、ホームグリフが表示されます" - favicon_url: "サイトの favicon。参照: http://en.wikipedia.org/wiki/Favicon" + logo_url: "あなとのサイトの左上に表示されるロゴ画像です。横幅の大きい長方形にする必要があります。空欄の場合、サイトタイトルが表示されます" + digest_logo_url: "ダイジェストEメールで、ロゴ画像の代わりに利用される画像です。横幅の大きい長方形にする必要があります。空欄の場合、 `logo_url` が使用されます" + logo_small_url: "サイトの左上に表示される小さいロゴ画像です。正方形である必要があります。下にスクロールすると表示されます。空欄の場合、ホームアイコンが表示されます" + mobile_logo_url: "モバイルサイトの左上に固定で表示されるロゴ画像です。正方形である必要があります。空欄の場合 `logo_url` が利用されます 例: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Apple のタッチデバイス用のアイコン。推奨サイズは 144px x 144px" notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)" @@ -611,24 +656,27 @@ ja: summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数" summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか" summary_max_results: "'トピックサマリー'として返却される最大ポスト数" + enable_private_messages: "トラストレベル1のユーザーにプライベートメッセージの作成と返信を許可する" enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する" long_polling_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com" long_polling_interval: "ユーザに送信するデータが存在しないとき、サーバが待機する時間(ログインユーザーのみ)" polling_interval: "ロングポーリングではないときの、ログイン済みクライアントのポーリング間隔(ミリ秒)" anon_polling_interval: "匿名ユーザのクライアントのポーリング間隔 (ミリ秒)" background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔（ミリ秒)" - auto_track_topics_after: "トピックが自動的にトラックされるまでのデフォルト時間 (ミリ秒)。なお、ユーザはこの設定をカスタマイズできます。(0で常にトラック、-1で常にトラックしない)" - new_topic_duration_minutes: "トピックが新規と見なされるデフォルト時間 (分)。なお、ユーザはこの設定をカスタマイズできます。(-1で常に新規とみなす、-2で最終訪問したものを新規とみなす)" flags_required_to_hide_post: "ポストが自動的に非表示状態になりユーザにプライベートメッセージが送信されるフラグ数 (0で無効)" cooldown_minutes_after_hiding_posts: "フラグにより非表示状態になったポストをユーザが編集可能になるまでの時間 (分)" max_topics_in_first_day: "サイト利用初日にユーザが作成することのできるトピックの最大数" max_replies_in_first_day: "サイト利用日にユーザが作成することのできる回答の最大数" + tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします" + tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします" + tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします" num_flags_to_block_new_user: "新規ユーザのポストに対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。" flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか" traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う" post_undo_action_window_mins: "ポストに対するアクション (「いいね!」、フラグ等) 取り消しを許可する時間 (秒)" + must_approve_users: "スタッフはサイトへのアクセスが許可される前のすべての新規ユーザを承認する必要があります。警告：公開中のサイトでこれを有効にすると、既存の非スタッフユーザのアクセスを取り消すことになります！" ga_tracking_code: "Google analytics のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics" ga_domain_name: "Google analytics のドメイン名。例: mysite.com; 参考 http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics(analytics.js) のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics" @@ -642,10 +690,13 @@ ja: post_menu_hidden_items: "展開記号がクリックされない限り、ポストのメニュー項目を隠します" share_links: "シェアダイアログに表示する項目、表示順を指定" track_external_right_clicks: "右クリックされた外部リンクをトラックする (例: 新しいタブで開く)。URL のリライトを要するためデフォルトでは無効化されています" + site_contact_username: "自動送信メールのfromに使用される有効なスタッフのユーザー名。空欄の場合デフォルトのシステムアカウントが使用される" + send_welcome_message: "全ての新規ユーザにクイックスタートガイド付きのウェルカムメッセージを送信する。" suppress_reply_directly_below: "ポストに回答が１つしかない場合、ポストの回答数を表示しない" suppress_reply_directly_above: "ポストに回答が１つしかない場合、ポストのin-reply-toを表示しない" suppress_reply_when_quoting: "ポストが引用返信だった場合、ポストのin-reply-toを表示しない" max_reply_history: "回答のin-reply-toを展開する最大数" + experimental_reply_expansion: "回答を展開するときに、その間にある回答を非表示にする(実験)" topics_per_period_in_top_summary: "デフォルトのトピックサマリに表示されるトップトピックの数" topics_per_period_in_top_page: "'もっと見る'を展開したときに表示するトップトピックの数" redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトさせる" @@ -654,6 +705,8 @@ ja: email_token_grace_period_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを無効するときに、何時間猶予を与えるか" enable_badges: "バッジシステムを有効にする" allow_index_in_robots_txt: "サーチエンジンにインデックスを許可するようにrobots.txtを指定する" + email_domains_blacklist: "ユーザーがアカウント登録をすることができない、パイプ区切りのドメイン名のリスト。 例 : mailinator.com|trashmail.net" + email_domains_whitelist: "ユーザー登録に必要なパイプ区切りのメールドメインのリスト。警告: 指定したメールドメイン以外のユーザは許可されません！" forgot_password_strict: "パスワードリマインダダイアログで、アカウントの存在を通知しない" log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトさせる" version_checks: "Discourse Hub にアップデート、新バージョンの有無を問い合わせ /admin ダッシュボードにバージョンメッセージを表示する" @@ -664,20 +717,24 @@ ja: invite_passthrough_hours: "ユーザーが、以前の招待キーを使う事ができる時間" invite_only: "パブリックなユーザー登録を無効化し、全てのユーザは他のメンバーかスタッフの招待を必要とする" login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する" - min_username_length: "ユーザ名の最小の文字数。　警告: !!これより短いユーザ名を持つ既存のユーザはログインできなくなります!!" - max_username_length: "ユーザ名の最大の文字数。 警告: !!これより長いユーザ名を持つ既存のユーザはログインできなくなります!!" + reserved_usernames: "サインアップが許可されていないユーザ名。" min_password_length: "パスワードの最小の長さ" block_common_passwords: "最もよく使われている10,000個のパスワードはパスワードとして許可しない" + enable_sso: "外部サイトを経由したシングルサインオンを有効にします(警告：ユーザーのメールアドレスは必ず外部サイトで認証されなければなりません)" enable_sso_provider: "Discourse SSO provider プロトコルを /session/sso_provider エンドポイントに実装し、sso_secretの設定が必須です" sso_url: "シングルサインオンエンドポイントのURL" sso_secret: "SSO認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります" - sso_overrides_email: "SSOペイロードから取得した外部サイトのメールアドレスでローカルのメールアドレスを上書きする(警告: 不一致が原因でローカルのメールアドレスの正規化が発生する可能性があります)" - sso_overrides_username: "SSOペイロードから取得した外部サイトのユーザ名でローカルのユーザ名を上書きする(警告: 不一致が原因でユーザ名の長さ/要件に違いがでる可能性があります) " + sso_overrides_email: "ログインする度にSSOペイロードから取得した外部サイトのメールアドレスでローカルのメールアドレスを上書きし、ローカルでの変更を防ぐ(警告: 不一致が原因でローカルのメールアドレスの正規化が発生する可能性があります)" + sso_overrides_username: "ログインする度に、SSOペイロードから取得した外部サイトのユーザ名でローカルのユーザ名を上書きすし、ローカルでの変更を防ぐ(警告: 不一致が原因でユーザ名の長さ/要件に違いがでる可能性があります)" + sso_overrides_name: "ログインする度に、SSOペイロードから取得した外部サイトの名前でローカルの名前を上書きし、ローカルでの変更を防ぐ" sso_overrides_avatar: "SSOペイロードから取得した外部サイトのプロフィール画像でローカルのプロフィール画像を上書きする。有効にする場合、プロフィール画像のアップデートを無効にする事を強く薦めます" + sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト" enable_local_logins: "ローカルのユーザ名、パスワードでのログインを有効にする (注意: 招待を使用するには有効にする必要があります)" allow_new_registrations: "新規ユーザー登録を許可。誰でもユーザーを作れるのを防ぐには、チェックを外してください。" enable_yahoo_logins: "Yahoo 認証を有効にする" + enable_google_oauth2_logins: "グーグル Oauth2 認証を有効にします。これはグーグルが現在サポートしている認証方式です。key と secret が必要です。" google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID" + google_oauth2_client_secret: "あなたの Google アプリケーションのクライアント Secret。" enable_twitter_logins: "Twitter 認証を有効にする (twitter_consumer_key と twitter_consumer_secret の設定が必要)" twitter_consumer_key: "Twitter 認証用の consumer key。http://dev.twitter.com で入手可能" twitter_consumer_secret: "Twitter 認証用の consumer secret。http://dev.twitter.com で入手可能" @@ -689,7 +746,7 @@ ja: github_client_secret: "Github 認証用の client secret。https://github.com/settings/applications で入手可能" allow_restore: "全てのサイトのデータをリプレイスするリストアを許可！　バックアップからのリストアを行うとき以外はfalseのままにしてください" maximum_backups: "ディスクに保存するバックアップの最大数。古いバックアップは自動的に削除されます" - backup_daily: "毎日自動的にサイトのバックアップを作成します" + backup_frequency: "サイトのバックアップを作成する頻度（日）" enable_s3_backups: "完了時にS3にバックアップをアップロードします。重要: 有効なS3 credentialsがファイル設定に必要です" s3_backup_bucket: "バックアップを保持するバケット。　警告: 必ずプライベートバケットになっていることを確認してください" active_user_rate_limit_secs: "'last_seen_at' フィールドを更新する頻度 (秒)" @@ -704,7 +761,9 @@ ja: max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数" max_edits_per_day: "ユーザが一日に編集できる最大数" max_topics_per_day: "ユーザが一日に作成できるトピックの最大数" + max_private_messages_per_day: "ユーザが一日に作成できるメッセージの最大数" max_invites_per_day: "ユーザが一日に招待できる最大数" + max_topic_invitations_per_day: "ユーザが一日にトピックに招待できる最大数" suggested_topics: "トピック下部に表示されるおすすめトピックの数" limit_suggested_to_category: "現在参照しているトピックのカテゴリからトピックをサジェストする" clean_up_uploads: "不正アップロードを防ぐためにどこからも参照されていないアップロードファイルを削除する。警告: この設定を有効にする前に /uploads ディレクトリのバックアップを取ることをおすすめします" @@ -717,8 +776,11 @@ ja: s3_access_key_id: "画像をアップロードするAmazonS3のaccess key id" s3_secret_access_key: "画像をアップロードする Amazon S3 の secret access key" s3_region: "画像をアップロードする Amazon S3 のリージョン名" + s3_cdn_url: "s3アセットに利用するCDNのURL(例: https://cdn.somewhere.com) 警告: 変更後は過去の投稿をrebakeする必要があります" + avatar_sizes: "自動生成するアバターサイズのリスト" enable_flash_video_onebox: "onebox で、swf の埋め込みと flv(Adobe Flash) リンクを許可する。注意: セキュリティリスクになる可能性があります" default_invitee_trust_level: "招待したユーザのデフォルトトラストレベル(0-4)" + default_trust_level: "新規ユーザのデフォルトトラストレベル(0-4) 警告: 変更すると深刻なスパムのリスクがあります" tl1_requires_topics_entered: "新規ユーザがトラストレベル1に昇格するために作成しなければならないトピックの数" tl1_requires_read_posts: "新規ユーザがトラストレベル1に昇格するために閲覧しなければらないポストの数" tl1_requires_time_spent_mins: "新規ユーザがトラストレベル1に昇格するためにポストを読まなければならない時間 (分)" @@ -752,6 +814,7 @@ ja: email_time_window_mins: "ユーザによるポストの最終編集チャンスを与えるために、通知用メール送信までに待つ時間 (分)" email_posts_context: "通知メールのコンテンツに含める回答の数" flush_timings_secs: "サーバにタイミングデータを送信する頻度 (秒)" + title_max_word_length: "トピックタイトルの最大文字数" title_min_entropy: "トピックタイトルの最小許容エントロピー (ユニークキャラクターや英語以外の単語を含むとより大きな値になります)" body_min_entropy: "ポスト本文の最小許容エントロピー (ユニークキャラクターや英語以外の単語を含むとより大きな値になります)" title_fancy_entities: "トピックタイトルの一般的な ASCII 文字をファンシーな HTML エンティティに変換する; SmartyPants http://daringfireball.net/projects/smartypants/" @@ -767,6 +830,9 @@ ja: topic_views_heat_low: "多くの閲覧があると、このフィールドはやや強調されます" topic_views_heat_medium: "多くの閲覧があると、このフィールドは適度に強調されます" topic_views_heat_high: "多くの閲覧があると、このフィールドは強く強調されます" + cold_age_days_low: "議論から日が経つと、更新日がすこし薄く表示されます" + cold_age_days_medium: "議論から日が経つと、更新日が適度に薄く表示されます" + cold_age_days_high: "議論から日が経つと、更新日が強く淡色表示されます" history_hours_low: "数時間以内に編集したポストは、編集インジケーターがやや強調されます" history_hours_medium: "数時間以内に編集したポストは、編集インジケーターが適度に強調されます" history_hours_high: "数時間以内に編集したポストは、編集インジケーターが強く強調されます" @@ -779,12 +845,18 @@ ja: newuser_spam_host_threshold: "新規ユーザが、スパム認定されることなく `newuser_spam_host_posts` ポスト内にに同一ホストへのリンクを貼ることができる数。" white_listed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザはこれらのドメインでポスト内にリンクを作成することを制限されません" staff_like_weight: "スタッフにより「いいね!」された場合、どのくらい重み付けをするか" - topic_view_duration_hours: "N時間毎にトピックを参照したIP/ユーザをカウント" levenshtein_distance_spammer_emails: "スパマーのメールアドレスとマッチさせるとき、数文字違いの曖昧な一致でも許可する" max_new_accounts_per_registration_ip: "もし既にトラストレベル0のユーザーがそのIPから(N)個作成されていたら、そのIPから登録できないようにする(スタッフメンバー、トラストレベル2以上は除く)" + min_ban_entries_for_roll_up: "When clicking the Roll up button, will create a new subnet ban entry if there are at least (N) entries." + max_age_unmatched_emails: "(N)日間一致しなかったスクリーンメールアドレスを削除" + max_age_unmatched_ips: "(N)日間一致しなかったスクリーンIPアドレスを削除" num_flaggers_to_close_topic: "介入するため、自動的にトピックを停止するために必要なフラグを付けたユニークユーザの数" num_flags_to_close_topic: "トピックの介入のため、自動的にトピックを停止するために必要なフラグの数" auto_respond_to_flag_actions: "フラグを解除時の自動返信を有効にする" + min_first_post_typing_time: "最初の投稿に必要なタイピング時間。閾値以下の場合、投稿は自動的に承認キューに追加されます。0を設定すると無効化されます(推奨されません)" + auto_block_fast_typers_on_first_post: "min_first_post_typing_timeを満たしていないユーザーを自動的にブロック" + auto_block_fast_typers_max_trust_level: "自動的にブロックされるfast typerに対する最大のトラストレベル" + auto_block_first_post_regex: "この正規表現に一致すると、ユーザーの最初の投稿をブロックし、承認キューに送られる。最初の投稿にのみ適用されます" reply_by_email_enabled: "メールでのトピックへの返信を有効化する" reply_by_email_address: "メールアドレスによる回答のテンプレート。例: %{reply_key}@reply.myforum.com" disable_emails: "Discourseからの全ての種類のメール送信を止める" @@ -797,6 +869,7 @@ ja: pop3_polling_host: "ポーリングを行うPOP3のホスト" pop3_polling_username: "ポーリングを行うPOS3アカウントのユーザ名" pop3_polling_password: "ポーリングを行うPOS3アカウントのパスワード" + log_mail_processing_failures: "Eメールの失敗ログをhttp://yoursitename.com/logs に保存する" email_in: "ユーザにメールでのトピック作成を許可する(POP3ポーリングが必須) 。設定タブでカテゴリ毎に設定してください" email_in_min_trust: "メールでのトピック作成を許可する最低トラストレベル" email_prefix: "メールのタイトルに使用される[ラベル]。空白の場合、タイトルがデフォルトで使用されます" @@ -815,45 +888,56 @@ ja: automatically_download_gravatars: "アカウントの生成時、メールアドレスの変更時にGravatarをダウンロード" digest_topics: "ダイジェストメールに表示されるトピックの最大数" digest_min_excerpt_length: "ダイジェストメール内の投稿の抜粋の最小文字数" - default_digest_email_frequency: "ユーザがダイジェストメールを受け取る頻度のデフォルト値。ユーザは設定画面でこの値をカスタマイズできます。" suppress_digest_email_after_days: "(n)日以上ユーザが参照していなければダイジェストメールを抑制します" disable_digest_emails: "全てのユーザのダイジェストメールを無効にする" - default_external_links_in_new_tab: "外部リンクは新しいタブで開きます。ユーザーはこの設定を変更する事が出来ます" detect_custom_avatars: "ユーザがプロフィール画像をアップロードしたか確認する" max_daily_gravatar_crawls: "Discourseがプロフィール画像の確認をgravastarに行う回数の上限" public_user_custom_fields: "パブリックに公開されるカスタムフィールドのホワイトリスト" staff_user_custom_fields: "スタッフが参照できるカスタムフィールドのホワイトリスト" + enable_user_directory: "ユーザーディレクトリの閲覧を提供" + allow_anonymous_posting: "全てのユーザーに匿名モードを許可" + anonymous_posting_min_trust_level: "匿名の投稿を行うための最小のトラストレベル" + anonymous_account_duration_minutes: "匿名性を守るため、N 分毎に匿名ユーザーを作成しなおします。　例 : 600を設定すると匿名ユーザへの変更と最後の投稿から600分経過していた場合、匿名アカウントが作成されます" allow_profile_backgrounds: "プロフィール背景のアップロードを許可" sequential_replies_threshold: "ユーザに連続回答が多すぎることをリマインドする、連続ポスト投稿のしきい値" enable_mobile_theme: "モバイル端末にモバイル向けテーマ (通常サイト用テーマにスイッチ可能) を利用する。レスポンシブなスタイルシートを使用する場合はこの設定を無効にしてください。" dominating_topic_minimum_percent: "ユーザがトピックを占拠しているとリマインドを行う、ポスト投稿支配率 " + daily_performance_report: "日別のNGINXのログを解析し、Staff Onlyトピックへ詳細を投稿する" suppress_uncategorized_badge: "トピック一覧でカテゴライズされていないトピックのバッジは表示しない" + permalink_normalizations: "パーマリンクをマッチングさせる前に正規表現を適用します。例えば、/(\\/topic.*)\\?.*/\\1 は、トピックURLのクエリ文字列を取り除きます。 フォーマットは、正規表現と \\1 のようなキャプチャにアクセスする文字列です" global_notice: "緊急の内容を表示します。全ての訪問者の緊急バナーで注意を行います。隠すには空白に変更してください(HTMLが許可されています)" + disable_edit_notifications: "システムユーザが'download_remote_images_to_local' を有効にした場合、編集時の通知を無効にする" + full_name_required: "ユーザープロフィールのフルネームを必須にする" enable_names: "ユーザーのプロフィール、ユーザーカード、メールアドレスでのフルネームを表示します。無効にすると、フルネームは非表示になります" display_name_on_posts: "@usernameに加えて、ポストにユーザのフルネームを表示する" + show_time_gap_days: "２つの投稿の作成日が離れていた場合、time gapをトピックに表示する。" invites_per_page: "ユーザページに表示されるデフォルトの招待数" short_progress_text_threshold: "プログレスバーが現在のポスト番号のみを表示するようになるポスト数のしきい値。プログレスバーの幅を変更した際には、この値を変更することをおすすめします。" default_code_lang: "Github コードブロックにデフォルトで適用されるプログラム言語シンタックスハイライト (lang-auto, ruby, python 等)" warn_reviving_old_topic_age: "最後の返信がこの設定よりも古いトピックに返信すると、警告を表示します。0を設定すると無効になります" autohighlight_all_code: "明示的に言語を指定しなくても、全てのコードブロックにコードハイライトを強制的に適用する" highlighted_languages: "適用するシンタックスハイライトルール(警告: あまりに多くの言語を含むとパフォーマンスに影響を与えます) デモ: https://highlightjs.org/static/demo/ " - embeddable_host: "このDiscourseフォーラムのコメントを埋め込む事が出来るHost。Host名のみ、http:// で始めない" feed_polling_enabled: "EMBEDDING ONLY: ポストとしてRSS/Atomフィードを埋め込むかどうか" feed_polling_url: "EMBEDDING ONLY: RSS/ATOMフィードのURLを埋め込む事が出来ます" embed_by_username: "embedされたトピックの作成者として表示されるDiscourseユーザー名" embed_username_key_from_feed: "フィードからDsicourseユーザ名をプルするキー" embed_truncate: "embedされた投稿をtruncateする" - embed_category: "embedトピックのカテゴリ" + embed_post_limit: "embedで表示する投稿の最大数" embed_whitelist_selector: "embedを許可するエレメントのCSS Selector" embed_blacklist_selector: "embedから削除するエレメントのCSS Selector" notify_about_flags_after: "この数時間後に処理されていないフラグがある場合は、contact_emailにメールを送信する。0を設定すると無効になります" enable_cdn_js_debugging: "全てのJSにcrossorigin権限を追加することで、/logsに適切なエラーを表示することを許可する" show_create_topics_notice: "サイトにpublicなトピックが5よりも少ない場合、トピックを作成するための通知が管理者に表示される" + delete_drafts_older_than_n_days: (n) 日間経過したドラフトを削除 vacuum_db_days: "DB領域を再利用するため、migration後にVACUUM FULL ANALYZEを実行する(0を設定すると無効化)" prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードするのを防止。警告: 画像ではなく、添付ファイルとして投稿された全てのファイルが対象です" + slug_generation_method: "slugを生成するメソッドを選択。 'encode'はパーセントエンコードされた文字列を生成します。 'none'は、slugを無効にします" enable_emoji: "絵文字を有効にする" emoji_set: "How would you like your emoji?" enforce_square_emoji: "絵文字のアスペクト比を強制的に揃える" + approve_post_count: "新規ユーザーの投稿に承認が必要になる投稿数" + approve_unless_trust_level: "トラストレベル以下のユーザーの投稿には承認が必要" + notify_about_queued_posts_after: "設定した時間よりも長い間レビュー待ちの状態になっている投稿があると、メールで通知します。0を設定するとこのメールは無効化されます" errors: invalid_email: "不正なメールアドレスです" invalid_username: "そのユーザ名のユーザは存在しません" @@ -876,6 +960,9 @@ ja: edited: "%{link} で %{display_username} があなたのポストを編集しました" posted: "%{link} に %{display_username} がポストを投稿しました" moved_post: "%{display_username} があなたのポストを %{link} に移動しました" + private_message: "%{display_username} があなたにメッセージを送信しました: %{link}" + invited_to_private_message: "%{display_username} がメッセージにあなたを招待しました: %{link}" + invited_to_topic: "%{display_username} がトピックにあなたを招待しました: %{link}" invitee_accepted: "%{display_username} があなたの招待を受けました" linked: "%{display_username} は%{link}であなたをリンクしました" granted_badge: "あなたは%{link}を獲得しました" @@ -899,11 +986,12 @@ ja: not_seen_in_a_month: "お帰りなさい！　最近見かけませんでしたね。　これらがあなたが離れてから最も人気のトピックです" move_posts: new_topic_moderator_post: - other: "%{count} 件のポストを新しいトピックに移動しました: %{topic_link}" + other: "%{count} 件のポストを新しいトピックに分割しました: %{topic_link}" existing_topic_moderator_post: - other: "%{count} 件のポストを既存のトピックに移動しました: %{topic_link}" + other: "%{count} 件のポストを既存のトピックにマージしました: %{topic_link}" change_owner: post_revision_text: "%{old_user} から %{new_user}にownershipを移動させました" + deleted_user: "削除されたユーザ" emoji: errors: name_already_exists: "申し訳ありません。'%{name}'は既に別の絵文字で使われています" @@ -943,6 +1031,7 @@ ja: not_allowed_from_ip_address: "そのIPアドレスからは%{username} としてログインできません" admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません" suspended: "%{date} までログインできません。" + suspended_with_reason: "%{date} までアカウントがサスペンドされています: %{reason}" errors: "%{errors}" not_available: "利用できません。%{suggestion} を試してみては?" something_already_taken: "エラーが発生しました。ユーザ名またはメールアドレスが既に使用中の可能性があります。パスワードリセットを行ってください。" @@ -950,6 +1039,8 @@ ja: omniauth_error_unknown: "ログインに失敗しました。もう一度試してください。" new_registrations_disabled: "新規登録は、この時点で許可されていません" password_too_long: "パスワードは200文字までです" + email_too_long: "メールアドレスが長過ぎます。アドレス部は254文字以内に、ドメイン部は253文字以内にする必要があります" + reserved_username: "そのユーザー名は許可されていません" missing_user_field: "全てのユーザーフィールドの入力が終わっていません" close_window: "ログインは完了しました。このウィンドウを閉じて続けてください" user: @@ -960,10 +1051,12 @@ ja: characters: "は英数字のみである必要があります" unique: "はユニークである必要があります" blank: "は空であってはなりません" - must_begin_with_alphanumeric: "は英数字で始まる必要があります" email: not_allowed: "はこのメールプロバイダーを許可していません。他のメールアドレスを使用してください。" blocked: "は許可されていません。" + ip_address: + blocked: "あなたのIPアドレスからの新規登録は許可されていません" + max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は許可されていません(最大数に達しました)。スタッフメンバーに連絡してください" invite_mailer: subject_template: "%{invitee_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました" text_body_template: | @@ -994,12 +1087,80 @@ ja: これは信頼されたユーザからの招待のため、あなたはログインする必要がありません invite_password_instructions: subject_template: "%{site_name} アカウントのパスワードを設定" + text_body_template: "%{site_name} へようこそ\n\nこのリンクをクリックしてパスワードを設定してください:\n%{base_url}/users/password-reset/%{email_token}\n\n(リンクの有効期限が切れていた場合は、\"パスワードを忘れたました\"を選択しメールアドレスを入力してください) \n" test_mailer: subject_template: "[%{site_name}] メール送信テスト" + text_body_template: | + This is a test email from + + [**%{base_url}**][0] + + Email deliverability is complicated. Here are a few important things you should check first: + + - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**. + + - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. in Gmail, it is the "show original" option in the drop-down menu at the top right of each mail. + + - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered. + + - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF. + + - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here. + + - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. + + (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) + + We hope you received this email deliverability test OK! + + Good luck, + + Your friends at [Discourse](http://www.discourse.org) + + [0]: %{base_url} + [1]: http://www.kitterman.com/spf/validate.html + [2]: http://mxtoolbox.com/ReverseLookup.aspx + [3]: http://www.dkim.org/ + [4]: http://whatismyipaddress.com/blacklist-check + [7]: http://dkimcore.org/tools/dkimrecordcheck.html + [8]: http://www.openspf.org/SPF_Record_Syntax + [md]: http://mandrill.com + [mg]: http://www.mailgun.com/ + [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] New Discourse version, update available" + text_body_template: | + 新しいバージョンの[Discourse](http://www.discourse.org) が利用可能です。 + + あなたのバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + You may want to: + + - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] update available" + text_body_template: | + 新しいバージョンの[Discourse](http://www.discourse.org) が利用可能です。 + + あなたのバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + You may want to: + + - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. + + ### Release notes + + %{notes} flags_reminder: flags_were_submitted: other: "これらのフラグは%{count}時間以上前に作成されました" @@ -1008,6 +1169,13 @@ ja: how_to_disable: ' "notify about flags after"設定でこのリマインダーを停止、頻度を変更することができます' subject_template: other: "%{count} 個のフラグが判断待ちです" + queued_posts_reminder: + subject_template: + other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです" + text_body_template: | + こんにちは + + 新規ユーザーの投稿がレビュー待ちになっています。[ 承認、または拒否を行うことができます] (%{base_url}/queued-posts) flag_reasons: off_topic: "あなたの投稿やトピックは「オフトピック」としてフラグされています" inappropriate: "あなたの投稿は「不適切」にフラグされています。コミュニティは攻撃的、 [コミュニティガイドライン](/guidelines)に違反だと判断しました" @@ -1023,13 +1191,110 @@ ja: system_messages: post_hidden: subject_template: "コミュニティによるフラグによりポストが非表示になりました" + text_body_template: "こんにちは \n\nこれは あなたの投稿が非表示になったことを　%{site_name}%　からのメッセージです\n\n%{base_url}%{url}\n\n%{flag_reason}\n\n複数のコミュニティメンバーによりこのポストにフラグが立てられた結果としてポストが非表示になったことを理解し、ポスト内容を修正することを検討してください。\nポスト内容の編集は %{edit_delay}後より行うことができます。編集後、非表示状態は解除されます。\n\n編集後、非表示状態は解除されます。 ただし、再度あなたのポストがコミュニティによってフラグ立てされた場合、モデレータに通知が行われます。この結果アカウントの凍結などの処置が行われる可能性もあります。\n\n詳しいガイドラインは、 [community guidelines]を参照してください (%{base_url}/guidelines).\n" + usage_tips: + text_body_template: |+ + 初心者向けヒントをいくつかご紹介します。 + + ### スクロールするだけ + + もっと読むためには、ただスクロールするだけです。 + 新しい返信や新しいトピックが追加された場合、それらは自動的に表示されます。ページのリフレッシュは必要ありません。 + + ## ナビゲーション + + - 検索、ユーザーページ、☰ メニュー, *右上のアイコンボタン*. + + - トピックのタイトルを選択すると、常に”未読返信"に移動することができます。reply countまたは、投稿日を選択すると、上部、下部に移動できます。 + + + + - トピックを読んでいる間、ナビゲーションのために右下にプログレスバーを表示します。 トピックタイトルを選択すると上部に移動します。? を押すと、キーボードショートカットが表示されます + + + + ## 返信 + + - トピック全体に返信するには、トピックの一番下にある を使います + + - 特定のユーザーに返信するには、そのポストのを使います + + - 新しいトピックで返信するには、ポストのを使います。新旧のトピック両方が自動的にリンクされます + + 引用を挿入したい場合、引用したいテキストを選択し、返信ボタンを押してください。繰り返し使えます！ + + + + 返信を誰かに通知する場合は、メンションを作成します。 `@`をタイプし、ユーザー名を選択してください。 + + + + 絵文字(http://www.emoji.codes/)を利用するには、`:`をタイプし名前を入力してください + + + + リンクをペーストするだけで、サマリーを生成します: + + + ## アクション + + ポスト毎にアクションボタンがあります + + + + そのポストで楽しみ、高く評価したことを伝えるため Likeボタンを押してシェアしましょう + + ポストに問題を発生した場合、個人的に伝えるか、[スタッフ](%{base_url}/about) に flagボタンで伝えることができます。また、ポストのリンクをshareし、後で読むためにbookmarkすることもできます + + ## 通知 + + あなたに返信したり、ポストを引用したり、あなたの`@username`にメンションがあると、ページの右上にすぐ数字が表示されます。通知にアクセスするために使用します。 + + + + 返信を忘れてしまう心配はありません。あなたが席を離れてる間に届いた通知はメールで通知されます。 + + ## あなたの設定 + + - ２日前よりも新しいトピックは新着と判断されます + + - 作成、返信、または長時間読むことにより、積極的に参加したトピックとして自動的に追跡します + + これらのトピックの横には、青い新着マークと、未読件数が表示されます + + + + トピックの下部にある通知コントロールにより通知を変更できます + + + + あるカテゴリに所属しているトピックを全て参照したいときなど、カテゴリ毎に通知を設定することができます + + 設定を変更するには、[設定](%{base_url}/my/preferences) を参照してください + + ## コミュニティトラスト + + 参加し、時間をかけることで、コミュニティからの信頼を獲得した完全な市民になり、ユーザーへの制限が解除されます。十分に高いトラストレベル(https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)で、コミュニティを共に管理する能力を得ることが出来ます。 + welcome_user: subject_template: "%{site_name} へようこそ!" + text_body_template: |2 + %{site_name}への参加ありがとうございます。ようこそ！ + + %{new_user_tips} + + 私たちは、[ガイドライン](%{base_url}/guidelines) を常に信じています + + 楽しんでください! + + (もし[スタッフメンバー](%{base_url}/about) に新規ユーザーとして連絡する必要がある場合、このメッセージに返信してください) welcome_invite: subject_template: "%{site_name}へようこそ!" + text_body_template: "ようこそ%{site_name} へ！\nあなたのアカウント**%{username}** を作成して、あなたはログインしています。\n氏名の変更は [your user profile][prefs] より行ってください。\n\n次回ログインするときは、\n\n1. かならず招待をうけたメールアドレスを使ってログインしてください。\n\n2.[your user profile][prefs]でパスワードを設定して、ログインのときはそれを使用してください。\n\n%{new_user_tips} [civilized community behavior](%{base_url}/guidelines)をお守りいただき、健全なコミュニティとなるよう皆様のご協力をお願いいたします。 \n\nそれではお楽しみください! \n\n(もし個人的に [staff members](%{base_url}/about)\ + \ と連絡を取る必要がある場合、このメッセージに返信してください)\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "バックアップは正常に完了しました" - text_body_template: "バックアップが完了しました.\n [admin > backup section](/admin/backups) から新しいバックアップがダウンロードできます" + text_body_template: "バックアップが成功しました。\n [admin > backup section](%{base_url}/admin/backups) から、バックアップをダウンロードしてください" backup_failed: subject_template: "バックアップ失敗" text_body_template: | @@ -1078,21 +1343,32 @@ ja: subject_template: "データ出力失敗" text_body_template: "申し訳ありません。データ出力に失敗しました。ログを確認するかスタッフメンバーに連絡してください" email_reject_trust_level: + subject_template: "[%{site_name}] Email issue -- 不十分なトラストレベル" text_body_template: | 申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした あなたのアカウントは、このアドレスに新しいトピックを投稿するために必要なトラストレベルに達していませんでした。不明な点がある場合は、スタッフメンバーに連絡してください。 email_reject_no_account: + subject_template: "[%{site_name}] Email issue -- 不明なアカウント" text_body_template: | 申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした。 このメールアドレスを持つユーザーアカウントがありませんでした。違うメールアドレスから送信するか、スタッフメンバーに連絡してください。 + email_reject_empty: + subject_template: "[%{site_name}] Email issue -- 本文なし" + email_reject_parsing: + subject_template: "[%{site_name}] Email issue -- 認識されていないコンテンツ" + text_body_template: "申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした \nメールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。\n" + email_reject_invalid_access: + subject_template: "[%{site_name}] Email issue -- 不正なアクセス" email_reject_post_error: + subject_template: "[%{site_name}] Email issue -- 投稿エラー" text_body_template: | 申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした 複雑な書式、大きすぎるメッセージ、小さすぎるメッセージなど、複数の原因が考えられます。もう一度試してください。もし続くようであれば、ウェブサイトから投稿してください email_reject_post_error_specified: + subject_template: "[%{site_name}] Email issue -- 投稿エラー" text_body_template: | 申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした @@ -1102,10 +1378,19 @@ ja: 問題が修正できたら、もう一度試してください email_reject_reply_key: + subject_template: "[%{site_name}] Email issue -- 不明なReply Key" text_body_template: "申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした。 \n\n提供されたreply keyが無効または不明のため、このメールがどの返答なのかがわかりません。スタッフメンバーに連絡してください。\n" email_reject_destination: + subject_template: "[%{site_name}] Email issue -- 不明な宛先" text_body_template: "申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした。 \n\n宛先が認識されませんでした。宛先(CC,BCCではなく)にサイトのアドレスがあること、スタッフから提供された正しいメールアドレスに送信していることを確認してください。\n\n" + email_reject_topic_not_found: + subject_template: "[%{site_name}] Email issue -- 存在しないトピック" + email_reject_topic_closed: + subject_template: "[%{site_name}] Email issue -- 停止済みトピック" + email_reject_auto_generated: + subject_template: "[%{site_name}] Email issue -- 自動生成された返信" email_error_notification: + subject_template: "[%{site_name}] Email issue -- POP認証エラー" text_body_template: | メールをポーリングするPOPサーバで認証エラーが発生しました。 @@ -1167,7 +1452,6 @@ ja: download_remote_images_disabled: subject_template: "リモート画像のダウンロードを無効化" text_body_template: "'download_remote_images_threshold'の制限に達したため、`download_remote_images_to_local`の設定は無効になりました" - unsubscribe_link: "メール解除は [ユーザ設定画面](%{user_preferences_url}) で行ってください。" subject_re: "Re:" subject_pm: "[プライベートメッセージ]" user_notifications: @@ -1178,6 +1462,11 @@ ja: reply_by_email: "回答するにはこのメールに返信するか、ブラウザで %{base_url}%{url} にアクセスしてください。" visit_link_to_respond: "回答するにはブラウザで %{base_url}%{url} にアクセスしてください。" posted_by: "%{post_date} に %{username} が投稿" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} がメッセージにあなたを招待しました '%{topic_title}'" + text_body_template: "\n{username} があなたをメッセージに招待しました \n\n> '%{topic_title}' \n>\n> %{topic_excerpt}\n\n> %{site_title} -- %{site_description}\n\nこのリンクからメッセージを参照してください: %{base_url}%{url}\n" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} がトピックにあなたを招待しました '%{topic_title}'" user_replied: subject_template: "[%{site_name}] '%{topic_title}' 内のあなたのポストに新たな回答が投稿されました" text_body_template: | @@ -1225,6 +1514,7 @@ ja: %{respond_instructions} digest: why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです" + subject_template: "[%{site_name}] ダイジェスト" new_activity: "あなたのトピックおよびポストにおけるアクティビティ:" top_topics: "人気の投稿" other_new_topics: "人気のトピック" @@ -1245,6 +1535,16 @@ ja: %{base_url}/users/password-reset/%{email_token} set_password: subject_template: "[%{site_name}] パスワード設定" + text_body_template: | + [%{site_name}](%{base_url}) のあなたのアカウントに対してパスワード追加のリクエストがありました。 + あるいは、この検証済みメールアドレスに関連付けられている任意のサポートされているオンラインサービス（グーグル、フェイスブックなど）を使用してログインすることができます。 + + もし、リクエストをしていない場合は、このメールを無視してください。 + + パスワードを選択する場合は次のリンクをクリックしてください: + %{base_url}/users/password-reset/%{email_token} + admin_login: + subject_template: "[%{site_name}] ログイン" account_created: subject_template: "[%{site_name}] あなたの新しいアカウント" text_body_template: | @@ -1261,7 +1561,7 @@ ja: signup_after_approval: subject_template: "%{site_name} への参加承認完了!" signup: - subject_template: "[%{site_name}] 新たなアカウントのアクティベーション" + subject_template: "[%{site_name}] アカウントの確認" text_body_template: | Welcome to %{site_name}! @@ -1293,22 +1593,25 @@ ja: too_large: "申し訳ありませんが、ファイルが大きすぎてアップロードできません (最大サイズは %{max_size_kb}KB です)" images: too_large: "申し訳ありませんが、画像が大きすぎてアップロードできません (最大サイズは %{max_size_kb}KB です)。リサイズして再アップロードしてください" - fetch_failure: "申し訳ありませんが、画像取得中にエラーが発生しました。" - unknown_image_type: "申し訳ありませんが、アップロードしようとしたファイルは画像ではないようです。" size_not_found: "申し訳ありませんが、画像のサイズを判定できませんでした。画像が壊れているかもしれません。" flag_reason: sockpuppet: "新規ユーザがトピックを作成し、同じ IP アドレスより別の新規ユーザが回答を投稿しました。サイトの flag_sockpuppets 設定を確認してください。" spam_hosts: "この新規ユーザは同一ドメインへのリンクを含むポストを複数作成しようとしました。サイトの newuser_spam_host_threshold 設定を確認してください" email_log: no_user: "id %{user_id}のユーザーは見つかりませんでした" + anonymous_user: "ユーザーは匿名です" + suspended_not_pm: "ユーザーはサスペンド状態です、プライベートメッセージはありません" seen_recently: "最近訪れたユーザ" post_not_found: "id %{post_id}のポストは見つかりません" notification_already_read: "メールが既読になったという通知です" topic_nil: "post.topic is nil" post_deleted: "投稿は投稿者によって削除されました" + user_suspended: "ユーザーはサスペンド状態です" already_read: "ユーザーはポストを既に読んだ" message_blank: "メッセージが空" message_to_blank: "メッセージの宛先(to)が空" + text_part_body_blank: "テキストの本文が空です" + body_blank: "本文が空です" color_schemes: base_theme_name: "ベース" about: "About" @@ -1328,6 +1631,12 @@ ja: privacy_topic: title: "プライバシーポリシー" admin_login: + success: "メールを送信しました" error: "エラー！" email_input: "アドミンメール" submit_button: "メールを送信する" + discourse_hub: + access_token_problem: "管理者に通知: サイト設定を更新して正しい discourse_org_access_key を設定してください。" + performance_report: + initial_post_raw: このトピックでは、あなたのサイトの毎日のパフォーマンスレポートが含まれています。 + initial_topic_title: ウェブサイトパフォーマンスレポート diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 8eded14563..b755b55a11 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -7,24 +7,58 @@ ko: dates: - short_date_no_year: "MMM D" - short_date: "YYYY-MMM-D" - long_date: "YYYY-MMM-D a h:mm" + short_date_no_year: "M월 D일" + short_date: "YYYY-M-D" + long_date: "YYYY-M-D a h:mm" title: "Discourse" - topics: "토픽들" - posts: "게시물들" + topics: "글타래" + posts: "글" loading: "로딩중" powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "로그인" via: "%{site_name}의 %{username}" is_reserved: "예약됨" purge_reason: "비활성화된 계정은 자동적으로 삭제됩니다." - disable_remote_images_download_reason: "서버에 저장공간이 부족해서 원격 이미지 저장이 비활성화됨. " + disable_remote_images_download_reason: "디스크저장공간이 부족하여 원격 이미지 다운로드 기능이 비활성화 되었습니다." + anonymous: "익명" errors: format: '%{attribute} %{message}' messages: too_long_validation: "%{length}자를 입력하셨습니다. 최대 %{max}자까지 입력 가능합니다. " invalid_boolean: "잘못된 값" + taken: "이미 가져옴" + accepted: 승인 필요 + blank: 비어있으면 안됨 + present: 비어야 함 + confirmation: " %{attribute} 속성과 맞지 않음" + empty: 필수사항 + equal_to: '다음 숫자와 같아야 함: %{count}' + even: 짝수여야 함 + exclusion: 예약됨 + greater_than: '%{count}보다 커야 함' + greater_than_or_equal_to: '%{count}보다 크거나 같아야 함' + inclusion: 리스트에 없음 + invalid: 올바르지 않음 + less_than: '%{count}보다 작아야 함' + less_than_or_equal_to: '%{count}보다 작거나 같아야 함' + not_a_number: 숫자가 아님 + not_an_integer: 정수여야 함 + odd: 홀수여야 함 + record_invalid: '유효성검사 실패: %{errors}' + restrict_dependent_destroy: + one: "연관된 %{record} 레코드가 존재하므로 레코드를 지울 수 없음." + many: "연관된 %{record} 레코드가 존재하므로 레코드를 지울 수 없음." + too_long: + other: 너무 김(최대 %{count} 글자) + too_short: + other: 너무 짦음(최소 %{count} 글자) + wrong_length: + other: 잘못된 길이 (%{count} 글자여야 함) + other_than: " %{count} 글자가 아니어야 합니다." + template: + body: '다음 필드에 문제가 있음:' + header: + other: '%{model} 저장 시에 %{count}개의 에러가 발생하여 진행을 못했습니다.' embed: load_from_remote: "글 로딩 중 오류가 발생하였습니다." bulk_invite: @@ -34,9 +68,11 @@ ko: backup_file_should_be_tar_gz: "백업 파일은 .tar.gz형식의 파일이어야 합니다." not_enough_space_on_disk: "백업을 업로드할 디스크 공간이 충분하지 않습니다." not_logged_in: "로그인된 사용자만 사용 가능합니다." + not_found: "요청한 URL이나 리소스를 찾지 못했습니다." + invalid_access: "요청한 리소스를 볼 권한이 없습니다." read_only_mode_enabled: "현재 읽기 전용 모드입니다." too_many_replies: - other: "죄송합니다. 신규 가입자들은 같은 주제에 %{count}개까지만 댓글을 달 수 있습니다." + other: "죄송합니다. 신규 가입자는 글 하나에 %{count}개까지만 댓글을 달 수 있습니다." embed: start_discussion: "토론 시작" continue: "토론 계속하기" @@ -44,32 +80,33 @@ ko: other: "추가 %{count} 개 댓글" loading: "토론 불러오는 중..." permalink: "Permalink" - imported_from: "%{link}에 있는 원글과 유사한 주제를 가진 토론 주제입니다." + imported_from: "%{link}에 있는 원글과 유사한 토론 글입니다." in_reply_to: "▶ %{username}" replies: other: "댓글 %{count}개" too_many_mentions: - zero: "죄송합니다. 당신은 다른 사용자를 언급할 수 없습니다." - one: "죄송합니다. 당신은 한 게시물에서 한 사용자만 언급할 수 있습니다." - other: "죄송합니다. 당신은 한 게시물에서 %{count}명의 사용자만 언급할 수 있습니다." + zero: "죄송합니다. 회원님은 다른 사용자를 언급할 수 없습니다." + one: "죄송합니다. 회원님은 한 댓글에서 한 사용자만 언급할 수 있습니다." + other: "죄송합니다. 회원님은 한 댓글에서 %{count}명의 사용자만 언급할 수 있습니다." too_many_mentions_newuser: - zero: "죄송합니다. 새로운 사용자는 다른 사용자를 언급할 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에서 한 사용자만 언급할 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에서 %{count}명의 사용자만 언급할 수 있습니다." + zero: "죄송합니다. 신규회원은 다른 사용자를 언급할 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 한 사용자만 언급할 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 %{count}명의 사용자만 언급할 수 있습니다." too_many_images: - zero: "죄송합니다. 새로운 사용자는 게시물에 이미지를 넣을 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 이미지만 넣을 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 이미지만 넣을 수 있습니다." + zero: "죄송합니다. 신규회원은 글에 이미지를 넣을 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 이미지 한 개만 넣을 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 이미지 %{count}개만 넣을 수 있습니다." too_many_attachments: - zero: "죄송합니다. 새로운 사용자는 게시물에 파일을 첨부 하실 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 파일만 첨부 하실 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 파일만 첨부 하실 수 있습니다." + zero: "죄송합니다. 신규회원은 글에 파일을 첨부 할 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 파일 한 개만 첨부할 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 파일 %{count}개만 첨부한 수 있습니다." too_many_links: - zero: "죄송합니다. 새로운 사용자는 게시물에 링크를 넣을 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 링크만 넣을 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 링크만 넣을 수 있습니다." - spamming_host: "죄송합니다. 링크를 첨부 하실 수 없습니다." - user_is_suspended: "가입이 보류된 사용자는 게시물을 작성할 수 없습니다." + zero: "죄송합니다. 신규회원은 글에 링크를 넣을 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 링크 한 개만 넣을 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 링크 %{count}개까지만 넣을 수 있습니다." + spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다." + user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다." + topic_not_found: "뭔가 잘못됐네요. 아마 글 보려는 도중에 글타래가 닫혔거나 지워진 건 아닐까요?" just_posted_that: "당신이 이전에 게시한 것과 너무 비슷합니다." has_already_been_used: "이미 사용되었습니다." invalid_characters: "사용할 수 없는 문자를 포함하고 있습니다." @@ -77,53 +114,68 @@ ko: next_page: "다음 페이지 →" prev_page: "← 이전 페이지" page_num: "%{num}페이지 " - topics_in_category: "'%{category}' 카테고리의 토픽들" + home_title: "홈" + topics_in_category: "'%{category}' 카테고리의 글타래들" rss_posts_in_topic: "'%{topic}' 의 RSS 피드" rss_topics_in_category: "'%{category}' 카테고리의 RSS 피드 " author_wrote: "%{author} 게시:" - num_posts: "게시글 수:" + num_posts: "글 수:" num_participants: "참여자:" - read_full_topic: "전체 토픽 읽기" + read_full_topic: "전체 글타래 읽기" + private_message_abbrev: "MSG" rss_description: - latest: "최신 토픽" - hot: "인기 토픽들" + latest: "최신 글타래" + hot: "인기 글타래" + posts: "최근 글" too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다." + excerpt_image: "이미지" + queue: + delete_reason: "운영팀이 글을 지웠습니다." groups: errors: can_not_modify_automatic: "자동 그룹은 수정 하실 수 없습니다." + member_already_exist: "'%{username}'은 이미 이 그룹의 멤버입니다." default_names: everyone: "모든 사람" - admins: "운영자들" + admins: "관리자" moderators: "운영자" staff: "스태프" - trust_level_0: "신뢰도_0" - trust_level_1: "신뢰도 1" - trust_level_2: "신뢰도 2" - trust_level_3: "신뢰도 3" - trust_level_4: "신뢰도 4" + trust_level_0: "회원등급 0" + trust_level_1: "회원등급 1" + trust_level_2: "회원등급 2" + trust_level_3: "회원등급 3" + trust_level_4: "회원등급 4" education: until_posts: - other: "%{count} 글" + other: "글 %{count}개" + new-topic: | + %{site_name}에 오신 것을 환영합니다 — **새로운 대화를 시작해서 감사합니다.** + + - 제목을 큰소리로 읽어봤을 때 흥미롭게 들리던가요? 좋은 요약문인가요? + + - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요? + + - 사람들이 *검색*할 수 있도록 글타래에 흔히 사용하는 단어를 집어넣으세요. 관련 글타래와 같이 엮으려면 해당 카테고리를 선택하시고요. + + 이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요. new-reply: | %{site_name}에 오신것을 환영합니다! - - 당신의 답글이 주제에 도움이 될 수 있도록 참여해주세요. + - 당신의 댓글이 어떤 식으로든 토론을 발전시키나요? - - 커뮤니티 사용자들의 의견을 존중하여 주시고 그들에게 예의를 갖춰주세요. + - 당신의 커뮤니티 회원에게 예의를 갖춰주세요. - - 건설적인 비판은 환영입니다, 하지만 사용자들이 아닌 그들의 아이디어를 비판해주세요. + - 건설적인 비판은 환영입니다만, 사람 말고 *아이디어*를 비판해주세요. - 더 자세한 사용방법은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요. + 이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요. + sequential_replies: | + ### 여러 글에 답글 한번에 달아보세요. - 이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. - avatar: | - ### 당신의 프로필에 새로운 사진을 등록해보는건 어떨까요?? + 답글을 연속으로 한 글타래에 달기 보다는 지난 글을 인용하거나 @사용자이름 해서 답글 하나로 작성해보세요. - 사용자님께서는 여러개의 토픽과 답글을 등록하였음에도 불구하고, 현재 아바타는 새로운 유저와 같은 아바타를 사용하고 있습니다. + 원하시는 글을 선택하시고 답글을 인용 버튼을 선택함으로써 이전에 쓰셨던 답글에 추가로 인용을 달거나 수정하실 수 있습니다. - **[프로필](%{profile_path})** 에 방문해서 사용자님을 표현하는 아바타 이미지를 올려보는건 어떨까요? - - 사용자님만의 특별난 아바타를 가지고 있으시면 사용자님의 의견에 더욱 집중 할 수 있고 또한 관심있는 사용자로써 찾기가 더 쉬워집니다! + 작은 답글을 여러개 다는 것보다 한개의 상세한 답글이 모두에게 글타래를 읽기 편하게 만듭니다. dominating_topic: | ### 다른 유저들도 이 대화에 참여할 수 있도록 해주세요 @@ -134,13 +186,13 @@ ko: ### 댓글 개수 제한에 걸렸습니다. 죄송합니다. 신규 사용자들은 같은 주제에 %{count}개까지만 댓글을 달 수 있습니다. - 댓글을 다는 대신 이전 댓글의 내용을 수정하거나, 다른 토픽을 읽어보는 건 어떨까요? + 댓글을 다는 대신 이전 댓글의 내용을 수정하거나, 다른 글타래를 읽어보는 건 어떨까요? reviving_old_topic: | - ### 이 토픽을 부활시키겠습니까? + ### 이 글타래를 부활시키겠습니까? - 이 토픽에 달린 마지막 댓글은 이미 %{days}일 이전에 달렸습니다. 댓글을 새로 달면 이 토픽이 글 목록의 최상단으로 올라가게 되고, 글에 참여한 사람들에게 알림이 됩니다. + 이 글타래에 달린 마지막 댓글은 이미 %{days}일 이전에 달렸습니다. 댓글을 새로 달면 이 글타래가 글 목록의 최상단으로 올라가게 되고, 글에 참여한 사람들에게 알림이 됩니다. - 이 토픽에 대한 논의를 재개하고 싶으신 게 확실하신가요? + 이 글타래에 대한 논의를 재개하고 싶으신 게 확실하신가요? activerecord: attributes: category: @@ -165,6 +217,8 @@ ko: attributes: password: common: "가장 자주 사용되는 10000개의 비밀번호 중 하나압니다. 보다 안전한 비밀번호를 사용하세요." + same_as_username: "는 아이디랑 같음. 제발 좀 더 안전한 비밀번호를 사용해주세요." + same_as_email: "는 이메일 주소랑 같음. 좀 더 안전한 비밀번호를 사용해주세요." ip_address: signup_not_allowed: "이 계정에서는 가입 하실 수 없습니다." color_scheme_color: @@ -175,17 +229,17 @@ ko: no_info_me: "
      프로필이 현재 비어있습니다. 지금 작성하시겠습니까?
      " no_info_other: "
      %{name}님께서는 아직 프로필을 작성하지 않으셨습니다
      " vip_category_name: "라운지" - vip_category_description: "신뢰 등급 3 혹은 그 이상의 회원만 입장가능한 카테고리" - meta_category_name: "메타" + vip_category_description: "회원등 3 혹은 그 이상의 회원만 입장가능한 카테고리" + meta_category_name: "사이트 피드백" meta_category_description: "이 사이트의 운영 방식에 대해 건의하고 토론하는 곳입니다." staff_category_name: "스태프" staff_category_description: "스태프들의 논의를 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다." - assets_topic_body: "이 토픽은 스태프에게만 보이는 영구적인 토픽입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 토픽에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (포스트 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출한다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요." + assets_topic_body: "이 글타래는 스태프에게만 보이는 영구적인 글타래입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 글타래에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (글 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출합니다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요." lounge_welcome: title: "라운지에 오신 것을 환영합니다." body: |2 - 축하합니다! :confetti_ball: 당신의 신뢰도가 **지도자** (신뢰도 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 … * 토픽을 제목을 수정할 수 있습니다 * 토픽의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 신뢰도 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](/badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (신뢰도에 관한 더 자세한 정보를 보시려면, [이 토픽을 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 + 축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 글타래를 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 … * 글타래를 제목을 수정할 수 있습니다 * 글타래의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](/badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 글타래를 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 category: topic_prefix: "'%{category}' 카테고리의 설명" replace_paragraph: "[이 첫번째 문단을 당신의 새로운 카테고리의 짧은 설명으로 바꿔주세요. 이 지침은 카테고리 선택 화면에 나타날 것입니다. 200자 이하로 적어주세요.]" @@ -194,12 +248,13 @@ ko: uncategorized_parent: "Uncategorized 카테고리는 부모 카테고리를 가질 수 없습니다." self_parent: "하위 카테고리의 부모는 자신이 될 수 없습니다." depth: "하위 카테고리는 계층 구조로 사용할 수 없습니다." + email_in_already_exist: "'%{email_in}' 수신용 이메일 주소는 '%{category_name}' 카테고리 에서 사용 중입니다." cannot_delete: uncategorized: "Uncategorized는 삭제할 수 없습니다." has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다." topic_exists: - other: "%{count}개의 토픽이 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 토픽은 %{topic_link}입니다." - topic_exists_no_oldest: "%{count}개의 토픽이 이 카테고리 내에 있어 삭제할 수 없습니다." + other: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 글타래는 %{topic_link}입니다." + topic_exists_no_oldest: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다." trust_levels: newuser: title: "새로운 사용자" @@ -211,7 +266,7 @@ ko: title: "정규 회원" elder: title: "지도자" - change_failed_explanation: "당신은 %{user_name} 사용자를 '%{new_trust_level}'으로 강등시키려 하였습니다. 하지만 해당 사용자의 신뢰도는 이미 '%{current_trust_level}'입니다. %{user_name} 사용자의 신뢰도는 '%{current_trust_level}'으로 유지됩니다. - if you wish to demote user lock trust level first" + change_failed_explanation: "당신은 %{user_name} 사용자를 '%{new_trust_level}'으로 강등시키려 하였습니다. 하지만 해당 사용자의 회원등급는 이미 '%{current_trust_level}'입니다. %{user_name} 사용자의 회원등급는 '%{current_trust_level}'으로 유지됩니다. - if you wish to demote user lock trust level first" rate_limiter: slow_down: "해당 작업을 너무 많이 수행했습니다. 잠시 뒤에 다시 시도해보세요." too_many_requests: "지금 하시려는 행동에는 하루 제한이 있습니다. %{time_left} 동안 기다리시고 다시 시도해 주세요." @@ -284,34 +339,38 @@ ko: please_continue: "%{site_name}으로 가기" error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?" activation: - action: "계정 활성화" already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다." please_continue: "계정이 활성화 되었습니다; 홈페이지로 이동합니다." continue_button: "%{site_name}으로 가기" welcome_to: "%{site_name}에 오신것을 환영합니다." approval_required: "이 포럼을 사용하기 위해선 운영자가 수동으로 당신의 새로운 계정을 수락해야 합니다. 계정이 수락이 되면 자동으로 이메일이 발송됩니다." + missing_session: "계정이 생성되었는지 확인을 못 하고 있습니다. 쿠키 설정이 켜졌는지 다시 한번 확인바랍니다." post_action_types: off_topic: - title: '오프 토픽' - description: '이 게시물은 이곳의 토픽과 관련된것 같지 않습니다. 다른 토픽으로 옮기거나 새로운 토픽을 시작하는 것이 어떤가요?' - long_form: '오프 토픽으로 신고하기' + title: '오프 글타래' + description: '이 글은 이곳의 글타래과 관련된것 같지 않습니다. 다른 글타래로 옮기거나 새로운 글타래를 시작하는 것이 어떤가요?' + long_form: '오프 글타래으로 신고하기' spam: title: '스팸' - description: '이 게시물은 광고성으로 판단되어집니다. 이 글은 현재 대화에서 유용하지도, 관련되지 않습니다.' + description: '이 글은 광고성으로 판단되어집니다. 이 글은 현재 대화에서 유용하지도, 관련되지 않습니다.' long_form: '스팸으로 신고하기' + email_title: '"%{title}" 스팸으로 지목됨' + email_body: "%{link}\n\n%{message}" inappropriate: title: '부적절함' - description: '이 게시물은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.' + description: '이 글은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.' long_form: '부적절함으로 신고하기' notify_user: - description: '이 게시물에 내가 작성자와 직접 대화하고 싶은 내용이 있습니다. 신고에서 제외해주세요.' - email_title: '"%{title}" 내의 당신의 게시글' + title: '메세지 @{{username}}' + description: '이 글에 내가 작성자와 직접 대화하고 싶은 내용이 있습니다. 신고에서 제외해주세요.' + long_form: '메세지한 유저' + email_title: '"%{title}" 내의 당신의 글' email_body: "%{link}\n\n%{message}" notify_moderators: title: "뭔가 다른것" - description: '이 게시물은 리스트에 없는 이유로 관리자의 주의가 필요합니다.' + description: '이 글은 리스트에 없는 이유로 관리자의 주의가 필요합니다.' long_form: '관리자의 주의를 위해 신고' - email_title: '"%{title}" 게시물에 대한 운영자의 확인이 필요합니다' + email_title: '"%{title}" 글에 대한 운영자의 확인이 필요합니다' email_body: "%{link}\n\n%{message}" bookmark: title: '북마크' @@ -332,25 +391,27 @@ ko: long_form: '스팸으로 신고하였습니다.' inappropriate: title: '부적절함' - description: '이 게시물은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나, + description: '이 글은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나, 커뮤니티 가이드라인에 맞지 않습니다.' long_form: '부적절함으로 신고하였습니다.' notify_moderators: title: "뭔가 다른것" - description: '이 게시물은 가이드라인, 이용약관, 또는 다른 이유와 관련해서 운영자의 주의가 필요합니다.' + description: '이 글은 가이드라인, 이용약관, 또는 다른 이유와 관련해서 운영자의 주의가 필요합니다.' long_form: '관리자의 주의를 위해 신고' - email_title: '토픽 "%{title}" 은 운영자의 확인이 필요합니다' + email_title: '글타래 "%{title}" 은 운영자의 확인이 필요합니다' email_body: "%{link}\n\n%{message}" flagging: - user_must_edit: '

      게시물이 신고되었기 때문에 일시적으로 보이지 않습니다.

      ' + you_must_edit: '

      회원님의 글이 신고되었습니다. 메세지를 확인 해주세요.

      ' + user_must_edit: '

      글이 신고되었기 때문에 일시적으로 보이지 않습니다.

      ' archetypes: regular: - title: "자주보는 토픽" + title: "자주보는 글타래" banner: + title: "배너 글타래" message: - make: "이 토픽은 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다." - remove: "이 토픽은 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다." + make: "이 글타래는 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다." + remove: "이 글타래는 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다." unsubscribed: title: '구독 해지"' description: "구독이 해지되었습니다." @@ -369,16 +430,17 @@ ko: xaxis: "일" yaxis: "방문자 수" signups: + title: "새 사용자" xaxis: "일" yaxis: "새로운 사용자 수" topics: - title: "토픽들" + title: "글타래들" xaxis: "일" - yaxis: "새로운 토픽의 개수" + yaxis: "새로운 글타래의 개수" posts: - title: "게시물들" + title: "글들" xaxis: "일" - yaxis: "새로운 게시물의 개수" + yaxis: "새로운 글의 개수" likes: title: "좋아요" xaxis: "일" @@ -396,8 +458,8 @@ ko: xaxis: "일" yaxis: "새로운 즐겨찾기 수" users_by_trust_level: - title: "신뢰도당 사용자 수" - xaxis: "신뢰도" + title: "회원등급당 사용자 수" + xaxis: "회원등급" yaxis: "사용자 수" emails: title: "이메일 보냄" @@ -406,33 +468,86 @@ ko: user_to_user_private_messages: title: "사용자대 사용자" xaxis: "일" + yaxis: "메세지 수" system_private_messages: title: "시스템" xaxis: "일" + yaxis: "메세지 수" moderator_warning_private_messages: title: "운영자 주의" xaxis: "일" + yaxis: "메세지 수" notify_moderators_private_messages: title: "운영자에게 알리기" xaxis: "일" + yaxis: "메세지 수" notify_user_private_messages: title: "사용자에게 알리기" xaxis: "일" + yaxis: "메세지 수" top_referrers: title: "가장 많이 언급된 사용자들" xaxis: "사용자" num_clicks: "클릭" - num_topics: "토픽들" + num_topics: "글타래들" top_traffic_sources: title: "트래픽 소스 순위" xaxis: "도메인" num_clicks: "클릭" - num_topics: "토픽들" + num_topics: "글타래들" num_users: "사용자들" top_referred_topics: - title: "가장 많이 참조된 토픽들" - xaxis: "토픽" + title: "가장 많이 참조된 글타래들" + xaxis: "글타래" num_clicks: "클릭" + page_view_anon_reqs: + title: "익명" + xaxis: "일" + yaxis: "익명 API 요청" + page_view_logged_in_reqs: + title: "로그인됨" + xaxis: "일" + yaxis: "API 요청 로그인됨" + page_view_crawler_reqs: + title: "웹크롤러" + xaxis: "일" + yaxis: "웹크롤러 API 요청" + page_view_total_reqs: + title: "총" + xaxis: "일" + yaxis: "총 API 요청" + http_background_reqs: + title: "백그라운드" + xaxis: "일" + yaxis: "라이브업데이트와 트랙킹에 사용된 요청" + http_2xx_reqs: + title: "Status 2xx (정상)" + xaxis: "일" + yaxis: "정상 요청 (Status 2xx)" + http_3xx_reqs: + title: "HTTP 3xx (다른페이지로이동)" + xaxis: "일" + yaxis: "다른페이지로이동 요청 (Status 3xx)" + http_4xx_reqs: + title: "HTTP 4xx (클라이언트 오류)" + xaxis: "일" + yaxis: "클라이언트 오류 (Status 4xx)" + http_5xx_reqs: + title: "HTTP 5xx (서버 오류)" + xaxis: "일" + yaxis: "서버 오류 (Status 5xx)" + http_total_reqs: + title: "총" + xaxis: "일" + yaxis: "총 요청횟수" + time_to_first_response: + title: "첫 응답" + xaxis: "일" + yaxis: "평균 시간 (시간단위)" + topics_with_no_response: + title: "답글 없는 주제" + xaxis: "일" + yaxis: "총" dashboard: rails_env_warning: "당신의 서버는 %{env} 모드에서 실행되고 있습니다." ruby_version_warning: "당신은 문제가 자주 발생하는 루비 버전 2.0.0을 사용하시고 있습니다. 247 또는 이후 패치 레벨로 업그레이드를 해주세요." @@ -447,22 +562,30 @@ 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) 중 하나를 설정하지 않았습니다. 사이트 세팅에서 설정해주세요. 자세히 알아보기("How to set up image uploads to S3?").' s3_backup_config_warning: 's3를 이용한 서버 설정이 완료 되지 않았습니다: s3_access_key_id, s3_secret_access_key, s3_secret_access_key 또는 s3_upload_bucket. 사이트 설정 에 가셔서 업데이트 하세요. "How to set up image uploads to S3?" 읽어 보세요.' image_magick_warning: '큰 이미지의 섬네일 만드는 설정이 있지만, ImageMagick가 설치되지 않았습니다. 최신버전 받기.' - failing_emails_warning: '%{num_failed_jobs} 개의 이메일 잡이 실패하였습니다. config.action_mailer 설정이 정확한지 config/environments/production.rb 파일을 체크해보세요.' + default_logo_warning: "사이트에 로고를 설정해 주세요. logo_url, logo_small_url, 와 favicon_url 를 사이트 설정 에서 설정하세요." + contact_email_missing: "사이트에 이메일을 설정해서 사이트와 관련된 긴급사항을 받아보세요. contact_email 을 사이트 설정 에서 설정해주세요." + contact_email_invalid: "이 사이트의 연락가능한 이메일이 부정확 합니다. 사이트 설정 에서 업데이트 해주세요." + title_nag: "사이트 이름을 설정하세요. 사이트 설정 에서 사이트 이름을 업데이트 해주세요." + site_description_missing: "검색 결과에 나올 한줄 설명을 적어주세요. 사이트 설정에서 site_description 업데이트하세요." consumer_email_warning: "이메일 전송을 위해 Gmail(또는 다른 커스텀 이메일 서비스)을 사용하고 있습니다. Gmail의 이메일 전송 제한 을 읽어보세요. mandrill.com을 이메일 서비스로 설정하는 것을 고려해보세요." + site_contact_username_warning: "중요 자동 메세지를 보낼 스태프 사용자 계정의 이름을 적으세요. 사이트 설정에서 site_contact_username을 업데이트하세요." + notification_email_warning: "알람 메일이 올바른 이 사이트의 도메인 내 이메일 주소로 전송되지 않고 있습니다; 이메일 전송이 안정적이지 않을 것입니다. 사이트 설정에서 올바른 도메인의 이메일 주소로 정해주세요." content_types: education_new_reply: title: "새로운 사용자 교육: 첫번째 답글들" description: "새로운 사용자가 첫 두개의 답글을 작성하면 자동 팝업됩니다." education_new_topic: - title: "새로운 사용자 교육: 첫번째 토픽들" - description: "새로운 사용자가 첫 두개의 토픽을 작성하면 자동 팝업됩니다." + title: "새로운 사용자 교육: 첫번째 글타래들" + description: "새로운 사용자가 첫 두개의 글타래를 작성하면 자동 팝업됩니다." usage_tips: title: "새로운 사용자 가이드" description: "새로운 사용자를 위한 가이드와 팁." welcome_user: title: "환영: 새로운 사용자" + description: "새 가입자에게 전달할 자동 메세지" welcome_invite: title: "환영: 초대된 사용자" + description: "사용자가 다른 사람이 보낸 초대장에 승인했을 때 에게 전달 될 자동 메세지" login_required_welcome_message: title: "로그인 필요: Welcome Message" description: "'login required' 설정이 활성화 되어있으면 웰컴 메시지가 로그인 되지 않은 사용자들에게 보여집니다." @@ -474,7 +597,7 @@ ko: description: " 태그 사이에 추가할 HTML" top: title: "페이지 상단" - description: "모든 페이지 상단에 추가할 HTML(헤더 아래, 네비게이션이나 토픽 제목 위)." + description: "모든 페이지 상단에 추가할 HTML(헤더 아래, 네비게이션이나 글타래 제목 위)." bottom: title: "페이지 하단" description: "모든 페이지 하단에 추가할 HTML" @@ -482,64 +605,75 @@ ko: censored_words: "단어는 자동적으로 `■■■■` 로 대체 됩니다." delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다." default_locale: "Discourse 인스턴스가 사용하는 기본 언어 (ISO 639-1 Code)" - allow_user_locale: "사용자에게 자신이 원하는 언어를 선택할 수 있는 옵션을 제공한다." - min_post_length: "포스트의 최소 글자 수" - max_post_length: "포스트의 최대 글자 수" - min_topic_title_length: "토픽 제목의 최소 글자 수" - max_topic_title_length: "토픽 제목의 최대 글자 수" + allow_user_locale: "사용자에게 자신이 원하는 언어를 선택 허용" + min_post_length: "글의 최소 글자 수" + min_first_post_length: "첫 글 (내용)의 최소 길이" + min_private_message_post_length: "메세지 내용의 최소 길이" + max_post_length: "글의 최대 글자 수" + min_topic_title_length: "글타래 제목의 최소 글자 수" + max_topic_title_length: "글타래 제목의 최대 글자 수" + min_private_message_title_length: "메세지 제목의 최소 길이" min_search_term_length: "검색을 하기 위한 최소 글자 수" - allow_uncategorized_topics: "카테고리없이 토픽이 생성되는 것을 허용한다." + allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다." uncategorized_description: "'카테고리 없음' 카테고리의 설명, 설명을 쓰지 않으려면 빈칸으로 놔둔다." - allow_duplicate_topic_titles: "같은 제목의 동일한 토픽을 허용한다." - unique_posts_mins: "같은 컨텐츠를 다시 포스트 할 수 있는 기간(분)" - educate_until_posts: "새로운 사용자가 포스트를 작성할 시 포스트 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 포스트 개수" + allow_duplicate_topic_titles: "같은 제목의 동일한 글타래 허용" + unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)" + educate_until_posts: "새로운 사용자가 글를 작성할 시 글 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 글 개수" title: "타이틀 태그에 쓰일 이 사이트의 이름" - queue_jobs: "오직 개발자만!! 주의!! By default, queue jobs in sidekiq. If disabled, your site will be broken." + site_description: "이 사이트를 한 문장으로 설명해 주세요. 설명 메타태그에 사용됩니다." + contact_email: "문의 답변 관련 중요 책임자 이메일주소. 접수안된 신고, 긴급사항으로 /about 양식에서 보낸 메일 등 중요한 알림에 사용 됩니다. " + contact_url: "이 사이트의 문의 URL. /about 문의양식에 사용됩니다." + queue_jobs: "개발자 전용! 경고! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "제대로된 넓이와 높이를 추가하기 위해, 원격 URL로 부터 이미지를 회수해온다." - download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경한다. 이미지가 깨지는 것을 막을 수 있다." + download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경. 이미지가 깨지는 것을 막을 수 있습니다." download_remote_images_threshold: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)" disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트" ninja_edit_window: "편집을 결과가 새로운 버전을 생성하지 않는 포스팅 이후에 경과할 시간(초)" post_edit_time_limit: "글 작성자가 해당 글을 편집하거나 삭제할 수 있도록 허용되는 시간(분). 0으로 설정하면 언제든지 편집이나 삭제가 허용됨." - edit_history_visible_to_public: "모든 사용자가 게시글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음." - delete_removed_posts_after: "작성자에 의해 삭제된 게시물은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." + edit_history_visible_to_public: "모든 사용자가 글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음." + delete_removed_posts_after: "작성자에 의해 삭제된 글은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." max_image_width: "글에서 사용할 수 있는 썸네일 이미지의 최대 너비" max_image_height: "글에서 사용할 수 있는 썸네일 이미지의 최대 높이" - category_featured_topics: "카테고리 페이지에서 한 카테고리당 보여질 토픽의 수" - show_subcategory_list: "카테고리에 들어갈 경우 토픽 리스트 대신 하위카테고리의 리스트를 보여준다." + category_featured_topics: "카테고리 페이지에서 한 카테고리당 보여질 글타래의 수" + show_subcategory_list: "카테고리에 들어갈 경우 글타래 리스트 대신 하위카테고리의 리스트를 보여준다." fixed_category_positions: "활성화하면 고정된 순서의 카테고리들을 바꿀 수 있다. 활성화 하지 않으면 카테고리는 활동적인 순서에 따라 정렬된다." + fixed_category_positions_on_create: "선택 시, 카테고리 정렬이 유지됩니다. (fixed_category_positions가 체크돼 있어야 합니다.)" add_rel_nofollow_to_user_content: "사용자 생성 컨텐츠에 대해서 rel nofollow 를 설정함. parent domain을 포함한 internal link는 예외임. 이 설정을 바꾸려면 모든 baked markdown을 \"rake posts:rebake\" 명령으로 변경해주서야 함" - post_excerpt_maxlength: "게시글 인용에 허용되는 최대 글자수" - post_onebox_maxlength: "onebox가 적용된 Discourse 포스트에 허용되는 최대 글자수" - onebox_domains_whitelist: "onebox 사용을 허가할 도메일 리스트; 이 도메인은 OpenGraph나 oEmbed를 지원하여야한다. http://iframely.com/debug를 통해 테스트해볼 수 있다." - logo_url: "로고 이미지는 사이트의 왼쪽 상단에 나타납니다. 만약 왼쪽이 비어있다면 사이트의 이름이 나타납니다." - digest_logo_url: "요약 이메일 발송시 사용될 로고. 공백으로 남겨두면 `logo_url`이 사용됩니다. 예: http://example.com/logo.png" - logo_small_url: "작은 로고 이미지는 사이트 왼쪽 상단에 스크롤링할 때 나타납니다. 만일 왼쪽이 빈다면 홈으로 가는 글자가 표시됩니다." - favicon_url: "이 사이트의 favicon, 참고 http://en.wikipedia.org/wiki/Favicon" + exclude_rel_nofollow_domains: "nofollow 도메인 리스트에 넣으면 링크에 추가가 안됩니다. tld.com은 자동으로 sub.tld.com도 포함합니다. 최소한, 이 사이트의 top-level 도메인은 허가해서 웹크롤러가 모든 자료를 검색할 수 있게 해야합니다. 다른 도메인으로도 이 사이트가 들어가진다면 그것도 추가해야 합니다." + post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수" + post_onebox_maxlength: "onebox가 적용된 Discourse 글에 허용되는 최대 글자수" + onebox_domains_whitelist: "onebox 사용을 허가할 도메일 리스트; 이 도메인은 OpenGraph나 oEmbed를 지원하여야합니다. 테스트: http://iframely.com/debug" apple_touch_icon_url: "애플 디바이스는 144px의 아이콘을 사용함. 144px X 144px 사이즈를 추천함" notification_email: "The from: 이 이메일 주소는 모든 기본 시스템 메일을 보내는데 사용됩니다. 여기에 명시된 도메인은 SPF, DKIM가 적용되어 있어야하며, reverse PTR 레코드가 제대로 설정되어 있어야 메일이 도착 할 수 있습니다." email_custom_headers: "커스텀 이메일 해더의 pipe-delimited" email_subject: "일반 메일을 위한 제목 커스터마이징. 이곳을 참고 https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" use_https: "사이트의 사이트의 전체 url((Discourse.base_url)이 http인가 아니면 https인가? 이미 HTTPS를 설정하고 동작중이 아니라면 활성화하지 마세요." - summary_score_threshold: "요약본에 포함되기 위한 게시글의 최소 점수 값" - summary_posts_required: "하나의 토픽에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 게시글 수" - summary_likes_required: "하나의 토픽에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수" + summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값" + summary_posts_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 글 수" + summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수" summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?" summary_max_results: "이 주제에 대한 요약 글 최대 갯수" + enable_private_messages: "회원등급 1인 유저들에게 메세지 작성과 메세지 답변을 허용하기" enable_long_polling: "Message bus used for notification can use long polling" + long_polling_base_url: "long polling에 사용 될 Base URL (CDN이 동적 콘텐트를 제공할 시에는 origin pull로 설정) eg: http://origin.site.com" + long_polling_interval: "보낼 데이터가 없을 때 응답 전에 서버가 기다려야하는 시간 (로그인된 유저 전용)" + polling_interval: "long polling을 안 쓸 때 로그인된 클라이언트가 몇 밀리초마다 poll해야 하는 지" anon_polling_interval: "How often should anonymous clients poll in milliseconds" - auto_track_topics_after: "토픽이 자동으로 추적되기까지의 기본 시간, 사용자에 따라 재정의 될 수 있음.(밀리초, 0 : 항상, -1 : 안함)" - new_topic_duration_minutes: "토픽이 새로운 토픽으로 간주되는 시본 시간, 사용자에 따라 재정의 될 수 있음.(분, -1 : 항상, -2 : 마지막 접속)" + background_polling_interval: "(페이지를 안 보고 있을 때) 클라이언트가 몇 밀리초마다 poll해야 하는 지" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "신고 당해서 숨겨진 글을 사용자가 편집할 수 있기 전까지 기대려야 하는 시간(분)" - max_topics_in_first_day: "사용 첫 날에 토픽을 생성할 수 있는 최대 허용 개수" + max_topics_in_first_day: "사용 첫 날에 글타래를 생성할 수 있는 최대 허용 개수" max_replies_in_first_day: "사용 첫 날에 사용자가 생성할 수 있는 답글의 최대 허용 개수" - num_flags_to_block_new_user: "신규 사용자가 n명의 다른 사용자들로부터 이 수치에 해당하는 스팸 신고를 받으면, 작성한 모든 게시글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" - num_users_to_block_new_user: "신규 사용자가 이 수치에 해당하는 다른 사용자들로부터 x개의 스팸 신고를 받으면, 작성한 모든 게시글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" + tl2_additional_likes_per_day_multiplier: "tl2 (회원)의 일별 좋아요 제한을 올릴 배수" + tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수" + tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수" + num_flags_to_block_new_user: "신규 사용자가 n명의 다른 사용자들로부터 이 수치에 해당하는 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" + num_users_to_block_new_user: "신규 사용자가 이 수치에 해당하는 다른 사용자들로부터 x개의 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" notify_mods_when_user_blocked: "만약 사용자가 자동 블락되면 중간 운영자에게 메시지 보내기" - flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 토픽을 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고" + flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고" traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것." - post_undo_action_window_mins: "사용자가 어떤 게시글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)" + post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)" + must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다." ga_tracking_code: "Google analytics (ga.js)의 트래킹 코드, 예: UA-12345678-9; 참고 http://google.com/analytics" ga_domain_name: "Google analytics (ga.js)의 도메인 이름, 예: mysite.com; 참고 http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js)의 트래킹 코드, 예: UA-12345678-9; 참고 http://google.com/analytics" @@ -547,168 +681,249 @@ ko: enable_escaped_fragments: "구형의 검색엔진 및 크롤러도 잘 동작하게 하기 위한 동작을 활성화. https://support.google.com/webmasters/answer/174992?hl=en 참고하세요." enable_noscript_support: "당신의 사이트를 검색하기 위한 noscript 태그를 이용한 일반적인 웹 크롤러를 활성화" allow_moderators_to_create_categories: "운영자가 새로운 카테고리를 만드는 것을 허용" - post_menu: "게시물 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)" + cors_origins: "Allowed origins cross-origin requests (CORS). 각 origin은 반드시 http:// 나 https:// 를 포함해야합니다. DISCOURSE_ENABLE_CORS 환경 변수를 true로 지정해줘야 CORS를 활성화할 수 있습니다." + top_menu: "첫페이지 메뉴에 어떤 아이템이 뜨고 어떤 순서로 뜰지 정합니다 예 최근|새로씀|안읽음|카테고리|위로|읽음|쓴글|북마크" + post_menu: "글 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)" + post_menu_hidden_items: "게시 메뉴에서 기본으로 숨길 메뉴 아이템들" share_links: "공유 다이얼로그에 어떤 아이템이 어떤 순서로 나올지 결정" track_external_right_clicks: "우클릭한 외부 링크를 추적한다 (에: 새 탭 열기) 이 설정을 위해선 해당 URL를 다시 써야하는 이유로 기본값은 비활성화이다." - suppress_reply_directly_below: "게시글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음" - suppress_reply_directly_above: "단 하나의 댓글 위의 게시글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음." + site_contact_username: "자동 메세지를 보낼 올바른 스태프 아이디. 빈칸으로 놔두면 기본 시스템 계정이 사용됩니다." + send_welcome_message: "모든 신규 유저들에게 시작 매뉴얼과 함께 환영 메세지 보내기" + suppress_reply_directly_below: "글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음" + suppress_reply_directly_above: "단 하나의 댓글 위의 글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음." + suppress_reply_when_quoting: "글안에 답글이 인용될 때 in-reply-to를 보여주지 않습니다." max_reply_history: "덧글 확장해서 보여지는 최대 갯수" - topics_per_period_in_top_summary: "인기 토픽 요약에 기본으로 보여질 토픽 수" - topics_per_period_in_top_page: "인기 토픽에서 '더 보기'를 요청할 시 보여질 토픽 수" + experimental_reply_expansion: "답글을 펼쳤을 때 중간 답글을 숨깁니다(실험 중)" + topics_per_period_in_top_summary: "인기 글타래 요약에 기본으로 보여질 글타래 수" + topics_per_period_in_top_page: "인기 글타래에서 '더 보기'를 요청할 시 보여질 글타래 수" redirect_users_to_top_page: "자동으로 신규 사용자와 오래간만에 들어온 사용자를 탑 페이지로 리다이렉트 시킴" show_email_on_profile: "사용자 프로필에서 자신의 이메일 주소 보기( 오직 본인과 관리자만 볼 수 있음)" email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)" email_token_grace_period_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰은 사용되어진 이후 유효한 기간(시간)" enable_badges: "훈장 시스템 활성화" allow_index_in_robots_txt: "이 사이트가 검색엔진에 의해 인덱스되는 것을 허용합니다.(robots.txt 수정)" + email_domains_blacklist: "가입 금지된 이메일 도메인 목록, 파이프 기호로 구분. 예: mailinator.com|trashmail.net" + email_domains_whitelist: "가입하려면 반드시 사용해야하는 이메일 도메인 목록, 파이프 기호로 구분. 경고: 이 목록외의 도메인으로는 가입이 안됩니다!" + forgot_password_strict: "비밀번호 찾기에서 아이디의 존재유무를 사용자에게 알리지 않습니다." + log_out_strict: "로그아웃 할때, 모든 장치에서 다같이 로그아웃" + version_checks: "Dicousre Hub에 ping을 날려 버전 업데이트와 새 버전 알림을 /admin 대시보드에 보이게 합니다." new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다." port: "Use this HTTP port rather than the default of port 80. Leave blank for none, mainly useful for development" force_hostname: "Specify a hostname in the URL. Leave blank for none, mainly useful for development" invite_expiry_days: "사용자 초대키 유효 기간, 일" invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간" invite_only: "공개 가입은 불가하도록 설정됨. 초대를 받아야만 신규 가입 가능함." - login_required: "게시글을 읽으려면 인증(로그인)이 필요함" + login_required: "글을 읽으려면 인증(로그인)이 필요함" min_password_length: "비밀번호 최소 글자수." block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음." + enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)" + enable_sso_provider: "/session/sso_provider 를 엔드포인트로 사용해서 Discourse SSO 제공 프로토콜 구현하기, sso_secret 체크 필요" sso_url: "SSO endpoint의 URL" - sso_overrides_email: "내부에서 사용되는 이메일을 SSO로부터 부여받은 외부 이메일로 사용. (주의 : 내부에서 사용되는 이메일 표준화로 인해 불일치가 발생할 수 있)" - sso_overrides_username: "내부에서 사용되는 사용자 이름을 SSO로부터 부여받은 외부 사용자 이름으로 사용. (주의 : 내부에서 사용되는 사용자 이름의 길이/요구조건의 차이점 때문에 불일치가 발생할 수 있)" + sso_secret: "SSO 정보 암호화 인증에 사용 될 암호 문자열, 10글자 이상이어야 합니다." + sso_overrides_email: "SSO로 접속 시 사용자 이메일 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 이메일 정보 불일치가 생길 수도 있습니다)" + sso_overrides_username: "SSO로 접속 시 사용자 아이디 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 아이디 길이/필요조건 등 내부 규정으로 인해 불일치가 생길 수도 있습니다)" + sso_overrides_name: "SSO로 접속 시 사용자 실명 정보 갱신 후 사용자 임의 변경 금지 설정" + sso_overrides_avatar: "SSO로 접속 시 사용자 아바타 이미지 갱신. 활성화하고 allow_uploaded_avatars를 비활성화를 매우 권장합니다." + sso_not_approved_url: "승인안된 SSO 계정은 이 URL로 이동" enable_local_logins: "기존의 로컬 username, password에 의한 인증을 허용. (초대 기능이 필요하다면 이 기능을 허용해야 함)" allow_new_registrations: "새로운 사용자 가입을 허락함. 새로운 계정 생성을 막으려면 체크하지 않음." enable_yahoo_logins: "야후 인증 활성화" - enable_google_oauth2_logins: "Google Oauth2 인증을 활성화한다. 이 인증 수단은 현재 Google에서 제공하고 있으며, key와 secret이 필요." + enable_google_oauth2_logins: "Google Oauth2 인증을 활성화합니다. 이 인증 수단은 현재 Google에서 제공하고 있으며, key와 secret 필요." google_oauth2_client_id: "Google Application의 Client ID" google_oauth2_client_secret: "Google Application의 Client Secret" - enable_twitter_logins: "Twitter 인증을 활성화한다. twitter_consumer_key와 twitter_consumer_secret이 필요." + enable_twitter_logins: "Twitter 인증을 활성화합니다. twitter_consumer_key와 twitter_consumer_secret 필요." twitter_consumer_key: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer key" twitter_consumer_secret: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer secret" - enable_facebook_logins: "Facebook 인증을 활성화한다. facebook_app_id와 facebook_app_secret이 필요." + enable_facebook_logins: "Facebook 인증을 활성화합니다. facebook_app_id와 facebook_app_secret 필요." facebook_app_id: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App id" facebook_app_secret: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App secret" - enable_github_logins: "Github 인증을 활성화한다. github_client_id와 github_client_secret이 필요." + enable_github_logins: "Github 인증을 활성화한다. github_client_id와 github_client_secret 필요." github_client_id: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client id" github_client_secret: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client secret" - allow_restore: "데이터 복원을 허용한다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둔다." + allow_restore: "데이터 복원을 허용합니다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둡니다." maximum_backups: "디스크에 유지할 최대 백업 개수. 오래된 백업순으로 자동으로 삭제된다." - backup_daily: "하루에 한 번 자동으로 백업한다." - enable_s3_backups: "백업이 완료되면 Amazon S3로 업로드한다. s3 credentials을 기입되어있는지 확인해야한다." - s3_backup_bucket: "백업본을 유지할 s3 버켓 이름. 주의 : 프라이빗 버켓인지 확인해야한다." + enable_s3_backups: "백업이 완료되면 Amazon S3로 업로드합니다. 중요: s3 credentials을 기입되어있는지 확인 필요" + s3_backup_bucket: "백업본을 유지할 s3 버켓 이름. 주의 : 프라이빗 버켓인지 반드시 확인해야하세요." active_user_rate_limit_secs: "'last_seen_at'을 업데이트 하는 주기(초)" verbose_localization: "UI에 언어 팁을 확장해 보여줌" previous_visit_timeout_hours: "최근 방문한 시간을 저장할 주기(시간)" - rate_limit_create_topic: "사용자가 토픽을 생성하고 난 후 다음 토픽을 생성할 때 까지의 대기 기간(초)" + rate_limit_create_topic: "사용자가 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)" rate_limit_create_post: "사용자가 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)" - rate_limit_new_user_create_topic: "새로운 사용자 토픽을 생성하고 난 후 다음 토픽을 생성할 때 까지의 대기 기간(초)" + rate_limit_new_user_create_topic: "새로운 사용자 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)" rate_limit_new_user_create_post: "새로운 사용자 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)" max_likes_per_day: "사용자가 하루동안 할 수 있는 최대 좋아요 개수" max_flags_per_day: "사용자가 하루동안 할 수 있는 최대 신고 개수" max_bookmarks_per_day: "사용자가 하루동안 할 수 있는 최대 북마크 개수" max_edits_per_day: "사용자가 하루동안 할 수 있는 최대 편집 수" - max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 토픽 개수" + max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 글타래 개수" + max_private_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수" max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다." - suggested_topics: "토픽 아랫부분에 몇개의 토픽을 제안하여 보여준다." - limit_suggested_to_category: "제안된 토픽은 현재의 카테고리에 있는 토픽 중에서만 보여준다." - clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거한다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋다." + max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수" + suggested_topics: "글타래 아랫부분에 몇개의 글타래를 제안하여 보여준다." + limit_suggested_to_category: "제안된 글타래는 현재의 카테고리에 있는 글타래 중에서만 보여준다." + clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거합니다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋습니다." clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)" purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)" purge_unactivated_users_grace_period_days: "유예기간(하루) 동안 활성화하지 않으면 계정이 삭제됩니다." + enable_s3_uploads: "Amazon S3 storage에 업로드해주세요. 중요: 올바른 S3 계정이 필요합니다.(access key id와 secret access key 둘다)" + s3_use_iam_profile: 'AWS EC2 IAM role로 key를 받음. 정보: 활성화하면 "s3 access key id"와 "s3 secret access key" 설정도 같이 변경됩니다.' + s3_upload_bucket: "파일이 업로드 될 위치의 Amazon S3 bucket name. 경고: 소문자 알파벳만 허용되며 점 . 이나 밑줄문자 _ 가 없어야 함." s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id" s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key" s3_region: "이미지를 업로드 할 때 사용할 Amazon S3 region" + s3_cdn_url: "s3 에셋에 사용될 CDN URL (예: https://cdn.somewhere.com). 경고: 이 설정 뒤에는 모든 글을 다시 구워야rebake 합니다." + avatar_sizes: "자동 생성 아바타 사이즈 목록" enable_flash_video_onebox: "swf, flv(어도비 플래쉬)링크를 embed 할 수 있도록 함. 주의: 보안에 대한 위험성을 알려주는 것이 좋다." - default_invitee_trust_level: "사용자를 초대하기 위한 기본 신뢰도(0-4)" - tl1_requires_topics_entered: "새로운 사용자가 신뢰받는 사용자-1 이 되기 위해 들어가봐야되는 토픽의 개수" - tl1_requires_read_posts: "새로운 사용자가 신뢰받는 사용자-1 가 되기 위해 읽어야 하는 포스트 개수" - tl1_requires_time_spent_mins: "새로운 사용자가 신뢰받는 사용자-1 이 되기 위해 몇 분 동안 포스트를 읽어야 하는지." - tl2_requires_topics_entered: "기본 사용자가 자주오는 사용자-2 가 되기 위해 들어가 봐야 되는 토픽 갯수" - tl2_requires_read_posts: "기본 사용자가 자주오는 사용자-2 가 되기 위해 읽어야 하는 토픽 갯수" - tl2_requires_time_spent_mins: "기본 사용자가 자주오는 사용자-2 가 되기 위해 몇 분 동안 포스트를 읽어야 하는지." - tl2_requires_days_visited: "기본 사용자가 자주오는 사용자-2 가 되기 위해 몇 일을 방문해야 하는지." - tl2_requires_likes_received: "기본 사용자가 자주오는 사용자-2 가 되기 위해 받아야 하는 좋아요 갯수" - tl2_requires_likes_given: "기본 사용자가 자주오는 사용자-2 가 되기 위해 눌러야하는 좋아요 수" - tl2_requires_topic_reply_count: "기본 사용자가 자주오는 사용자-2 가 되기 위해 달아야 하는 덧글 수" + default_invitee_trust_level: "사용자를 초대하기 위한 기본 회원등급(0-4)" + default_trust_level: "모든 신규가입자의 기본 회원등급 (0-4). 경고: 변경시에 스팸 문제가 생길 가능성이 높습니다." + tl1_requires_topics_entered: "새회원이 회원등급-1이 되기 위해 봐야 하는 글타래 갯수" + tl1_requires_read_posts: "새회원이 회원등급-1이 되기 위해 읽어야 하는 글 갯수" + tl1_requires_time_spent_mins: "새회원이 회원등급-1 이 되기 위해 몇 분 동안 글을 읽어야 하는지." + tl2_requires_topics_entered: "회원등급-2가 되기 위해 봐야 하는 글타래 갯수" + tl2_requires_read_posts: "회원등급-2가 되기 위해 읽어야 하는 글타래 갯수" + tl2_requires_time_spent_mins: "회원등급-2가 가 되기 위해 몇 분 동안 글을 읽어야 하는지." + tl2_requires_days_visited: "회원등급-2가 되기 위해 며칠을 방문해야 하는지." + tl2_requires_likes_received: "회원등급-2가 되기 위해 받아야 하는 좋아요 횟수" + tl2_requires_likes_given: "회원등급-2가 되기 위해 눌러야하는 좋아요 횟수" + tl2_requires_topic_reply_count: "기회원등급-2가 되기 위해 달아야 하는 댓글 갯수" tl3_requires_days_visited: "VIP 사용자-3 이 되기 위해 지난 100일 동안 최소한 사이트에 방문해야 하는 수 (0 ~ 100)" - tl3_requires_topics_replied_to: "VIP 사용자-3 이 되기 위해 지난 100일 동안 답글을 달아야하는 최소 토픽수(0 ~ )" - tl3_requires_topics_viewed: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 토픽 중 본 토픽의 비율(%, 0 ~ 100)" - tl3_requires_posts_read: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 포스트 중 본 포스트의 비율(%, 0 ~ 100)" - tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 토픽의 전체 개수" - tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 토픽의 전체 개수" - tl3_requires_max_flagged: "사용자가 VIP 사용자-3 이 되기 위해 지난 100일동안 서로 다른 사용자에게 최소한으로 받지 말아야하는 신고된 포스트 수(0 ~ )" - tl3_promotion_min_duration: "신뢰도가 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수" + tl3_requires_topics_replied_to: "VIP 사용자-3 이 되기 위해 지난 100일 동안 답글을 달아야하는 최소 글타래수(0 ~ )" + tl3_requires_topics_viewed: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 글타래 중 본 글타래의 비율(%, 0 ~ 100)" + tl3_requires_posts_read: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 글 중 본 글의 비율(%, 0 ~ 100)" + tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수" + tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수" + tl3_requires_max_flagged: "사용자가 VIP 사용자-3 이 되기 위해 지난 100일동안 서로 다른 사용자에게 최소한으로 받지 말아야하는 신고된 글 수(0 ~ )" + tl3_promotion_min_duration: "회원등급이 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수" tl3_requires_likes_given: "VIP 사용자-3 이 되기 위해 지난 100일 동안 해야 할 좋아요 수" tl3_requires_likes_received: "VIP 사용자-3 이 되기 위해 지난 100일 동안 받아야 할 좋아요 수" tl3_links_no_follow: "VIP 사용자-3 의 글에 있는 링크에서 rel=nofollow 를 제거하지 마시오." - min_trust_to_create_topic: "새로운 토픽을 생성하기 위한 최소 신뢰도" - min_trust_to_edit_wiki_post: "위키로 설정된 포스트를 수정할 수 있는 최소 신뢰도" - newuser_max_links: "새로운 사용자가 포스트에 붙일 수 있는 최대 링크 개수" - newuser_max_images: "새로운 사용자가 포스트에 붙일 수 있는 최대 이미지 개수" + min_trust_to_create_topic: "새로운 글타래를 생성하기 위한 최소 회원등급" + min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급" + newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수" + newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수" newuser_max_attachments: "새로운 사용자가 포트에 붙일 수 있는 최대 첨부파일 개수" - newuser_max_mentions_per_post: "새료운 사용자가 포스트에 사용할 수 있는 최대 @name 알림 개수" - newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 토픽에 달 수 있는 최대 답글 개수" - max_mentions_per_post: "포스트 당 사용할 수 있는 최대 @name 알림의 수" - create_thumbnails: "포스트의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다." - email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 포스트의 변경하고 완료할 수 있는 기회를 준다." + newuser_max_mentions_per_post: "새료운 사용자가 글에 사용할 수 있는 최대 @name 알림 개수" + newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 글타래에 달 수 있는 최대 답글 개수" + max_mentions_per_post: "글 당 사용할 수 있는 최대 @name 알림의 수" + create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다." + email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다." email_posts_context: "알림메일의 내용에 추가할 기존 답글 수" flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)" - title_min_entropy: "토픽 제목에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" - body_min_entropy: "포스트 본문에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" - title_fancy_entities: "토픽 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/" - min_title_similar_length: "유사 토픽에 대한 체크가 있기 전, 최소 제목 글자 수" - min_body_similar_length: "유사 토픽에 대한 체크가 있기 전, 포스트의 최소 본문 글자 수" + title_max_word_length: "글타래 제목안에 단어들의 최대 길이" + title_min_entropy: "글타래 제목에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" + body_min_entropy: "글 본문에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" + title_fancy_entities: "글타래 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/" + min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수" + min_body_similar_length: "유사 글타래에 대한 체크가 있기 전, 글의 최소 본문 글자 수" category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트" - max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 한다." - max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 한다." - authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 '*'을 사용하면 모든 타입의 파일이 가능하다." - max_similar_results: "새로운 토픽을 작성할 때, 에디터 위에 보여줄 비슷한 토픽들의 개수. 제목과 본문을 바탕으로 비교한다." + category_style: "카테고리 뱃지 시각 스타일" + max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다." + max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다." + authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)" + max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다." title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등" - topic_views_heat_low: "토픽이 연하게 하이라이트 되기 위한 조회수" - topic_views_heat_medium: "토픽이 적당하게 하이라이트 되기 위한 조회수" - topic_views_heat_high: "토픽이 진하게 하이라이트 되기 위한 조회수" + topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수" + topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수" + topic_views_heat_high: "글타래가 진하게 하이라이트 되기 위한 조회수" + cold_age_days_low: "글의 마지막 활동 날짜가 조금 희미해지기 시작하는 일 수" + cold_age_days_medium: "글의 마지막 활동 날짜가 어느정도 희미해지기 시작하는 일 수" + cold_age_days_high: "글의 마지막 활동 날짜가 많이 희미해지기 시작하는 일 수" + history_hours_low: "글이 수정 뒤에 수정됐다는 표시가 조금 희미해지는 시간" + history_hours_medium: "글이 수정 뒤에 수정됐다는 표시가 어느정도 희미해지는 시간" + history_hours_high: "글이 수정 뒤에 수정됐다는 표시가 많이 희미해지는 시간" + topic_post_like_heat_low: "조회수가 조금 희미해지는 이 글:좋아요 비율" + topic_post_like_heat_medium: "조회수가 어느정도 희미해지는 이 글:좋아요 비율" + topic_post_like_heat_high: "조회수가 많이 희미해지는 이 글:좋아요 비율" faq_url: "FAQ주소가 있으면 전체 URL을 적어주세요." tos_url: "이용약관이 있으면 전체 URL을 적어주세요." privacy_policy_url: "개인정보 보호가 있으면 전체 URL을 적어주세요." newuser_spam_host_threshold: "스팸인가 결정하는 새로운 사용자가 게시한 같은 링크 수 `newuser_spam_host_posts`" - white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 포스트를 생성하는데 제한되지 않는다." + white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 글를 생성하는데 제한되지 않는다." staff_like_weight: "스태프가 좋아요를 눌렀을 때 부여할 가산점" levenshtein_distance_spammer_emails: "스패머 메일을 체크할 때, 허용할 다른 글자 개수(fuzzy match)" - reply_by_email_enabled: "이메일을 통해 토픽에 댓글을 달 수 있음." + max_new_accounts_per_registration_ip: "(n) 회원등급의 0개의 계정(스태프도 tl2 이상도 아닌 계정만)이 이 IP에 있으면, 새로운 회원가입 방지." + min_ban_entries_for_roll_up: "Roll up 버튼을 눌렀을 때, 적어도 (N)개의 엔트리가 있다면 새 subnet ban 엔트리를 만듭니다." + max_age_unmatched_emails: "(N)일 뒤에 안 맞는 막힌 이메일 접근을 지웁니다." + max_age_unmatched_ips: "(N)일 뒤에 안 맞는 막힌 IP 접근을 지웁니다." + num_flaggers_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고자 수" + num_flags_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고 횟수" + auto_respond_to_flag_actions: "신고 기각 시 자동 답변 활성화" + reply_by_email_enabled: "이메일을 통해 글타래에 댓글을 달 수 있음." reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com" + disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다." + strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요." + short_email_length: "짦은 이메일 바이트 길이" pop3_polling_enabled: "POP3를 이용한 이메일 설문조사" + pop3_polling_ssl: "SSL로 POP3 서버를 연결합니다. (추천)" pop3_polling_period_mins: "이메일을 받기 위해 POP3S 계정을 체크하는 분 단위 NOTE: 재시동 필요." pop3_polling_port: "이메일 설문조사를 위한 POP3 포트번호 " pop3_polling_host: "이메일 설문조사를 위한 POP3 호스트" pop3_polling_username: "이메일 설문조사를 위한 POP3 사용자 계정 이름" pop3_polling_password: "이메일 설문조사를 위한 POP3 사용자 비밀번호" - email_in: "이메일을 통해 새로운 토픽을 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정한다." - email_in_min_trust: "이메일을 통해 새 토픽을 포스팅 할 수 있는 최소 사용자 신뢰도" + email_in: "이메일을 통해 새로운 글타래를 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정합니다." + email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 회원등급" email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다." email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다." - minimum_topics_similar: "새로운 토픽을 작성할 때, 유사한 토픽들을 보여주기 위해 존재해야 할 최소 토픽 개수" - relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (토픽이 작성된 이후부터)" - delete_user_max_post_age: "(x)일 이전의 첫 포스트가 있는 유저는 삭제할 수 없음." - delete_all_posts_max: "전체 게시글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 게시글 수. 만약 사용자가 이것보다 많은 게시글을 가지고 있으면 한번에 삭제 할 수 없다." + minimum_topics_similar: "새로운 글타래를 작성할 때, 유사한 글타래들을 보여주기 위해 존재해야 할 최소 글타래 개수" + relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (글타래가 작성된 이후부터)" + delete_user_max_post_age: "(x)일 이전의 첫 글가 있는 유저는 삭제할 수 없음." + delete_all_posts_max: "전체 글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 글 수. 만약 사용자가 이것보다 많은 글을 가지고 있으면 한번에 삭제 할 수 없다." username_change_period: "등록 후 사용자 이름 최소 유지 일 수(0은 사용자 이름 변경을 막음)" email_editable: "등록 후 이메일 주소를 바꿀수 있는 있음" - allow_uploaded_avatars: "사용자들이 커스톰 아바타를 올릴 수 있도록 허용" - allow_animated_avatars: "사용자들이 에니메이션이 있는 gif 아바타를 사용할 수 있도록 허용. 주의 : 변경을 한 후 `avatars:refresh` rake 실행이 필요하다." - automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드한다." - digest_topics: "요약 이메일에서 보여질 최대 토픽 개수" - digest_min_excerpt_length: "요약 이메일에서 최소 포스트 발췌 수" - default_digest_email_frequency: "사용자가 요약 이메일을 받는 횟수 기본값. 사용자는 그들의 환경설정에서 변경할 수 있음" - default_external_links_in_new_tab: "다른 싸이트의 링크는 새 탭으로 연다. 사용자는 자신의 설정에 따라 바꿀 수 있음" - detect_custom_avatars: "사용자가 커스텀 아바타를 업로드 했는지 여부를 체크한다." + logout_redirect: "로그아웃 후에 이동할 위치 예: (http://somesite.com/logout)" + allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다." + default_avatars: "신규가입자가 받게될 기본 아바타 URL" + automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다." + digest_topics: "요약 이메일에서 보여질 최대 글타래 개수" + digest_min_excerpt_length: "요약 이메일에서 최소 글 발췌 수" + suppress_digest_email_after_days: "(n)일동안 사이트에서 보지 못한 사용자에게는 이메일 요약을 보내지 않습니다." + disable_digest_emails: "모든 유저들 이메일 다이제스트 못하게 하기" max_daily_gravatar_crawls: "하루에 Discourse가 커스텀 아파타를 위해 Gravatar를 체크하는 최대 횟수" - allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용한다." + public_user_custom_fields: "유저가 쓸 수 있는 공개 커스텀 필드 목록" + staff_user_custom_fields: "스태프가 쓸 수 있는 공개 커스텀 필드 목록" + enable_user_directory: "전체 유저 둘러보기 목록 제공" + allow_anonymous_posting: "익명 모드 허용" + anonymous_posting_min_trust_level: "익명 게시 할 수 있는 최소 회원등급" + anonymous_account_duration_minutes: "한 익명이 익명계정을 만들 때 빨리 만드는 걸 막을 분 단위 시간 예: 600으로 정해놓으면 마지막 게시하고 익명 전환 후로 600분이 지나는 즉시 새 계정이 만들어 집니다." + allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다." + sequential_replies_threshold: "한 유저가 한 글타래에 너무 연속으로 답글 달았다고 알리게 될 연속 글 수" enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용합니다, 그리고 PC용 화면으로 전환할 수 있습니다. 만약 커스텀 스타일 시트를 사용한다면 이것을 비활성화 시키세요." - dominating_topic_minimum_percent: "한 토픽에서 한 사용자의 영향력을 결정하는 게시글 수의 퍼센트" - suppress_uncategorized_badge: "토픽 리스트에서 카테고리가 없는 토픽에 대한 훈장을 보여주지 않는다." - display_name_on_posts: "포스트에 @username 뿐만 아니라 사용자의 전체 이름도 보여준다." + dominating_topic_minimum_percent: "한 글타래에서 한 사용자의 영향력을 결정하는 글 수의 퍼센트" + daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 글타래 게시" + suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다." + global_notice: "긴급, 비상 전체 배너를 모든 방문자에게 표시합니다. 숨기려면 빈칸으로 바꾸면 됩니다(HTML 허용)." + disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다." + full_name_required: "사용자 정보에서 실명은 필수입니다." + enable_names: "사용자의 실명을 프로필, 사용자카드, 이메일에서 보여줍니다. 실명을 아무데서도 안보이게 하려면 비활성화하세요." + display_name_on_posts: "글에 @username 뿐만 아니라 사용자의 전체 이름도 보여준다." + show_time_gap_days: "두 글의 일차를 보여주기 위해 두 글이 떨어져 있어야 할 일수" invites_per_page: "사용자 페이지에 방문자를 표시합니다." - short_progress_text_threshold: "토픽의 포스트 개수가 이 값을 넘어서면, 포스트 프로그래스바는 오직 현재 포스트 넘버만 보여준다. 만약 포스트 프로그래스바의 넓이는 변경하면, 이 숫자도 변경해야한다." + short_progress_text_threshold: "글타래의 글 개수가 이 값을 넘어서면, 글 프로그래스바는 오직 현재 글 넘버만 보여준다. 만약 글 프로그래스바의 넓이는 변경하면, 이 숫자도 변경해야합니다." default_code_lang: "기본 programming language syntax highlighting은 GitHub code blocks이 적용된다. (lang-auto, ruby, python etc.)" - warn_reviving_old_topic_age: "이 값보다 오래된 토픽에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. " + warn_reviving_old_topic_age: "이 값보다 오래된 글타래에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. " autohighlight_all_code: "형식이 지정되기 전의(되지 않은) 모든 코드 블럭들에 대해, 사용자가 언어를 지정하지 않아도 강제로 code highlighting이 적용된다." - embed_post_limit: "포스트 개수가 최대치입니다." + highlighted_languages: "구문 강조 규칙 포함. (경고: 너무 많은 언어를 넣으면 성능에 영향을 미칩니다.) 보기: https://highlightjs.org/static/demo/ ← 예제" + feed_polling_enabled: "EMBEDDING 전용: RSS/ATOM도 글로 embed할 것인지" + feed_polling_url: "EMBEDDING 전용: RSS/ATOM의 URL도 embed로 받도록 하기" + embed_by_username: "embed 글타래를 작성한 Discourse 사용자 아이디 " + embed_username_key_from_feed: "feed에서 Discourse 아이디 가져올 때 쓰는 Key" + embed_truncate: "임베드된 글 비우기" + embed_post_limit: "글 개수가 최대치입니다." + embed_whitelist_selector: "embed에서 보여져야 할 DOM element 선택하는 CSS 셀렉터" + embed_blacklist_selector: "embed에서 지워져야 할 DOM element 선택하는 CSS 셀렉터" + notify_about_flags_after: "이 시간동안 처리되지 않은 신고가 들어와 있으면, contact_email 주소로 이메일을 보냅니다. 0으로 넣으면 비활성화됩니다." + enable_cdn_js_debugging: "/logs에서 적절한 모든 js를 포함해 crossorigin 권한 오류가 뜨도록 합니다." + show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다." + delete_drafts_older_than_n_days: (n) 일지난 임시 보관글 삭제하기 + vacuum_db_days: "VACUUM FULL ANALYZE를 실행해서 통합 후 DB 공간 재확인 (0으로 설정하면 비활성화)" + prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다." + slug_generation_method: "slug 생성 방식. 'encoded'는 퍼센트 기호로 인코딩해서 생성합니다. 'none'은 slug 자체를 비활성화합니다.." + enable_emoji: "emoji 활성화" + emoji_set: "어떤 emoji가 좋은가요?" + enforce_square_emoji: "모든 emoji를 정사각형 비율로 강제로 바꿉니다." + approve_post_count: "신규가입자가 올릴 수 있는 글 수" + approve_unless_trust_level: "허가 받고 글 올려야 하는 유저들 최저 회원등급" + notify_about_queued_posts_after: "글이 리뷰가 되길 기다리면서 이 시간이 지나면 문의처 메일로 연락을 보냅니다. 0으로 두면 보내지 않습니다." errors: invalid_email: "유효하지 않은 이메일 주소입니다." invalid_username: "해당 이름의 사용자가 없습니다." @@ -717,18 +932,23 @@ ko: invalid_integer_max: "%{max}이하 이어야 합니다." invalid_integer: "정수만 허용됩니다." regex_mismatch: "해당 포멧은 허용되지 않습니다." + must_include_latest: "Top메뉴는 '최근' 탭을 반드시 갖고 있어야 합니다." invalid_string: "허용되는 정보가 아닙니다." invalid_string_min_max: "글자 수가 %{min}자 이상 %{max}자 이하이어야 합니다." invalid_string_min: "글자수가 %{min}자 이상이어야 합니다." invalid_string_max: "글자 수가 %{max}자 이상이어야 합니다." + invalid_reply_by_email_address: "값이 반드시 '%{reply_key}'를 갖고 있어야하며 알림 이메일과 달라야합니다." notification_types: mentioned: "%{display_username} 사용자가 %{link} 에서 당신을 언급하였습니다." liked: "%{display_username} 사용자가 %{link} 를 좋아합니다." - replied: "%{display_username} 사용자가 %{link} 에 당신의 게시글에 답글을 달았습니다." - quoted: "%{display_username} 사용자가 %{link} 에서 당신의 게시글을 인용했습니다." + replied: "%{display_username} 사용자가 %{link} 에 당신의 글에 답글을 달았습니다." + quoted: "%{display_username} 사용자가 %{link} 에서 당신의 글을 인용했습니다." edited: "%{display_username} 사용자가 %{link} 에서 당신의 글을 수정하였습니다." posted: "%{display_username} 사용자가 %{link} 에 글을 게시 했습니다." - moved_post: "%{display_username} 사용자가 %{link} 에 당신의 게시글을 이동하였습니다." + moved_post: "%{display_username} 사용자가 %{link} 에 당신의 글을 이동하였습니다." + private_message: "%{display_username} 회원님이 메세지를 보냈습니다: %{link}" + invited_to_private_message: "%{display_username} 회원님이 메세지에 초대했습니다: %{link}" + invited_to_topic: "%{display_username} 회원님이 글타래에 초대했습니다: %{link}" invitee_accepted: "%{display_username} 사용자가 당신의 초대를 수락하였습니다." linked: "%{display_username} 사용자가 %{link} 에서 당신을 링크했습니다." granted_badge: "당신은 %{link}를 획득했습니다." @@ -739,6 +959,8 @@ ko: topic: '검색 결과' user: '사용자' sso: + not_found: "계정 생성 또는 찾기 불가, 관리자에게 문의하세요" + account_not_approved: "계정이 승인을 기다리고 있습니다, 승인 후 완료 이메일이 보내집니다." unknown_error: "업데이트 정보에 오류가 있습니다. 사이트 관리자에게 문의해주세요." timeout_expired: "로그인 연결 시간이 초과되었습니다. 다시한번 시도해주세요" original_poster: "원본 게시자" @@ -746,53 +968,54 @@ ko: most_recent_poster: "최근 게시자" frequent_poster: "빈번한 게시자" redirected_to_top_reasons: - new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 토픽들입니다." - not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 토픽들입니다." - move_posts: - new_topic_moderator_post: - other: "%{count}개의 글을 새 토픽으로 옮겼습니다: %{topic_link}" - existing_topic_moderator_post: - other: "%{count}개의 글을 기존 토픽으로 옮겼습니다: %{topic_link}" + new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다." + not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다." change_owner: post_revision_text: "소유권이 %{old_user}에서 %{new_user}으로 이전되었습니다." emoji: errors: name_already_exists: "죄송합니다. '%{name}'은/는 이미 다른 이모티콘이 사용하고 있습니다." + error_while_storing_emoji: "죄송합니다, emoji를 저장하는 도중 오류가 발생했습니다." topic_statuses: - archived_enabled: "이 토픽은 보관되었고 더이상 변경하실 수 없습니다." - archived_disabled: "이 토픽의 보관이 풀렸고 이제 변경하실 수 있습니다." - closed_enabled: "이 토픽은 이제 닫혔습니다. 새로운 답글을 다실 수 없습니다." - closed_disabled: "이 토픽은 이제 열렸습니다. 새로운 답글을 다실 수 있습니다." + archived_enabled: "이 글타래는 보관되었고 더이상 변경하실 수 없습니다." + archived_disabled: "이 글타래의 보관이 풀렸고 이제 변경하실 수 있습니다." + closed_enabled: "이 글타래는 이제 닫혔습니다. 새로운 답글을 다실 수 없습니다." + closed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 다실 수 있습니다." autoclosed_enabled_days: - other: "이 토픽은 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_hours: - other: "이 토픽은 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_minutes: - other: "이 토픽은 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_lastpost_days: - other: "이 토픽은 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_lastpost_hours: - other: "마지막 댓글로부터 %{count} 시간이 지나 토픽이 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다." + other: "마지막 댓글로부터 %{count} 시간이 지나 글타래가 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다." autoclosed_enabled_lastpost_minutes: - other: "이 토픽은 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." - autoclosed_disabled: "이 토픽은 이제 열렸습니다. 새로운 답글을 허용합니다." - autoclosed_disabled_lastpost: "이 토픽은 이제 열렸습니다. 새로운 답글을 허용합니다." - pinned_enabled: "이 토픽은 고정되었습니다. 고정이 해제되기 전까지 카테고리의 상단에 나타납니다." - pinned_disabled: "이 토픽은 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." - pinned_globally_enabled: "이 토픽은 이제 전역적으로 고정되었습니다. 카테고리와 모든 토픽 리스트에서 상단에 나타납니다." - pinned_globally_disabled: "이 토픽은 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." - visible_enabled: "이 토픽은 리스트에 추가되었습니다. 토픽 리스트에 나타나게 될 것입니다." - visible_disabled: "이 토픽은 이제 리스트에서 해제되었습니다. 더이상 토픽 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다." + other: "이 글타래는 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + autoclosed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다." + autoclosed_disabled_lastpost: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다." + pinned_enabled: "이 글타래는 고정되었습니다. 고정이 해제되기 전까지 카테고리의 상단에 나타납니다." + pinned_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." + pinned_globally_enabled: "이 글타래는 이제 전역적으로 고정되었습니다. 카테고리와 모든 글타래 리스트에서 상단에 나타납니다." + pinned_globally_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." + visible_enabled: "이 글타래는 리스트에 추가되었습니다. 글타래 리스트에 나타나게 될 것입니다." + visible_disabled: "이 글타래는 이제 리스트에서 해제되었습니다. 더이상 글타래 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다." login: not_approved: "당신의 계정은 아직 활성화되지 않았습니다. 이메일을 확인하시고 로그인 해주세요." incorrect_username_email_or_password: "계정 아이디, 이메일 또는 패스워드가 다릅니다." wait_approval: "가입해 주셔서 감사합니다. 곧 활성화 메일이 도착할 것 입니다." active: "당신의 계정이 활성화되었습니다." + activate_email: "

      거의 끝났습니다. 인증 이메일을 %{email} 주소로 보냈습니다. 설명을 따라서 인증을 마쳐주시면 됩니다.

      메일이 오지 않을 경우, 스팸폴더를 확인하거나 로그인 시도를 해서 다른 인증메일을 보내도록 할 수 있습니다..

      " not_activated: "당신은 아직 로그인 할 수 없습니다. 계정 활성화 이메일을 보냈습니다. 계정을 활성화하기 위해 지침을 따라주세요." + not_allowed_from_ip_address: "이 IP 주소에서는 %{username} 으로 로그인 할 수 없습니다." + admin_not_allowed_from_ip_address: "그 IP로는 관리자로 로그인할 수 없습니다." suspended: "당신은 %{date} 까지 로그인할 수 없습니다. " + suspended_with_reason: "%{date}까지 계정 정지 됨: %{reason}" errors: "%{errors}" not_available: "불가능합니다. %{suggestion}" something_already_taken: "뭔가가 이상합니다. 아마도 계정의 아이디 또는 이메일이 이미 등록된것 같습니다. 비밀번호 찾기 링크를 이용해주세요." + omniauth_error: "죄송합니다, 회원님 계정을 인증하는데 오류가 발생했습니다. 인증을 회원님이 승인하지 않았을 수도 있습니다." omniauth_error_unknown: "로그인에 문제가 있습니다. 다시 시도해주세요." new_registrations_disabled: "지금은 새로 가입할 수 없습니다." password_too_long: "비밀번호는 200글자 이내만 허용됩니다." @@ -806,10 +1029,30 @@ ko: characters: "문자나 숫자만 사용해야 합니다." unique: "이미 사용중입니다." blank: "공백이 없어야 합니다." - must_begin_with_alphanumeric: "첫글자는 문자나 숫자로 시작해야 합니다." email: not_allowed: "이 이메일 제공업체는 허용되지 않습니다. 다른 이메일 제공 업체를 사용하세요." blocked: "는 허용되지 않습니다" + ip_address: + blocked: "이 IP주소에서는 가입이 안됩니다." + max_new_accounts_per_registration_ip: "이 IP에서는 가입이 더이상 되지 않습니다(최대 가입 제한 도달). 스태프에게 연락주세요." + invite_mailer: + subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다." + text_body_template: | + %{invitee_name}님께서 당신을 토의에 초대했습니다. + + > **%{topic_title}** + > + > %{topic_excerpt} + + 사이트: + + > %{site_title} -- %{site_description} + + 관심이 있으시면 아래 링크로 들어가기: + + %{invite_link} + + 신뢰된 사용자에게서 온 초대므로 이 토의에 바로 답글을 달 수 있습니다. invite_forum_mailer: subject_template: "%{site_domain_name}의 %{invitee_name}님께서 당신을 초대하였습니다." text_body_template: | @@ -828,44 +1071,306 @@ ko: subject_template: "%{site_name} 계정을 위해 비밀번호 설정" test_mailer: subject_template: "[%{site_name}] 이메일 발송 테스트" + text_body_template: | + 이것은 테스트 이메일 양식입니다. + + [**%{base_url}**][0] + + 이메일 발송은 어렵습니다. 먼저 체크해야 할 몇가지 사항을 알려드립니다: + + - `알림 이메일` 발신지 주소가 사이트 설정에 적었는지 *확실히* 보세요. **발신지 이메일 주소에 적힌 도메인은 받는 곳에서 검사하게 될 도메인입니다**. + + - 이메일 raw source를 이메일 클라이언트에서 보는 방법을 알아두고 이메일 헤더에서 중요한 단서를 찾도록 합니다. Gmail에서는, 각 메일의 오른쪽 위에 있는 드롭다운 메뉴의 "원본보기" 옵션입니다. + + - **중요:** 당신의 ISP회사가 도메인네임과 IP주소를 연결시켜주러 들어오는 a reverse DNS record 갖고 있나요? [Reverse PTR record 테스트][2]해보세요. ISP회사가 적절한 reverse DNS pointer record를 안 넣었다면, 어떤 이메일도 발송이 안될 수 있습니다. + + - 이메일 도메인의 [SPF record][8]가 제대로 설정됐나요? [SPF record 테스트][1]해보세요. 참고로 TXT가 제대로된 공식 SPF 타입입니다. + + - 이메일 도메인의 [DKIM record][3]가 제대로 설정됐나요? 이게 이메일 전송에 큰 영향을 줍니다. [your DKIM record 테스트][7]해보세요. + + - 스스로 이메일서버를 운영중이라면, 메일서버 IP가 [블랙리스트][4]에 안들어 가있는지 확실히 봐야합니다. 또 DNS의 HELO 메세지로 resolve가 되는 완벽히 인증된 호스트네임으로 제대로 보내고 있는지 확인해야 합니다. 아니라면 대부분의 받는 쪽 메일 서비스에서 거절 받을 겁니다. + + (한 가지 *쉬운* 방법은 [Mandrill][md]이나 [Mailgun][mg]이나 [Mailjet][mj]에 가입해 메일링 서비스를 받는 것이고 작은 커뮤니티에서는 괜찮을 겁니다. 그래도 SPF레코드 DKIM레코드는 DNS에 등록해줘야합니다!) + + 우리도 이 이메일 전송 테스트를 제대로 받았기를 바랍니다. + + 행운을 빕니다. + + 당신의 친구 [Discourse](http://www.discourse.org) + + [0]: %{base_url} + [1]: http://www.kitterman.com/spf/validate.html + [2]: http://mxtoolbox.com/ReverseLookup.aspx + [3]: http://www.dkim.org/ + [4]: http://whatismyipaddress.com/blacklist-check + [7]: http://dkimcore.org/tools/dkimrecordcheck.html + [8]: http://www.openspf.org/SPF_Record_Syntax + [md]: http://mandrill.com + [mg]: http://www.mailgun.com/ + [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] 새 Discourse 버전으로 업데이트 가능." + text_body_template: | + [Discourse](http://www.discourse.org) 새 버전이 나왔습니다. + + 현재 이 Discourse 버전: %{installed_version} + 새 버전: **%{new_version}** + + 제안: + + - [GitHub changelog](https://github.com/discourse/discourse/commits/master)에 뭐가 바뀌었는지 확인해보세요. + + - 브라우저 상에서 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)로 들어가 업그레이드가 가능합니다. + + - [meta.discourse.org](http://meta.discourse.org) 포럼에서 Discourse 관련 지원, 토의, 뉴스를 보실 수 있습니다. new_version_mailer_with_notes: subject_template: "[%{site_name}] 업데이트 가능." + text_body_template: |+ + [Discourse](http://www.discourse.org) 새 버전이 나왔습니다. + + 현재 이 Discourse 버전: %{installed_version} + 새 버전: **%{new_version}** + + 제안: + + - [GitHub changelog](https://github.com/discourse/discourse/commits/master)에 뭐가 바뀌었는지 확인해보세요. + + - 브라우저 상에서 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)로 들어가 업그레이드가 가능합니다. + + - [meta.discourse.org](http://meta.discourse.org) 포럼에서 Discourse 관련 지원, 토의, 뉴스를 보실 수 있습니다. + + ### 릴리즈 노트 + + %{notes} + flags_reminder: + flags_were_submitted: + other: "이 신고들은 %{count}시간 전에 접수 됐습니다." please_review: "후기를 써주세요." - post_number: "게시글" + post_number: "글" + how_to_disable: '"notify about flags after" 설정을 통해 이메일 알림의 빈도를 변경하거나 비활성화할 수 있습니다.' + subject_template: + other: "%{count}개의 신고가 접수 대기 중" + queued_posts_reminder: + subject_template: + other: "[%{site_name}]의 %{count}개의 글이 검토를 기다리고 있습니다." + text_body_template: | + 안녕하세요, + + 새 유저가 쓴 글가 심의를 기다리고 있습니다. [여기서 승인 또는 거절합니다](%{base_url}/queued-posts). + flag_reasons: + off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. " + inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다." + spam: "내가 올린 글타래가 **스팸**으로 신고 되었습니다. 커뮤니티가 이 글타래가 생각보다 광고성, 선동적이라고 느끼나 봅니다." + notify_moderators: "내가 올린 글타래가 **관리자의 관심 필요**로 신고 되었습니다. 커뮤니티가 관리자의 세심한 중재가 필요하다고 느낍니다." flags_dispositions: agreed: "알려줘서 감사합니다. 문제가 있음에 동의하며 내용을 살펴보겠습니다." agreed_and_deleted: "알려줘서 감사합니다. 문제가 있음에 동의하며 해당 글을 삭제했습니다." disagreed: "알려줘서 감사합니다. 살펴보겠습니다." deferred: "알려줘서 감사합니다. 살펴보겠습니다." deferred_and_deleted: "알려줘서 감사합니다. 해당 글을 삭제했습니다." + temporarily_closed_due_to_flags: "이 글타래는 많은 신고가 들어와 임시로 닫힌 상태입니다." system_messages: post_hidden: - subject_template: "포럼 신고로 인한 게시글 숨김" + subject_template: "포럼 신고로 인한 글 숨김" + text_body_template: | + 안녕하세요, + + %{site_name}에서 내 글이 숨겨진 것을 알리기 위해 보내진 자동 메세입니다.. + + %{base_url}%{url} + + %{flag_reason} + + 이 글이 가려지기 전에 커뮤니티 여러 사용자가 신고를 했습니다. 사용자들의 피드백을 반영해 글을 수정해주세요. **%{edit_delay}분 뒤에 글을 수정할 수 있으며 자동으로 숨김 해제됩니다..** + + 하지만 글이 한번 더 커뮤니티에서 숨김이 된 경우 스태프가 풀어주기 전까지 숨김해제가 안되며 계정 정지 등의 조치가 취해질 수 있습니다. + + 조언을 얻기 위해, [커뮤니티 가이드라인](%{base_url}/guidelines)을 참고해 주세요. welcome_user: subject_template: "%{site_name} 사이트에 오신것을 환영합니다!" + text_body_template: | + %{site_name}에 가입해주셔서 감사합니다, 환영합니다! + + %{new_user_tips} + + 우리는 [문화시민의 커뮤니티 활동지침](%{base_url}/guidelines)을 항상 따릅니다. + + 커뮤니티를 즐겨주세요! + + (할 말이 있을 땐 새 사용자로서 [스태프](%{base_url}/about)들에게 이야기 주세요, 이 메세지에 답글로 주시면 바로 올라갑니다.) welcome_invite: subject_template: "%{site_name} 사이트에 오신것을 환영합니다!" + text_body_template: | + %{site_name}의 초대에 응해주셔서 감사합니다 반갑습니다! + + **%{username}**로 새 사용자를 만들었고 로그인된 상태입니다. [사용자 정보][prefs]에 들어가 이름을 바꿀 수 있습니다. + + 나중에 다시 로그인하려면: + + 1. 항상 **초대 받은 이메일 주소를 사용해서** 로그인해주셔야지 안 그러면 같은 사람이라고 인식 못할 겁니다! + + 2. [사용자 정보][prefs],에서 유니크한 비밀번호를 만들어 사용해주세요. + + %{new_user_tips} + + 우리는 [문화시민의 커뮤니티 활동 지침](%{base_url}/guidelines)을 항상 따릅니다. + + 커뮤니티를 즐려주세요! + + (할 말이 있을 땐 새 사용자로서 [스태프](%{base_url}/about)들에게 이야기주세요, 이 메세지에 답글로 주시면 바로 올라갑니다.) + + [사용자 정보 설정]: %{user_preferences_url} backup_succeeded: subject_template: "백업 성공" + text_body_template: "백업이 성공적으로 끝났습니다..\n[관리 > 백업](%{base_url}/admin/backups)에서 새 백업본을 다운로드 받으세요." backup_failed: subject_template: "백업에 실패했습니다." + text_body_template: | + 백업이 실패하였습니다. + + 로그: + + ``` + %{logs} + ``` restore_succeeded: subject_template: "복원 성공" text_body_template: "복원에 성공했습니다." restore_failed: subject_template: "복원 실패" + text_body_template: | + 복구가 실패하였습니다. + + 로그: + + ``` + %{logs} + ``` + bulk_invite_succeeded: + subject_template: "대량 사용자 초대가 성공적으로 진행되었습니다." + text_body_template: "대량 사용자 초대가 진행되어 %{sent}개의 초대장을 보냈습니다." + bulk_invite_failed: + subject_template: "대량 사용자 초대 중 오류가 났습니다." + text_body_template: | + 대량 유저 초대 파일이 처리됐습니다. %{sent}개의 초대장이 보내졌고 %{failed}개의 에러 (전송안됨)가 났습니다. + + 로그: + + ``` + %{logs} + ``` csv_export_succeeded: subject_template: "데이터 추출이 완료되었습니다." + text_body_template: | + 데이터 내보내기가 성공적으로 끝났습니다! :dvd: + + %{file_name} (%{file_size}) + + 48시간 후에 위의 다운로드 링크는 지워집니다. csv_export_failed: subject_template: "데이터 추출 실패" text_body_template: "죄송합니다. 데이터 추출에 실패하였습니다. 로그를 확인하시거나 관리자에게 문의해주세요." + email_reject_trust_level: + subject_template: "[%{site_name}] 이메일 문제 -- 회원등급 충족 안됨." + text_body_template: | + 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 새 글타래를 작성하는 데 필요한 회원등급이 없습니다. 오류라고 생각되면 스태프에게 연락주세요. + email_reject_no_account: + subject_template: "[%{site_name}] 이메일 문제 -- 모르는 계정" + text_body_template: | + 죄송합니다 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 이 이메일 주소로 되어있는 사용자 계정이 없습니다. 다른 이메일 주소로 보내거나 스태프에게 연락 주세요. + email_reject_empty: + subject_template: "[%{site_name}] 이메일 문제 -- 내용 없음" + email_reject_parsing: + subject_template: "[%{site_name}] 이메일 문제 -- 내용 인식 불가" + text_body_template: | + 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다. + email_reject_invalid_access: + subject_template: "[%{site_name}] 이메일 문제 -- 잘못된 접근" + text_body_template: | + 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 이 카테고리에서 새 글타래를 작성하는 데 필요한 회원등급이 없습니다. 오류라고 생각되면 스태프에게 연락주세요. + email_reject_post_error: + subject_template: "[%{site_name}] 이메일 문제 -- 게시 오류" + text_body_template: | + 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 복잡한 포매팅, 대용량 메세지, 너무 짧은 메세지가 문제일 수 있습니다. 다시 시도 해보고 계속 문제 된다면 웹사이트를 통해 글을 올리세요. + email_reject_post_error_specified: + subject_template: "[%{site_name}] 이메일 문제 -- 게시 오류" + text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n이유:\n\n%{post_error}\n\n문제를 고치고 다시 시도해 보세요.\n" + email_reject_reply_key: + subject_template: "[%{site_name}] 이메일 문제 -- 잘못된 답글 Key" + text_body_template: | + 죄송합니다 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 받은 답글 key가 올바르지 않거나 모르는 key여서 어디에 답글을 달아야 하는지 모르겠스빈다. 스태프에게 연락주세요. + email_reject_destination: + subject_template: "[%{site_name}] 이메일 문제 -- 모르는 주소" + text_body_template: | + 죄송합니다 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. + + 목적지 이메일 주소 전부가 식별되지 않습니다. 사이트 주소가 To: 줄(Cc:나 Bcc:는 안됨)에 들어 있는지 스태프에게 받은 올바른 이메일 주소로 보내고 있는지 확인해주세요. + email_reject_topic_not_found: + subject_template: "[%{site_name}] 이메일 문제 -- 글타래 못 찾음" + text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 글타래가 더이상 존재하지 않습니다, 아마 지워졌을 수도 있습니다. 오류라고 생각되면 스태프에게 연락주세요.\n" + email_reject_topic_closed: + subject_template: "[%{site_name}] 이메일 문제 -- 글타래 닫힘" + text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 글타래가 닫혔거나 더이상 답글을 받지 않스빈다. 오류라고 생각되면 스태프에게 연락 주세요.\n" + email_reject_auto_generated: + subject_template: "[%{site_name}] 이메일 문제 -- 자동 생성된 답글" + text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n이메일이 \"자동 생성\"으로 확인 되어 받을 수 없습니다. 오류라고 생각되면 스태프에게 연락주세요.\n" + email_error_notification: + subject_template: "[%{site_name}] 이메일 문제 -- POP 인증 오류" + text_body_template: | + POP서버에서 메일을 가져오는데 인증 오류가 발생했습니다. + + POP 인증정보를 제대로 입력했는지 확인해주세요. [사이트 설정](%{base_url}/admin/site_settings/category/email). too_many_spam_flags: subject_template: "새로운 계정은 블락되었습니다." + text_body_template: | + 안녕하세요 + + %{site_name}에서 글이 신고가 접수되어 자동으로 숨겨져 이 알림 메세지를 보냅니다. + + 만일의 사태를 대비하기 위해 이 계정은 새 답글이나 글타래를 다는 것을 막았으며 스태프가 확인 후 풀어드립니다. + + 추가적인 조언은 [커뮤니티 가이드라인](%{base_url}/guidelines)에서 확인하실 수 있습니다. blocked_by_staff: subject_template: "계정이 블락" + text_body_template: | + 안녕하세요, + + %{site_name}에서 이 계정이 스태프에 의해 블락되었음을 알리는 자동 메세지 입니다. + + 추가적인 조언은 [community guidelines](%{base_url}/guidelines)에서 확인하실 수 있습니다. + user_automatically_blocked: + subject_template: "%{username} 신규가입자가 커뮤니티 신고로 블락됨" + text_body_template: | + 자동 생성 메세지입니다. + + 새 사용자 [%{username}](%{base_url}%{user_url})님이 여러 사용자가 %{username}님의 글(들)을 신고하여 자동으로 블락되었습니다. + + [신고 접수](%{base_url}/admin/flags) 확인 바랍니다. %{username}님이 잘못 블락 되었으면, [사용자 관리 페이지](%{base_url}%{user_url})에서 블락해제해 주세요. + + `block_new_user` 사이트 설정을 변경해 쓰레솔드를 바꿀 수 있습니다. + spam_post_blocked: + subject_template: "%{username} 신규가입자가 연속 링크로 블락됨" + text_body_template: | + 자동 생성 메세지입니다. + + 새 사용자 [%{username}](%{base_url}%{user_url})님이 %{domains} 링크로 여러 글을 올려서 스팸이 의심되어 블락되었습니다. 다만, 이 사용자는 %{domains} 링크가 없는 글은 계속 올릴 수 있습니다. + + [사용자 관리 페이지](%{base_url}%{user_url})에서 확인 바랍니다. + + 이는 `newuser_spam_host_threshold`와 `white_listed_spam_host_domains` 사이트 설정으로 변경할 수 있습니다. unblocked: subject_template: "계정 블락 해제" text_body_template: | @@ -873,7 +1378,7 @@ ko: 이 메세지는 당신의 계정이 블락 해제 되었다는 것을 알리기 위해 %{site_name}에서 자동으로 생성되었습니다. - 당신은 이제 새로운 토픽과 답글을 게시할 수 있습니다. + 당신은 이제 새로운 글타래과 답글을 게시할 수 있습니다. pending_users_reminder: subject_template: other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다." @@ -881,7 +1386,9 @@ ko: 가입 승인 대기중(또는 거절된)인 새로운 사용자가 있습니다. [운영자 색션에서 새로운 사용자들을 리뷰하세요](/admin/users/list/pending). - unsubscribe_link: "만약 구독해지를 원하시면 [사용자 환경설정](%{user_preferences_url})을 방문하세요." + download_remote_images_disabled: + subject_template: "외부에서 이미지 다운로드 못함" + text_body_template: "`download_remote_images_to_local` 설정이`download_remote_images_threshold`에서 정한 디스크 용량에 도달하여 비활성화 되었습니다." subject_re: "덧: " subject_pm: "[PM] " user_notifications: @@ -892,6 +1399,36 @@ ko: reply_by_email: "응답하시려면 %{base_url}%{url} 를 방문하시거나 이메일에 답장하세요." visit_link_to_respond: "응답하시려면 %{base_url}%{url} 를 방문하세요." posted_by: "%{username} 사용자가 %{post_date}에 게시하였습니다." + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다" + text_body_template: |2 + + %{username} 회원님이 메세지에 초대했습니다. + + > **%{topic_title}** + > + > %{topic_excerpt} + + 사이트: + + > %{site_title} -- %{site_description} + + %{base_url}%{url} 로 들어가서 메세지를 확인하기 + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다." + text_body_template: |2 + + %{username} 회원님이 토의에 초대하였습니다. + + > **%{topic_title}** + > + > %{topic_excerpt} + + 사이트: + + > %{site_title} -- %{site_description} + + 메세지 링크: %{base_url}%{url} user_replied: subject_template: "[%{site_name}] '%{topic_title}'에 답글이 달렸습니다" text_body_template: | @@ -902,7 +1439,7 @@ ko: --- %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}' 토픽에 당신을 인용하였습니다" + subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}' 글타래에 당신을 인용하였습니다" text_body_template: | %{message} @@ -920,7 +1457,7 @@ ko: --- %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{subject_prefix} '%{topic_title}'에 새로운 게시물이 등록되었습니다" + subject_template: "[%{site_name}] %{subject_prefix} '%{topic_title}'에 새로운 글이 등록되었습니다" text_body_template: | %{message} @@ -938,12 +1475,16 @@ ko: --- %{respond_instructions} digest: - new_activity: "당신의 토픽과 게시물에 등록된 새로운 활동:" - top_topics: "인기 게시글" - other_new_topics: "인기 토픽" + why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황" + subject_template: "[%{site_name}] 근황" + new_activity: "당신의 글타래과 글에 등록된 새로운 활동:" + top_topics: "인기 글" + other_new_topics: "인기 글타래" + unsubscribe: "%{site_link} 근황은 한동안 접속을 안해서 보냈어요. 스팸 같아서 보기도 싫으면 %{unsubscribe_link}." click_here: "클릭" from: "%{site_name} 요약" read_more: "더 읽기" + more_topics: "%{new_topics_since_seen}개의 글타래가 새로 올라왔어요." more_topics_category: "더 많은 새글:" forgot_password: subject_template: "[%{site_name}] 패스워드 재설정" @@ -954,8 +1495,29 @@ ko: %{base_url}/users/password-reset/%{email_token} set_password: subject_template: "[%{site_name}] 패스워드 재설정" + text_body_template: | + [%{site_name}](%{base_url})의 회원님 계정에 비밀번호를 추가 요청을 받았습니다. 이 이메일이 사용된 다른 온라인 서비스 (Google, Facebook, etc)를 이용해 로그인할 수 있습니다. + + 이 요청을 하지 않았다면, 이 메일은 무시해도 안전합니다. + + 비밀번호 선택 페이지: + %{base_url}/users/password-reset/%{email_token} + admin_login: + subject_template: "[%{site_name}] 로그인" + text_body_template: | + [%{site_name}](%{base_url})의 회원님 계정에 로그인 요청을 받았습니다. + + 이 요청을 하지 않았다면, 이 메일은 무시해도 안전합니다. + + 로그인 페이지: + %{base_url}/users/admin-login/%{email_token} account_created: subject_template: "[%{site_name}] 당신의 새 계정" + text_body_template: | + %{site_name}에 새 계정이 만들어 졌습니다. + + 비밀번호 설정 페이지: + %{base_url}/users/password-reset/%{email_token} authorize_email: subject_template: "[%{site_name}] 이메일 확인" text_body_template: | @@ -964,8 +1526,24 @@ ko: %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "당신은 %{site_name} 가입이 승인되었습니다!" + text_body_template: | + %{site_name}에 오신 것을 환영합니다! + + 스태프가 %{site_name} 계정을 승인했습니다. + + 새 계정을 활성화해서 시작하려면 아래를 클릭: + %{base_url}/users/activate-account/%{email_token} + + 링크가 안 될 경우 복사 붙여넣기로 주소에 넣어 들어가주세요. + + %{new_user_tips} + + 우리는 [문화시민의 커뮤니티 활동 지침](%{base_url}/guidelines)을 항상 따릅니다. + + 커뮤니티를 즐겨주세요! + + (새 사용자로서 할말이 있으시면 이글에 답변함으로써 [스태프](%{base_url}/about)들에게 이야기해주세요.) signup: - subject_template: "[%{site_name}] 새로운 계정을 활성화하세요" text_body_template: | %{site_name}에 오신것을 환영합니다! @@ -974,7 +1552,7 @@ ko: 만약 위의 링크를 클릭 할 수 없으면 주소를 복사하여 당신의 웹브라우저에 붙여넣으세요. page_not_found: - title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 토픽을 찾으신 것은 아닌가요?" + title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 글타래를 찾으신 것은 아닌가요?" popular_topics: "인기" recent_topics: "최근" see_more: "더" @@ -992,14 +1570,19 @@ ko: edit_reason: "이미지를 다운로드 합니다." unauthorized: "업로드 하시려는 파일 확장자는 사용이 불가능합니다 (사용가능 확장자: %{authorized_extensions})." pasted_image_filename: "게시된 이미지" + store_failure: "#%{user_id}가 업로드한 파일 #%{upload_id} 을 저장하는데 실패함." + attachments: + too_large: "죄송합니다, 업로드하려는 파일이 너무 큽니다. (최대 크기 %{max_size_kb}KB)." images: - fetch_failure: "죄송합니다. 이미지 업로드에 오류가 있습니다." - unknown_image_type: "죄송합니다. 당신은 이미지로 보이지 않는 파일을 업로드 하려고 하였습니다." + too_large: "죄송합니다, 업로드하려는 이미지가 너무 큽니다. (최대 크기 %{max_size_kb}KB). 크기를 줄여서 다시 시도해보세요." size_not_found: "죄송합니다. 이미지 사이즈가 잘못 되었습니다. 혹시 깨진 이미지가 아닌가요?" flag_reason: - sockpuppet: "새로운 사용자가 토픽을 만들었습니다. 그리고 같은 IP를 사용하는 새 사용자가 답글을 달았습니다. 사이트 설정의 flag_sockpuppets를 확인하세요." + sockpuppet: "새로운 사용자가 글타래를 만들었습니다. 그리고 같은 IP를 사용하는 새 사용자가 답글을 달았습니다. 사이트 설정의 flag_sockpuppets를 확인하세요." + spam_hosts: "이 신규 가입자가 같은 주소로 여러번 게시하려고 했습니다. 사이트 설정의 newuser_spam_host_threshold 항목을 참고하세요." email_log: no_user: "ID %{user_id} 인 사용자를 찾을 수 없습니다" + anonymous_user: "유저가 익명임" + suspended_not_pm: "메세지가 아니라 사용자가 정지됐습니다." seen_recently: "최근 보여진 사용자" post_not_found: "해당하는 ID %{post_id} 을 찾을 수 없습니다. " notification_already_read: "이 알림 이미 읽은 것에 대한 이메일 입니다." @@ -1013,6 +1596,7 @@ ko: body_blank: "본문이 비어있음" color_schemes: base_theme_name: "기본 테마 색상" + about: "소개" guidelines: "가이드라인" privacy: "개인정보 취급방침" edit_this_page: "이 페이지 수정" @@ -1020,7 +1604,7 @@ ko: boolean_yes: "네" boolean_no: "아니오" static_topic_first_reply: |+ - 이 토픽인 %{page_name} 페이지의 첫글 수정. + 이 글타래인 %{page_name} 페이지의 첫글 수정. guidelines_topic: title: "FAQ/가이드" @@ -1028,3 +1612,13 @@ ko: title: "서비스 이용약관" privacy_topic: title: "개인정보취급방침" + admin_login: + success: "이메일 보냄" + error: "에러!" + email_input: "관리자 이메일" + submit_button: "이메일 보내기" + discourse_hub: + access_token_problem: "관리자에게 말하기: 제발 웹사이트 설정 업데이트해서 맞는 discourse_org_access_key를 포함하게 해주세요." + performance_report: + initial_post_raw: 이 글타래는 웹사이트의 일일 성능 보고를 포함하고 있습니다. + initial_topic_title: 웹사이트 성능 보고 diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index f548eae262..86e266e1ef 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -133,11 +133,15 @@ nb_NO: rss_description: latest: "Siste emner" hot: "Populære emner" + posts: "Nyeste innnlegg" too_late_to_edit: "Det innlegget ble laget for lenge siden. Det kan ikke lenger bli redigert eller slettet." excerpt_image: "bilde" + queue: + delete_reason: "Slettet via køen for innleggmoderering" groups: errors: can_not_modify_automatic: "Du kan ikke gjøre endringer på en automatisk gruppe" + member_already_exist: "'%{username}' er allerede medlem av denne gruppen." default_names: everyone: "alle" admins: "administratorer" @@ -162,14 +166,6 @@ nb_NO: - Konstruktiv kritikk ønskes velkommen, men husk å kritiser ideèr, ikke mennesker. For mer informasjon [see våre retningslinjer](/guidelines). Dette panelet vil kun vises for ditt første %{education_posts_text}. - avatar: | - ### Laste opp et nytt bilde for kontoen din? - - Du har lagt inn noen emner og svar, men avataren din er ikke så unik som du er -- det er den samme standard avataren som alle nye brukere har. - - Har du vurdert å **[se på brukerprofilen din](%{profile_path})** og laste opp et eget bilde som representerer deg? - - Det er lettere å følge diskusjonene og å finne interessante personer i samtalene når alle har en unik avatar! sequential_replies: | ### Vurder å svare til flere innlegg på samme tid @@ -233,7 +229,7 @@ nb_NO: no_info_other: "
      %{name} har ikke skrevet noe i Om meg-feltet på sin profil ennå
      " vip_category_name: "Salong" vip_category_description: "En kategori tilgjengelig for brukere med tillitsnivå 3 og høyere." - meta_category_name: "Meta" + meta_category_name: "Tilbakemelding" meta_category_description: "Diskusjon om denne nettsiden, organiseringen av den, hvordan den fungerer og hvordan vi kan forbedre den." staff_category_name: "Stab" staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer." @@ -383,12 +379,12 @@ nb_NO: please_continue: "Fortsett til %{site_name}" error: "Det oppsto en feil ved endring av din epostadresse. Kanskje addressen allerede er i bruk?" activation: - action: "Aktiver din konto" already_done: "Beklager, denne bekreftelseslenken er ikke lenger gyldig. Kanskje er kontoen din allerede aktivert?" please_continue: "Din nye konto er registrert; du vil bli videresendt til hjemmesiden. " continue_button: "Fortsett til %{site_name}" welcome_to: "Velkommen til %{site_name}!" approval_required: "En moderator må manuelt godkjenne kontoen din før du får tilgang til forumet. Du vil motta en epost når kontoen din er godkjent!" + missing_session: "Vi kan ikke se hvorvidt kontoen din ble opprettet. Venligst påse at du har cookies aktivert." post_action_types: off_topic: title: 'Off-Topic' @@ -399,6 +395,7 @@ nb_NO: description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant til emnet men av promoterende karakter.' long_form: 'markerte dette som spam' email_title: '"%{title}" ble rapportert som spam' + email_body: "%{link}\n\n%{message}" inappropriate: title: 'Upassende' description: 'Dette innlegget har innhold som for en fornuftig person vil kunne være fornærmende, nedverdigende eller brudd på retningslinjene til dette nettsamfunnet.' @@ -443,11 +440,13 @@ nb_NO: email_title: 'Emne "%{title}" krever moderator oppmerksomhet' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

      Innlegget ditt har blitt rapportert av nettsamfunnet. Venligst sjekk dine meldinger.

      ' user_must_edit: '

      Dette innlegget ble rapportert av nettsamfunnet og er midlertidig skjult.

      ' archetypes: regular: title: "Vanlig emne" banner: + title: "Banneremne" message: make: "Dette emnet er nå en banner. Det vil vises på toppen av hver side til brukeren lukker det." remove: "Dette emnet er ikke lenger en banner. Det vil ikke lenger vises på toppen av hver side." @@ -555,6 +554,12 @@ nb_NO: title: "Totalt" xaxis: "Dag" yaxis: "Totale API-kall" + page_view_logged_in_mobile_reqs: + title: "Innlogget API-forespørsler" + xaxis: "Dag" + yaxis: "Innlogget API-forespørsler fra mobil" + page_view_anon_mobile_reqs: + xaxis: "Dag" http_background_reqs: title: "Bakgrunn" xaxis: "Dag" @@ -579,11 +584,24 @@ nb_NO: title: "Total" xaxis: "Dag" yaxis: "Totalt forespørsler" + time_to_first_response: + title: "Tid før første respons" + xaxis: "Dag" + yaxis: "Gjennomsnittlig tid (timer)" + topics_with_no_response: + title: "Emner uten svar" + xaxis: "Dag" + yaxis: "Totalt" + mobile_visits: + title: "Brukerbesøk" + xaxis: "Dag" + yaxis: "Antall besøk" dashboard: rails_env_warning: "Serveren din kjører i %{env] modus." ruby_version_warning: "Du kjører en versjon av Ruby 2.0.0 som er kjent for å ha problemer. Oppgrader derfor til patch level 247 eller senere." 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 Nettstedinstillinger." content_types: education_new_reply: title: "Ny bruker utdanning: Første svar" @@ -594,6 +612,7 @@ nb_NO: description: "Brukerveiledning og nyttig informasjon for nye brukere" welcome_user: title: "Velkommen: Ny Bruker" + description: "En melding som automatisk sendes til alle nye brukere når de oppretter konto." welcome_invite: title: "Velkommen: Invitert Bruker" login_required_welcome_message: @@ -612,6 +631,7 @@ nb_NO: site_settings: censored_words: "Ord som automatisk vil bli erstattet med ■■■■" delete_old_hidden_posts: "Auto-slett skjulte innlegg som er skjult i mer enn 30 dager." + default_locale: "Standard språk for denne instansen av Discourse (ISO 639-1 Kode)" allow_user_locale: "Tillta at brukere velger eget språk" min_post_length: "Minimum tillatt lengde for innlegg i tegn" min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg" @@ -619,7 +639,6 @@ nb_NO: min_topic_title_length: "Minimum tillatt lengde for tittel i tegn" max_topic_title_length: "Maksimum tillatt lengde for innlegg i tegn" min_search_term_length: "Minimum lengde på søkeord i tegn" - allow_uncategorized_topics: "Tillat å lage emner uten kategori." uncategorized_description: "Beskrivelsen av denne ukategoriserte kategorien. La stå tom for ingen beskrivelse." allow_duplicate_topic_titles: "Tillat emner med lik, duplikat tittel." unique_posts_mins: "Hvor mange minutter før en bruker kan lage en post med det samme innholdet igjen" @@ -640,7 +659,6 @@ nb_NO: max_image_width: "Maksimal thumbnail bredde for bilder i et innlegg" max_image_height: "Maksimal thumbnail høyde for bilder i et innlegg" post_excerpt_maxlength: "Maksimal lengde på et utdrag eller oppsummering av innlegg." - favicon_url: "Et favicon for din side, se http://en.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Ikon brukt på Apple touch enheter. Anbefalt størrelse er 144px x 144px." allow_moderators_to_create_categories: "Tillat moderatorer å opprette nye kategorier" show_email_on_profile: "Vis brukerens epostadresse i profilen (kun synlig for brukeren selv og forum staff)" @@ -648,7 +666,6 @@ nb_NO: enable_badges: "Aktiver badge system" log_out_strict: "Ved utlogging, logg ut av ALLE enheter som er pålogget" invite_expiry_days: "Hvor lenge en bruker invitasjons nøkkel er gyldig i dager" - backup_daily: "Opprett sikkerhetskopier automatisk en gang om dagen." rate_limit_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt" rate_limit_new_user_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt" max_likes_per_day: "Maximum antall liker per bruker per dag" @@ -658,7 +675,6 @@ nb_NO: faq_url: "Hvis du har en FAQ på et annet nettsted du gjerne vil bruke, vennligst sett inn URL'en her." delete_user_max_post_age: "Ikke tillatt å slette brukere hvor deres første innlegg er mer enn (x) dager gamle." email_editable: "Tillat brukere å endre deres email etter at de har registrert seg." - allow_uploaded_avatars: "Tillat brukere å laste opp egne avatarer." allow_profile_backgrounds: "Gi brukere mulighet til å laste opp profilbakgrunner." enable_mobile_theme: "Mobilenheter bruker et mobilvennlig tema, med muligheten til å gå til den fulle siden. Deaktiver dette hvis du ønsker å bruke et tilpasset stilark." dominating_topic_minimum_percent: "Hvor mange innlegg en bruker kan lage innenfor en topic før de blir påminnet om dominering av en topic." @@ -726,7 +742,6 @@ nb_NO: long: "kan ikke være mer enn %{max} tegn" unique: "må være unik" blank: "Må være til stede" - must_begin_with_alphanumeric: "må begynne med en bokstav eller et tall" email: blocked: "er ikke tillatt." flags_reminder: @@ -737,7 +752,6 @@ nb_NO: disagreed: "Takk for at du sier ifra. Vi skal se på det. " deferred: "Takk for at du sier ifra. Vi ser på saken. " deferred_and_deleted: "Takk for at du sier ifra. Vi har fjernet innlegget. " - temporarily_closed_due_to_flags: "Dette emnet er midlertidig stengt grunnet et høyt antall varslinger fra fellesskapet" system_messages: post_hidden: subject_template: "Innlegg skjult grunnet fellesskaps varslinger" @@ -756,7 +770,6 @@ nb_NO: read_more: "Les Mer" more_topics_category: "Flere nye emner:" signup: - subject_template: "[%{site_name}] Aktiver din nye konto" text_body_template: | Velkommen til %{site_name}! diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 05f795aac9..e359d44e12 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -65,6 +65,13 @@ nl: other: '%{count} fouten voorkomen dat deze %{model} opgeslagen kan worden' embed: load_from_remote: "Er ging iets mis bij het laden van dat bericht." + site_settings: + min_username_length_exists: "Je kan de minimale gebruikersnaam lengte niet hoger instellen dan de kortste gebruikersnaam." + min_username_length_range: "Je kan het minimum niet hoger instellen dan het maximum." + max_username_length_exists: "Je kan de maximale gebruikersnaam lengte niet lager instellen dan de langste gebruikersnaam." + max_username_length_range: "Je kan het maximum niet lager instellen dan het minimun." + default_categories_already_selected: "Je kan geen categorie selecteren die wordt gebruikt in een andere lijst." + s3_upload_bucket_is_required: "U kunt niet de uploads van de S3 toestaan totdat u de 's3_upload_bucket' hebt verleend." bulk_invite: file_should_be_csv: "Het bestand moet in csv- of txt-formaat zijn." backup: @@ -133,6 +140,7 @@ nl: rss_description: latest: "Nieuwste topics" hot: "Hot topics" + posts: "Nieuwste berichten" too_late_to_edit: "Dat bericht is lang geleden geschreven. Het kan niet meer gewijzigd of verwijderd worden." excerpt_image: "afbeelding" queue: @@ -175,14 +183,7 @@ nl: - Je mag best kritisch zijn, maar onthoud dat je kritiek moet geven op *ideeën*, niet op mensen. Voor meer informatie, [bekijk onze regels](/guidelines). Deze tekst zal alleen verschijnen bij je eerste %{education_posts_text}. - avatar: | - ### Wat dacht je van een nieuwe afbeelding voor je account? - - Je hebt een aantal berichten en reacties geplaatst, maar je avatar is niet zo uniek als jij bent -- het is dezelfde avatar als alle andere nieuwe gebruikers hebben. - - Heb je al overwogen **[om naar je profielpagina te gaan](%{profile_path})** om een nieuwe afbeelding van jou te uploaden? - - Het is makkelijker om conversaties te volgen en interessante mensen te vinden als iedereen een unieke avatar heeft! + avatar: "### Hoe lijkt het je om een foto te gebruiken voor je account?\n\nJe heb al een aantal topics en reacties geplaatst, maar je profielfoto is nog niet zo uniek als jij zelf -- het is maar een letter. \n\nHeb je overwogen **[visiting your user profile](%{profile_path})** en een foto die weergeeft wie jij bent te uploaden?\n\nHet is gemakkelijker om discussies en interessante personen in conversaties te volgen als iedereen een unieke profielfoto heeft!\n" sequential_replies: | ### Overweeg om op meerdere berichten ineens te reageren @@ -246,7 +247,7 @@ nl: no_info_other: "
      %{name} heeft nog niks in zijn of haar Over Mij-profielveld ingevuld
      " vip_category_name: "Lounge" vip_category_description: "Een categorie exclusief voor leden met trust level 3 en hoger." - meta_category_name: "Meta" + meta_category_name: "Over Deze Site" meta_category_description: "Discussies over deze site, de organisatie, hoe het werkt en hoe het verbeterd kan worden." staff_category_name: "Staf" staff_category_description: "Privécategorie voor stafgesprekken. Topics zijn alleen zichtbaar voor admins en moderatoren." @@ -386,7 +387,7 @@ nl: one: "bijna 1 jaar geleden" other: "bijna %{count} jaren geleden" password_reset: - no_token: "Sorry, deze wachtwoord-verander link is te oud. Log opnieuw in en selecteer 'Ik ben mijn wachtwoord vergeten' om een nieuwe link te krijgen." + no_token: "Sorry, die link voor het wijzigen van je wachtwoord is te oud. Selecteer de Inloggen knop en kies 'Ik ben mijn wachtwoord vergeten' om een nieuwe link te krijgen." choose_new: "Kies een nieuw wachtwoord" choose: "Kies een wachtwoord" update: 'Wijzig wachtwoord' @@ -400,7 +401,7 @@ nl: please_continue: "Ga verder naar %{site_name}" error: "Er ging iets mis bij het wijzigen van je e-mailadres. Wellicht is deze al in gebruik?" activation: - action: "Activeer je account" + action: "Klik hier om je account te activeren" already_done: "Sorry, de link om je account te activeren is niet langer geldig. Wellicht is je account al geactiveerd?" please_continue: "Je account is bevestigd en je wordt nu doorgestuurd naar de homepage." continue_button: "Ga verder naar %{site_name}" @@ -466,8 +467,9 @@ nl: user_must_edit: '

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

      ' archetypes: regular: - title: "Standaard topic" + title: "Standaard Topic" banner: + title: "Banner Topic" message: make: "Dit topic is nu een banner. Het zal bovenaan elke pagina verschijnen totdat het is weggeklikt door de gebruiker." remove: "Dit topic is geen banner meer. Het zal niet meer bovenaan elke pagina verschijnen." @@ -566,15 +568,23 @@ nl: page_view_logged_in_reqs: title: "Ingelogd" xaxis: "Dag" - yaxis: "Ingelogde API Aanvragen" + yaxis: "API Aanvragen Ingelogd" page_view_crawler_reqs: title: "Web Crawlers" xaxis: "Dag" - yaxis: "Web Crawler API Aanvragen" + yaxis: "API Aanvragen Web Crawler" page_view_total_reqs: title: "Totaal" xaxis: "Dag" yaxis: "Totaal API Aanvragen" + page_view_logged_in_mobile_reqs: + title: "API Aanvragen Ingelogd" + xaxis: "Dag" + yaxis: "API Aanvragen Mobiel Ingelogd" + page_view_anon_mobile_reqs: + title: "Anonieme API Aanvragen" + xaxis: "Dag" + yaxis: "Anonieme AIP Aanvragen Mobiel" http_background_reqs: title: "Achtergrond" xaxis: "Dag" @@ -599,12 +609,25 @@ nl: title: "Totaal" xaxis: "Dag" yaxis: "Totaal aanvragen" + time_to_first_response: + title: "Tijd tot eerste reactie" + xaxis: "Dag" + yaxis: "Gemiddelde tijd (uur)" + topics_with_no_response: + title: "Topics zonder reactie" + xaxis: "Dag" + yaxis: "Totaal" + mobile_visits: + title: "Gebruiker bezoeken" + xaxis: "Dag" + yaxis: "Aantal bezoeken" dashboard: rails_env_warning: "Je server draait in %{env} modus." ruby_version_warning: "Je gebruikt een versie van Ruby 2.0.0 met problemen. Upgrade naar patch level 247 of later." host_names_warning: "Het bestand config/database.yml heeft localhost als standaard hostname. Verander dat in de hostname van je site." gc_warning: 'Je server gebruikt de standaard ruby garbage collection instellingen, en daarmee krijg je niet de beste prestaties. Lees deze topic over instellingen voor prestaties: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq draait niet. Veel taken, zoals het versturen van e-mails, worden asynchroon uitgevoerd door sidekiq. Zorg ervoor dat er altijd een sidekiq process draait. Hier is meer informatie over sidekiq.' + queue_size_warning: 'Het aantal taken in de wachtrij %{queue_size} is hoog. Dit kan duiden op problemen met het Sidekiq proces. Of je moet meer Sidekiq workers toevoegen.' memory_warning: 'Jouw server draait met minder dan 1 GB aan geheugen. Ten minste 1 GB geheugen is aanbevolen.' google_oauth2_config_warning: 'De server is geconfigureerd om aanmelden en inloggen via Google OAuth2 (enable_google_oauth2_logins) toe te staan, maar de client id en client secret values zijn niet ingesteld. Ga naar de Site Instellingen en stel deze in. Bekijk deze gids voor meer informatie.' facebook_config_warning: 'De server is geconfigureerd om registratie en inloggen via Facebook mogelijk te maken (enable_facebook_logins), maar er zijn geen app id en app secret waarden opgegeven. Ga naar de Instellingen en vul de waarden in. Zie deze uitleg voor meer informatie.' @@ -613,7 +636,6 @@ nl: s3_config_warning: 'De server is geconfigureerd om bestanden naar S3 te uploaden, maar tenminste een van de volgende instellingen is niet opgegeven: s3_access_key_id, s3_secret_access_key of s3_upload_bucket. Ga naar de Instellingen en vul de waarden in. Zie "How to set up image uploads to S3?" voor meer informatie.' 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 de Site Instellingen en stel deze in. Bekijk "How to set up image uploads to S3?" voor meer informatie.' 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 download de laatste release.' - failing_emails_warning: 'Er zijn %{num_failed_jobs} mislukte emailtaken. Check of de instellingen voor config.action_mailer in het bestand config/discourse.conf kloppen. Bekijk alle mislukte Sidekiq jobs.' default_logo_warning: "Stel de grafische logos voor je site in. Stel logo_url, logo_small_url, en favicon_url in in Site Instellingen." 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 Site Instellingen." contact_email_invalid: "De site contact email is ongeldig. Verander deze in Site Instellingen." @@ -666,7 +688,7 @@ nl: max_topic_title_length: "Maximum lengte van een topictitel" min_private_message_title_length: "Minimale toegestane titel lengte in tekens voor berichten" min_search_term_length: "Minimum lengte van een zoekterm in tekens" - allow_uncategorized_topics: "Sta topics zonder categorie toe" + allow_uncategorized_topics: "Topics zonder categorie toestaan. WAARSCHUWING: Alle topics moet weer aan een categorie zijn toegekend voor dit wordt uitgezet." uncategorized_description: "De omschrijving voor de ongecategoriseerde categorie. Laat blanco voor geen omschrijving." allow_duplicate_topic_titles: "Sta topics met dezelfde titels toe" unique_posts_mins: "Hoeveel minuten iemand moet wachten voordat deze een bericht met dezelfde inhoud mag plaatsen" @@ -689,27 +711,34 @@ nl: category_featured_topics: "Aantal topics dat wordt weergegeven in de categorielijst. An het wijzigen van dit getal kan het tot 15 minuten duren voordat de lijst is bijgewerkt." show_subcategory_list: "Laat subcategorielijst zien in plaats van de topiclijst bij het openen van een categorie." fixed_category_positions: "Indien aangevinkt kun je categorieën in een vaste volgorde arrangeren. Indien uitgevinkt zullen de categorieeen gesorteerd worden op activiteit." + fixed_category_positions_on_create: "Indien aangevinkt wordt de categorie volgorde aangehouden in het menu voor nieuwe topics (vaste-categorie-posities vereist)." add_rel_nofollow_to_user_content: "Voeg 'rel nofollow' toe aan alle ingediende gebruikers-content, behalve voor interne links (inclusief parent domeinen). Als je dit verandert moet je ook alle berichten rebaken met: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "Een lijst van domeinen waar ´nofollow´ niet aan de links moet worden toegevoegd. (voorbeelddomein.com staat automatisch sub.voorbeelddomein toe). Voeg minimaal het 'top-level' domein van deze site toe om web crawlers alle content te laten vinden. Als delen van deze site zich op andere domeinen bevinden, voeg deze eveneens toe." post_excerpt_maxlength: "Maximale lengte van een uittreksel / samenvatting van een bericht." post_onebox_maxlength: "Maximale lengte van een 'oneboxed Discourse' bericht in tekens." onebox_domains_whitelist: "Een lijst met domeinen waarvoor oneboxing is toegestaan; deze domeinen moeten OpenGraph of oEmbed ondersteunen. Dit kun je testen op http://iframely.com/debug" - logo_url: "De logo afbeelding welke linksboven op de site getoond wordt; indien blanco zal de site titeltekst getoond worden." - digest_logo_url: "Het alternatieve logo welke bovenaan de digest mail van de site gebruikt wordt. Indien blanco zal `logo_url` gebruikt worden. Bijv: http://example.com/logo.png" - logo_small_url: "De kleine logo afbeelding welke linksboven op de site getoond wordt als er naar beneden gescrold is. Indien blanco zal een hoofdpagina symbool getoond worden." - favicon_url: "Een favicon voor je site. Zie http://nl.wikipedia.org/wiki/Favicon" - mobile_logo_url: "De vaste positie logo afbeelding welke linksboven op de mobiele site getoond wordt. Indien blanco zal `logo_url` gebruikt worden." + logo_url: "De logo afbeelding links bovenaan je site moet de vorm hebben van een brede rechthoek. Indien leeg wordt de site titeltekst getoond." + digest_logo_url: "Het alternatieve logo voor bovenaan de digest mail van je site wordt moet de vorm hebben van een brede rechthoek. Indien leeg wordt ´logo_url´ gebruikt." + logo_small_url: "De kleine logo afbeelding links boven aan je site moet de vorm van een vierkant hebben en wordt getoond als naar beneden wordt gescrold. Indien leeg wordt een homepage symbool getoond." + favicon_url: "Een favicon voor je site, zie http://nl.wikipedia.org/wiki/Favicon. Voor een correcte werking via CDN moet het een png zijn." + mobile_logo_url: "De logo afbeelding met vaste positie voor linksboven op je mobiele site. De afbeelding moet vierkant zijn. Indien leeg wordt `logo_url` gebruikt. Bijv.: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icoon voor Apple touch devices. Aanbevolen grootte is 144px bij 144px." notification_email: "Het afzender email adres dat wordt gebruikt voor het verzenden van alle essentiële systeem emails. Voor het domein dat hier gespecificeerd is moeten de SPF, DKIM en reverse PTR records goed ingesteld zijn om de mails te doen aankomen." email_custom_headers: "Een lijst van custom email headers, gescheiden door een pipe (|)" email_subject: "Wijzigbaar onderwerp formaat voor standaard emails. Bekijk https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801 voor meer informatie" use_https: "Gebruik http of https voor de volledige url van de site (Discourse.base_url)? GEBRUIK DIT NIET ALS HTTPS NOG NIET OPGEZET IS!" + summary_score_threshold: "De minimum score voor een bericht om opgenomen te worden in 'Samenvatting Topic' " + summary_posts_required: "Minimum aantal berichten in een topic voor weergave ´Samenvatting Topic´" + summary_likes_required: "Minimum aantal Likes in een topic voor weergave ´Samenvatting Topic´" + summary_percent_filter: "Als iemand op 'Samenvatting Topic' klikt, laat dan de top % van de berichten zien" + summary_max_results: "Maximaal aantal berichten in weergave ´Samenvatting Topic´" enable_private_messages: "Sta toe dat trust level 1 gebruikers berichten kunnen maken en kunnen antwoorden op berichten" enable_long_polling: "De 'message bus' die gebruikt wordt voor notificaties kan 'long polling' gebruiken." + long_polling_base_url: "Basis URL voor ´long polling´ (indien via een CDN dynamische content wordt toegepast, kies hier dan 'origin pull´) b.v. http://originele.website.com" long_polling_interval: "De hoeveelheid tijd die de server zou moeten wachten voordat het clients beantwoord als er geen data te verzenden is (alleen voor ingelogde gebruikers)" + polling_interval: "Als ´long polling´ niet wordt toegepast, hoe vaak moet een ingelogde client een 'poll' uitvoeren in milliseconden" anon_polling_interval: "Hoe vaak een anonieme client een 'poll' moet uitvoeren in milliseconden" background_polling_interval: "Hoe vaak zouden de clients moeten pollen in milliseconden (als het venster in de achtergrond staat)" - auto_track_topics_after: "Hoeveel milliseconden het moet duren voordat een topic automatisch bijgehouden wordt (0 voor altijd, -1 voor nooit)" - new_topic_duration_minutes: "Hoeveel minuten kan een topic als nieuw beschouwd worden (-1 voor altijd, -2 voor laatste bezoek)" flags_required_to_hide_post: "Berichten zullen automatisch worden verborgen zodra het aantal meldingen maximaal dit aantal is (0 voor nooit)" cooldown_minutes_after_hiding_posts: "Het aantal minuten dat een gebruiker moet wachten voordat zij een door de gemeenschap verborgen bericht kunnen wijzigen" max_topics_in_first_day: "Het maximum aantal topics dat een gebruiker mag maken tijdens hun eerste dag op de site" @@ -731,6 +760,7 @@ nl: enable_escaped_fragments: "Val terug naar Google's Ajax-Crawling API als er geen webcrawler is gedetecteerd. Bekijk https://support.google.com/webmasters/answer/174992?hl=en voor meer info." enable_noscript_support: "Ondersteun <noscript> tag" allow_moderators_to_create_categories: "Moderators mogen nieuwe categorieën maken" + cors_origins: "Toegestane domeinen voor ´cross-origin requests´ (CORS). Elk domein moet http:// of https:// bevatten. De DISCOURSE_ENABLE_CORS omgevingsvariabele moet staan ingesteld op ´WAAR´ om CORS te kunnen gebruiken." top_menu: "Bepaal de volgorde en selectie van items in het hoofdmenu. Bijvoorbeeld latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "De volgorde en selectie van items in het berichtmenu. Bijvoorbeeld like|edit|flag|delete|share|bookmark|reply" post_menu_hidden_items: "De menu-items die standaard verborgen moeten worden in het post menu totdat er op de uitbreidings-ellips is geklikt." @@ -744,17 +774,43 @@ nl: max_reply_history: "Maximaal aantal uit te klappen antwoorden als een 'in antwoord op' uitgeklapt wordt." experimental_reply_expansion: "Verberg tussenliggende antwoorden als een antwoord uitgeklapt wordt (experimenteel)" topics_per_period_in_top_summary: "Aantal topics in het top-topics overzicht" + topics_per_period_in_top_page: "Aantal topics in het uitgeklapte ´Meer...´ top-topics overzicht" redirect_users_to_top_page: "Stuur nieuwe en lang-niet-geziene gebruikers door naar de top-pagina" + show_email_on_profile: "Laat e-mail van gebruikers zien in hun profiel (alleen zichtbaar voor henzelf en staf)" + email_token_valid_hours: "Wachtwoord vergeten / activeer account tokens zijn (n) uur geldig." + email_token_grace_period_hours: "Wachtwoord vergeten / activeer account tokens zijn nog geldig gedurende een respijtperiode van (n) uur na het benutten." enable_badges: "Activeer het badgesysteem" allow_index_in_robots_txt: "Specificeer in robots.txt dat de site geïndexeerd mag worden door zoekmachines." + email_domains_blacklist: "Een lijst van e-maildomeinen gescheiden door een vertikaal streepje (pipe), die niet worden toegestaan. Voorbeeld: mailingen.com|trashmail.net" + email_domains_whitelist: "Een lijst van e-maildomeinen gescheiden door een vertikaal streepje (pipe), die zijn voorgeschreven om te worden toegelaten. WAARSCHUWING: Gebruikers met andere e-maildomeinen dan opgenomen in de lijst worden NIET toegelaten." + forgot_password_strict: "Gebruikers niet informeren dat een account bestaat tijdens het gebruik van het wachtwoord vergeten menu. " + log_out_strict: "Sluit bij het uitloggen ALLE sessies voor de gebruiker op alle apparaten." + version_checks: "Ping de Discourse-Hub voor updates en laat meldingen van nieuwe versies zien op het dashboard van de beheerder." + new_version_emails: "Stuur een email naar het contact_email adres wanneer een nieuwe versie van Discourse beschikbaar is." port: "DEVELOPER ONLY! WARNING! Mocht je een specifieke poort willen toewijzen aan de URL. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing." force_hostname: "DEVELOPER ONLY! WARNING! Mocht je een specifieke hostname willen toewijzen. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing." invite_expiry_days: "Hoe lang uitnodigingscodes geldig blijven (in dagen)." + invite_passthrough_hours: "Hoe lang een gebruiker een eerder verkregen uitnodigingssleutel kan gebruiken om in te loggen, in uren gespecificeerd" + invite_only: "Openbare registratie is uitgeschakeld, alle nieuwe gebruikers moeten expliciet worden uitgenodigd door andere leden of personeel." + login_required: "Authenticatie vereist om inhoud te lezen op deze site, verbied anonieme toegang." + min_username_length: "Minimale lengte gebruikersnaam in karakters." + max_username_length: "Maximale lengte gebruikersnaam in karakters." + reserved_usernames: "Gebruikersnamen waarvoor registratie niet is toegestaan." min_password_length: "Minimum lengte wachtwoord." + block_common_passwords: "Accepteer geen wachtwoorden die voorkomen in de 10.000 meest voorkomende wachtwoorden." + enable_sso: "Schakel single sign on in via een externe site (WAARSCHUWING: E-MAILADRESSEN VAN GEBRUIKERS '* MOETEN * DOOR DE EXTERNE SITE WORDEN GEVALIDEERD)" + enable_sso_provider: "Pas Discourse SSO provider protocol toe op het /session/sso_provider eindpunt, vereist dat sso_secret is ingesteld" sso_url: "URL van single sign on eindpunt" - sso_overrides_email: "Gebruikt het mailadres van de SSO service i.p.v. het lokaal opgegegeven adres. (WAARSCHUWING: er kunnen discrepanties ontstaan door normalisatie van lokale mailadressen)" - sso_overrides_username: "Gebruikt de gebruikersnaam van de SSO service i.p.v. de lokaal gekozen gebruikersnaam. (WAARSCHUWING: er kunnen discrepanties ontstaan door verschillen in eisen aan bijv. de lengte van de gebruikersnaam)" + sso_secret: "Geheime tekenreeks voor het cryptografisch valideren van SSO informatie, zorg er voor dat het 10 tekens of langer is" + sso_overrides_email: "Overschrijft bij elke aanmelding lokaal opgegeven mailadres door mailadres uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door normalisatie van lokale mailadressen)" + sso_overrides_username: "Overschrijft bij elke aanmelding lokaal opgegeven gebruikersnaam door gebruikersnaam uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door verschillen in gebruikersnaam lengte/vereisten)" + sso_overrides_name: "Overschrijft bij elke aanmelding lokaal opgegeven volledige naam door volledige naam uit SSO payload van externe site, en voorkomt lokaal wijzigen" + sso_overrides_avatar: "Overschrijft gebruikers avatar door avatar uit SSO payload van externe site, uitschakelen van allow_uploaded_avatars is sterk aanbevolen." + sso_not_approved_url: "Stuur niet geaccepteerde SSO accounts door naar deze URL" + enable_local_logins: "Accounts op basis van een lokale gebruikersnaam en wachtwoord toestaan. (Let op: dit moet aan staan voor toegang op basis van een uitnodiging.)" + allow_new_registrations: "Nieuwe gebruikers registreren toestaan. Uitschakelen om te voorkomen dat iedereen een nieuw account kan maken." enable_yahoo_logins: "Zet inloggen met Yahoo! aan" + enable_google_oauth2_logins: "Google Oauth2 authenticatie toestaan. Dit is de authenticatiemethode die momenteel door Google wordt ondersteund. Vereist key en secret." google_oauth2_client_id: "Client ID van je Google applicatie." google_oauth2_client_secret: "Client secret van je Google applicatie." enable_twitter_logins: "Zet inloggen met Twitter aan. Hiervoor heb je een twitter_consumer_key en twitter_consumer_secret nodig." @@ -766,17 +822,73 @@ nl: enable_github_logins: "Zet inloggen met Github aan. Hiervoor heb je een github_client_id en github_client_secret nodig." github_client_id: "github_client_id (registreer op https://github.com/settings/applications)" github_client_secret: "github_client_secret (registreer op https://github.com/settings/applications)" + allow_restore: "Herstellen van data toestaan, waarbij ALLE site-data wordt overschreven! Laat op 'false' staan, tenzij je een back-up terug wil zetten." maximum_backups: "Het maximum aantal backups om te bewaren. Oudere backups worden automatisch verwijderd." + automatic_backups_enabled: "Automatische back-ups uitvoeren volgens de opgegeven back-up frequentie." + backup_frequency: "Hoe vaak we een back-up van de site maken, in dagen." + enable_s3_backups: "Upload voltooide back-ups naar S3. LET OP: Zorg ervoor dat je je S3 inloggegevens hebt ingevuld in de Bestanden instellingen." s3_backup_bucket: "De S3 bucket voor de backups. WAARSCHUWING: zorg er voor dat dit een privébucket is." active_user_rate_limit_secs: "Hoe vaak we het 'last_seen_at'-veld updaten, in seconden." + verbose_localization: "Uitgebreide localization tips weergeven in de gebruikersinterface." previous_visit_timeout_hours: "Hoe lang een bezoek duurt voordat we het als het 'vorige' bezoek beschouwen, in uren." + rate_limit_create_topic: "Na het maken van een topic moeten gebruikers (n) seconden wachten voor ze een andere topic kunnen maken." + rate_limit_create_post: "Na het plaatsen van een bericht moeten gebruikers (n) seconden wachten voor ze een ander bericht kunnen plaatsen." + rate_limit_new_user_create_topic: "Na het maken van een topic moeten nieuwe gebruikers (n) seconden wachten voor ze een andere topic kunnen maken." + rate_limit_new_user_create_post: "Na het plaatsen van een bericht moeten nieuwe gebruikers (n) seconden wachten voor ze een ander bericht kunnen plaatsen." + max_likes_per_day: "Het maximum aantal likes per gebruiker per dag." + max_flags_per_day: "Het maximum aantal markeringen per gebruiker per dag." + max_bookmarks_per_day: "Het maximum aantal favoriet aanduidingen per gebruiker per dag." + max_edits_per_day: "Het maximum aantal bewerkingen per gebruiker per dag." + max_topics_per_day: "Het maximum aantal topics dat een gebruiker per dag kan maken." + max_private_messages_per_day: "Het maximum aantal berichten dat een gebruiker per dag kan maken." + max_invites_per_day: "Het maximum aantal uitnodigingen dat een gebruiker per dag kan versturen." + max_topic_invitations_per_day: "Het maximum aantal uitnodigingen voor een topic dat een gebruiker per dag kan sturen." + suggested_topics: "Aantal aanbevolen topics onderaan een topic." + limit_suggested_to_category: "Alleen topics van de huidige categorie weergeven in aanbevolen topics." + clean_up_uploads: "Verwijder weesbestanden zonder referentie om illegale hosting te voorkomen. LET OP: maak een back-up van je /uploads directory voordat je deze instelling aanzet." clean_orphan_uploads_grace_period_hours: "Na hoeveel uur een weesbestand voor verwijderding gemarkeerd wordt." purge_deleted_uploads_grace_period_days: "Na hoeveel uur een weesbestand definitief verwijderd wordt." + purge_unactivated_users_grace_period_days: "Respijtperiode (in dagen) voordat een gebruiker die het account niet heeft geactiveerd wordt verwijderd." + enable_s3_uploads: "Uploads plaatsen op Amazon S3 storage. LET OP: vereist geldige S3 inloggegevens (zowel acces key id als secret access key)" + s3_use_iam_profile: 'Gebruik AWS EC2 IAM rol om keys binnen te halen. LET OP: na inschakelen dit gebruikt i.p.v. de instellingen voor "s3 access key id" en "s3 secret access key".' + s3_upload_bucket: "De naam van de Amazon S3 bucket waar bestanden naar worden geüpload. LET OP: moet bestaan uit kleine letters, zonder puntjes en geen underscores." + s3_access_key_id: "Het Amazon S3 access key id dat wordt gebruikt voor het uploaden van afbeeldingen." + s3_secret_access_key: "De Amazon S3 secret access key die wordt gebruikt voor het uploaden van afbeeldingen." + s3_region: "De naam van de Amazon S3 region die wordt gebruikt voor het uploaden van afbeeldingen." + s3_cdn_url: "De CDN URL voor alle S3 assets (bijvoorbeeld: https://cdn.ergens.com). LETOP: na het wijzigen van deze instelling moeten je alle oude berichten rebaken." + avatar_sizes: "Lijst van automatisch gegenereerde avatar groottes." + enable_flash_video_onebox: "Embedden van swf en flv (Adobe Flash) links toestaan in oneboxen. LET OP: dit kan onveilig zijn" default_invitee_trust_level: "Het standaard trustlevel (0-4) voor uitgenodigde leden." + default_trust_level: "Het standaard trustlevel (0-4) voor alle nieuwe gebruikers. LET OP! Wijzigen van deze instelling geeft een serieus risico op spam." + tl1_requires_topics_entered: "Hoeveel topics een nieuw lid moet maken voordat deze naar trustlevel 1 gepromoveerd wordt." + tl1_requires_read_posts: "Hoeveel berichten een nieuw lid moet lezen voordat deze naar trustlevel 1 gepromoveerd wordt." + tl1_requires_time_spent_mins: "Hoeveel minuten een nieuw lid berichten moet lezen voordat deze naar trustlevel 1 gepromoveerd wordt." + tl2_requires_topics_entered: "Hoeveel topics een lid moet maken voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_read_posts: "Hoeveel berichten een lid moet lezen voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_time_spent_mins: "Hoeveel minuten een lid berichten moet lezen voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_days_visited: "Hoeveel dagen een lid de site moet bezoeken voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_likes_received: "Hoeveel likes een lid moet ontvangen voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_likes_given: "Hoeveel likes een lid moet geven voordat deze naar trustlevel 2 gepromoveerd wordt." + tl2_requires_topic_reply_count: "Op hoeveel topics een lid moet reageren voordat deze naar trustlevel 2 gepromoveerd wordt." + tl3_requires_days_visited: "Minimum aantal dagen dat een lid de site moet hebben bezocht in de laatste 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3 (0 tot 100)" + tl3_requires_topics_replied_to: "Minimum aantal topics waarop een lid moet hebben gereageerd in de laatste 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3 (0 of hoger)" + tl3_requires_topics_viewed: "Het percentage van topics gemaakt in de afgelopen 100 dagen dat een lid bekeken moet hebben om in aanmerking te komen voor promotie naar trustlevel 3. (0 to 100)" + tl3_requires_posts_read: "Het percentage van berichten gemaakt in de afgelopen 100 dagen dat een lid bekeken moet hebben om in aanmerking te komen voor promotie naar trustlevel 3. (0 to 100)" + tl3_requires_topics_viewed_all_time: "Het minimum totaal aantal topics dat een lid moet hebben bekeken om te kwalificeren voor trustlevel 3." + tl3_requires_posts_read_all_time: "Het minimum totaal aantal berichten dat een lid moet hebben bekeken om te kwalificeren voor trustlevel 3." + tl3_requires_max_flagged: "Van leden moeten minder dan x berichten gemarkeerd zijn door x verschillende leden in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3, waarbij x de waarde van deze instelling is. (0 of hoger)" + tl3_promotion_min_duration: "Het minimum aantal dagen van de duur van een promotie naar trustlevel 3 voordat een lid kan worden gedegradeerd naar trustlevel 2." + tl3_requires_likes_given: "Het minimum aantal likes dat een lid moet hebben gegeven in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3." + tl3_requires_likes_received: "Het minimum aantal likes dat een lid moet hebben gekregen in de afgelopen 100 dagen om in aanmerking te komen voor promotie naar trustlevel 3." + tl3_links_no_follow: "rel=nofollow niet verwijderen van links geplaatst door leden met trustlevel 3." min_trust_to_create_topic: "Het minimale trust level dat nodig is om een topic te mogen maken." min_trust_to_edit_wiki_post: "Het minimale trust level dat nodig is om een bericht te wijzigen dat als wiki gemarkeerd is." newuser_max_links: "Hoeveel links een nieuw lid in een bericht kan plaatsen." newuser_max_images: "Hoeveel afbeeldingen een nieuw lid in een bericht kan plaatsen." + newuser_max_attachments: "Hoeveel bestanden een nieuw lid in een bericht kan plaatsen." + newuser_max_mentions_per_post: "Het maximum aantal @naam notificaties dat een nieuw lid kan gebruiken in een bericht. " + newuser_max_replies_per_topic: "Het maximum aantal reacties dat een nieuw lid kan maken in een enkel topic totdat iemand terug reageert." + max_mentions_per_post: "Het maximum aantal @naam notificaties iedereen kan gebruiken in een bericht." title_fancy_entities: "Converteer algemene ASCII-tekens naar fancy HTML in topictitels, zoals SmartyPants (http://daringfireball.net/projects/smartypants)" min_title_similar_length: "De minimale lengte die een titel van een topic moet hebben voordat er wordt gezocht naar vergelijkbare topics." min_body_similar_length: "De minimale lengte die de inhoud van een bericht moet hebben voordat er wordt gezocht naar vergelijkbare topics." @@ -787,6 +899,10 @@ nl: tos_url: "Heb je je Algemene Voorwaarden ergens extern staan, geef hier dan de volledige url op." privacy_policy_url: "Heb je je Privacy Voorwaarden ergens extern staan, geef hier dan de volledige url op." newuser_spam_host_threshold: "Hoe vaak kan een gebruiker linken naar dezelfde host in hun `newuser_spam_host_posts` berichten voordat deze links als spam gezien worden." + white_listed_spam_host_domains: "Een lijst met domeinen die niet op spam gecontroleerd worden. Nieuwe gebruikers kunnen ongelimiteerd links plaatsen naar deze domeinen." + staff_like_weight: "Hoeveel zwaarder de weegfactor moet zijn voor likes gegeven door staf." + levenshtein_distance_spammer_emails: "Bij het matchen van spammer e-mails , het aantal verschillende karakters waarbij nog steeds een fuzzy match kan bestaan." + max_new_accounts_per_registration_ip: "Als er al (n) accounts met trustlevel 0 zijn van een bepaald IP-adres (en geen daarvan is staflid of heeft een trustlevel 2 of hoger), stop met het accepteren van nieuwe aanmeldingen van dat IP-adres." reply_by_email_enabled: "Ondersteuning voor antwoorden per e-mail." reply_by_email_address: "Template voor antwoorden per e-mail, bijvoorbeeld: %{reply_key}@reageer.mijnforum.nl" email_in_min_trust: "Het minium trustlevel dat een gebruiker moet hebben om nieuwe topics te kunnen mailen." @@ -794,11 +910,8 @@ nl: delete_all_posts_max: "Het maximaal aantal berichten dat ineens verwijderd kan worden met de 'Verwijder alle berichten'-knop. Als een gebruiker meer berichten heeft, kunnen de berichten niet in een keer verwijderd worden en kan de gebruiker dus niet verwijderd worden." username_change_period: "The number of days after registration that accounts can change their username (0 om wijziging niet toe te staan)." email_editable: "Gebruikers mogen hun e-mailadres na registratie nog wijzigen." - allow_uploaded_avatars: "Sta toe dat avatars geupload kunnen worden." digest_topics: "Het maximum aantal topics dat in de e-maildigest opgenomen wordt." digest_min_excerpt_length: "Hoeveel karakters er per bericht getoond worden in de mail digest" - default_digest_email_frequency: "Hoe vaak ontvangen gebruikers standaard de digestmails. Ze kunnen dit in hun eigen instellingen nog aanpassen." - default_external_links_in_new_tab: "Open externe links in a nieuwe tab. Gebruikers kunnen dit wijzigen in hun instellingen." allow_profile_backgrounds: "Gebruikers mogen een profielachtergrond instellen." enable_mobile_theme: "Mobiele apparaten gebruiken een mobiel-vriendelijke theme met de mogelijkheid te schakelen naar de volledige site. Schakel deze optie uit als je een eigen stylesheet wil gebruiken die volledig responsive is." suppress_uncategorized_badge: "Laat de badge niet zien voor topics zonder categorie in de topiclijsten." @@ -841,13 +954,6 @@ nl: redirected_to_top_reasons: new_user: "Welkom bij deze community! Dit zijn een aantal van de meest populaire topics." not_seen_in_a_month: "Welkom terug! We hebben je een tijdje niet gezien. Dit is een overzicht van de meest populaire topics die zijn gemaakt tijdens je afwezigheid." - move_posts: - new_topic_moderator_post: - one: "Ik heb een bericht naar een nieuwe topic verplaatst: %{topic_link}" - other: "Ik heb %{count} berichten naar een nieuwe topic verplaatst: %{topic_link}" - existing_topic_moderator_post: - one: "Ik heb een bericht naar een bestaande topic verplaatst: %{topic_link}" - other: "Ik heb %{count} berichten naar een bestaande topic verplaatst: %{topic_link}" change_owner: post_revision_text: "Eigendom overgezet van %{old_user} naar %{new_user}" topic_statuses: @@ -867,14 +973,21 @@ nl: incorrect_username_email_or_password: "Incorrecte gebruikersnaam, e-mailadres of wachtwoord" wait_approval: "Bedankt voor je inschrijving. We zullen je laten weten als je account is goedgekeurd." active: "Je account is actief en klaar voor gebruik!" + activate_email: "

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

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

      " not_activated: "Je kan nog niet inloggen. We hebben je een activatiemail gestuurd. Volg de instructies in de mail om je account te activeren." + not_allowed_from_ip_address: "Je kan niet inloggen als %{username} vanaf dat IP-adres." + admin_not_allowed_from_ip_address: "Je kan niet inloggen als admin vanaf dat IP-adres." suspended: "Je kan tot %{date} niet inloggen." + suspended_with_reason: "Account geschorst tot %{date}: %{reason}" errors: "%{errors}" not_available: "Niet beschikbaar. Probeer %{suggestion}?" something_already_taken: "Er ging iets mis, misschien zijn de gebruikersnaam en/of e-mailadres al in gebruik? Gebruik dan de 'wachtwoord vergeten' link" omniauth_error_unknown: "Er is iets misgegaan bij het inloggen. Probeer het opnieuw." new_registrations_disabled: "Het registeren van nieuwe accounts is niet toegestaan op dit moment." password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn." + reserved_username: "Die gebruikersnaam is niet toegestaan." + missing_user_field: "Je hebt niet alle velden ingevuld." + close_window: "Authenticatie is voltooid. Sluit dit venster om verder te gaan." user: no_accounts_associated: "Geen accounts gekoppeld" username: @@ -883,29 +996,51 @@ nl: characters: "mag alleen nummers, letters en underscores bevatten" unique: "moet uniek zijn" blank: "mag niet leeg zijn" - must_begin_with_alphanumeric: "moet met een letter of nummer beginnen" + must_begin_with_alphanumeric: "moet beginnen met een letter, cijfer of underscore" + must_not_contain_two_special_chars_in_seq: "mag niet 2 of meer opvolgende speciale karakters bevatten (.-_)" + must_not_contain_confusing_suffix: "mag geen verwarrend achtervoegsel bevatten, zoals b.v.: .json of .png " email: not_allowed: "is niet toegestaan vanaf die e-mailprovider. Gebruik een ander e-mailadres." blocked: "is niet toegestaan." + ip_address: + blocked: "Nieuwe registraties vanaf jouw IP-adres zijn niet toegestaan." + max_new_accounts_per_registration_ip: "Nieuwe registraties vanaf jouw IP-adres zijn niet toegestaan (maximum limiet bereikt). Neem contact op met een staflid." + invite_mailer: + subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}" + text_body_template: | + %{invitee_name} nodigt je uit voor een discussie + + > **%{topic_title}** + > + > %{topic_excerpt} + + op + + > %{site_title} -- %{site_description} + + Ben je geïnteresseerd, klik dan op de onderstaande link: + + %{invite_link} + + Deze uitnodiging komt van een vertrouwde gebruiker, je kunt direct deelnemen aan de discussie. invite_forum_mailer: subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}" + text_body_template: | + %{invitee_name} nodigt je uit voor + + > **%{site_title}** + > + > %{site_description} + + Ben je geïnteresseerd, klik dan op de onderstaande link: + + %{invite_link} + + Deze uitnodiging is van een vertrouwde gebruiker, het is daarom niet nodig om in te loggen. test_mailer: subject_template: "[%{site_name}] E-mail Bezorgtest" new_version_mailer: subject_template: "[%{site_name}] Nieuwe Discourse-versie, update beschikbaar" - text_body_template: | - Er is een nieuwe versie van [Discourse](http://www.discourse.org) beschikbaar: - - Jouw versie: %{installed_version} - Nieuwe versie: **%{new_version}** - - Je wil misschien wel: - - - Kijken wat er nieuw is in de [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Upgraden door naar [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) te gaan en op de "Upgrade" knop te klikken. - - - Bezoek [meta.discourse.org](http://meta.discourse.org) voor nieuws, discussies over en ondersteuning voor Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] Update beschikbaar" flags_reminder: @@ -920,6 +1055,91 @@ nl: system_messages: post_hidden: subject_template: "Bericht van %{site_name}: je bericht is verborgen wegens meldingen uit de community" + usage_tips: + text_body_template: | + Hier een paar snelle tips om je op weg te helpen: + + ## Lezen + + Om verder te lezen, **gewoon door blijven scrollen naar beneden!** + + Als er nieuwe reacties zijn op een topic, verschijnen deze automatisch – het is niet nodig de pagina te verversen. + + ## Navigatie + + - Voor zoeken, je profielpagina, of het ☰ menu, klik op de **icoontjes rechts boven**. + + - Het selecteren van een titel van een topic leid je altijd naar het **volgende ongelezen bericht** in de topic. Om naar het begin of eind van de topic te gaan, selecteer dan reacties of activiteit. + + + + - Bij het lezen van een topic, selecteer de voortgangsbalk rechts onder voor uitgebreide navigatie. Spring snel terug naar boven door de titel van de topic te selecteren. Druk op ? voor een lijst met supersnelle toets combinaties. + + + + ## Reageren + + - Om te regageren op het **topic in het algemeen**, gebruik helemaal onderaan de topic. + + - Om te reageren op een **iemand in het bijzonder**, gebruik op zijn of haar bericht. + + - Om te reageren met **een nieuwe topic**, gebruik aan de rechterkant van een bericht. De oude en nieuwe topic worden aan elkaar verbonden. + + Om een quote te plaatsen, selecteer de tekst die je wilt quoten en klik op de Reageer knop. Herhalen voor meerdere quotes! + + + + Om iemand op de hoogte te stellen van je reactie, vermeld zijn of haar naam. Typ'@' en selecteer dan een gebruikersnaam. + + + + Om [standard Emoji](http://www.emoji.codes/) te gebruiken, type gewoon `:` en selecteer er een via de naam, of gebruik traditionele smileys `;)` + + + + Voor een automatische ingekorte vermelding van je link, plaats de link op een losse regel. + + + + ## Acties + + Er zijn actieknoppen onder aan elk bericht: + + + + Om te laten weten dat je een bericht waardeert, gebruik de **leuk** knop. Deel je waardering! + + Als je een probleem ziet met iemands bericht, laat het weten aan iemand privé, of [our staff](%{base_url}/about) met de **markeer** knop. Je kunt ook een link naar een bericht **delen**, of het toevoegen aan de favorieten van je gebruikerspagina om het later gemakkelijk te vinden. + + ## Notificaties + + Als iemand op je reageert op één van je berichten, tekst van je quote, of jou specifiek noemt met '@gebruikersnaam', dan verschijnt er een direct een getal rechts boven op de pagina. Klik er op en je ziet je **notificaties**. + + + + Maak je geen zorgen over het missen van een reactie – je ontvangt via e-mail alle notificaties die binnenkomen als je weg bent. + + ## Jouw instellingen + + - Alle topics minder dan **twee dagen oud** worden als nieuw gerekend. + + - Alle topics waarin je **actief in hebt geparticipeerd** (door maken, reageren, of gedurende een langere periode lezen) volg je automatisch. + + Een getal in het blauw staat als nieuw en ongelezen indicatoren naast deze topics: + + + + Je kan je notificaties voor elke topic wijzigen via In de gaten houden onder aan de topic. + + + + Je kan ook je notificaties instellen per categorie, als je elke nieuwe topic in een bepaalde categorie wilt bekijken. + + Om één van deze instellingen te wijzigen, zie: [your user preferences](%{base_url}/my/preferences). + + ## Groeps Vertrouwen + + Als je gaat deelnemen, win je na verloop van tijd het vertrouwen van de gebruikersgemeenschap, wordt je een volwaardig deelnemer, en worden de beperkingen de gelden voor nieuwe gebruikers opgeheven. Als je [vertrouwensniveau] (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) hoog genoeg is, krijg je nieuwe mogelijkheden om ons te helpen de gebruikersgemeenschap de managen. welcome_user: subject_template: "Welkom bij %{site_name}!" welcome_invite: @@ -1001,7 +1221,6 @@ nl: [Beoordeel deze gebruikers in het admingedeelte](/admin/users/list/pending). download_remote_images_disabled: subject_template: "Het downloaden van externe afbeeldingen is uitgeschakeld" - unsubscribe_link: "Om deze e-mails niet langer willen ontvangen, ga naar [je gebruikersinstellingen](%{user_preferences_url})." subject_re: "Re:" subject_pm: "[PM]" user_notifications: @@ -1012,6 +1231,10 @@ nl: reply_by_email: "Beantwoord deze mail om te reageren op dit forumbericht, of ga naar %{base_url}%{url} in je browser." visit_link_to_respond: "Ga naar %{base_url}%{url} in je browser om te reageren." posted_by: "Geplaatst door %{username} op %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} nodigt je uit voor een bericht '%{topic_title}'" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} nodigt je uit voor een topic '%{topic_title}'" user_replied: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -1059,10 +1282,11 @@ nl: %{respond_instructions} digest: why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}." + subject_template: "[%{site_name}] Digest" new_activity: "Nieuwe reacties op je topics en berichten:" top_topics: "Populaire berichten" other_new_topics: "Populaire topics" - unsubscribe: "Deze samenvatting wordt door %{site_link} verstuurd als we je een tijdje niet gezien gebben op onze site. Mocht je dit uit willen zetten of je e-mailvoorkeur willen veranderen, %{unsubscribe_link}." + unsubscribe: "Deze samenvatting wordt door %{site_link} verstuurd als we je een tijdje niet gezien hebben op onze site. Mocht je dit uit willen zetten of je e-mailvoorkeur willen veranderen, %{unsubscribe_link}." click_here: "klik hier" from: "%{site_name} Digest" read_more: "Lees verder" @@ -1101,8 +1325,25 @@ nl: %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "Je inschrijving op %{site_name} is geaccepteerd!" + text_body_template: | + Welkom op %{site_name}! + + Een staflid heeft je account op %{site_name} goedgekeurd. + + Klik op de volgende link om je nieuwe account te bevestigen en activeren: + %{base_url}/users/activate-account/%{email_token} + + Als de bovenstaande link niet is aan te klikken, probeer deze dan te kopiëren en te plakken in de adresregel van je webbrowser. + + %{new_user_tips} + + Wij geloven in de volgende richtlijnen: [civilized community behavior](%{base_url}/guidelines) + + Veel plezier! + + (Als je contact wilt opnemen met [staff members](%{base_url}/about) als nieuwe gebruiker, stuur dan een reply op dit bericht.) signup: - subject_template: "[%{site_name}] Activeer je nieuwe account" + subject_template: "[%{site_name}] Bevestig je nieuwe account" text_body_template: | Welkom op %{site_name}! @@ -1134,14 +1375,13 @@ nl: too_large: "Sorry, het bestand dat je wil uploaden is te groot (maximum grootte is %{max_size_kb}%KB)." images: too_large: "De afbeelding die je wil uploaden is te groot (maximum grootte is %{max_size_kb}%KB). Verklein de afbeelding en probeer het opnieuw." - fetch_failure: "Er ging iets mis bij het opvragen van de afbeelding." - unknown_image_type: "Het bestand dat je wil uploaden is geen afbeelding." size_not_found: "Het is niet gelukt de afmetingen van de afbeelding te bepalen. Misschien is het bestand corrupt?" flag_reason: sockpuppet: "Een nieuwe gebruiker maakte een nieuwe topic en een andere gebruiker reageerde - vanaf hetzelfde IP-adres. Zie de flag_sockpuppets instelling." spam_hosts: "Deze nieuwe gebruiker probeerde om meerdere berichten met links naar hetzelfde domein te plaatsen. Zie de newuser_spam_host_threshold instelling." email_log: no_user: "Kan geen gebruiker met id %{user_id} vinden" + anonymous_user: "Lid is anoniem" seen_recently: "Gebruiker was recentelijk nog online" post_not_found: "Kan geen bericht met id %{post_id} vinden" notification_already_read: "De notificatie waar deze mail voor is is al gezien" @@ -1155,6 +1395,7 @@ nl: body_blank: "geen tekst" color_schemes: base_theme_name: "Basis" + about: "Over" guidelines: "Regels" privacy: "Privacy" edit_this_page: "Wijzig deze pagina" @@ -1169,3 +1410,21 @@ nl: title: "Algemene Voorwaarden" privacy_topic: title: "Privacy Voorwaarden" + badges: + long_descriptions: + basic: | + Deze badge is aan je toegekend met het bereiken van trustlevel 1. Bedankt dat je een tijdje hebt rondgekeken, wat topics hebt gelezen en wat meer te weten bent gekomen over bedoeling van dit forum. De restricties voor nieuwe gebruikers gelden nu niet meer voor jou, en je kunt nu gebruik maken van alle basis communicatie mogelijkheden, zoals persoonlijke berichten, markeren, wijzigen van wiki's en de mogelijkheid om afbeeldingen en meerdere links in één bericht te plaatsen. + member: | + Deze badge is aan je toegekend met het bereiken van trustlevel 2. Bedankt voor je deelname gedurende enkele weken om op het forum actief te zijn. Je kunt nu persoonlijke uitnodigingen versturen vanuit je gebruikerspagina of een bepaalde topic, groepsberichten versturen en je hebt per dag meer likes tot je beschikking. + regular: | + Deze badge is aan je toegekend met het bereiken van trustlevel 3. Bedankt dat je al meerdere maanden deel uit maakt van ons forum, behoort tot de meest actieve lezers en regelmatig bijdraagt aan wat dit forum zo goed maakt. Je kunt nu de naam en categorie van topics aanpassen en gebruik maken van een speciale "lounge", krachtiger spam markeringen en nog veel meer likes per dag. + leader: | + Deze badge is aan je toegekend met het bereiken van trustlevel 4. Je bent door de staf uitgekozen voor een voortrekkersrol, om op dit forum een positief voorbeeld te geven in woord en gedrag. Je kunt nu alle berichten aanpassen, topics modereren door bijvoorbeeld pinnen, sluiten, verbergen, archiveren, splitsen en samenvoegen en je hebt een vrijwel onbeperkt aantal likes per dag. + admin_login: + success: "E-mail verstuurd" + error: "Fout!" + email_input: "Beheerder E-mail" + submit_button: "E-mail versturen" + performance_report: + initial_post_raw: Deze topic bevat dagelijkse performance rapporten van je site + initial_topic_title: Website performance rapporten diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 0aa196677d..6b8a993c42 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -8,7 +8,7 @@ pl_PL: dates: short_date_no_year: "D MMM" - short_date: "D MMM YYYY" + short_date: "D MMM RRRR" long_date: "D MMMM YYYY H:mm" title: "Discourse" topics: "Tematy" @@ -120,6 +120,7 @@ pl_PL: other: "Przepraszamy, nowi użytkownicy mogą dodać tylko %{count} linków we wpisie." spamming_host: "Przepraszamy, nie możesz umieścić linka do tej strony." user_is_suspended: "Zawieszeni użytkownicy nie mogą wysyłać wiadomości." + topic_not_found: "Coś poszło nie tak. Być może temat został zamknięty lub usunięty w międzyczasie?" just_posted_that: "jest zbyt podobne do tego co umieściłeś niedawno" has_already_been_used: "został już użyty" invalid_characters: "zawiera niepoprawne znaki" @@ -134,9 +135,11 @@ pl_PL: num_posts: "Wpisy:" num_participants: "Uczestnicy:" read_full_topic: "Przeczytaj cały temat" + private_message_abbrev: "Wiad." rss_description: latest: "Ostatnie wątki" hot: "Popularne wątki" + posts: "Aktualne wpisy" too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty." excerpt_image: "zdjęcie" queue: @@ -144,6 +147,7 @@ pl_PL: groups: errors: can_not_modify_automatic: "Nie możesz modyfikować automatycznej grupy" + member_already_exist: "'%{username}' należy już do tej grupy." default_names: everyone: "wszyscy" admins: "admini" @@ -159,15 +163,8 @@ pl_PL: one: "1 wpis" few: "%{count} wpisy" other: "%{count} wpisów" - new-reply: "Witaj na %{site_name} — **dziękujemy za zaangażowanie!**\n\n- Czy twoja odpowiedź wnosi coś pozytywnego do dyskusji?\n\n- Zachowuj się przyjaźnie w stosunku do innych.\n\n- Konstruktywna krytyka jest mile widziana, ale krytykujemy *pomysły*, a nie ludzi.\n\nWięcej informacji znajdziesz [w wytycznych społeczności](/guidelines). \nTen panel pojawi się tylko przy pisaniu pierwszych %{education_posts_text}.\n" - avatar: | - ### Co powiesz na zmianę swojego zdjęcia? - - Napisałeś już kilka tematów i wpisów, lecz Twój awatar nie jest tak unikalny jak Ty -- jest tym samym domyślnym awatarem, który mają wszyscy nowi użytkownicy. - - Rozważałeś **[odwiedzenie swojego profilu](%{profile_path})** i ustawienie własnego obrazka, który będzie Cię reprezentował? - - Łatwiej czyta się dyskusje i znajduje ciekawych ludzi w rozmowach, gdy każdy ma unikalny awatar! + new-topic: "Witaj na %{site_name} — **dziękujemy za rozpoczęcie nowej dyskusji!**\n\n- Czy tytuł brzmi interesująco, gdy przeczytasz go na głos? Czy jest dobrym podsumowaniem treści?\n\n- Kto będzie tym zainteresowany? Dlaczego temat jest istotny? Jakiego rodzaju odpowiedzi oczekujesz? \n\n- Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce. \n\nAby dowiedzieć się więcej, [zobacz przewodnik społeczności](/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.\n\n\n" + new-reply: "Witaj na %{site_name} — **dziękujemy za zaangażowanie!**\n\n- Czy twoja odpowiedź wnosi coś pozytywnego do dyskusji?\n\n- Zachowuj się przyjaźnie w stosunku do innych.\n\n- Konstruktywna krytyka jest mile widziana, ale krytykujemy *pomysły*, a nie ludzi.\n\nWięcej informacji znajdziesz [w przewodniku społeczności](/guidelines). \nTen panel pojawi się tylko przy pisaniu pierwszych %{education_posts_text}.\n" dominating_topic: | ### Pozwól innym dołączyć do rozmowy @@ -223,7 +220,7 @@ pl_PL: no_info_other: "
      %{name} jeszcze nie podał swojego opisu w profilu
      " vip_category_name: "Salon" vip_category_description: "Kategoria wyłącznie dla członków o poziomie zaufania 3 lub wyższym." - meta_category_name: "Meta" + meta_category_name: "Dyskusje o serwisie" meta_category_description: "Dyskusje o tej stronie, jej organizacji, tym jak działa i jak możemy ją usprawnić." staff_category_name: "Zespół" staff_category_description: "Ukryta kategoria dla rozmów zespołu. Tematy są widoczne tylko dla adminów i moderatorów." @@ -254,11 +251,12 @@ pl_PL: category: topic_prefix: "O kategorii %{category}" replace_paragraph: "[Zamień ten pierwszy paragraf na krórki opis nowej kategorii. Opis ten będzie wyświetlany na karcie wyboru kategorii, więc postaraj się utrzymać go poniżej 200 znaków. Póki nie zmienisz tego tekstu, ani nie utworzysz tematu, kategoria nie będzie wyświetlana na liście kategorii.]" - post_template: "%{replace_paragraph}\n\nW kolejnych paragrafach możesz umieścić dłuższy opis, oraz opisać zasady i wytyczne jakie będą obowiązywać w tej kategorii. \n\nKilka rzeczy do rozważenia:\n\n- Czemu ma służyć ta kategoria? Dlaczego inni powinni wybierać tę kategorię dla swoich tematów?\n\n- Czym się różni od innych kategorii, które już mamy?\n\n- Czy potrzebujemy tej kategorii?\n\n- Czy powinniśmy ją połączyć z jakąś inną kategorią, lub podzielić na więcej kategorii?\n" + post_template: "%{replace_paragraph}\n\nW kolejnych paragrafach możesz umieścić dłuższy opis, oraz opisać zasady i zwyczaje jakie będą obowiązywać w tej kategorii. \n\nKilka rzeczy do rozważenia:\n\n- Czemu ma służyć ta kategoria? Dlaczego inni powinni wybierać tę kategorię dla swoich tematów?\n\n- Czym się różni od innych kategorii, które już mamy?\n\n- Czy potrzebujemy tej kategorii?\n\n- Czy powinniśmy ją połączyć z jakąś inną kategorią, lub podzielić na więcej kategorii?\n" errors: uncategorized_parent: "Inne nie mogą być podkategorią innej kategorii." self_parent: "Podkategoria nie może być swoim rodzicem" depth: "Nie możesz umieścić subkategorii w innej subkategorii" + email_in_already_exist: "Przychodzący adres email '%{email_in}' jest teraz używany w tej '%{category_name}' kategorii. " cannot_delete: uncategorized: "Nie można usunąć kategorii Inne" has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. " @@ -401,15 +399,15 @@ pl_PL: please_continue: "Przejdź do %{site_name}" error: "Podczas próby zmiany Twojego adresu email wystąpił błąd. Być może ten adres jest już używany?" activation: - action: "Aktywuj swoje konto" already_done: "Przepraszamy, ten link aktywujący konto jest już nieważny. Być może Twoje konto jest już aktywne ?" please_continue: "Twoje nowe konto zostało aktywowane, zostaniesz przekierowany na stronę główną." continue_button: "Przejdź do %{site_name}" welcome_to: "Witamy na forum %{site_name}!" approval_required: "Moderator musi zaakceptować Twoje nowe konto zanim uzyskasz dostęp do forum. O aktywacji zostaniesz poinformowanym mailem." + missing_session: "Nie wiemy, czy twoje konto zostało utworzone, upewnij się, że masz włączone pliki cookies." post_action_types: off_topic: - title: 'Nie-na-temat' + title: 'Nie na temat' description: 'Ten post jest niezwiązany z obecną dyskusją zdefiniowaną przez tytuł i pierwszy post, i powinien zostać przeniesiony gdzieś indziej.' long_form: 'oflagowano jako nie-na-temat' spam: @@ -423,7 +421,9 @@ pl_PL: description: 'Ten wpis zawiera treści które umiarkowana osoba może uznać za wulgarne, obraźliwe lub naruszające wytyczne społeczności.' long_form: 'oflagowano jako niewłaściwe' notify_user: + title: 'Powiadom @{{username}}' description: 'Ten wpis zawiera coś o czym chciałbym porozmawiać z tą osobą bezpośrednio i prywatnie. Bez oflagowania.' + long_form: 'użytkownik został powiadomiony' email_title: 'Twój wpis w "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: @@ -460,6 +460,7 @@ pl_PL: email_title: 'Temat "%{title}" wymaga uwagi moderatora' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

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

      ' user_must_edit: '

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

      ' archetypes: regular: @@ -572,6 +573,10 @@ pl_PL: title: "Łącznie" xaxis: "Dzień" yaxis: "Razem żądań API" + page_view_logged_in_mobile_reqs: + xaxis: "Dzień" + page_view_anon_mobile_reqs: + xaxis: "Dzień" http_background_reqs: title: "Tło" xaxis: "Dzień" @@ -596,6 +601,18 @@ pl_PL: title: "Łącznie" xaxis: "Dzień" yaxis: "Razem zapytań" + time_to_first_response: + title: "Czas na pierwszą odpowiedź. " + xaxis: "Dzień" + yaxis: "Średni czas (w godzinach)" + topics_with_no_response: + title: "Tematy bez odpowiedzi" + xaxis: "Dzień" + yaxis: "Łącznie" + mobile_visits: + title: "Wizyty użytkowników" + xaxis: "Dzień" + yaxis: "Liczba wizyt" dashboard: rails_env_warning: "Twój serwer działa w trybie %{env}" ruby_version_warning: "Używasz Ruby w wersji 2.0.0, która może powodować problemy. Zaktualizuj się do patch level 247 lub późniejszej. " @@ -608,14 +625,16 @@ pl_PL: twitter_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale klucz i sekret nie są ustawione. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' github_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą GitHuba (enable_github_logins), ale id klienta i sekret nie są ustawione. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' s3_config_warning: 'Serwer jest skonfigurowany by przesyłać pliki na s3, ale przynajmniej jedno z następujących ustawień nie jest ustawione: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' + s3_backup_config_warning: 'Serwer jest skonfigurowany tak, aby wysyłać kopie zapasowe do s3, ale jedno z ustawień nie jest ustawione prawidłowo: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Idź do ustawień strony i zaktualizuj ustawienia. Zobacz Jak ustawić wysyłanie zdjęć do S3 .' image_magick_warning: 'Serwer jest skonfigurowany by tworzyć miniaturki dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą ulubionego menedżera pakietów lub pobierz najnowszą wersję.' - failing_emails_warning: '%{num_failed_jobs} prac emailowych nie powiodło się. Sprawdź plik config/discourse.conf i upewnij się, że ustawienia serwera poczty są poprawne. Zobacz nieudane prace w Sidekiqu.' default_logo_warning: "Ustaw logo dla swojej strony. Zaktualizuj logo_url, logo_small_url i favicon_url tutaj: ustawienia strony." contact_email_missing: "Wprowadź kontaktowy adres e-mail strony, aby otrzymywać ważne powiadomienia w sprawie strony. Zaktualizuj to w Ustawieniach strony. " contact_email_invalid: "Kontaktowy adres email jest zły. Zaktualizuj to w Ustawieniach strony." title_nag: "Wprowadź nazwę swojej strony. Zaktualizuj tytuł w Ustawieniach strony." site_description_missing: "Wprowadź jedno zdanie opisujące Twoją stronę, które pojawi się w wynikach wyszukiwania. Zaktualizuj opis strony w Ustawieniach strony." consumer_email_warning: "Twój serwis jest skonfigurowany by używać Gmaila (lub innego konsumenckiego serwisu poczty) do wysyłania emaili. Gmail ogranicza jak dużo wiadomości możesz wysłać. Rozważ wykorzystanie dostawcy serwisu pocztowego jak mandrill.com by zagwarantować dostarczanie poczty." + site_contact_username_warning: "Wprowadź nazwę użytkownika zespołu, aby wysłać ważny szablon automatycznej wiadomości. Zaktualizuj site_contact_username w Ustawieniach Strony " + notification_email_warning: "Emaile z powiadomieniami nie zostały wysłane z prawidłowego adresu email na twojej domenie; dostawca usługi email może być niekonsekwentny i nierzetelny. Ustaw prawidłowy email w notification_email w Ustawieniach Strony." content_types: education_new_reply: title: "Edukacja nowych użytkowników: Pierwsze odpowiedzi" @@ -660,13 +679,13 @@ pl_PL: max_topic_title_length: "Maksymalna długość tytułu tematu, w znakach" min_private_message_title_length: "Minimalna liczba znaków w temacie wiadomości " min_search_term_length: "Minimalna długość wyszukiwanego tekstu, w znakach" - allow_uncategorized_topics: "Pozwól na tworzenie tematów bez kategorii." uncategorized_description: "Znajdują się tu wątki którym jeszcze nie przypisano odpowiedniej kategorii." allow_duplicate_topic_titles: "Pozwól na tworzenie tematów o identycznych tytułach." unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł ponownie zrobić wpis z tą samą treścią" educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów." title: "Nazwa tej strony używana w tagu title." site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description." + contact_email: "Adres email kogoś, z kim należy się kontaktować w kwestii serwisu. Istotne informacje z discourse.org dotyczące krytycznych aktualizacji mogą być wysyłane pod ten adres." contact_url: "URL kontaktowy dla tego serwisu. Używany na podstronie /about." queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img." @@ -676,18 +695,16 @@ pl_PL: ninja_edit_window: "Przez tyle sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu." post_edit_time_limit: "Autor może edytować lub usunąć swój wpis przez tyle minut po jego utworzeniu. Ustawienie 0 oznacza 'zawsze'." edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może." + delete_removed_posts_after: "Wpisy usunięte przez autora będą automatycznie zlikwidowane po (n) godzinach. Jeżeli liczba godzin będzie wynosić 0, to zostaną usunięte natychmiast. " max_image_width: "Maksymalna szerokość miniaturki grafiki we wpisie. " max_image_height: "Maksymalna wysokość miniaturki grafiki we wpisie. " category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." show_subcategory_list: "Po wejściu do kategorii, zamiast listy tematów wyświetlaj listę podkategorii." fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. " + fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). " post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu." post_onebox_maxlength: "Maksymalna długość (ilość znaków) treści wpisu osadzonego via Onebox" onebox_domains_whitelist: "Lista domen dla których włączony jest oneboxing; te domeny powinny wspierać OpenGraph lub oEmbed. Można to sprawdzić na http://iframely.com/debug" - logo_url: "Logo w lewym górnym rogu strony; jeśli zostawisz to pole puste zamiast logo pojawi się nazwa strony w formie tekstowej" - digest_logo_url: "Alternatywne logo używane w biuletynie email. Jeśli puste, zostanie użyta wartość z pola `logo_url`, np: http://example.com/logo.png" - logo_small_url: "Małe logo w lewym górnym rogu strony widoczne przy przewijaniu. Jeśli zostawisz to pole puste zamiast logo pojawi się symbol strony domowej." - favicon_url: "Favicon serwisu. Więcej informacji: http://pl.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Ikona używana przez urządzenia Apple. Rekomendowany wymiar to 144px na 144px." notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny." email_custom_headers: "A pipe-delimited list of custom email headers" @@ -699,8 +716,6 @@ pl_PL: enable_private_messages: "Zezwalaj użytkownikom o 1 poziomie zaufania na tworzenie wiadomości i odpowiadanie na nie." enable_long_polling: "Message bus used for notification can use long polling" anon_polling_interval: "How often should anonymous clients poll in milliseconds" - auto_track_topics_after: "Liczba milisekund zanim temat jest automatycznie dodany do śledzonych. użytkownik może nadpisać tę wartość w swoich ustawieniach (0 zawsze, -1 nigdy)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." ga_tracking_code: "Identyfikator Google analytics (ga.js), np: UA-12345678-9; zobacz http://google.com/analytics" @@ -714,6 +729,7 @@ pl_PL: track_external_right_clicks: "Śledź zewnętrzne linki kliknięte prawym klawiszem (np. otwierane w nowej zakładce). Domyślnie wyłączone, gdyż wymaga nadpisywania URLi." topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków" topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej' na ekranie popularnych wątków." + email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin." enable_badges: "Włącz system odznak" port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80." force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default." @@ -735,7 +751,6 @@ pl_PL: github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" maximum_backups: "Maksymalna liczba kopii zapasowych do przechowywania na dysku. Starsze kopie zapasowe zostaną automatycznie usunięte." - backup_daily: "Automatycznie utwórz raz dziennie kopie zapasową strony." active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" verbose_localization: "Wyświetlaj dodatkowe identyfikatory tłumaczeń w treści etykiet" previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours" @@ -748,12 +763,20 @@ pl_PL: max_invites_per_day: "Maksymalna liczba zaproszeń jakie użytkownik może wysłać jednego dnia." suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu." limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii." + avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów." default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników." + tl1_requires_topics_entered: "Jak wiele tematów musi odwiedzić nowy użytkownik, przed promocją na 1-szy poziom zaufania." + tl1_requires_read_posts: "Jak wiele postów musi przeczytać nowy użytkownik, przed promocją na 1-szy poziom zaufania." + tl1_requires_time_spent_mins: "Jak wiele minut musi spędzić nowy użytkownik czytając posty, przed promocją 1-szy poziom zaufania." + tl2_requires_topics_entered: "Jak wiele tematów musi odwiedzić użytkownik, przed promocją na 2-gi poziom zaufania." + tl2_requires_read_posts: "Jak wiele postów musi przeczytać użytkownik, przed promocją na 2-gi poziom zaufania." + tl2_requires_time_spent_mins: "Jak wiele minut musi spędzić użytkownik czytając posty, przed promocją na 2-gi poziom zaufania." min_trust_to_create_topic: "The minimum trust level required to create a new topic." newuser_max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla nowych użytkowników)." max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla wszystkich)." title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/" category_colors: "Lista kolorów w formacie hex do użycia w etykietach kategorii." + category_style: "Styl etykiet kategorii" title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc." faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here." tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here." @@ -766,19 +789,21 @@ pl_PL: relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)." delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted." email_editable: "Allow users to change their e-mail address after registration." - allow_uploaded_avatars: "Zezwól użytkownikom przesyłanie własnych avatarów." digest_topics: "Maksymalna liczba tematów w podsumowaniu e-mail." digest_min_excerpt_length: "Minimalny wycinek wpisu (liczba znaków) w podsumowaniu e-mail." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." suppress_digest_email_after_days: "Nie wysyłaj podsumowań e-mail użytkownikom, którzy nie odwiedzili serwisu dłużej niż (n) dni." disable_digest_emails: "Wyłącz wysyłanie podsumowania e-mail wszystkim uzytkownikom. " - default_external_links_in_new_tab: "Otwieraj zewnętrzne odnośniki w nowej karcie. Użytkownicy mogą zmienić to ustawienie w swoich preferencjach." allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu." enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. " suppress_uncategorized_badge: "Nie pokazuj etykiety z nazwą kategorii Inne na listach tematów." + enable_emoji: "Włącz obsługę emoji" + emoji_set: "Jaki jest twój preferowany styl emoji?" errors: invalid_email: "Nieprawidłowy adres email." invalid_username: "Użytkownik o takiej nazwie nie istnieje." + invalid_integer: "Wartość musi być liczbą całkowitą." + regex_mismatch: "Wartość nie jest zgodna z wymaganym formatem." + must_include_latest: "Górne menu musi zawierać zakładkę 'aktualne'." invalid_string: "Nieprawidłowa wartość." notification_types: mentioned: "%{display_username} wspomina o Tobie w %{link}" @@ -789,10 +814,12 @@ pl_PL: posted: "%{display_username} pisze w %{link}" moved_post: "%{display_username} przenosi twój wpis do %{link}" invitee_accepted: "%{display_username} przyjął(-ęła) Twoje zaproszenie" + granted_badge: "Zdobywasz %{link}" search: within_post: "#%{post_number} przez %{username}" types: category: 'Kategorie' + topic: 'Wyniki' user: 'Użytkownicy' sso: account_not_approved: "Konto czeka na zatwierdzenie. Dostaniesz powiadomienie emailem, kiedy to się stanie." @@ -800,15 +827,6 @@ pl_PL: most_posts: "Większość postów" most_recent_poster: "Autor najnowszego wpisu" frequent_poster: "Aktywny uczestnik" - move_posts: - new_topic_moderator_post: - one: "Przenoszę wpis do nowego tematu: %{topic_link}" - few: "Przenoszę %{count} wpisy do nowego tematu: %{topic_link}" - other: "Przenoszę %{count} wpisów do nowego tematu: %{topic_link}" - existing_topic_moderator_post: - one: "Przenoszę wpis do innego tematu: %{topic_link}" - few: "Przenoszę %{count} wpisy do innego tematu: %{topic_link}" - other: "Przenoszę %{count} wpisów do innego tematu: %{topic_link}" topic_statuses: archived_enabled: "Temat został zarchiwizowany. Został zablokowany i nie może być zmieniany. " archived_disabled: "Temat został przywrócony z archiwum. Został odblokowany i może ponownie być zmieniany." @@ -867,7 +885,6 @@ pl_PL: characters: "może zawierać tylko litery, cyfry i podkreślenia" unique: "musi być unikalna" blank: "musi zostać podana" - must_begin_with_alphanumeric: "musi zaczynać się od litery lub cyfry" email: not_allowed: "nie jest dopuszczany od tego dostawcy poczty. Użyj innego adresu email." blocked: "is not allowed." @@ -888,6 +905,10 @@ pl_PL: subject_template: "Ustaw hasło dla swojego konta na %{site_name}" test_mailer: subject_template: "[%{site_name}] Test dostarczania poczty" + new_version_mailer: + subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna." + new_version_mailer_with_notes: + subject_template: "[%{site_name}] dostępna aktualizacja" flags_reminder: flags_were_submitted: one: "Flagi dodane godzinę temu." @@ -898,6 +919,13 @@ pl_PL: one: "1 flaga oczekuje na reakcję" few: "%{count} flagi oczekują na reakcję" other: "%{count} flagi oczekują na reakcję" + flag_reasons: + inappropriate: "Twój wpis został oznaczony jako **nieodpowiedni**: społeczność uznała, że zbyt agresywny lub niezgodny z [jej wytycznymi](/guidelines)." + flags_dispositions: + disagreed: "Dziękujemy za zwrócenie uwagi. Zajmiemy się tym wkrótce." + deferred: "Dziękujemy za zwrócenie uwagi. Zajmiemy się tym wkrótce." + deferred_and_deleted: "Dziękujemy za zwrócenie uwagi. Wpis został usunięty." + temporarily_closed_due_to_flags: "Ten temat został tymczasowo zamknięty z uwagi na wysoką liczbę oflagowań wykonanych przez społeczność." system_messages: post_hidden: subject_template: "Wpis został ukryty z powodu oflagowania przez społeczność" @@ -907,7 +935,6 @@ pl_PL: subject_template: "Witaj na %{site_name}!" backup_succeeded: subject_template: "Kopia zapasowa jest gotowa" - text_body_template: "Kopia zapasowa została wykonana pomyślnie.\nOdwiedź [admin > kopie zapasowe](/admin/backups) aby ją pobrać." backup_failed: subject_template: "Kopia zapasowa nieudana" text_body_template: | @@ -931,6 +958,33 @@ pl_PL: ``` %{logs} ``` + bulk_invite_succeeded: + subject_template: "Przetwarzanie masowej ilości zaproszeń zakończyło się sukcesem." + text_body_template: "Plik z zaproszeniami został przetworzony. Wysłanych zaproszeń: %{sent}." + bulk_invite_failed: + subject_template: "Plik z zaproszeniami został przetworzony z błędami." + text_body_template: |+ + Plik z zaproszeniami został przetworzony -- wysłanych: %{sent}, błędów: %{failed}. + + Dziennik operacji: + + ``` + %{logs} + ``` + + + csv_export_succeeded: + subject_template: "Zakończono eksport danych" + text_body_template: |+ + Eksport danych zakończył się sukcesem! :dvd: + + %{file_name} (%{file_size}) + + Powyższy link będzie aktywny przez 48 godzin. + + csv_export_failed: + subject_template: "Nieudany eksport danych" + text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub skontaktuj się z operatorami serwisu." too_many_spam_flags: subject_template: "Nowe konto zablokowane" blocked_by_staff: @@ -950,7 +1004,6 @@ pl_PL: one: "1 użytkownik czeka na zatwierdzenie" few: "%{count} użytkowników czeka na zatwierdzenie" other: "%{count} użytkowników czeka na zatwierdzenie" - unsubscribe_link: "Możesz zrezygnować z powiadomień email w [ustawieniach konta](%{user_preferences_url})." subject_re: "Re: " subject_pm: "[PW] " user_notifications: @@ -1048,7 +1101,6 @@ pl_PL: signup_after_approval: subject_template: "Zostałeś zaakceptowany na forum %{site_name}!" signup: - subject_template: "[%{site_name}] Aktywuj Twoje nowe konto" text_body_template: | Witaj na %{site_name}! @@ -1071,8 +1123,6 @@ pl_PL: unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})." pasted_image_filename: "Pasted image" images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -1082,12 +1132,27 @@ pl_PL: user_suspended: "użytkownik został zawieszony" color_schemes: base_theme_name: "Podstawa" + guidelines: "Przewodnik" + privacy: "Prywatność" + edit_this_page: "Edytuj tę stronę" csv_export: boolean_yes: "Tak" boolean_no: "Nie" static_topic_first_reply: | Edytuj pierwszy post w tym temacie by zmienić zawartość strony %{page_name}. guidelines_topic: - title: "FAQ" + title: "FAQ/Przewodnik" tos_topic: title: "Warunki użytkowania" + privacy_topic: + title: "Polityka prywatności" + admin_login: + success: "Email wysłany" + error: "Błąd!" + email_input: "Email administratora. " + submit_button: "Wyślij Email. " + discourse_hub: + access_token_problem: "Powiedz administratorowi tej witryny: Zaktualizuj na poprawne ustawienia discourse_org_access_key." + performance_report: + initial_post_raw: 'Ten temat zawiera codzienne raporty wydajności dla twojej witryny. ' + initial_topic_title: 'Testy wydajności witryny. ' diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 2dc6087fb2..19ff795b9f 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -65,6 +65,13 @@ pt: other: '%{count} erros impediram este %{model} de ser gravado' embed: load_from_remote: "Ocorreu um erro no carregamento dessa mensagem." + site_settings: + min_username_length_exists: "Não pode definir o comprimento mínimo do nome de utilizador acima do nome de utilizador mais curto." + min_username_length_range: "Não pode definir o mínimo acima do máximo." + max_username_length_exists: "Não pode definir o comprimento máximo do nome de utilizador abaixo do nome de utilizador mais longo." + max_username_length_range: "Não pode definir o máximo abaixo do mínimo." + default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista." + s3_upload_bucket_is_required: "Não pode ativar carregamentos para o S3 excepto se tiver fornecido o 's3_upload_bucket'." bulk_invite: file_should_be_csv: "O ficheiro a carregar deve estar em formato csv ou txt." backup: @@ -133,8 +140,11 @@ pt: rss_description: latest: "Tópicos recentes" hot: "Tópicos quentes" + posts: "Últimas mensagens" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." excerpt_image: "imagem" + queue: + delete_reason: "Eliminado através da fila de moderação de mensagens" groups: errors: can_not_modify_automatic: "Não pode modificar um grupo automático" @@ -173,7 +183,14 @@ pt: - Críticas construtivas são bem-vindas, mas critique *ideias*, não pessoas. Para mais, [verifique as diretrizes da comunidade](/guidelines). Este painel irá aparecer apenas para o seu primeiro %{education_posts_text}. - avatar: "### Que tal uma nova imagem para a sua conta? \n\nPublicou alguns tópicos e respostas, mas o seu avatar não é tão original como você o é -- é o mesmo avatar padrão que todos os novos utilizadores têm .\n\nJá considerou **[visitar o seu perfil de utilizador](%{profile_path})** e fazer o envio de uma imagem personalizada que o representa?\n\nÉ mais fácil acompanhar as discussões da comunidade e encontrar pessoas interessantes em conversas quando todas as pessoas têm um avatar exclusivo!\n" + avatar: | + ### E que tal uma fotografia para a sua conta? + + Publicou alguns tópicos e respostas, mas a sua fotografia de perfil não é tão única como você o é -- é apenas uma letra. + + Considerou **[visitar o seu perfil de utilizador](%{profile_path})** e carregar uma fotografia que o represente? + + É mais fácil seguir discussões e encontrar pessoas interessantes em conversações quando toda a gente tem uma fotografia de perfil única! sequential_replies: | ### Considere responder a várias mensagens de uma única vez @@ -229,7 +246,7 @@ pt: same_as_username: "é a mesma que o seu nome de utilizador. Por favor utilize uma palavra-passe mais segura." same_as_email: "é a mesma que o seu email. Por favor utilize uma palavra-passe mais segura." ip_address: - signup_not_allowed: "O registo não é permitido através desta conta." + signup_not_allowed: "A inscrição não é permitida através desta conta." color_scheme_color: attributes: hex: @@ -239,7 +256,7 @@ pt: no_info_other: "
      %{name} ainda não colocou nada no campo Sobre Mim
      " vip_category_name: "Salão" vip_category_description: "Uma categoria exclusiva para membros de Nível de Confiança 3 ou superior." - meta_category_name: "Meta" + meta_category_name: "Comentários sobre o Sítio" meta_category_description: "Discussão sobre este sítio, a sua organização, como funciona, e como podemos melhorá-lo." staff_category_name: "Pessoal" staff_category_description: "Categoria privada para discussões do pessoal. Os tópicos estão apenas visíveis para administradores e moderadores." @@ -380,6 +397,7 @@ pt: one: "há quase 1 ano atrás" other: "há quase %{count} anos atrás" password_reset: + no_token: "Desculpe, essa hiperligação para alterar a palavra-passe é muito antiga. Selecione o botão Iniciar Sessão e utilize 'Esqueci a minha palavra-passe' para obter uma nova hiperligação." choose_new: "Por favor escolha uma nova palavra-passe" choose: "Por favor escolha uma palavra-passe" update: 'Atualizar Palavra-passe' @@ -393,12 +411,13 @@ pt: please_continue: "Continuar para %{site_name}" error: "Ocorreu um erro ao alterar o seu endereço de email. Talvez o endereço já esteja a ser utilizado?" activation: - action: "Ativar a sua conta" + action: "Clique aqui para ativar a sua conta" already_done: "Pedimos desculpa, esta hiperligação de confirmação já não está válida. Talvez a sua conta já esteja ativa?" please_continue: "A sua nova conta foi confirmada; será redirecionado para a página principal." continue_button: "Continuar para %{site_name}" welcome_to: "Bem-vindo a %{site_name}!" approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!" + missing_session: "Não conseguimos detetar se a sua conta foi criada, por favor assegure-se que tem os cookies ativos." post_action_types: off_topic: title: 'Fora de Contexto' @@ -460,6 +479,7 @@ pt: regular: title: "Tópico Habitual" banner: + title: "Tópico de Faixa" message: make: "Este tópico é agora uma faixa. Aparecerá no topo de cada página até ser dispensado pelo utilizador." remove: "Este tópico já não é uma faixa. Deixará de aparecer no topo de cada página." @@ -567,6 +587,14 @@ pt: title: "Total" xaxis: "Dia" yaxis: "Total de Pedidos API" + page_view_logged_in_mobile_reqs: + title: "Pedidos API de Início de Sessão" + xaxis: "Dia" + yaxis: "Pedidos API Mobile de Início de Sessão" + page_view_anon_mobile_reqs: + title: "Pedidos API Anon" + xaxis: "Dia" + yaxis: "Pedidos API Anon Mobile" http_background_reqs: title: "Fundo" xaxis: "Dia" @@ -591,12 +619,25 @@ pt: title: "Total" xaxis: "Dia" yaxis: "Total de pedidos" + time_to_first_response: + title: "Tempo para a próxima resposta" + xaxis: "Dia" + yaxis: "Tempo médio (horas)" + topics_with_no_response: + title: "Tópicos sem resposta" + xaxis: "Dia" + yaxis: "Total" + mobile_visits: + title: "Visitas de Utilizadores" + xaxis: "Dia" + yaxis: "Número de visitas" dashboard: rails_env_warning: "O seu servidor está a executar em modo %{env}." ruby_version_warning: "Está a utilizar uma versão do Ruby 2.0.0 que é conhecida por ter alguns problemas. Por favor atualize para o nível 247 ou posterior." host_names_warning: "O ficheiro config/database.yml está a utilizar o nome do servidor local por defeito. Modifique para usar o nome do servidor do seu sítio." gc_warning: 'O seu servidor está a utilizar a recolha de lixo do ruby com os parâmetros por defeito, os quais não irão propocionar a melhor performance. Leia este tópico sobre ajuste de performance: Afinar Ruby and Rails para o Discourse.' sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que pelo menos um processo sidekiq está em execução. Aprenda sobre Sidekiq aqui.' + queue_size_warning: 'O número de trabalhos na fila é %{queue_size}, o que é alto. Isto pode indicar um problema com o(s) processo(s) Sidekiq, ou pode necessitar de adicionar mais trabalhadores Sidekiq.' memory_warning: 'O seu servidor está a executar com menos de 1 GB de memória total. Pelo menos 1 GB é a quantidade de memória recomendada.' google_oauth2_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Google OAuth2 (enable_google_oauth2_logins), mas o id e os valores privados do cliente não estão configurados. Vá às Configurações do Sítio e atualize as definições. Veja este guia para saber mais.' facebook_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Facebook (enable_facebook_logins), mas o id e os valores privados da aplicação não estão configurados. Vá às Configurações do Sítio e atualize as definições. Veja este guia para saber mais.' @@ -605,14 +646,14 @@ pt: s3_config_warning: 'O servidor está configurado para fazer carregamento de ficheiros 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 Configurações do Sítio e atualize estas definições. Veja "How to set up image uploads to S3?" para saber mais.' 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á às Configurações do Sítio e atualize as definições. Veja "How to set up image uploads to S3?" para saber mais.' 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 para descarregar a última versão.' - failing_emails_warning: 'Há %{num_failed_jobs} tarefas de envio de emails que falharam. Verifique o ficheiro config/discourse.conf e assegure-se que as configurações do servidor de email estão corretas. Veja as tarefas que falharam no Sidekiq.' + 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. Veja as tarefas que falharam no Sidekiq.' default_logo_warning: "Defina os logótipos gráficos do seu sítio. Atualize logo_url, logo_small_url, e favicon_url nas Configurações do Sítio." 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 Configurações do Sítio." contact_email_invalid: "O email de contacto do sítio é inválido. Atualize-o nas Configurações do Sítio." title_nag: "Introduza o nome do seu sítio. Atualize o título nas Configurações do Sítio." 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 Configurações do Sítio." consumer_email_warning: "O seu sítio está configurado para usar Gmail (ou outro serviço de email)O Gmail limita a quantidade de emails que pode enviar. 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_contato_nomedeutilizador nas Configurações do Sítio." + 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 Configurações do Sítio." 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 Configurações do Sítio." content_types: education_new_reply: @@ -658,15 +699,15 @@ pt: max_topic_title_length: "Tamanho máximo permitido por título de cada tópico, em caracteres" min_private_message_title_length: "Tamanho mínimo permitido por título nas mensagens, em caracteres" min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres" - allow_uncategorized_topics: "Permitir a criação de tópicos sem categoria." + allow_uncategorized_topics: "Permitir a criação de tópicos sem categoria. AVISO: Se houver quaisquer tópicos não categorizados, tem que re-categorizá-los antes de desligar isto." uncategorized_description: "Descrição da categoria sem classificação. Deixar em branco para nenhuma descrição." allow_duplicate_topic_titles: "Permitir tópicos com títulos idênticos e duplicados." unique_posts_mins: "Quantos minutos antes que um utilizador possa criar uma mensagem com o mesmo conteúdo outra vez?" educate_until_posts: "Quando um utilizador começar a escrever as primeiras (n) novas mensagens, mostrar o painel pop-up de educação do novo utilizador no editor." title: "O nome deste sítio, tal como usado na etiqueta do título." site_description: "Descrever este sítio em uma frase, tal como usado na etiqueta de descrição meta." - contact_email: "Endereço de email do principal contato para este sítio. Usado para notificações críticas tais como sinalizações não tratadas, assim como no formulário de contato /sobre para assuntos urgentes." - contact_url: "URL de Contato para este sítio. Utilizado no formulário de contato /sobre para assuntos urgentes." + contact_email: "Endereço de email do principal contacto para este sítio. Usado para notificações críticas tais como sinalizações não tratadas, assim como no formulário de contacto /sobre para assuntos urgentes." + contact_url: "URL de Contacto para este sítio. Utilizado no formulário de contacto /sobre para assuntos urgentes." queue_jobs: "PROGRAMADORES APENAS! AVISO! Por defeito, fila de trabalhos no sidekiq. Se não estiver ativa, o seu sítio irá ficar corrompido." crawl_images: "Recuperar imagens de URLs remotos para inserir o comprimento e largura corretos." download_remote_images_to_local: "Converter imagens remotas em imagens locais ao descarregá-las; isto previne imagens corrompidas." @@ -681,15 +722,17 @@ pt: category_featured_topics: "Número de tópicos visíveis por categoria na página de /categorias. Após a alteração deste valor, irá demorar até 15 minutos para que a página de categorias fique atualizada." show_subcategory_list: "Mostrar lista de subcategorias em vez de lista de tópicos quando inserida uma categoria." fixed_category_positions: "Se estiver marcado, irá conseguir organizar as categorias por uma ordem fixa. Se não estiver marcado, as categorias são listadas por ordem de actividade." + fixed_category_positions_on_create: "Se marcado, a ordenação de categorias irá ser mantida no diálogo de criação do tópico (requere fixed_category_positions)" add_rel_nofollow_to_user_content: "Adicionar a etiqueta rel nofollow em todos os conteúdos submetidos pelo utilizador, excepto para hiperligações internas (incluindo domínios pai). Se mudar isto, terá que atualizar todas as suas mensagens com: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "Uma lista de domínios em que nofollow não deve ser adicionado a linkls.tld.com irá permitir automaticamente sub.tld.com. Como mínimo, deve adicionar o domínio de alto nível deste sítio para ajudar os rastreadores da internet a encontrarem todo o conteúdo. Se outras partes do seu sítio estão em outros domínicios, adicione-os também." post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem." post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres." onebox_domains_whitelist: "Lista de domínios que permitem colocar em caixa única; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug" - logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio; quando deixado em branco, o texto do título do sítio será exibido." - digest_logo_url: "Logótipo alternativo usado no topo do resumo de email do seu sítio. Se for deixado em branco `logo_url` será usado. ex: http://exemplo.com/logo.png" - logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo, visível quando arrastado para baixo. Quando deixado em branco, um glifo do início será exibido." - favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "A imagem do logótipo com posição fixa usada no canto superior esquerdo do seu sítio móvel. Quando deixado em branco, `logo_url` será usado." + logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma retangular. Quando deixada em branco, o texto do título do sítio será exibido." + digest_logo_url: "A imagem do logótipo alternativo utilizado no topo do resumo de email do seu sítio, deve ter uma forma retangular. Quando deixada em branco `logo_url` será utilizado." + logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido." + favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png" + mobile_logo_url: "A imagem do logótipo com posição fixa utilizada no canto superior esquerdo do seu sítio móvel deve ter uma forma quadrada. Quando deixado em branco, `logo_url` será utilizado. ex: http://exemplo.com/uploads/default/logo.png" apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px." notification_email: "Para: endereço de email usado ao enviar emails essenciais do sistema. O domínio especificado aqui deverá ter SPF, DKIM e registos PTR inversos configurados corretamente para a chegada do email." email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados" @@ -707,8 +750,6 @@ pt: polling_interval: "Quando não está a ocorrer uma solicitação ao servidor, com que frequência devem os clientes ligados requerer uma atualização, em milissegundos" anon_polling_interval: "Com que frequência os clientes não registados podem fazer solicitações ao servidor, em milisegundos" background_polling_interval: "Com que frequência deverão os clientes solicitar o servidor, em milissegundos (quando a janela está em plano de fundo)" - auto_track_topics_after: "Milissegundos antes de um tópico ser automaticamente acompanhado, os utilizadores podem substituir (0 para sempre, -1 para nunca)" - new_topic_duration_minutes: "Número de minutos que um tópico é considerado como novo, os utilizadores podem substituir (-1 para sempre, -2 para desde a última visita)" flags_required_to_hide_post: "Número de sinalizações que fazem com que uma mensagem seja automaticamente oculta e que uma MP seja enviada para o utilizador (0 para nunca)" cooldown_minutes_after_hiding_posts: "Número de minutos que o utilizador deve esperar antes de poder editar uma mensagem oculta devido a sinalizações por parte da comunidade" max_topics_in_first_day: "O número máximo de tópicos que é o utilizador pode criar no seu primeiro dia no Fórum." @@ -721,7 +762,9 @@ pt: notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores." flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam." traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha." + allow_html_tables: "Permitir inserção de tabelas em Markdown utilizando tags HTML, TABLE,THEAD, TD, TR,TH fazem parte da lista branca (requer que todas as mensagens antigas que contém tabelas sejam refeitas)" post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)." + must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!" ga_tracking_code: "Código de acompanhamento do Google Analytics (ga.js), ex: UA-12345678-9; ver http://google.com/analytics" ga_domain_name: "Nome de domínio da Google Analytics (ga.js), ex: omeusitio.com; ver http://google.com/analytics" ga_universal_tracking_code: "Código de acompanhamento do Google Universal Analytics (analytics.js), ex: UA-12345678-9; ver http://google.com/analytics" @@ -749,48 +792,54 @@ pt: email_token_valid_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por (n) horas." email_token_grace_period_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por um período de carência de (n) horas após serem recuperados" enable_badges: "Ativar o sistema de distintivos" + enable_whispers: "Permitir que os utilizadores sussurrem ao pessoal" allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa." email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!" forgot_password_strict: "Não informar os utilizadores da existência da conta quando estes utilizam o diálogo de password esquecida." log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos" - version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel /admin" - new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível." + version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel de administração" + new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível." port: "PROGRAMADOR APENAS! AVISO! Utilize esta porta HTTP em vez da porta 80. Deixar em branco para usar a porta padrão 80." force_hostname: "PROGRAMADOR APENAS! AVISO! Especifique um nome de servidor no URL. Deixe em branco para utilizar o valor por defeito." invite_expiry_days: "Durante quantos dias as chaves de convite são válidas." invite_passthrough_hours: "Quanto tempo pode um utilizador utilizar uma chave de convite previamente recuperada, em horas" invite_only: "O registo público está desativado, todos os novos utilizadores devem ser explicitamente convidados por outros membros ou pelo pessoal." login_required: "Requerer autenticação para ler conteúdo neste sítio, não permitir acesso anónimo." - min_username_length: "Tamanho mínimo do nome de utilizador, em caracteres. AVISO: QUAISQUER UTILIZADORES COM NOMES MAIS PEQUENOS QUE ISTO SERÃO PROIBIDOS DE ACEDER AO SÍTIO." - max_username_length: "Tamanho máximo do nome de utilizador, em caracteres. AVISO: QUAISQUER UTILIZADORES COM NOMES MAIORES QUE ISTO SERÃO PROIBIDOS DE ACEDER AO SÍTIO." + min_username_length: "Comprimento mínimo do nome de utilizador, em caracteres." + max_username_length: "Comprimento máximo do nome de utilizador, em caracteres." + reserved_usernames: "Nomes de utilizadores para os quais o registo não é permitido." min_password_length: "Tamanho mínimo da palavra-passe." block_common_passwords: "Não permitir palavras-passe que estejam nas 10,000 palavras-passe mais comuns." + enable_sso: "Ativar inscrição única através de um sítio externo (AVISO: OS ENDEREÇOS DE EMAIL DOS UTILIZADORES *DEVEM* SER VALIDADOS PELO SÍTIO EXTERNO!)" enable_sso_provider: "Implementar o protocolo do provedor SSO do Discourse no caminho /session/sso_provider, requer que sso_secret seja configurado" sso_url: "URL da inscrição única" sso_secret: "String secreta usada para autenticar criptograficamente informação SSO, garanta que tem 10 ou mais caracteres" - sso_overrides_email: "Substitui o email local por um email externo de um SSO (AVISO: discrepâncias podem ocorrer devido a normalização de emails locais)" - sso_overrides_username: "Substitui nomes de utilizador locais por nomes de utilizadores externos de um SSO (AVISO: discrepâncias podem ocorrer diferenças no nome de utilizador length/requirements)" - sso_overrides_name: "Substitui o nome local por um nome externo de um SSO" - sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars" + sso_overrides_email: "Substitui o email local por um email de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido à normalização de emails locais) " + sso_overrides_username: "Substitui nomes de utilizadores locais por nomes de utilizadores de sítios externos a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido a diferenças no comprimento/requisitos do nome de utilizador)" + sso_overrides_name: "Substitui o nome completo local por um nome completo de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais." + sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos a partir de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars" + sso_not_approved_url: "Redirecionar contas SSO não aprovadas para este URL" enable_local_logins: "Ativar contas com nome de utilizador e senha de forma local (Nota: isto tem que estar ativo para que os convites funcionem)" allow_new_registrations: "Permitir registo de novos utilizadores. Desmarcar isto para prevenir que alguém crie uma nova conta." + enable_signup_cta: "Mostrar um aviso a utilizadores anónimos que retornem levando-os a inscreverem-se para uma conta." enable_yahoo_logins: "Ativar autenticação pelo Yahoo" enable_google_oauth2_logins: "Ativar autenticação Google Oauth2. Este é o método que permite a autenticação que a Google atualmente suporta. Requer chave e segredo." google_oauth2_client_id: "ID do cliente da sua aplicação Google." - google_oauth2_client_secret: "Segredo do cliente da sua aplicação Google." + google_oauth2_client_secret: "Chave do cliente da sua aplicação Google." enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret" twitter_consumer_key: "Chave de consumidor para autenticação pelo Twitter, registada em http://dev.twitter.com" - twitter_consumer_secret: "Segredo do Consumidor para a autenticação pelo Twitter, registada em http://dev.twitter.com" + twitter_consumer_secret: "Chave do Consumidor para a autenticação pelo Twitter, registada em http://dev.twitter.com" enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret" facebook_app_id: "Id App usado para autenticação pelo Facebook, registado em https://developers.facebook.com/apps" - facebook_app_secret: "Segredo App para autenticação com o Facebook, registado em https://developers.facebook.com/apps" + facebook_app_secret: "Chave da App para autenticação com o Facebook, registado em https://developers.facebook.com/apps" enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret" github_client_id: "Id do cliente para autenticação pelo Github, registado em https://github.com/settings/applications" - github_client_secret: "Segredo do Cliente para autenticação pelo Github, registado em https://github.com/settings/applications" + github_client_secret: "Chave do Cliente para autenticação pelo Github, registado em https://github.com/settings/applications" allow_restore: "Permitir o restauro, que pode substituir TODOS os dados do sítio. Deixar a falso a menos que planeie restaurar uma cópia de segurança" maximum_backups: "Valor máximo de cópias de segurança a serem guardadas em disco. Cópias de Segurança antigas são automaticamente eliminadas." - backup_daily: "Criar automaticamente uma cópia de segurança local, uma vez por dia." + automatic_backups_enabled: "Executar cópias de segurança automáticas de acordo com as definições de frequência de cópia de segurança" + backup_frequency: "Com que frequência criamos cópias de segurança do sítio, em dias." enable_s3_backups: "Carregar cópias de segurança para S3 quando completo. IMPORTANTE: requer credenciais S3 válidas inseridas nas configurações dos ficheiros." s3_backup_bucket: "Balde remoto para guardar cópias de segurança. AVISO: Certifique-se que este é um balde privado." active_user_rate_limit_secs: "Qual a frequência de atualização do campo 'última vez visto em', em segundos." @@ -807,6 +856,7 @@ pt: max_topics_per_day: "Número máximo de tópicos que um utilizador pode criar por dia." max_private_messages_per_day: "Número máximo de mensagens que os utilizadores podem criar por dia." max_invites_per_day: "Número máximo de convites que um utilizador pode enviar por dia." + max_topic_invitations_per_day: "Número máximo de convites para tópicos que um utilizador pode enviar por dia." suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico." limit_suggested_to_category: "Apenas mostrar tópicos da categoria atual nos tópicos sugeridos." clean_up_uploads: "Remover carregamentos orfãos não referenciados para prevenir alojamento ilegal. AVISO: poderá querer criar uma cópia de segurança da diretoria /uploads antes de ativar esta configuração." @@ -819,6 +869,10 @@ pt: s3_access_key_id: "Id da chave de acesso Amazon S3 que será usada para carregar imagens." s3_secret_access_key: "Chave de acesso secreta Amazon S3 que será usada para carregar imagens." s3_region: "Nome da região Amazon S3 que será usada para carregar imagens." + s3_cdn_url: "O URL CDN a ser usado para todos os recursos s3 (por exemplo: https://cdn.somewhere.com). AVISO: após alterar esta configuração deve refazer as últimas mensagens." + avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente." + external_system_avatars_enabled: "Utilize o serviço do sistema externo de avatars." + external_system_avatars_url: "URL do serviço do sistema externo de avatars. Substituições permitidas são {nome_de_utilizador} {primeira_letra} {cor} {tamanho}" enable_flash_video_onebox: "Ativar a incorporação de hiperligações swf e flv (Adobe Flash) em caixas únicas. AVISO: pode introduzir riscos de segurança." default_invitee_trust_level: "Nível de Confiança padrão (0-4) para utilizadores convidados." default_trust_level: "Nível de Confiança padrão (0-4) para todos os novos utilizadores. AVISO! Alterar isto irá colocá-lo em sério risco de spam." @@ -871,6 +925,9 @@ pt: topic_views_heat_low: "Após todas estas visualizações, o campo de visitas fica ligeiramente destacado." topic_views_heat_medium: "Após todas estas visualizações, o campo de visitas fica moderadamente destacado." topic_views_heat_high: "Após todas estas visualizações, o campo de visitas fica fortemente destacado." + cold_age_days_low: "Após todos estes dias de conversação, a data da última atividade fica ligeiramente escurecida." + cold_age_days_medium: "Após todos estes dias de conversação, a data da última atividade fica moderadamente escurecida." + cold_age_days_high: "Após todos estes dias de conversação, a data da última atividade fica fortemente escurecida." history_hours_low: "Uma mensagem editada dentro destas horas tem o indicador de edição ligeiramente destacado." history_hours_medium: "Uma mensagem editada dentro destas horas tem o indicador de edição moderadamente destacado." history_hours_high: "Uma mensagem editada dentro destas horas tem o indicador de edição fortemente destacado." @@ -892,6 +949,10 @@ pt: num_flaggers_to_close_topic: "Número mínimo de sinalizações únicas que são necessárias para automaticamente pausar um tópico para intervenção." num_flags_to_close_topic: "Número mínimo de sinalizações ativas que são necessárias para automaticamente pausar um tópico para intervenção." auto_respond_to_flag_actions: "Ativar respostas automáticas ao eliminar uma bandeira." + min_first_post_typing_time: "Quantidade mínima de tempo em milissegundos que um utilizador deve digitar durante a sua primeira mensagem, se o limite não for atingido a mensagem será automaticamente inserida na fila de aprovação. Configurar a 0 para desativar (não recomendado)" + auto_block_fast_typers_on_first_post: "Bloquear automaticamente utilizadores que não cumprem min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Nível de confiança máximo para bloquear automaticamente escritores rápidos" + auto_block_first_post_regex: "Expressão regular sensível a maiúsculas e minúsculas que se passar irá fazer com que a primeira mensagem do utilizador seja bloqueada e enviada para a fila de aprovação. Exemplo: raging|a[bc]a, irá fazer com que todas as mensagens que contenham raging ou aba ou aca sejam bloqueadas primeiro. Aplicável apenas à primeira mensagem." reply_by_email_enabled: "Ativar respostas aos tópicos por email." reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com" disable_emails: "Impedir que Discourse envie qualquer tipo de emails" @@ -904,6 +965,7 @@ pt: pop3_polling_host: "Servidor para solicitações de email via POP3." pop3_polling_username: "Nome de utilizador para a conta POP3 para resgatar emails." pop3_polling_password: "Palavra-passe para a conta POP3 solicitar emails ao servidor." + log_mail_processing_failures: "Registar todas as falhas de processamento de email em http://nomedoseusítio.com/logs" email_in: "Permitir que utilizadores publiquem novos tópicos através de email (requer pop3). Configurar os endereços no separador \"Configurações\" de cada categoria." email_in_min_trust: "Nível de Confiança mínimo que um utilizador necessita de ter para poder publicar novos tópicos por email." email_prefix: "A [etiqueta] usada no assunto dos emails. Se não estiver configurada, será 'Título' por defeito." @@ -915,18 +977,16 @@ pt: username_change_period: "Número de dias após o registo em que as contas podem modificar o seu nome de utilizador (0 para não permitir a modificação do nome de utilizador)" email_editable: "Permitir que os utilizadores alterem o seu endereço de email após o registo." logout_redirect: "Localização de redirecionamento do navegador após encerramento da sessão EX: (http://algumsítio.com/terminarsessao)" - allow_uploaded_avatars: "Permitir que utilizadores carreguem avatars personalizados." - allow_animated_avatars: "Permitir que os utilizadores usem avatars com imagens animadas gifs. AVISO: executar a tarefa avatars:atualizar após mudança de configuração." + allow_uploaded_avatars: "Permitir que os utilizadores carreguem fotografias de perfil personalizadas." + allow_animated_avatars: "Permitir que os utilizadores utilizem fotografias de perfil com gifs animados. AVISO: executar avatars:atualizar após mudança desta configuração." allow_animated_thumbnails: "Gera miniaturas de imagens ou gifs animados." default_avatars: "URLs para avatars que serão usados por defeito para novos utilizadores até que estes o mudem." automatically_download_gravatars: "Descarregar Gravatars para os utilizadores após criação de conta ou mudança de email." digest_topics: "Número máximo de tópicos a serem apresentados no resumo do email." digest_min_excerpt_length: "Tamanho mínimo do excerto da mensagem no resumo do email, em caracteres." - default_digest_email_frequency: "Por defeito, quantas vezes os utilizadores recebem emails de resumo. Os utilizadores podem alterar esta configuração nas suas preferências." suppress_digest_email_after_days: "Suprimir emails de resumos para utilizadores não vistos no sítio por mais de (n) dias." disable_digest_emails: "Desativar os emails de resumo para todos os utilizadores." - default_external_links_in_new_tab: "Abrir hiperligações externas num novo separador. Os utilizadores podem alterar isto nas suas preferências." - detect_custom_avatars: "Se deve ou não haver uma verificação de que os utilizadores carregaram avatars personalizados." + detect_custom_avatars: "Se deve ou não verificar que os utilizadores carregaram fotografias de perfil personalizadas." max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá verificar o Gravatar para avatars personalizados, por dia" public_user_custom_fields: "Lista de campos personalizados para um utilizador e que podem ser exibidos publicamente." staff_user_custom_fields: "Lista de campos personalizados para um utilizador e que podem ser exibidos ao pessoal." @@ -938,38 +998,58 @@ pt: sequential_replies_threshold: "Número de mensagens que um utilizador tem que fazer em linha num tópico antes de ser relembrado acerca de demasiadas respostas sequenciais." enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o sítio completo. Desative isto se quer usar um estilo personalizado que é totalmente responsivo." dominating_topic_minimum_percent: "Que percentagem de mensagens um utilizador tem que fazer num tópico antes de ser relembrado sobre dominar demasiado um tópico." + daily_performance_report: "Analise os logs diários NGINX e publique um tópico visível apenas para o pessoal com detalhes" suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos." + permalink_normalizations: "Utilize a seguinte expressão regular antes de combinar hiperligações permanentes, por exemplo: /(\\/topic.*)\\?.*/\\1 irá retirar sequências de consulta de rotas de tópicos. O formato é regex+sequência utilize \\1 etc. para aceder a capturas." global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)." disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo." full_name_required: "O nome completo é um campo obrigatório no perfil de utilizador." enable_names: "Mostrar o nome completo do utilizador no seu perfil, cartão de utilizador, e emails. Desativar para esconder o nome completo em todos os locais." display_name_on_posts: "Mostrar o nome completo de um utilizador nas suas mensagens em adição ao seu @nome-de-utilizador." + show_time_gap_days: "Se duas mensagens são feitas com todos estes dias de diferença, exibir a diferença de tempo no tópico." invites_per_page: "Convites por defeito exibidos na página do utilizador." short_progress_text_threshold: "Após o número de mensagens num tópico passar acima deste número, a barra de progresso irá apenas mostrar o número da mensagem atual. Se alterar a largura da barra de progresso, poderá ter que mudar este valor." default_code_lang: "Linguagem de programação por defeito a aplicar no destaque da sintaxe em blocos de código GitHub (lang-auto, ruby, python, etc.)" warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico em que a última resposta é mais antiga que estes dias, um aviso será exibido. Desativar ao configurar para 0." autohighlight_all_code: "Forçar o destaque do código a todos os blocos de código pré-formatados mesmo quando não se especifica a linguagem." highlighted_languages: "Incluídas regras de destaque da sintaxe (Aviso: incluir demasiadas linguagens pode impactar o desempenho) ver: https://highlightjs.org/static/demo/ para uma demonstração" - embeddable_host: "Servidor que pode incorporar os comentários deste fórum Discourse. Apenas o nome do servidor, não começar com http://" feed_polling_enabled: "INCORPORAR APENAS: incorporar feeds RSS/ATOM como mensagens." feed_polling_url: "INCORPORAR APENAS: URL dos feeds de RSS/ATOM para embutir." embed_by_username: "Nome de utilizador Discourse do utilizador que cria tópicos embebidos." embed_username_key_from_feed: "Chave para recuperar o nome de utilizador discourse do feed." - embed_truncate: "Truncar mensagens embutidas." - embed_category: "Categoria de tópicos embutidos." + embed_truncate: "Truncar mensagens incorporadas." embed_post_limit: "Número máximo de mensagens a serem incorporadas." embed_whitelist_selector: "Seletor CSS para elementos permitidos em incorporações." embed_blacklist_selector: "Seletor CSS para elementos que foram removidos de incorporações." - notify_about_flags_after: "Se houver sinalizações que não tenham sido tratadas após tantas horas, envie um email para contact_email. Configurar a 0 para desativar." + notify_about_flags_after: "Se houver sinalizações que não tenham sido tratadas após tantas horas, envie um email para 'contact_email'. Configurar a 0 para desativar." enable_cdn_js_debugging: "Permitir que /logs exiba erros próprios ao adicionar permissões de origem-cruzada em todos os js incluídos." show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos." + delete_drafts_older_than_n_days: Eliminar rascunhos mais antigos que (n) days. + show_logout_in_header: "Mostrar Terminar Sessão no menu suspenso do utilizador no cabeçalho" vacuum_db_days: "Executar VACUUM FULL ANALYZE para reclamar espaço na Base de Dados após a migração (configurar a 0 para desativar)" prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem." + slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo." enable_emoji: "Ativar emoji" emoji_set: "Como gostaria de ter o seu emoji?" enforce_square_emoji: "Forçar uma relação de aspecto quadrado para todos os emojis." approve_post_count: "A quantidade de mensagens de um novo utilizador que devem ser aprovadas" approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados" + notify_about_queued_posts_after: "Se não houver mensagens que estiveram à espera de revisão por mais do que estas horas, um email será enviado para o email de contacto. Configure para 0 para desativar estes emails." + default_email_digest_frequency: "Por defeito, quantas vezes os utilizadores recebem emails de resumo." + default_email_private_messages: "Por defeito, enviar um email quando alguém envia mensagens ao utilizador." + default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador." + default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem." + default_email_always: "Por defeito, enviar notificações por email mesmo quando o utilizador está ativo." + default_other_new_topic_duration_minutes: "Condição global por defeito para o qual um tópico é considerado novo." + default_other_auto_track_topics_after_msecs: "Tempo global por defeito antes de um tópico ser automaticamente acompanhado." + default_other_external_links_in_new_tab: "Por defeito, abrir hiperligações externas num novo separador." + default_other_enable_quoting: "Por defeito, ativar resposta por citação para texto destacado." + default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser." + default_other_disable_jump_reply: "Por defeito, não saltar para a mensagem do utilizador após ter respondido." + default_other_edit_history_public: "Por defeito, realizar revisões públicas das mensagens." + default_categories_watching: "Lista de categorias que por defeito são vigiadas." + default_categories_tracking: "Lista de categorias que por defeito são acompanhadas." + default_categories_muted: "Lista de categorias que por defeito são mudas." errors: invalid_email: "Endereço de email inválido." invalid_username: "Não existe nenhum utilizador com esse nome de utilizador." @@ -1018,13 +1098,14 @@ pt: not_seen_in_a_month: "Bem-vindo novamente! Não o vemos há algum tempo. Estes são os tópicos mais populares desde que esteve ausente." move_posts: new_topic_moderator_post: - one: "Eu movi uma mensagem para um novo tópico: %{topic_link}" - other: "Eu movi %{count} mensagens para um novo tópico: %{topic_link}" + one: "Uma mensagem foi dividida em um novo tópico: %{topic_link}" + other: "%{count} mensagens foram divididas em um novo tópico: %{topic_link}" existing_topic_moderator_post: - one: "Eu movi uma mensagem para um tópico existente: %{topic_link}" - other: "Eu movi %{count} mensagens para um tópico existente: %{topic_link}" + one: "Uma mensagem foi agregada em um tópico existente: %{topic_link}" + other: "%{count} mensagens foram agregadas em um tópico existente: %{topic_link}" change_owner: post_revision_text: "Direito de posse transferido de %{old_user} para %{new_user}" + deleted_user: "um utilizador eliminado" emoji: errors: name_already_exists: "Pedimos desculpa, o nome '%{name}' já está a ser usado por outro emoji." @@ -1070,6 +1151,7 @@ pt: not_allowed_from_ip_address: "Não pode iniciar sessão como %{username} a partir desse endereço IP." admin_not_allowed_from_ip_address: "Não pode iniciar sessão como administrador a partir desse endereço IP." suspended: "Não pode iniciar sessão até %{date}." + suspended_with_reason: "Conta suspensa até %{date}: %{reason}" errors: "%{errors}" not_available: "Não disponível. Tente %{suggestion}?" something_already_taken: "Algo de errado ocorreu, talvez o nome de utilizador ou o email já estejam registados. Tente a hiperligação Esqueci a minha palavra-passe." @@ -1077,6 +1159,8 @@ pt: omniauth_error_unknown: "Algo ocorreu ao processar o seu início de sessão, por favor tente novamente." new_registrations_disabled: "Neste momento não é permitido novo registo de contas." password_too_long: "As palavras-passe estão limitadas a 200 caracteres." + email_too_long: "O email fornecido é demasiado longo. Nomes de caixas de email não devem ter mais que 254 caracteres, e nomes de domínio não devem ter mais que 253 caracteres." + reserved_username: "Esse nome de utilizador não é permitido." missing_user_field: "Não completou todos os campos de utilizador." close_window: "A autenticação está completa. Feche esta janela para continuar." user: @@ -1087,10 +1171,16 @@ pt: characters: "pode incluir apenas números, letras e sublinhados" unique: "tem que ser único" blank: "tem que estar preenchido" - must_begin_with_alphanumeric: "tem que começar com uma letra ou com um número" + must_begin_with_alphanumeric: "tem que começar com uma letra ou número ou um sublinhado" + must_end_with_alphanumeric: "tem que terminar com uma letra ou número ou um sublinhado" + must_not_contain_two_special_chars_in_seq: "não deve conter uma sequência de 2 ou mais caracteres especiais (.-_)" + must_not_contain_confusing_suffix: "não deve conter um sufixo confuso tal como .json ou .png etc." email: not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email." blocked: "não é permitido." + ip_address: + blocked: "Novos registos não são permitidos a partir do seu endereço IP." + max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal." invite_mailer: subject_template: "%{invitee_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}" text_body_template: | @@ -1125,44 +1215,23 @@ pt: Este convite é de um utilizador confiável, por isso não precisa de se autenticar. invite_password_instructions: subject_template: "Configurar a palavra-passe para a sua conta %{site_name}" + text_body_template: | + Obrigado por aceitar o seu convite para %{site_name} -- bem-vindo! + + Clique nesta hiperligação para escolher uma nova palavra-passe: + %{base_url}/users/password-reset/%{email_token} + + (Se a hiperligação acima tiver expirado, escolha "Esqueci a minha palavra-passe" ao iniciar sessão com o seu endereço de email.) test_mailer: subject_template: "[%{site_name}] Teste de entrega de email" - text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve\ - \ o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" + text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n\ + [7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" new_version_mailer: subject_template: "[%{site_name}] Nova versão Discourse, atualização disponível" - text_body_template: | - Uma nova versão de [Discourse](http://www.discourse.org) está disponível. - - A sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Pode desejar: - - - Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Atualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), e pressionando o botão "Atualizar". - - - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse. + text_body_template: "Uma nova versão de [Discourse](http://www.discourse.org) está disponível. \n\nA sua versão: %{installed_version}\nNova versão: **%{new_version}**\n\nPode desejar: \n\n- Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\n- Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).\n\n- Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse.\n" new_version_mailer_with_notes: subject_template: "[%{site_name}] atualização disponível" - text_body_template: | - Uma nova versão de [Discourse](http://www.discourse.org) está disponível. - - A sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Pode desejar: - - - Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Atualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), e pressionando o botão "Atualizar". - - - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse. - - ### Notas de lançamento - - %{notes} + text_body_template: "Uma nova versão de [Discourse](http://www.discourse.org) está disponível. \n\nA sua versão: %{installed_version}\nNova versão: **%{new_version}**\n\nPode desejar: \n\n- Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\n- Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).\n\n- Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse.\n\n### Release notes\n\n%{notes}\n" flags_reminder: flags_were_submitted: one: "Estas sinalizações foram submetidas há 1 hora atrás." @@ -1173,6 +1242,14 @@ pt: subject_template: one: "1 sinalização à espera de ser tratada" other: "%{count} sinalizações à espera de serem tratadas" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 mensagem à espera de revisão" + other: "[%{site_name}] %{count} mensagens à espera de revisão" + text_body_template: | + Olá, + + Existem mensagens de novos utilizadores que estão à espera de revisão. [Podem ser aprovadas ou rejeitadas aqui](%{base_url}/queued-posts). flag_reasons: off_topic: "A sua mensagem foi marcada como **fora do contexto**: a comunidade sente que não se enquadra neste tópico, conforme o seu título e a sua primeira mensagem." inappropriate: "A sua mensagem foi sinalizada como **inapropriada**: a comunidade sente que é ofensiva, abusiva ou que é uma violação das nossas [diretrizes da comunidade](/guidelines)." @@ -1184,14 +1261,15 @@ pt: disagreed: "Obrigado por nos informar. Estamos a analisá-lo." deferred: "Obrigado por nos informar. Estamos a analisá-lo." deferred_and_deleted: "Obrigado por nos informar. Removemos a mensagem." - temporarily_closed_due_to_flags: "O tópico está temporariamente fechado devido a um grande número de sinalizações da comunidade." + temporarily_closed_due_to_flags: "Este tópico está fechado temporariamente devido a um grande número de bandeiras da comunidade. " system_messages: post_hidden: subject_template: "Mensagem oculta devido a sinalizações da comunidade" + text_body_template: "Olá,\n\nEsta é uma mensagem automática de %{site_name} para informá-lo que a sua mensagem foi oculta. \n\n%{base_url}%{url} \n\n%{flag_reason}\n\nMúltiplos membros da comunidade sinalizaram esta mensagem antes de ser escondida, por isso considere como poderá rever a sua mensagem para refletir o seu feedback. **Pode editar a sua mensagem após %{edit_delay} minutos, e esta será automaticamente exibida.**\n\nContudo, se a mensagem for escondida pela comunidade uma segunda vez, irá manter-se escondida até ser tratada pelo pessoal – e poderão ainda ocorrer ações, incluindo uma possível suspensão da sua conta.\n\nPara orientação adicional, por favor consulte as [diretrizes da comunidade](%{base_url}/guidelines).\n" usage_tips: - text_body_template: "Algumas dicas para que possa começar: \n\n## Continue a arrastar para baixo \n\nNão há botões para páginas seguintes nem números de páginas – para ler mais, **simplesmente continue a arrastar para baixo!**\n\nÀ medida que novas mensagens vão surgindo, estas irão aparecer automaticamente. \n\n## Onde estou?\n\n - Para pesquisar, para a sua página de utilizador ou para o menu, use o botão com o **icone ☰ no canto superior direito**.\n\n- Qualquer título de tópico irá levá-lo à próxima mensagem não lida. Utilize o tempo da última atividade e o contador de mensagens para ir para o início ou para o final. \n\n- Ao ler um tópico, salte para o topo ↑ ao selecionar o título do tópico. Selecione a barra de progresso verde no canto inferior direito para controlos de navegação completos, ou utilize página principal e chavesfinais.\n\n\n\n## Como posso responder?\n\n- Para responder ao tópico geral, utilize o botão de Resposta no final de cada página.\n\n- Para responder a uma mensagem específica, utilize o botão de Resposta nessa mensagem.\n\n-Para levar a conversa para um rumo diferente, mas mantê-las hiperligadas utilize Responder como Tópico hiperligado à direita desta mensagem.\n\n. Para citar alguém na sua resposta, selecione o texto que pretende citar, e de seguida pressione qualquer um dos botões de Resposta.\n\n\nPara mencionar alguém na sua resposta, mencione os seus nomes. Digite `@` e o preenchimento automático irá aparecer.\n\n\n\nPara [Emoji padrão](http://www.emoji.codes/), simplesmente comece a digitar `:` ou os tradicionais risonhos `:)` :smile:\n\n## O que posso fazer mais?\n\nHá botões de ação no final de cada publicação.\n\n\n\nPara deixar alguém saber que gostou das suas mensagens, utilize o botão **gosto**. Se vir um problema com uma mensagem, avise-os ou avise o nosso pessoal em privado utilizando o botão de **sinalização**.\n\nPode também **partilhar** uma hiperligação de uma publicação, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador.\n\nQuem está a falar comigo?\n\nQuando alguém responde à sua mensagem, cita a sua mensagem ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o ao aceder às suas **notificações**.\n\t\n\n\nNão se preocupe em falhar uma resposta – irá receber emails com respostas (e mensagens) se não estiver online quando estas chegam.\n\n## Quando são as conversações consideradas novas?\n\nPor defeito, todas as conversações com menos de dois dias são consideradas novas, e qualquer conversação onde tenha participado (respondido, criado, ou lido por um extenso período) irão ser automaticamente acompanhadas. \n\nVerá o indicador numérico e o indicador azul (novo) junto desses tópicos: \n\n\nPode alterar o estado individual das notificações de um tópico através do controlo no final do tópico (isto também pode ser definido por categoria). Para mudar a maneira como os tópicos são acompanhados, ou a definição de novo, consulte [as suas preferências](%{base_url}/my/preferences). \n\n## Porque não posso fazer certas coisas?\n\nNovos utilizadores estão um pouco limitados por razões de segurança. À medida que for participando, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e essas limitações serão automaticamente removidas. Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar ainda mais capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" + text_body_template: "Aqui ficam algumas dicas para que possa começar: \n\n## Leitura\n\nPara ler mais, **simplesmente continue a arrastar para baixo!**\n\nÀ medida que novas mensagens ou novos tópicos vão chegando, estes irão surgir automaticamente – não é necessário atualizar a página. \n\n## Navegação \n\n- Para pesquisar, a sua página de utilizador, ou o menu ☰, utilize **o ícone no canto superior direito**. \n\n- Selecionar o título de um tópico irá levá-lo sempre à **próxima mensagem não lida** no tópico. Para inserir no início ou no final, selecione a contagem de respostas ou alternativamente, a data da última resposta. \n\n\n\n - Ao ler um tópico, selecione a barra de progresso no canto inferior direito para controlos de navegação completos. Salte rapidamente para o topo ao selecionar o título do tópico. Pressione ? para uma lista rápida de atalhos do teclado. \n\n\n\n## Responder \n\n– Para responder ao **tópico em geral**, utilize no final de cada tópico. \n\n- Para responder a uma **pessoa específica**, utilize nas suas mensagens. \n\n- Para responder com um **novo tópico**, utilize à direita desta mensagem. Tanto os tópicos antigos como os novos serão ligados automaticamente. \n\nPara inserir uma citação, selecione o texto que deseja citar e de seguida pressione qualquer botão de Resposta. Repetir para múltiplas citações! \n\n\n\nPara notificar alguém da sua resposta, mencione o seu nome. Digite `@` para começar a selecionar um nome de utilizador. \n\n\n\nPara utilizar [Emoji padrão](http://www.emoji.codes/), simplesmente digite `:` para encontrar por nome, ou os tradicionais risonhos `;)` \n\n\n\nPara gerar um sumário para uma hiperligação, cole-o numa linha por si só:\n\n\n\n## Ações \n\nExistem botões de ação no final de cada mensagem. \n\n\n\nPara deixar alguém saber que gostou e apreciou as suas mensagens, utilize o botão **gosto**. Partilhe o amor! \n\nSe vir um problema com uma mensagem de alguém, avise a pessoa em privado, ou avise [o nosso pessoal](%{base_url}/about), sobre a mesma utilizando o botão **sinalizar**. Pode também **partilhar** uma hiperligação para uma mensagem, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador. \n\n## Notificações \n\nQuando alguém lhe responde, cita a sua mensagem ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o para aceder às suas **notificações**. \n\n\n\n Não se preocupe em falhar uma resposta – irá receber notificações por email que chegam quando está ausente. \n\n## As Suas Preferências \n\n- Todos os tópicos com menos de **dois dias** são considerados novos. \n\n- Qualquer tópico em que tenha **participado ativamente** (respondido, criado, ou lido por um extenso período) será acompanhado automaticamente. \n\nVerá o indicador numérico e o indicador azul (novo) junto desses tópicos: \n\n \n\nPode alterar as suas notificações para qualquer tópico através do controlo de notificações no final do tópico.\n\n\n\nPode também configurar\ + \ estados de notificação por categoria, se quer observar cada novo tópico numa categoria específica. \n\nPara alterar qualquer uma destas configurações, consulte [as suas preferências] (%{base_url}/my/preferences). \n\n##Confiança da Comunidade \n\nÀ medida que for participando aqui, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e limitações de novos utilizadores serão automaticamente removidas. Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar novas capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" welcome_user: subject_template: "Bem-vindo a %{site_name}!" text_body_template: | @@ -1228,7 +1306,7 @@ pt: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Cópia de segurança completa corretamente" - text_body_template: "A cópia de segurança foi feita corretamente.\nVisite a [admin > secção de cópias de segurança](/admin/backups) para descarregar a sua nova cópia de segurança." + text_body_template: "A cópia de segurança foi bem-sucedida.\nVisite [admin > secção de cópias de segurança](%{base_url}/admin/backups) para descarregar a sua nova cópia de segurança." backup_failed: subject_template: "A cópia de segurança falhou" text_body_template: | @@ -1290,8 +1368,18 @@ pt: Não há nenhuma conta de utilizador conhecida com este endereço de email. Tente enviar a partir de um endereço de email diferente, ou contacte um membro do pessoal. email_reject_empty: subject_template: "[%{site_name}] Problema de email -- Sem Conteúdo" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (com título%{former_title}) não funcionou. + + Não conseguimos encontrar nenhum conteúdo de resposta no seu email. + + Se está a obter isto e _realmente_ incluiu uma resposta, tente novamente com um formato mais simples. email_reject_parsing: subject_template: "[%{site_name}] Problema de email -- Conteúdo não reconhecido" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + Não conseguimos encontrar a sua resposta no email. **Certifique-se que a sua resposta se encontra no topo do email** - não conseguimos processar respostas em linha. email_reject_invalid_access: subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" text_body_template: | @@ -1328,10 +1416,22 @@ pt: Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que o endereço do sítio está na linha Para: (não em Cc: ou em Bcc:), e que está a enviar para o endereço de email correto fornecido pelo pessoal. email_reject_topic_not_found: subject_template: "[%{site_name}] Problema de email -- Tópico Não Encontrado" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + O tópico ao qual está a responder já não existe, talvez tenha sido eliminado? Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_topic_closed: subject_template: "[%{site_name}] Problema de email -- Tópico Encerrado" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + O tópico ao qual está a responder encontra-se fechado e já não aceita respostas. Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_auto_generated: subject_template: "[%{site_name}] Problema de email -- Resposta Gerada Automaticamente" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + O seu email foi marcado como "auto gerado", o qual não podemos aceitar. Se acredita que isto é um erro, contacte um membro do pessoal. email_error_notification: subject_template: "[%{site_name}] Problema de email -- Erro de autenticação POP" text_body_template: | @@ -1395,7 +1495,10 @@ pt: download_remote_images_disabled: subject_template: "Descarregamento de imagens remotas desativado" text_body_template: "A configuração `download_remote_images_to_local` foi desativada porque o limite de espaço em disco em `download_remote_images_threshold` foi alcançado." - unsubscribe_link: "Para cancelar a subscrição destes emails, visite as suas [preferências de utilizador](%{user_preferences_url})." + unsubscribe_link: | + Para cancelar a subscrição destes emails, visite as suas [preferências de utilizador](%{user_preferences_url}). + + Para parar de receber notificações acerca deste tópico específico, [clique aqui](%{unsubscribe_url}). subject_re: "Re:" subject_pm: "[MP]" user_notifications: @@ -1511,6 +1614,15 @@ pt: Clique na hiperligação seguinte para escolher uma palavra-passe. %{base_url}/users/password-reset/%{email_token} + admin_login: + subject_template: "[%{site_name}] Iniciar sessão" + text_body_template: | + Alguém pediu para iniciar sessão na sua conta em [%{site_name}](%{base_url}). + + Se não fez este pedido, pode ignorar este email com segurança. + + Clique na seguinte hiperligação para iniciar sessão: + %{base_url}/users/admin-login/%{email_token} account_created: subject_template: "[%{site_name}] A Sua Nova Conta" text_body_template: | @@ -1544,7 +1656,7 @@ pt: (Se precisar de comunicar com [membros do pessoal](%{base_url}/sobre) como um novo utilizador, apenas responda a esta mensagem.) signup: - subject_template: "[%{site_name}] Ativar a sua nova conta" + subject_template: "[%{site_name}] Confirme a sua nova conta" text_body_template: | BeM-vindo ao %{site_name}! @@ -1572,18 +1684,20 @@ pt: unauthorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})." pasted_image_filename: "Imagem colada" store_failure: "Falha ao armazenar o carregamento #%{upload_id} para o utilizador #%{user_id}." + file_missing: "Desculpe, deve fornecer um ficheiro para carregamento." attachments: too_large: "Pedimos desculpa, o ficheiro que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB)." images: too_large: "Pedimos desculpa, a imagem que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor redimensione-a e tente novamente." - fetch_failure: "Pedimos desculpa, ocorreu um erro ao transferir a imagem." - unknown_image_type: "Pedimos desculpa, mas o ficheiro que tentou carregar não parece ser uma imagem." size_not_found: "Pedimos desculpa, mas não conseguimos determinar o tamanho da imagem. É possível que seu ficheiro de imagem esteja corrompido?" + avatar: + missing: "Desculpe, mas o avatar que selecionou não está presente no servidor. Pode tentar carregá-lo novamente?" flag_reason: sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP respondeu. Veja as configurações de flag_sockpuppets" spam_hosts: "Este novo utilizador tentou criar múltiplas mensagens com hiperligações ao mesmo domínio. Verifique as configurações do sítio em newuser_spam_host_threshold." email_log: no_user: "Não foi possível encontrar o utilizador com o id %{user_id}" + anonymous_user: "Utilizador é anónimo" suspended_not_pm: "O utilizador está suspenso, sem mensagens" seen_recently: "O utilizador foi visto recentemente" post_not_found: "Não foi possível encontrar a mensagem com o id %{post_id}" @@ -1609,206 +1723,108 @@ pt: Edite a primeira mensagem neste tópico para alterar os conteúdos da página %{page_name}. guidelines_topic: title: "FAQ/Diretrizes" - body: "\n\n## [Isto é um Local Civilizado para Discussão](#civilizado)\n\nPor favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações.\n\nEstas não são regras rígidas e rápidas, meramente para ajuda do julgamento humano da nossa comunidade. Utilize estas diretrizes para manter este local limpo e iluminado para discussões públicas civilizadas.\n\n\n\n## [Melhorar a discussão](#melhorar) \n\nAjude-nos a fazer deste um óptimo local para discussões ao trabalhar constantemente para melhorar de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde.\n\nOs tópicos discutidos aqui têm importância para nós, e queremos agir como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde do que está a ser dito.\n\nUma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você.\n\n\n\n## [Seja Agradável, Mesmo Que\ - \ Discorde](#agradável) \n\nPode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite:\n\n*Chamar Nomes. \n*Adicionar ataques pessoais. \n* Responder ao tom de uma mensagem e não ao seu conteúdo. \n*Contradições instintivas\n\nPelo contrário, forneça contra-argumentos que melhorem a conversação.\n\n\n\n## [A Sua Participação Conta](#participe)\n\nAs conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher comprometer-se nos debates que tornam este fórum um local interessante para se estar — e evite os que não o fazem.\n\nO Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, sinalizações, respostas, edições, e por aí adiante. Utilize estas ferramentas para melhorar a sua própria experiência e de todos os outros também.\n\nVamos tentar deixar o nosso parque melhor do que quando o encontrámos.\n\n\n\n## [Se vir um Problema, Sinalize-o](#sinalize-problemas)\n\nOs moderadores têm uma autoridade especial; estes são responsáveis por este fórum. Assim como você o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou polícias.\n\nQuando vir mau comportamento, não responda. O reconhecimento\ - \ encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas sinalize-o. Se houver sinalizações suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores.\n\nDe maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas mensagens em qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade.\n\n\n\n## [Seja sempre civilizado](#seja-civilizado)\n\nNada estraga mais uma conversação saudável do que insolências:\n\n *Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou de ódio. \n*Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito. \n*Respeite os outros. Não assedie ou magoe ninguém, não personifique pessoas, e não exponha as suas informações pessoais. \n*Respeite o fórum. Não publique spam ou qualquer outra coisa que vandalize o fórum.\n\nEstes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem certeza, pergunte-se a si próprio como se sentiria se a sua mensagem fosse capa no New York Times.\n\nEste é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, hiperligações\ - \ e imagens seguras para família e amigos.\n\n\n\n## [Mantenha-o Organizado](#manter-organizado)\n\nFaça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso:\n\n*Não comece um tópico na categoria errada. \n*Não cruze mensagens sobre o mesmo tema em múltiplos tópicos. \n*Não publique respostas sem conteúdo. \n*Não desvie um tópico ao mudar o seu centro de atenção. \n*Não assine as suas mensagens — qualquer mensagem tem a sua informação de perfil anexada à mesma.\n\nEm vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico.\n\n\n\n## [Publique Apenas As Suas Próprias Coisas](#roubo)\n\nNão pode publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, hiperligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei.\n\n\n\n## [Patrocinado Por Si](#poder)\n\nEste sítio é operado pelos seus [membros locais amigáveis](/sobre) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico em [categoria meta](/c/meta) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente\ - \ que pode ser tratado por um tópico meta ou por uma sinalização, contacte-nos através do [página do pessoal](/sobre).\n\n\n\n## [Termos de Serviço](#tds)\n\nSim, a legalidade é chata, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra companheiros inimigos. Temos os [Termos de Serviço](/tds) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço tem que concordar em cumprir os nossos [TDS](/tds).\n" + body: "\n\n## [Este é um Local Civilizado para Discussão Pública](#civilizado) \n\nPor favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações. \n\nEstas não são regras rígidas e rápidas, meramente ajuda para o julgamento humano da nossa comunidade. Utilize estas diretrizes para manter este local limpo e iluminado para discussões públicas civilizadas. \n\n\n\n## [Melhorar a Discussão](#melhorar) \n\nAjude-nos a fazer deste um óptimo local para debates ao trabalhar constantemente para melhorar esses debates de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde. \n\nOs tópicos discutidos aqui têm importância para nós, e queremos agir como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde do que está a ser dito. \n\nUma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você. \n\n\n\n ## [Seja Agradável, Mesmo Que Discorde](#agradável) \n\nPode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite: \n\n*Chamar Nomes. \n*Adicionar ataques pessoais. \n* Responder ao tom de uma mensagem e não ao seu conteúdo. \n*Contradições instintivas \n\nPelo contrário, forneça contra-argumentos que melhorem a conversação. \n\n\n\n## [A Sua Participação Conta](#participe) \n\nAs conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher comprometer-se nos debates que tornam este fórum um local interessante\ + \ para se estar — e evite os que não o fazem. \n\nO Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, sinalizações, respostas, edições, e por aí em diante. Utilize estas ferramentas para melhorar a sua própria experiência e de todos os outros também.\n\nVamos tentar deixar o nosso parque melhor do que quando o encontrámos. \n\n\n\n ## [Se vir um Problema, Sinalize-o](#sinalize-problemas) \n\nOs moderadores têm uma autoridade especial; estes são responsáveis por este fórum. Assim como você o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou polícias. \n\nQuando vir mau comportamento, não responda. O reconhecimento encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas sinalize-o. Se houver sinalizações suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores.\n\nDe maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas mensagens em qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade. \n\n\n\n## [Seja sempre civilizado](#seja-civilizado) \n\nNada estraga mais uma conversação saudável do que insolências: \n\n*Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou de ódio. \n*Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito.\n*Respeite os outros. Não assedie ou magoe ninguém, não personifique pessoas, e não exponha as suas informações pessoais. \n*Respeite o fórum. Não publique spam ou qualquer outra coisa que vandalize o fórum. \n\nEstes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem certeza, pergunte-se a si próprio como se sentiria se a sua mensagem fosse capa do New York Times.\ + \ \n\nEste é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, hiperligações e imagens seguras para família e amigos. \n\n\n\n## [Mantenha-o Organizado](#manter-organizado) \n\nFaça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso: \n\n*Não comece um tópico na categoria errada. \n*Não cruze mensagens sobre o mesmo tema em múltiplos tópicos. \n*Não publique respostas sem conteúdo. \n*Não desvie um tópico ao mudar o seu centro de atenção. \n*Não assine as suas mensagens — qualquer mensagem tem a sua informação de perfil anexada à mesma. \n\nEm vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico. \n\n\n \n## [Publique Apenas As Suas Próprias Coisas](#roubo) \n\nNão pode publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, hiperligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei. \n\n\n## [Patrocinado Por Si](#poder) \n\nEste sítio é operado pelos seus [membros locais amigáveis](/sobre) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico em [site feedbackcategory](/c/site-feedback) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente que pode ser tratado por um tópico meta ou por uma sinalização, contacte-nos através do [página do pessoal](/sobre). \n\n \n\n## [Termos de Serviço](#tds) \n\nSim, a legalidade é chata, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra companheiros inimigos. Temos os [Termos de Serviço](/tds) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço tem que concordar em cumprir os nossos [TDS](/tds).\n" tos_topic: title: "Termos de Serviço" - body: "Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, %{company_domain} Software do Fórum, %{company_domain} Suporte do Fórum e serviço de alojamento %{company_domain} (\"Alojamento\"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} (\"%{company_name}\"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, %{company_domain}’s [Política de Privacidade](/privacy) e [Diretrizes da Comunidade](/faq)) e procedimentos que possam ser publicados de tempos em tempos neste Sítio por %{company_name} (coletivamente, the \"Acordo\").\n\nPor favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade.\n\n\n\n## [1. A Sua Conta %{company_domain} ](#1)\n\nSe criar uma conta\ - \ no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Terá que notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões.\n\n\n\n## [2.Responsabilidade dos Participantes](#2)\n\nSe publicar material no Sítio, publicar hiperligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceira parte o faça) material no Sítio (qualquer material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computadores. Ao tornar o Conteúdo disponível, está a representar e garantir que:\n\n* o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceira parte;\n* se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado\ - \ a qualquer software, ou (ii) ter garantido uma renúncia do seu empregado a todos os direitos no e para o Conteúdo;\n* está de acordo com licenças de qualquer terceira-parte relacionada com o Conteúdo, e fez todas as coisas necessárias para passar corretamente quaisquer termos requeridos aos utilizadores finais;\n* o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo destrutivo;\n* o Conteúdo não é spam, não é gerado por máquina, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing);\n* o Conteúdo não é pornográfico, nem contém ameaças ou incita violência, e não viola os direitos de privacidade ou publicidade de qualquer terceira parte;\n* o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas tais como hiperligações de spam ou grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados;\n* o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e \n* terá, no caso do Conteúdo incluir código de computador, categorizado e/ou descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido\ - \ pedido para fazê-lo por %{company_name} ou pelo contrário.\n\n\n\n## [3. Licença do Conteúdo do Utilizador](#3)\n\nAs contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou censurável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por alguma razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer uma compensação de quaisquer montantes previamente pagos.\n\n\n\n## [4. Pagamento e Renovação](#4)\n\n### Termos Gerais\n\nAtualizações ou serviços opcionais pagos podem estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como\ - \ indicado. Estas taxas não são reembolsáveis.\n\n### Renovação Automática\n\nA não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura.\n\n\n\n## [5. Serviços](#5)\n\n### Serviços de Alojamento, Suporte\n\nServiços opcionais de Alojamento e Suporte podem ser fornecidos por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições.\n\n\n\n## [6. Responsabilidade dos Visitantes do Sítio](#6)\n\n%{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. O Sítio pode ter conteúdo\ - \ ofensivo, indecente assim como também imprecisões técnicas, erros tipográficos entre outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiras partes, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não.\n\n%{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado.\n\n\n\n## [7. Conteúdo Publicado Noutros Sítios](#7)\n\nNão revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem hiperligações e que se hiperligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não--%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas\ - \ não-%{company_domain}.\n\n\n\n## [8. Violação de Direitos de Autor e Política DCMA](#8)\n\nAssim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com hiperligação para, por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}.\n%{company_name} irá responder por tais notícias, incluindo tal como requerido ou apropriado por remover o material ilícito ou desativando as hiperligações para o material ilícito.\n%{company_name} irá terminar o acesso a e o uso do Sítio se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator repetido dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer uma compensação de qualquer valor previamente pago a %{company_name}.\n\n\n\n## [9. Propriedade Intelectual](#9)\n\nEste Acordo não transfere totalmente de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiras partes, e todos os direitos, títulos\ - \ e interesse na e para a propriedade irá permanecer (entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados na hiperligação com o Sítio podem ser marcas de terceiras partes. O seu uso do Sítio não lhe concede direitos ou licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiras partes.\n\n\n\n## [10. Anúncios](#10)\n\n%{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços.\n\n\n\n## [11. Atribuição](#11)\n\n%{company_name} reserva-se ao direito de mostrar hiperligações de atribuição tais como ‘Patrocinado por %{company_domain},’ e atribuição de fontes ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas.\n\n\n\n## [12. Alterações](#12)\n\n%{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e\ - \ verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços devem ser sujeitos aos termos e condições deste Acordo.\n\n\n\n## [13. Terminação](#13)\n\n%{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade.\n\n\n\n## [14. Isenção de Garantias](#14)\n\nO Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem limitação, as garantias de comerciabilidade, adequadas a uma finalidade específica. Nem %{company_name} nem os seus fornecedores e licenciadores, fazem garantias de que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto.\ - \ Se está a ler isto, aqui está [uma ajuda] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição.\n\n\n\n## [15. Limitação da Responsabilidade](#15)\n\nEm nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, de incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade de qualquer falha ou atraso devido a matérias para além do seu razoável controlo. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável.\n\n\n\n## [16. Representações Gerais e Garantia](#16)\n\nRepresenta e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Diretrizes da Comunidade](/guidelines) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis\ - \ (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados de qualquer país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer terceira parte.\n\n\n\n## [17. Indemnização](#17)\n\nConcorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo.\n\n\n\n## [18. Diversos](#18)\n\nEste Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name}, de uma versão revista. Excepto o definido na lei, se houver, disposição em contrário, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo aos conflitos das disposições da lei, e a receita própria por qualquer disputa emergente de ou\ - \ relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. \n\nExceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de \"Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser forçada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos, em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado pelos seus termos e condições; %{company_name} pode assignar os seus direitos sob este Acordo sem condição.\ - \ O presente Acordo será vinculativo e reverterá em benefício das partes e dos seus sucessores.\n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.\n\nOriginalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).\n" + body: "Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, %{company_domain} Software do Fórum, %{company_domain} Fóruns de Suporte e serviço de alojamento %{company_domain} (\"Alojamento\"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} (\"%{company_name}\"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, %{company_domain}’s [Política de Privacidade](/privacy) e [Diretrizes da Comunidade](/faq)) e procedimentos que possam ser publicados de tempos em tempos neste Sítio por %{company_name} (coletivamente, the \"Acordo\"). \n\nPor favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade. \n\n \n\n## [1. A Sua Conta %{company_domain} ](#1) \n\nSe criar uma conta no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Deve notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões. \n\n \n\n## [2.Responsabilidade dos Participantes](#2) \n\nSe publicar material no Sítio, publicar hiperligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceira parte o faça) material no Sítio (qualquer\ + \ material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computadores. Ao tornar o Conteúdo disponível, está a representar e garantir que: \n\n* o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceira parte; \n* se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado a qualquer software, ou (ii) ter garantido uma renúncia do seu empregado a todos os direitos no e para o Conteúdo; \n* está de acordo com licenças de qualquer terceira-parte relacionada com o Conteúdo, e fez todas as coisas necessárias para passar corretamente quaisquer termos requeridos aos utilizadores finais; \n* o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo destrutivo; \n* o Conteúdo não é spam, não é gerado por máquina, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing); \n* o Conteúdo não é pornográfico, nem contém ameaças ou incita violência, e não viola os direitos de privacidade ou publicidade de qualquer terceira parte; \n* o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas tais como hiperligações de spam ou grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados; \n* o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e \n* terá, no caso do Conteúdo incluir código de computador, categorizado e/ou\ + \ descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido pedido para fazê-lo por %{company_name} ou pelo contrário. \n\n \n\n## [3. Licença do Conteúdo do Utilizador](#3) \n\nAs contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou censurável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por alguma razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer uma compensação de quaisquer montantes previamente pagos. \n\n \n\n## [4. Pagamento e Renovação](#4) \n\n### Termos Gerais \n\nAtualizações ou serviços opcionais pagos podem estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como indicado. Estas taxas não são reembolsáveis. \n\n### Renovação Automática \n\nA não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura. \n\n \n\n## [5. Serviços](#5) \n\n### Serviços de Alojamento, Suporte \n\nServiços opcionais de Alojamento e Suporte podem ser fornecidos\ + \ por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições. \n\n \n\n## [6. Responsabilidade dos Visitantes do Sítio](#6) \n\n%{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. O Sítio pode ter conteúdo ofensivo, indecente assim como também imprecisões técnicas, erros tipográficos entre outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiras partes, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não. %{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado. \n\n \n\n## [7. Conteúdo Publicado Noutros Sítios](#7) \n\nNão revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem hiperligações e que se hiperligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não--%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas,\ + \ cavalos de Tróia e outros conteúdos destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas não-%{company_domain}. \n\n \n\n## [8. Violação de Direitos de Autor e Política DCMA](#8) \n\nAssim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com hiperligação para, por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}. %{company_name} irá responder por tais notícias, incluindo tal como requerido ou apropriado por remover o material ilícito ou desativando as hiperligações para o material ilícito. %{company_name} irá terminar o acesso a e o uso do Sítio se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator repetido dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer uma compensação de qualquer valor previamente pago a %{company_name}. \n\n \n\n## [9. Propriedade Intelectual](#9) \n\nEste Acordo não transfere totalmente de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiras partes, e todos os direitos, títulos e interesse na e para a propriedade irá permanecer (entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados na hiperligação com o Sítio podem ser marcas de terceiras partes. O seu uso do Sítio não lhe concede direitos ou\ + \ licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiras partes. \n\n \n\n## [10. Anúncios](#10) \n\n%{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços. \n\n \n\n## [11. Atribuição](#11) \n\n%{company_name} reserva-se ao direito de mostrar hiperligações de atribuição tais como ‘Patrocinado por %{company_domain},’ e atribuição de fontes ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas. \n\n \n\n## [12. Alterações](#12) \n\n%{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços devem ser sujeitos aos termos e condições deste Acordo. \n\n \n\n## [13. Terminação](#13) \n\n%{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade. \n\n \n\n## [14. Isenção de Garantias](#14) \n\nO Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem\ + \ limitação, as garantias de comerciabilidade, adequadas a uma finalidade específica. Nem %{company_name} nem os seus fornecedores e licenciadores, fazem garantias de que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto. Se está a ler isto, aqui está [uma ajuda] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição. \n\n \n\n## [15. Limitação da Responsabilidade](#15) \n\nEm nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, de incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade de qualquer falha ou atraso devido a matérias para além do seu razoável controlo. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável. \n\n \n\n## [16. Representações Gerais e Garantia](#16) \n\nRepresenta e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Diretrizes da Comunidade](/diretrizes) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados de qualquer país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer\ + \ terceira parte. \n\n \n\n## [17. Indemnização](#17) \n\nConcorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo. \n\n \n\n## [18. Diversos](#18) \n\nEste Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name}, de uma versão revista. Excepto o definido na lei, se houver, disposição em contrário, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo aos conflitos das disposições da lei, e a receita própria por qualquer disputa emergente de ou relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. Exceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de \"Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser forçada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos,\ + \ em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado pelos seus termos e condições; %{company_name} pode assignar os seus direitos sob este Acordo sem condição. O presente Acordo será vinculativo e reverterá em benefício das partes, dos seus sucessores e signatários autorizados. \n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. \n\nOriginalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).\n" privacy_topic: title: "Política de Privacidade" - body: | - - - ## [Que informações reunimos?](#reunião) - - Reunimos informação sobre si assim que se regista no nosso sítio e juntamos dados quando participa no fórum ao ler, escrever e avaliar o conteúdo aí partilhado. - - Ao inscrever-se no nosso sítio, pode ser-lhe pedido para inserir o seu nome e endereço de email. Pode contudo, visitar o nosso sítio sem se registar. O seu endereço de email será verificado por um email contendo uma hiperligação única. Se essa hiperligação for visitada, sabemos que tem controlo do seu endereço de email. - - Ao inscrever-se e publicar, recordamos o endereço IP de onde a publicação é originária. Podemos também reter logs de servidores que incluem endereços IP de todos os pedidos feitos ao servidor. - - - - ## [Para que usamos as suas informações?](#usar) - - Todas as informações que reunimos sobre si podem ser usadas numa das seguintes maneiras: - - * Para personalizar a sua experiência — a sua informação ajuda-nos a responder melhor às suas necessidades individuais. - * Para melhorar o nosso sítio — continuamos a lutar por melhorar as ofertas do nosso sítio com base na informação e feedback que recebemos de si. - * Para melhorar o serviço ao cliente — a sua informação ajuda-nos a responder mais eficazmente aos pedidos de serviço ao cliente e pedidos de suporte. - *Para enviar emails periodicamente — O endereço de email que nos fornece pode ser usado para lhe enviar informação, notificações que peça sobre mudanças em tópicos ou em resposta ao seu nome de utilizador, respostas a inquéritos e/ou outros pedidos ou questões. - - - - ## [Como protegemos a sua informação?](#protect) - - Implementamos uma variedade de medidas de precaução para manter as suas informações pessoais em segurança quando insere, submete ou acede à sua informação pessoal. - - - - ## [Qual é a sua política de retenção de dados?](#retenção-dados) - - Iremos fazer um esforço de boa fé para: - - * Reter logs de servidores contendo o endereço IP de todos os pedidos para este servidor não mais que 90 dias. - * Reter endereços IP associados a utilizadores registados e às suas publicações não mais que 5 anos. - - - - ## [Usamos cookies?](#cookies) - - Sim. Os cookies são pequenos ficheiros que um sítio ou um fornecedor de serviços transfere para o disco do seu computador através do navegador de Internet (se assim o permitir). Estes cookies permitem que o sítio reconheça o seu navegador e, se tiver uma conta registada, associá-lo a essa. - - Usamos cookies para entender e guardar as suas preferências para visitas futuras e compilar dados agregados sobre o tráfego do sítio e a interação com o mesmo para lhe podermos oferecer as melhores experiências e ferramentas no futuro. Podemos contratar fornecedores de serviços para nos ajudarem a entender melhor os visitantes do nosso sítio. Estes fornecedores de serviços não têm permissão para usar a informação reunida em nosso nome excepto para nos ajudar a conduzir e melhorar o nosso negócio. - - - - ## [Divulgamos informação com partes exteriores?](#divulgar) - - Não vendemos, trocamos ou de outra maneira transferimos a sua informação pessoal para partes exteriores. Isto não inclui terceiras partes confiáveis que nos ajudam a operar sítio, conduzir o nosso negócio, ou servi-lo, enquanto estas partes acordarem em manter a informação confidencial. Podemos também partilhar a sua informação quando acreditamos que é apropriado para estar de acordo com a lei, reforçar as políticas do nosso sítio ou proteger os nossos, ou de outros, direitos, propriedades ou segurança. Contudo, informação não-pessoal do visitante pode ser fornecida a outras partes para marketing, publicidade ou outros usos. - - - - ## [Hiperligações de Terceiras Partes](#terceira-parte) - - Ocasionalmente, à nossa descrição, podemos incluir ou oferecer serviços ou produtos de terceiros no nosso sítio. Estes sítios de terceiros têm políticas de privacidade separadas e independentes. Por este motivo, não temos responsabilidade no conteúdo ou atividades destes sítios hiperligados. No entanto, procuramos proteger a integridade do nosso sítio e damos as boas-vindas a qualquer feedback sobre estes sítios. - - - - ## [Cumprimento da Proteção da Privacidade Online Infantil](#coppa) - - O nosso sítio, produtos e serviços são direcionados a pessoas com pelo menos 13 anos de idade. Se este servidor está nos EUA e tem menos de 13 anos de idade, como parte dos requisitos do COPPA ([Proteção da Privacidade Online Infantil](http://en.wikipedia.org/wiki/Children)), não utilize este sítio. - - - - ## [Política de Privacidade Online](#online) - - Estas políticas de privacidade online aplicam-se apenas à informação reunida através do nosso sítio e não à informação reunida offline. - - - - ## [O seu consentimento](#consentimento) - - Ao utilizar o nosso sítio, está a consentir a política de privacidade do nosso sítio. - - - - ## [Mudanças à nossa Política de Privacidade](#mudanças) - - Se decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página. - - Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. + body: " \n\n## [Que informações reunimos?](#reunião) \n\nReunimos informação sobre si assim que se regista no nosso sítio e juntamos dados quando participa no fórum ao ler, escrever e avaliar o conteúdo aqui partilhado. \n\nAo inscrever-se no nosso sítio, pode ser-lhe pedido para inserir o seu nome e endereço de email. Pode contudo, visitar o nosso sítio sem se registar. O seu endereço de email será verificado por um email contendo uma hiperligação única. Se essa hiperligação for visitada, sabemos que tem controlo do seu endereço de email. \n\nAo inscrever-se e publicar, recordamos o endereço IP de onde a publicação é originária. Podemos também reter logs de servidores que incluem endereços IP de todos os pedidos feitos ao servidor. \n\n \n\n## [Para que usamos as suas informações?](#usar) \n\nTodas as informações que reunimos sobre si podem ser usadas numa das seguintes maneiras: \n\n* Para personalizar a sua experiência — a sua informação ajuda-nos a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso sítio — continuamos a lutar por melhorar as ofertas do nosso sítio com base na informação e feedback que recebemos de si. \n* Para melhorar o serviço ao cliente — a sua informação ajuda-nos a responder mais eficazmente aos pedidos de serviço ao cliente e pedidos de suporte. \n* Para enviar emails periodicamente — O endereço de email que nos fornece pode ser usado para lhe enviar informação, notificações que peça sobre mudanças em tópicos ou em resposta ao seu nome de utilizador, respostas a inquéritos e/ou outros pedidos ou questões. \n\n \n\n## [Como protegemos a sua informação?](#protect)\n\nImplementamos uma variedade de medidas de precaução para manter as suas informações pessoais em segurança quando insere, submete ou acede à sua informação pessoal. \n\n \n\n## [Qual é a sua política de retenção de dados?](#retenção-dados)\n\nIremos fazer um esforço de boa fé para: \n\n* Reter logs de servidores contendo o endereço IP de todos os pedidos para este servidor\ + \ não mais que 90 dias. \n* Reter endereços IP associados a utilizadores registados e às suas publicações por não mais que 5 anos. \n\n \n\n## [Usamos cookies?](#cookies) \n\nSim. Os cookies são pequenos ficheiros que um sítio ou um fornecedor de serviços transfere para o disco do seu computador através do navegador de Internet (se assim o permitir). Estes cookies permitem que o sítio reconheça o seu navegador e, se tiver uma conta registada, associá-lo a essa. \n\nUsamos cookies para entender e guardar as suas preferências para visitas futuras e compilar dados agregados sobre o tráfego do sítio e a interação com o mesmo para lhe podermos oferecer as melhores experiências e ferramentas no futuro. Podemos contratar fornecedores de serviços para nos ajudarem a entender melhor os visitantes do nosso sítio. Estes fornecedores de serviços não têm permissão para usar a informação reunida em nosso nome excepto para nos ajudar a conduzir e melhorar o nosso negócio. \n\n \n\n## [Divulgamos informação com partes exteriores?](#divulgar) \n\nNão vendemos, trocamos ou de outra maneira transferimos a sua informação pessoal para partes exteriores. Isto não inclui terceiras partes confiáveis que nos ajudam a operar sítio, conduzir o nosso negócio, ou servi-lo, enquanto estas partes acordarem em manter a informação confidencial. Podemos também partilhar a sua informação quando acreditamos que é apropriado para estar de acordo com a lei, reforçar as políticas do nosso sítio ou proteger os nossos, ou de outros, direitos, propriedades ou segurança. Contudo, informação não-pessoal do visitante pode ser fornecida a outras partes para marketing, publicidade ou outros usos. \n\n \n\n## [Hiperligações de Terceiras Partes](#terceira-parte) \n\nOcasionalmente, à nossa descrição, podemos incluir ou oferecer serviços ou produtos de terceiros no nosso sítio. Estes sítios de terceiros têm políticas de privacidade separadas e independentes. Por este motivo, não temos responsabilidade no conteúdo ou atividades destes sítios hiperligados. No entanto, procuramos\ + \ proteger a integridade do nosso sítio e damos as boas-vindas a qualquer feedback sobre estes sítios. \n\n \n\n## [Cumprimento da Proteção da Privacidade Online Infantil](#coppa) \n\nO nosso sítio, produtos e serviços são direcionados a pessoas com pelo menos 13 anos de idade. Se este servidor está nos EUA e tem menos de 13 anos de idade, como parte dos requisitos do COPPA ([Proteção da Privacidade Online Infantil]( https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), não utilize este sítio. \n\n \n\n## [Política de Privacidade Online](#online) \n\nEstas políticas de privacidade online aplicam-se apenas à informação reunida através do nosso sítio e não à informação reunida offline. \n\n \n\n## [O seu consentimento](#consentimento) \n\nAo utilizar o nosso sítio, está a consentir a política de privacidade do nosso sítio. \n\n \n\n## [Mudanças à nossa Política de Privacidade](#mudanças) \n\nSe decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página. \n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.\n" static: search_help: | -

      Dicas

      +

      Dicas

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

      -

      Opções

      +

      Opções

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

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

      badges: long_descriptions: autobiographer: | - Blá blá blá - Blá blá blá + Este distintivo é concedido por preencher o seu perfil de utilizador e por selecionar uma imagem de perfil. Deixar a comunidade saber mais sobre quem você é e no que está interessado torna a comunidade melhor e mais ligada. first_like: | - Blá blá blá - Blá blá blá + Este distintivo é concedido na primeira vez que gosta de uma mensagem utilizando o botão :heart:. Gostar de mensagens é uma excelente maneira de deixar os seus companheiros membros da comunidade saberem que o que eles postaram foi interessante, útil, giro, ou divertido. Partilhe o amor! first_link: | - Blá blá blá - Blá blá blá + Este distintivo é concedido na primeira vez que coloca uma hiperligação para outro tópico numa resposta. Ligar tópicos ajuda os leitores a encontrarem conversas relacionadas interessantes, ao exibir ligação entre tópicos em ambas as direções. first_quote: | - Blá blá blá - Blá blá blá + Este distintivo é concedido na primeira vez que cita uma mensagem na sua resposta. Citar secções relevantes de mensagens anteriores na sua resposta ajuda a manter as discussões focadas e no tópico. first_share: | - Blá blá blá - Blá blá blá + Este distintivo é concedido na primeira vez que partilha uma hiperligação para uma mensagem ou tópico utilizando o botão de partilha. Partilhar hiperligações é uma excelente maneira de mostrar discussões interessantes com o resto do mundo e de fazer crescer a sua comunidade. read_guidelines: | - Blá blá blá - Blá blá blá + Este distintivo é concedido por ler as diretrizes da comunidade. Seguir e partilhar estas simples diretrizes ajuda a construir uma comunidade segura, divertida e sustentável. reader: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao ler um tópico longo. Ler é fundamental. Ler atentamente ajuda-o a seguir a conversação e leva-o a respostas melhores e mais completas. editor: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao editar a sua mensagem. Não hesite em editar as suas mensagens em qualquer altura para melhorá-las, corrigir pequenos erros, ou adicionar algo que se tenha esquecido. first_flag: | - Sinalizar é crítico para a saúde da nossa comunidade. Se notar qualquer mensagem que requer a atenção do moderador por favor - não hesite em sinalizá-la. Pode também usar o diálogo de sinalização para enviar mensagens aos utilizadores assim que chegar - ao nível de confiança 1. + Este distintivo é concedido ao sinalizar uma mensagem. Sinalizar é crítico para a saúde da sua comunidade. Se notar em alguma mensagem que necessite de atenção do moderador por favor + não hesite em sinalizá-la. Pode também utilizar o diálogo de sinalização para enviar mensagens para colegas utilizadores. nice_share: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao partilhar uma hiperligação para uma mensagem que seja visitada por 25 visitantes externos. Bom trabalho! Partilhar hiperligações para discussões interessantes com amigos é uma excelente maneira de fazer crescer a nossa comunidade. welcome: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando recebe o seu primeiro gosto numa mensagem. Parabéns, publicou algo que os colegas membros da comunidade acham interessante, giro, ou útil! anniversary: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando tiver sido membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por ficar por cá e por contribuir para a nossa comunidade! good_share: | - Blá blá blá - Blá blá blá + Este distintivo é concedido por partilhar uma hiperligação para uma mensagem que seja visitada por 300 visitantes externos. Bom trabalho! Mostrou uma discussão interessante a lotnovas pessoas e ajudou-nos a crescer. great_share: | - Blá blá blá - Blá blá blá + Este distintivo é concedido por partilhar uma hiperligação para uma mensagem que seja visitada por 100 visitantes externos. Uau! Promoveu uma discussão interessante junto de uma enorme nova audiência para esta comunidade, e ajudou-nos a crescer de uma forma exponencial. nice_post: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao criar uma resposta que obtém 10 gostos. Bom trabalho! nice_topic: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao criar um tópico que obtém 10 gostos. Bom trabalho! good_post: | - Blá blá blá - Blá blá blá - good_topic: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao criar uma resposta que obtém 25 gostos. Bom trabalho! + good_topic: |+ + Este distintivo é concedido ao criar um tópico que obtém 25 gostos. Bom trabalho! + great_post: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao criar uma mensagem que obtém 50 gostos. Uau! great_topic: | - Blá blá blá - Blá blá blá + Este distintivo é concedido ao criar uma resposta que obtém 50 gostos. Uau! basic: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando atinge o nível de confiança 1. Obrigado por ficar por cá durante algum tempo e por ler alguns tópicos para aprender do que se trata a nossa comunidade. As suas restrições de novo utilizador foram removidas, e foram-lhe atribuídas habilidades essenciais da comunidade, tais como mensagens pessoais, sinalização, edição da wiki, e a habilidade de publicar imagens e múltiplas hiperligações. member: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para se juntar à nossa comunidade. Agora pode enviar convites pessoais da sua página de utilizador ou tópicos individuais, criar mensagens de grupo, e mais alguns gostos por dia! regular: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando atingir o nível de confiança 3. Obrigado por ser uma parte regular da nossa comunidade por um período de meses, um dos leitores mais ativos e um contribuinte fiável no que torna a comunidade fantástica. Agora pode recategorizar e renomear tópicos, aceder à área do salão privado, sinalizações de spam mais poderosas, e muitos mais gostos por dia. leader: | - Blá blá blá - Blá blá blá + Este distintivo é concedido quando atinge o nível de confiança 4. É um líder nesta comunidade, selecionado pelo pessoal, e define um exemplo positivo para a comunidade nos seus trabalhos e palavras. Tem a habilidade de editar todas as mensagens, realizar ações de moderador de tópicos tais como fixar, fechar, arquivar, dividir e unir, e toneladas de gostos por dia. + admin_login: + success: "Email Enviado" + error: "Erro!" + email_input: "Email Administração" + submit_button: "Enviar Email" + discourse_hub: + access_token_problem: "Dizer a um administrador: Por favor atualize as configurações do sítio para incluir a discourse_org_access_key correta." + performance_report: + initial_post_raw: Este tópico inclui relatórios diários de desempenho para o seu sítio. + initial_topic_title: Relatórios de desempenho do sítio diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 9e6ed66873..1bd2070eea 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -133,6 +133,7 @@ pt_BR: rss_description: latest: "Últimos tópicos" hot: "Tópicos quentes" + posts: "Últimos tópicos" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada." excerpt_image: "imagem" queue: @@ -175,14 +176,6 @@ pt_BR: - Críticas construtivas são bem-vindas, mas critique *idéias*, não pessoas. Para mais, [veja nosso guia da comunidade](/guidelines). Esta mensagem aparecerá somente para o seu primeiro %{education_posts_text}. - avatar: | - ### Que tal uma nova imagem para a sua conta? ⏎ - ⏎ - Você postou alguns tópicos e respostas, mas seu avatar não é tão original como você é -- é o mesmo avatar padrão que todos os novos usuários têm ⏎. - ⏎ - Já considerou **[visitar o seu perfil de usuário](%{profile_path})** e fazer o envio de uma imagem personalizada que representa você?⏎ - ⏎ - É mais fácil para acompanhar as discussões da comunidade e encontrar pessoas interessantes em conversas quando todo mundo tem um avatar exclusivo!⏎ sequential_replies: | ### Considere responder a várias mensagens simultaneamente @@ -236,7 +229,7 @@ pt_BR: no_info_other: "
      %{name} ainda não colocou nada no campo Sobre Mim
      " vip_category_name: "Salão" vip_category_description: "Uma categoria exclusiva para membros com nível de confiança 3 e superior." - meta_category_name: "Meta" + meta_category_name: "Feedback do Site" meta_category_description: "Discussão sobre este fórum, sua organização, como ele funciona e como podemos melhorá-lo." staff_category_name: "Equipe" staff_category_description: "Categoria particular para as discussões da equipe. Tópicos só são visíveis para os administradores e moderadores." @@ -267,7 +260,7 @@ pt_BR: category: topic_prefix: "Sobre a categoria %{category} " replace_paragraph: "[Substitua este primeiro parágrafo com uma breve descrição de sua nova categoria. Esta orientação será exibida na área de seleção de categoria, assim, tente mantê-lo abaixo de 200 caracteres. Até que você edite o texto ou crie tópicos, esta categoria não aparecerá na página de categorias.]" - post_template: "%{replace_paragraph}\n\nUse os parágrados a seguir para uma descrição longa, assim como para estabelecer diretrizes ou regras da categoria.\n\nAlgumas coisas para se considerar em qualquer resposta de discussão:\n\n- Para que serve esta categoria? Porque algum usaria esta categoria para seu tópico?\n\n- Como esta categoria se difere das demais categorias já existentes?\n\n- Nós precisamos desta categoria?\n\n- Deveríamos mesclar esta categoria com outra, ou dividir esta categoria em mais categorias?\n" + post_template: "%{replace_paragraph}\n\nUse os parágrafos a seguir para uma descrição longa, assim como para estabelecer diretrizes ou regras da categoria.\n\nAlgumas coisas para se considerar em qualquer resposta de discussão:\n\n- Para que serve esta categoria? Porque algum usaria esta categoria para seu tópico?\n\n- Como esta categoria se difere das demais categorias já existentes?\n\n- Nós precisamos desta categoria?\n\n- Deveríamos mesclar esta categoria com outra, ou dividir esta categoria em mais categorias?\n" errors: uncategorized_parent: "Sem categoria não pode ter uma categoria pai" self_parent: "A subcategoria mãe não pode ser ela mesma" @@ -376,7 +369,6 @@ pt_BR: one: "há quase 1 ano atrás" other: "há quase %{count} anos atrás" password_reset: - no_token: "Desculpe, mas o link para alteração de senha expirou. Entre novamente e selecione a opção 'Esqueci minha senha' para obter um novo link." choose_new: "Por favor escolhe uma password nova" choose: "Por favor, escolha uma senha" update: 'Atualizar Senha' @@ -390,7 +382,6 @@ pt_BR: please_continue: "Continuar no %{site_name}" error: "Houve um erro ao alterar o seu endereço de email. Talvez o endereço já esteja sendo utilizado?" activation: - action: "Ativar sua conta" already_done: "Desculpe, este link de confirmação não está mais válido. Talvez a sua conta já esteja ativa?" please_continue: "Sua conta agora está confirmada; você vai ser redirecionado para a página inicial." continue_button: "Continuar no %{site_name}" @@ -458,6 +449,7 @@ pt_BR: regular: title: "Tópico Regular" banner: + title: "Tópico Banner" message: make: "Este tópico é agora um banner. Ele aparecerá no topo de cada página até que seja julgado improcedente pelo usuário." remove: "Este tópico não é mais um banner. Ela deixará de aparecer no topo de todas as páginas." @@ -565,6 +557,14 @@ pt_BR: title: "Total" xaxis: "Dia" yaxis: "Solicitações Totais de API" + page_view_logged_in_mobile_reqs: + title: "Requisições de API de usuários logados" + xaxis: "Dia" + yaxis: "Requisições de API de usuários logados mobile" + page_view_anon_mobile_reqs: + title: "Requisições de API de anônimos" + xaxis: "Dia" + yaxis: "Requisições de API de anônimos mobile" http_background_reqs: title: "Background" xaxis: "Dia" @@ -589,6 +589,18 @@ pt_BR: title: "Total" xaxis: "Dia" yaxis: "Solicitações totais" + time_to_first_response: + title: "Tempo para primeira resposta" + xaxis: "Dia" + yaxis: "Tempo médio (horas)" + topics_with_no_response: + title: "Tópicos sem resposta" + xaxis: "Dia" + yaxis: "Total" + mobile_visits: + title: "Visitas de Usuários" + xaxis: "Dia" + yaxis: "Número de visitas" dashboard: rails_env_warning: "Seu servidor está rodando no modo %{env}." ruby_version_warning: "Você está executando uma versão do Ruby 2.0.0, que é conhecido por ter problemas. Atualize para o patch 247 ou superior." @@ -603,7 +615,6 @@ 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 Configurações do Site e atualize estas definições. Veja "How to set up image uploads to S3?" para saber mais.' 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 Configurações e atualize estas definições. Veja "How to set up image uploads to S3?" para saber mais.' 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 para fazer download da última versão.' - failing_emails_warning: 'Há %{num_failed_jobs} processos de e-mail que falharam. Verifique se o seu arquivo config/discourse.conf e garanta que as configurações do servidor de e-mail estão corretas. Veja os processos com falha no Sidekiq.' default_logo_warning: "Defina os logotipos gráficos para o seu site. Atualize logo_url, logo_small_url, e favicon_url nas Configurações do Site." 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 Configurações do Site." contact_email_invalid: "O email de contato do site é inválido. Atualize-o nas Configurações do Site." @@ -656,7 +667,7 @@ pt_BR: max_topic_title_length: "Comprimento máximo permitido para o título do post em caracteres" min_private_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem" min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres" - allow_uncategorized_topics: "Permitir tópicos serem criados sem categoria." + allow_uncategorized_topics: "Permitir criação de tópicos sem uma categoria. NOTA: Se existe algum tópico sem nenhuma categoria, você deve movê-los para uma categoria antes de desabilitar esta opção." uncategorized_description: "A descrição da categoria Sem categoria. Deixe em branco para nenhuma descrição." allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados, idênticos." unique_posts_mins: "Quantos minutos antes para um utilizador poder criar uma postagem com o mesmo conteúdo outra vez?" @@ -679,15 +690,12 @@ pt_BR: category_featured_topics: "Número de tópicos exibidos por categoria na página /categories. Depois de alterar este valor, levará até 15 minutos para a página de categorias atualizar-se." show_subcategory_list: "Mostrar lista de subcategorias ao invés de lista de tópicos ao entrar em uma categoria." fixed_category_positions: "Se selecionado, você será capaz de organizar as categorias em uma ordem fixa. Se nada for feito, as categorias serão listadas em ordem de atividade." + fixed_category_positions_on_create: "Se ativado, a ordenação das categorias vai ser mantida no formulário de criação de tópico. (requer fixed_category_positions)" add_rel_nofollow_to_user_content: "Adicionar \"nofollow\" para todo conteúdo incluído por um usuário, exceto links internos (incluindo sub domínios). Para que as mudanças façam efeito é necessário rodar \"rake posts:rebake\"." + exclude_rel_nofollow_domains: "Uma lista de domínios aonde nofollow não deve ser adicionado nos links. tld.com automaticamente permite sub.tld.com. No mínimo, você deve adiocionar o domínio principal deste site para ajudar os motores de busca encontrarem todo conteúdo. Se outras partes de seu site estão em outros domínios, adicione estes também." 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: "A imagem de logo no topo esquerdo do seu site; se deixado em branco, o título do size será mostrado." - digest_logo_url: "O logo alternativo usado no topo do resumo de e-mails do seu site. Se deixar em branco `logo_url` será usado. eg: http://example.com/logo.png" - logo_small_url: "A pequena imagem de logo no topo à esquerda do seu site, vista quando rolando a página abaixo. Se deixado em branco, um símbolo de homepage será mostrado." - favicon_url: "Um favicon para o seu site" - mobile_logo_url: "A posição fixada da imagem do logo utilizado no canto superior esquerdo do site móvel. Se deixar em branco `logo_url` será usado." 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" @@ -705,8 +713,6 @@ pt_BR: polling_interval: "Com que frequencia os clientes podem solicitar o servidor em milisegundos" 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 )" - auto_track_topics_after: "Quantos milisegundos esperar antes que um tópico seja automaticamente rastreado (0 para sempre, -1 para nunca)" - new_topic_duration_minutes: "Quantos minutos um tópico permanece considerado como novo (-1 para sempre, -2 para desde a última visita)" flags_required_to_hide_post: "As postagens vão ser escondidos automaticamente quando o númereo de sinalizações atingir este número (0 para nunca)" 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_topics_in_first_day: "O número máximo de tópicos que um usuário tem permissão para criar em seu primeiro dia no site" @@ -761,17 +767,18 @@ pt_BR: invite_passthrough_hours: "Quando tempo um usuário pode usar uma chave de convite previamente usada para logar, em horas" invite_only: "Cadastro público está desabilitado, todos os novos usuários devem ser explicitamente convidados por outros membros ou equipe." login_required: "Exigir autenticação para ler conteúdo neste site, desabilitar acesso anônimo." - min_username_length: "Tamanho mínimo de nome de usuário em caracteres. AVISO: QUAISQUER USUÁRIOS EXISTENTES COM NOMES MENORES DO QUE ISSO SERÃO INCAPACITADOS DE ACESSAR O SITE." - max_username_length: "Tamanho máximo de nome de usuário em caracteres. AVISO: QUAISQUER USUÁRIOS EXISTENTES COM NOMES MAIORES DO QUE ISSO SERÃO INCAPACITADOS DE ACESSAR O SITE." + reserved_usernames: "Nomes de usuário não permitidos para criação de contas." min_password_length: "Comprimento mínimo da senha." block_common_passwords: "Não permitir senhas que estiverem entre as 10,000 senhas mais comuns." + enable_sso: "Permite autenticação única atráves de site externo (AVISO: OS ENDEREÇOS DE E-MAIL *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)" enable_sso_provider: "Implementar protocolo do provedor Discourse SSO no caminho /session/sso_provider, requer que sso_secret seja configurado" sso_url: "URL destino do logon único" sso_secret: "String secreta usada para autenticar criptograficamente informação de SSO, esteja certo de que possui 10 ou mais caracteres" - sso_overrides_email: "Substitui e-mail local com site externo de e-mail do servidor SSO (ATENÇÃO: discrepâncias podem ocorrer devido à normalização de e-mails locais)" - sso_overrides_username: "Substitui nome de usuário local com nome de usuário do site externo do servidor SSO (ATENÇÃO: discrepâncias podem ocorrer devido a diferenças nos requerimentos de comprimento de nome de usuário)" - sso_overrides_name: "Substitui nome completo local com nome completo do site externo do conteúdo SSO" + sso_overrides_email: "Substitui endereço de e-mail local pelo fornecido no site externo através de cada informação de login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a normalização de e-mails locais)" + sso_overrides_username: "Substitui nome de usuário local com o fornecido pelo site externo através da informação de cada login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a diferenças ao tamanho e pré-requisitos de nomes de usuário)" + sso_overrides_name: "Substitui nome completo local com nome completo do site externo através da informação de login, e previne mudanças locais." sso_overrides_avatar: "Substitui o avatar do usuário pelo avatar do site externo de SSO. Se habilitado, desabilitar allow_uploaded_avatars é altamente recomendado" + sso_not_approved_url: "Redireciona contas não aprovadas no login externo para este endereço" enable_local_logins: "Habilitar nome de usuário e senha local para autenticação nas contas. (Observação: deve ser habilitado para funcionamento dos convites)" allow_new_registrations: "Permitir registro de novos usuários. Desmarque isso para prevenir quem quer que seja de criar uma nova conta." enable_yahoo_logins: "Ativar autenticação pelo Yahoo" @@ -789,7 +796,6 @@ pt_BR: github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications" allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup" maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente" - backup_daily: "Criar automaticamente um backup do site uma vez ao dia." enable_s3_backups: "Fazer upload dos backups para o S3 quando completado. IMPORTANTE: exige credenciais válidas do S3 configuradas nas Configurações de Arquivos." s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado." active_user_rate_limit_secs: "Qual a frequencia de atualização do campo 'última vez visto em', em segundos." @@ -819,6 +825,8 @@ pt_BR: s3_access_key_id: "A id da chave de acesso da Amazon S3 que será usada para fazer upload de imagens." s3_secret_access_key: "O segredo da chave de acesso da Amazon S3 que será usada para fazer upload de imagens." s3_region: "O nome da região da Amazon S3 que será usada para fazer upload de imagens." + 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." 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." @@ -871,6 +879,9 @@ pt_BR: topic_views_heat_low: "Após este tanto de visualizações, o campo de visualizações é levemente realçado." topic_views_heat_medium: "Após este tanto de visualizações, o campo de visualizações é moderadamente realçado." topic_views_heat_high: "Após este tanto de visualizações, o campo de visualizações é fortemente realçado." + cold_age_days_low: "Depois de N dias de conversa, a última atividade é suavemente escurecida." + cold_age_days_medium: "Depois de N dias de conversa, a última atividade é moderadamente escurecida." + cold_age_days_high: "Depois de N dias de conversa, a última atividade é fortemente escurecida." history_hours_low: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição levemente realçado." history_hours_medium: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição moderadamente realçado." history_hours_high: "Uma postagem editada dentro deste tanto de horas tem o indicador de edição fortemente realçado." @@ -883,7 +894,6 @@ pt_BR: newuser_spam_host_threshold: "Quantas vezes um usuário pode postar um link para o mesmo site dentro de`newuser_spam_host_posts` posts antes de ser considerado spam." white_listed_spam_host_domains: "Uma lista de domínios excluídas do teste de spam. Usuários novos nunca serão restringidos de criar posts com links para estes domínios." staff_like_weight: "Qual o fator de ênfase extra a dar para likes da staff." - topic_view_duration_hours: "Contar nova visualização de um tópico por IP/Usuário a cada N horas" levenshtein_distance_spammer_emails: "Ao equiparar emails de spammers, o número da diferença de caracteres que ainda assim irá permitir uma equiparação imprecisa." max_new_accounts_per_registration_ip: "Se já houver (n) contas com o nível de confiança 0 deste IP (e nenhum for membro da staff ou tiver NC2 ou mais alto), parar de aceitar novas assinaturas daquele IP." min_ban_entries_for_roll_up: "Ao clicar no botão Combinar, criará uma entrada de banimento de subrede se houverem ao menos (N) entradas." @@ -915,18 +925,13 @@ pt_BR: username_change_period: "O número de dias após o registro para que as contas possam mudar o seu nome de usuário (0 para não permitir a mudança de nome de usuário)." email_editable: "Permitir que os usuários alterem o seu endereço de e-mail após o registro." logout_redirect: "Local para onde redirecionar o navegador após o logout EX: (http://somesite.com/logout)" - allow_uploaded_avatars: "Permitir usuários de fazer upload de avatares personalizados." - allow_animated_avatars: "Permitir usuários de usar gifs animados como avatares. AVISO: execute o avatars:refresh rake test após mudar essa configuração." allow_animated_thumbnails: "Gera thumbnails animados a partir de gifs animados." default_avatars: "URLs para avatars que serão usadas por padrão para novos usuários até que sejam alteradas por eles." automatically_download_gravatars: "Fazer download de Gravatars dos usuários ao criar conta ou mudança de email." digest_topics: "O número máximo de tópicos a serem mostrados no resumo via email." digest_min_excerpt_length: "O excerto mínimo de post no resumo via email, em caracteres." - default_digest_email_frequency: "Quantas vezes os usuários recebem emails de resumo por padrão. Eles podem alterar essa configuração em suas preferências." suppress_digest_email_after_days: "Suprimir emails de resumo para usuários não vistos no site há mais do que (n) dias." disable_digest_emails: "Desabilitar emails de resumo para todos os usuários." - default_external_links_in_new_tab: "Abrir links externos em uma nova guia. Os usuários podem mudar isso em suas preferências." - detect_custom_avatars: "Se ou não deve se checar que os usuários fizeram upload de avatares personalizados." max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá checar o Gravatar por avatares personalizados em um dia" public_user_custom_fields: "Um conjunto de campos personalizados para um usuário que podem ser apresentados publicamente." staff_user_custom_fields: "Um conjunto de campos personalizados para um usuário que pode ser mostrado para membros da equipe." @@ -938,31 +943,32 @@ pt_BR: sequential_replies_threshold: "Número de posts que um usuário precisa fazer em seguida num tópico antes de ser relembrado sobre muitas respostas sequenciais." enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o site completo. Desative isso se você quiser usar um estilo personalizado que é totalmente responsivo." dominating_topic_minimum_percent: "Qual o percentual de postagens que um usuário precisa fazer em um tópico antes de ser relembrado sobre ser excessivamente dominante em um tópico." + daily_performance_report: "Analiza logs do NGINX diariamente e cria um tópico na categoria Somente Equipe com os detalhes." suppress_uncategorized_badge: "Não mostrar emblema para assuntos não categorizados em listas de tópicos" global_notice: "Mostrar um banner global URGENTE, de EMERGÊNCIA para todos os visitantes, mude para branco para esconder (HTML permitido)." disable_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado." full_name_required: "Nome completo é um campo obrigatório do perfil do usuário." enable_names: "Mostrar o nome completo do usuário em seu perfil, cartão de usuário, e emails. Desabilitar para esconder o nome completo em todos os lugares." display_name_on_posts: "Também exibir o nome completo do usuário em suas mensagens" + show_time_gap_days: "Se duas mensagens são feitas com N dias de intervalo, mostre o intervalo no tópico." invites_per_page: "Mostrar convites padrões no página de usuário" short_progress_text_threshold: "Após o número de mensagens em um tópico for acima deste número, a barra de progresso mostrará apenas o número da mensagem atual. Se você alterar a largura da barra de progresso, você pode precisar alterar este valor." default_code_lang: "Realce de sintaxe padrão da linguagem de programação aplicada a blocos de código GitHub (lang-auto, Ruby, Python, etc)" warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico mais velho do que este número de dias, um aviso será exibido para desencorajar o usuário de reviver uma velha discussão. Desabilite definindo para 0." autohighlight_all_code: "Aplicar código destacando todos os blocos de código pré-formatados, mesmo quando não for específica o idioma" highlighted_languages: "Incluir regras de destaque de sintaxe. (AVISO: incluir muitas linguagens podem afetar a performance) veja: https://highlightjs.org/static/demo/ para uma demonstração" - embeddable_host: "Servidor que pode incorporar os comentários deste forum Discourse. Apenas o Nome do Servidor, não começar com http://" feed_polling_enabled: "Se um feed RSS / ATOM são importados como mensagens" feed_polling_url: "URL do feed RSS / ATOM para importar" embed_by_username: "Nome de usuário Discourse para o usuário que cria os tópicos" embed_username_key_from_feed: "Chave para puxar nome do usuário discourse a partir do feed." embed_truncate: "Cortar os posts embutidos." - embed_category: "Categoria dos posts embutidos." embed_post_limit: "Número máximo de respostas para embutir" embed_whitelist_selector: "Seletor CSS para os elementos que são permitidos em embeds." embed_blacklist_selector: "Selector CSS para elementos que são removidos dos embeds." notify_about_flags_after: "Se houver sinalizações sem ações após muitas horas, envia um e-mail para contact_email. Ajuste para 0 para desligar." enable_cdn_js_debugging: "Permitir /logs de mostrar os devidos erros ao adicionar permissões de crossorigin em todos os includes de js." show_create_topics_notice: "Se o site tem menos de 5 tópicos públicos, mostrar um aviso pedindo para os administradores criarem alguns tópicos." + delete_drafts_older_than_n_days: Apagar rascunhos mais antigos do que (N) dias. vacuum_db_days: "Executar VACUUM FULL ANALYZE para recuperar o espaço do DB após migrações (definir como 0 para desabilitar)" prevent_anons_from_downloading_files: "Impedir que usuários anônimos façam download de arquivos anexados. AVISO: isso irá impedir quaisquer componentes do site que não sejam imagens, tendo sido postados como anexos, de funcionar." slug_generation_method: "Escolha um método para geração de slug. 'Codificado' irá gerar strings com '%'. 'Nenhum' irá desabilitar a geração de slugs." @@ -971,6 +977,7 @@ pt_BR: enforce_square_emoji: "Forçar proporção quadrangular para todos emojis." approve_post_count: "Quantidade de mensagens de novos usuários que devem ser aprovadas" approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados" + notify_about_queued_posts_after: "Se existirem tópicos aguardando revisão a mais de N horas, um e-mail será enviado para o e-mail de contato. Coloque 0 para cancelar estes e-mails." errors: invalid_email: "Endereço de email inválido" invalid_username: "Não há nenhum usuário com esse nome de usuário." @@ -1017,13 +1024,6 @@ pt_BR: redirected_to_top_reasons: new_user: "Bem vindo a nossa comunidade! Aqui estão os nosso tópicos populares mais recentes." not_seen_in_a_month: "Bem-vindo de volta! Nós não o vemos a um tempo. Estes são os principais tópicos de discussão desde que você foi embora." - move_posts: - new_topic_moderator_post: - one: "Eu movi uma postagem para este novo tópico: %{topic_link}" - other: "Eu movi %{count} postagens para este novo tópico: %{topic_link}" - existing_topic_moderator_post: - one: "Eu movi uma postagem para este tópico: %{topic_link}" - other: "Eu movi %{count} postagens para este tópico: %{topic_link}" change_owner: post_revision_text: "Autoria transferida de %{old_user} para %{new_user}" emoji: @@ -1071,6 +1071,7 @@ pt_BR: not_allowed_from_ip_address: "Você não pode entrar como %{username} a partir deste endereço IP." admin_not_allowed_from_ip_address: "Você não pode entrar como administrador a partir deste endereço IP." suspended: "Você não pode entrar até %{date}." + suspended_with_reason: "Conta suspendida até %{date}: %{reason}" errors: "%{errors}" not_available: "Não disponível. Tente %{suggestion}?" something_already_taken: "Algo deu errado, talvez o nome de usuário ou o email já estejam registrados. Tente o link Esqueci minha Senha." @@ -1078,6 +1079,7 @@ pt_BR: omniauth_error_unknown: "Algo deu errado no processamento do seu login, por favor tente novamente." new_registrations_disabled: "Novas contas não são permitidas neste momento." password_too_long: "Senhas são limitadas a 200 caracteres." + reserved_username: "Este nome de usuário não é permitido." missing_user_field: "Você não completou todos campos de usuário" close_window: "A autenticação está completa. Feche esta janela para continuar." user: @@ -1088,10 +1090,12 @@ pt_BR: characters: "deve incluir apenas números, letras e sublinhados" unique: "tem que ser único" blank: "tem que ser preenchido" - must_begin_with_alphanumeric: "tem de começar com uma letra ou um número" email: not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email." blocked: "não é permitido." + ip_address: + blocked: "Novos registros não são permitidos a partir do seu endereço de IP." + max_new_accounts_per_registration_ip: "Novos registros não são permitidos a partir do seu endereço de IP (quantidade máxima alcançada). Contate um membro da equipe." invite_mailer: subject_template: "%{invitee_name} convidou você para '%{topic_title}' em %{site_domain_name}" text_body_template: | @@ -1167,38 +1171,8 @@ pt_BR: [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Nova versão do Discourse, atualização disponível" - text_body_template: | - Uma nova versão do [Discourse](http://www.discourse.org) está disponível. - - Sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Recomendamos: - - - Ver o que há de novo nas [mudanças do GitHub] (https://github.com/discourse/discourse/commits/master) - - - Atualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) e pressionando o botão de "Atualizar". - - - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, discussões e suporte para o Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] atualização disponível" - text_body_template: | - Uma nova versão do [Discourse](http://www.discourse.org) está disponível. - - Sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Sugerimos: - - - Ver o que há de novo nas [mudanças do GitHub] (https://github.com/discourse/discourse/commits/master) - - - Atualizar visitando [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) e pressionando o botão de "Atualizar". - - - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, discussões e suporte para o Discourse. - - ### Notas de lançamento - - %{notes} flags_reminder: flags_were_submitted: one: "Essas sinalizações foram submetidos mais de 1 hora." @@ -1209,6 +1183,14 @@ pt_BR: subject_template: one: "1 sinalização aguardando a ser controlada" other: "%{count} sinalizações aguardando a ser controladas" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 mensagem aguardando revisão" + other: "[%{site_name}] %{count} mensagens aguardando revisão" + text_body_template: | + Olá, + + Existem tópicos de usuários novos que aguardam serem revisados. [Eles podem ser aprovados ou rejeitados aqui](%{base_url}/queued-posts). flag_reasons: off_topic: "Sua postagem foi sinalizada como **off-topic**: a comunidade sente que não é uma boa adequação ao tópico, como atualmante definido de acordo com o título e o primeiro post." inappropriate: "Sua postagem foi sinalizada como **não apropriada**: a comunidade sente que ela é ofensiva, abusiva, ou uma violação das [nossas orientações da comunidade](/guidelines)." @@ -1220,79 +1202,10 @@ pt_BR: disagreed: "Obrigado por nos avisar. Nós estamos olhando nele." deferred: "Obrigado por nos avisar. Nós estamos olhando nele." deferred_and_deleted: "Obrigado por nos avisar. Nós removemos o post." - temporarily_closed_due_to_flags: "Este tópico foi temporariamente fechado devido à um grande número de sinalizações da comunidade" + temporarily_closed_due_to_flags: "Este tópico foi temporariamente fechado devido a um grande número de sinalizações da comunidade." system_messages: post_hidden: subject_template: "%{site_name} Aviso: Postagem escondida devido a Sinalização pela Comunidade" - usage_tips: - text_body_template: | - Dicas rápidas para iniciar: - - ## Continue a rolagem - - Não existem botões de próxima página ou números de página - para ler mais, **apenas continue a rolagem para baixo!** - - A medida que novas mensagens chegam, elas irão aparecer automaticamente. - - ## Onde estou? - - - Para buscar, sua página de usuário, ou o menu, use o botão **ícone ☰ no lado superior direito**. - - - Qualquer título de tópico o levará a próxima mensagem não lida. Use o tempo de última atividade e contagem de mensagens para entrar no início ou final. - - - Enquanto estiver lendo um tópico, pule para o inicio ↑ selecionando o título do tópico. Selecione a barra de progresso verde no canto inferior direito para completo controle de navegação, ou use as teclas de início e fim. - - - - ## Como eu respondo? - - - Para responder ao tópico todo, use o botão de Resposta no final da página. - - - Para responder a uma mensagem específica, use o botão de Resposta daquela mensagem. - - - Para iniciar uma conversa em diferentes direções, e mantê-las conectadas, use a Responder com Tópico conectado a direita da mensagem. - - Para citar alguém em sua resposta, selecione o texto que quer citar, então pressione qualquer botão de Resposta. - - - - Para notificar alguém em sua resopsta, mencione seu nome. Digite `@` e uma seleção de auto completar irá surgir. - - - - Para [Emoji padrão](http://www.emoji.codes/), comece digitando `:` ou um tradicional sorriso `:)` :smile: - - ## O que mais eu posso fazer? - - Existem botões de ações no final de cada mensagem. - - - - Para deixar alguém saber que você gostou de sua mensagem, use o botão **like**. Se você ver um problema com uma mensagem, de forma privada, notifique a pessoa ou a equipe, por meio do botão **flag**. - - Você pode também **compartilhar** um link para uma mensagem, ou **bookmark** para consultar depois na sua página de usuário. - - ## Quem está falando comigo? - - Quando alguém responde a uma mensagem sua, citação sua mensagem, ou indica seu `@nomedeusuário`, um número irá aparecer imediatamente no canto superior direito da página. Use para acessar suas **notificações**. - - - - Não se preocupe se perder uma resposta – você receberá um email com respostas (e mensagens) se não estiver online quando ela chegar. - - ## Quando conversas são novas? - - Por padrão toda conversa a menos de dois dias são consideradas novas, e qualquer conversa que você participou (respondeu, criou, ou leu a certo tempo) será automaticamente rastreada. - - Você irá ver os números indicadores novos próximo aos tópicos: - - - - Você pode mudar o estado de notificação individual de um tópico por meio do controle no final do tópico (também pode ser definido por categoria). Para mudar como seus tópicos são rastreados, ou a definição de novo, veja [preferências de usuário](%{base_url}/my/preferences). - - ## Por que não posso fazer certas coisas? - - Novos usuários são limitados por razões de segurança. Conforme participar, irá ganhar confiança da comunidade, e se tornar um cidadão completo, e as limitações serão removidas automaticamente. Em um [nível de confiabilidade](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) bem alto, você ganhará mais habilidades para nos ajudar a gerenciar a comunidade. welcome_user: subject_template: "Bem-vindo ao %{site_name}!" text_body_template: | @@ -1329,7 +1242,7 @@ pt_BR: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Backup completado com sucesso" - text_body_template: "O backup foi bem sucedido.\nVisite a [administração > seção backup](/admin/backups) para fazer download do seu novo backup." + text_body_template: "O backup foi bem sucedido. Visite a [admin > seção backup](%{base_url}/admin/backups) para baixar seu novo backup." backup_failed: subject_template: "O backup falhou" text_body_template: | @@ -1484,7 +1397,6 @@ pt_BR: download_remote_images_disabled: subject_template: "Baixar imagens remotas desativado" text_body_template: "A configuração `download_remote_images_to_local` está desativada porque o espaço limite no disco configurado em `download_remote_images_threshold` foi alcançado." - unsubscribe_link: "Se você deseja se desinscrever destes emails, visite suas [preferências do usuário](%{user_preferences_url})." subject_re: "Re:" subject_pm: "[PM]" user_notifications: @@ -1598,6 +1510,8 @@ pt_BR: set_password: subject_template: "[%{site_name}] Definir Senha" text_body_template: "Alguém solicitou para adicionar uma senha para a sua conta em [%{site_name}] (% {base_url}). Alternativamente, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc) que está associado a este endereço de e-mail validado.\n \nSe você não fez esse pedido, você pode ignorar este e-mail. \n \nClique no link abaixo para escolher uma senha: \n%{base_url}/users/password-reset/%{email_token}\n" + admin_login: + subject_template: "[%{site_name}] Login" account_created: subject_template: "[%{site_name}] Sua nova Conta" text_body_template: | @@ -1631,7 +1545,6 @@ pt_BR: (Se precisar se comunicar com um [membro interno](%{base_url}/about) como um novo usuário, só responder a esta mensagem.) signup: - subject_template: "[%{site_name}] Ativar a sua nova conta" text_body_template: | Ben-vindo ao %{site_name}! @@ -1663,8 +1576,6 @@ pt_BR: too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB)." images: too_large: "Desculpe, a imagem que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor a redimensione e tente novamente." - fetch_failure: "Desculpe, houve um erro ao transferir a imagem." - unknown_image_type: "Desculpe, mas o arquivo que você tentou enviar não parece ser uma imagem." size_not_found: "Desculpe, mas não conseguimos determinar o tamanho da imagem. É possível que seu arquivo de imagem esteja corrompido?" flag_reason: sockpuppet: "Um novo usuário criou um tópico e outro novo usuário no mesmo endereço IP respondeu. Veja a configuração flag_sockpuppets." @@ -1696,125 +1607,68 @@ pt_BR: static_topic_first_reply: "Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name} \n" guidelines_topic: title: "Perguntas frequentes/Diretrizes" - body: "\n\n## [Este é um Lugar Civilizado para Discussão Pública](#civilized)\n\nPor gentileza trate este fórum de discussão com o mesmo respeito que você teria em um parque público. Nós, também, somos uma comunidade de recursos compartilhados — um local para compartilhar habilidades, conhecimento e interesses através da discussão em andamento.\n\nEstas não são regras duras e firmes, meramente suportes ao julgamento humano de nossa comunidade. Use estas diretrizes para manter um lugar claro, bem-iluminado de conversa pública civilizada.\n\n\n\n## [Melhore a Discussão](#improve)\n\nAjude-nos a fazer deste um grande lugar de discussão ao trabalhar sempre para melhorar a discussão de alguma forma, mesmo que pequena. Se você estiver incerto de que o seu post acrescenta à conversa, pense melhor no que você quer dizer e tente novamente depois.\n\nOs tópicos discutidos aqui importam para nós, e nós queremos que você aja como se eles importassem para você, também. Seja respeitoso com os tópicos e as pessoas que os discutem, ainda que você discorde com algo do que está sendo dito.\n\nUma forma de melhorar a discussão é por descobrir algumas que já estão acontecendo. Por favor passe algum tempo navegando nos tópicos aque antes de responder ou iniciar o seu próprio, e você terá uma chance de conhecer outros que compartilham dos seus interesses.\n\n\n\n## [Seja Agradável, Mesmo Quando Você Discorda](#agreeable)\n\nVocê pode querer responder à algo discordando. Tudo bem. Mas, lembre-se de _criticar idéias, não pessoas_. Por gentileza evite:\n\n* Xingamentos\n* Ataques ad hominem\n* Responder ao tom de um post ao invés do seu conteúdo efetivo.\n* Contradição impensada.\n\nAo invés disso, ministre contra-argumentos razoáveis que aprimorem a conversa.\n\n\n\n## [Sua Participação Conta](#participate)\n\nAs conversas que nós temos aqui colocam um ambiente para todos. Ajude-nos a influenciar o futuro desta comunidade escolhendo empenhar-se em discussões que façam deste fórum um lugar interessante para se estar — e evitando\ - \ aquelas que não façam.\n\nO Discourse fornece ferramentas que permitem a comunidade de identificar coletivamente as melhores (e piores) contribuições: favoritos, likes, sinalizações, respostas, edits, e assim em diante. Utilize estas ferramentas para aprimorar sua própria experiência, e também a de todos os outros.\n\nVamos tentar deixar nosso parque melhor do que nós o encontramos.\n\n\n\n## [Se Você Ver um Problema, Sinalize-o](#flag-problems)\n\nModeradores têm autoridade especial; eles são responsáveis por este fórum. Mas você também. Com a sua ajuda, moderadores podem ser facilitadores da comunidade, não zeladores ou polícia.\n\nQuando você vê um comportamento ruim, não responda. Isso encoraja o comportamento ruim por reconhecê-lo, consume a sua energia, e desperdiça o tempo de todos. _Apenas sinalize-o_. Se as sinalizações aumentam o suficiente, ação será tomada, seja automaticamente ou através de intervenção da moderação.\n\nDe modo a manter nossa comunidade, moderadores se reservam o direito de remover qualquer conteúdo e qualquer conta de usuário por qualquer motivo e quando quer que seja. Moderadores não prevêem novos posts de qualquer modo; os moderadores e operadores do site não têm qualquer responsabilidade por qualquer conteúdo postado pela comunidade.\n\n\n\n## [Sempre Seja Civilizado](#be-civil)\n\nNada sabota uma conversa saudável como a grosseria:\n\n* Seja civilizado. Não poste qualquer coisa que uma pessoa razoável consideraria ofensivo, abusivo, ou discurso de ódio.\n* Deixe-o limpo. Não poste qualquer coisa obscena ou sexualmente explícita.\n* Respeite aos demais. Não perturbe ou aflija, se passe por outras pessoas, ou exponha suas informações particulares.\n* Respeite nosso fórum. Não poste spam ou vandalize o fórum de algum outro modo.\n\nEstes não são termos concretos com definições precisas — evite mesmo a _aparência_ de qualquer destas coisas. Se você estiver incerto, pergunte-se como você se sentiria se sua postagem fosse veiculada na primeira página do New York Times.\n\nEste é um fórum público, e motores de busca indexam\ - \ estas discussões. Mantenha a linguagem, links, e imagens seguros para família e amigos.\n\n\n\n## [Mantenha-o Arrumado](#keep-tidy)\n\nFaça um esforço para colocar coisas no lugar certo, para que assim nós possamos passar mais tempo discutindo e menos limpando. Assim:\n\n* Não inicie um tópico na categoria incorreta.\n* Não faça postagens cruzadas da mesma coisa em múltiplos tópicos.\n* Não poste respostas sem conteúdo.\n* Não desvie um tópico mudando-no em meio à correnteza.\n* Não assine seus posts — cada postagem tem sua informação de perfil anexada à ela. \n\nAo invés de postar \"+1\" ou \"Concordo\", use o botão Like. Ao invés de levar um tópico existente numa direção radicalmente diferente, utilize Responder como um Tópico Linkado.\n\n\n\n## [Poste Apenas Suas Próprias Coisas](#stealing)\n\nVocê deve não postar o que quer que seja digital que pertence a outro sem permissão. Você deve não postar descrições de, links para, ou métodos para roubar a propriedade intelectual de outro (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei.\n\n\n\n## [Powered by Você](#power)\n\nEste site é operado pela suar [amigável staff local](/about) e *você*, a comunidade. Se você tiver quaisquer outras questões sobre como as coisas devem funcionar aqui, abra um novo tópico na [categoria meta](/c/meta) e vamos discutir! Se houver um assunto crítico ou urgente que não puder ser resolvido por um tópico meta ou sinalização, entre em contato conosco através da [página da staff](/about).\n\n\n\n## [Terms of Service](#tos)\n\nSim, juridiquês é chata, mas nós devemos nos proteger – e por extensão, você e seus dados – contra pessoas não-amigáveis. Nós temos um [Termos of Serviço](/tos) descrevendo a sua (e a nossa) conduta e direitos relacionados a conteúdo, privacidade e leis. Para usar este serviço, você deve concordar em permanecer por nossos [TOS](/tos).\n" tos_topic: title: "Termos de Serviço" - body: "Os seguintes termos e condições regem todo o uso do site %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do site, incluindo, mas não limitado a, o Software do Fórum do %{company_domain}, o Fóruns de Suporte do %{company_domain} e o serviço de hospedagem (\"hosting\") do %{company_domain}, (em conjunto, o site). O site é propriedade e operada por %{company_full_name} (\"%{company_name}\"). O Site é oferecido sujeito à sua aceitação, sem modificação de todos os termos e condições contidos neste documento e todas as outras regras operacionais, políticas (incluindo, sem limitação, a [Política de Privacidade](/privacy) e [Regras da Comunidade ](/faq)) e procedimentos do %{company_domain} que possam ser publicadas de tempos em tempos neste site por %{company_name} (coletivamente, o \"Contrato\").\n\nPor favor, leia este Contrato cuidadosamente antes de acessar ou utilizar o site. Ao acessar ou utilizar qualquer parte do web site, você concorda em ficar vinculado aos termos e condições deste acordo. Se você não concordar com todos os termos e condições deste contrato, então você não pode acessar o site ou utilizar qualquer serviço. Se estes termos e condições são consideradas uma oferta por %{company_name}, a aceitação é expressamente limitada a estes termos. O site está disponível apenas para indivíduos que são pelo menos 13 anos de idade.\n\n\n\n## [1. Sua conta %{company_domain}](#1)\n\nSe você criar uma conta no site, você é responsável por manter a segurança da sua conta e você é totalmente responsável por todas as atividades que ocorrem sob a conta. Você deve notificar imediatamente %{company_name} de qualquer uso não autorizado de sua conta ou qualquer outra violação de segurança. %{company_name} não será responsável por quaisquer atos ou omissões por você, incluindo quaisquer danos de qualquer tipo incorridos como resultado de tais atos ou omissões.\n\n\n\n## [2. Responsabilidade de Contribuintes](#2)\n\nSe você postar o material no site, postar links no site, ou de outra forma (ou permitir que terceiros o fazem) material disponível por meio do\ - \ site (qualquer material, \"Conteúdo\"), Você é inteiramente responsável pelo conteúdo de, e qualquer dano resultante do que de conteúdo. Esse é o caso, independentemente de o conteúdo em questão constitui um texto, gráficos, um arquivo de áudio, ou software de computador. Ao deixar o conteúdo disponível, você declara e garante que: \n\n* O download, cópia e uso do Conteúdo não irá infringir os direitos de propriedade, incluindo, mas não se limitando aos direitos autorais, patentes, marcas ou direitos de segredo comercial, de qualquer terceiro; \n* Se o seu empregador tem direitos de propriedade intelectual que você cria, você tem (i) recebeu permissão do seu empregador para publicar ou tornar disponível o conteúdo, incluindo, mas não limitado a qualquer software, ou (ii) garantiu de seu empregador uma renúncia como de todos os direitos ou ao conteúdo; \n* Você tem cumprido plenamente todas as licenças de terceiros relativas ao conteúdo, e ter feito todas as coisas necessárias para passar com êxito para usuários finais através de quaisquer condições exigidas; \n* O conteúdo não contém ou instala qualquer vírus, worms, malware, cavalos de Tróia ou outros conteúdos prejudiciais ou destrutivas; \n* O conteúdo não é spam, não é por máquina ou gerado aleatoriamente, e não contém conteúdo comercial antiético ou indesejados projetados para direcionar o tráfego para sites de terceiros ou impulsionar motor de pesquisa rankings de sites de terceiros, ou para atos mais ilícitos (tais como phishing) ou iludir os destinatários quanto à fonte do material (como falsificação); \n* O conteúdo não é pornográfico, não contém ameaças ou incita a violência, e não viola a privacidade ou direitos de publicidade de terceiros; \n* O seu conteúdo não está sendo anunciado através de mensagens eletrônicas indesejadas como spam links em newsgroups, listas de e-mails, blogs e sites, e métodos promocionais não solicitados semelhantes; \n* O seu conteúdo não tem o nome de uma maneira que engana os seus leitores a pensar que você é outra pessoa ou empresa; e\n* você tem, no caso de Conteúdo que inclui código de computador, com categorizados\ - \ com precisão e/ou descrito o tipo, natureza, usos e efeitos dos materiais, se solicitado a fazê-lo por %{company_name} ou de outra forma.\n\n\n\n## [3. Conteúdo de Licença de Usuário](#3)\n\nContribuições do usuário são licenciada sob uma Licença [Creative Commons Atribuição-Uso Não-Comercial-Compartilhamento pela mesma licença 3.0 Unported](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem limitar qualquer dessas representações ou garantias, o %{company_name} tem o direito (mas não a obrigação) de, no exclusivo critério do %{company_name}(i) recusar ou remover qualquer conteúdo que, parecer razoável no %{company_name}, violando qualquer política do %{company_name} ou seja de alguma forma prejudicial ou censurável, ou (ii) rescindir ou negar o acesso e utilização do Site para qualquer indivíduo ou entidade, por qualquer motivo, em uma única discrição do %{company_name}. O %{company_name} não terá obrigação de fornecer um reembolso de quaisquer montantes já pagos.\n\n\n\n\n## [4. Pagamento e Renovação](#4)\n\n### Termos Gerais\n\nServiços opcionais pagos ou atualizações podem estar disponíveis no site. Ao utilizar um serviço opcional pago ou atualização, você concorda em pagar ao %{company_name} as taxas mensais ou anuais de assinatura indicados. Os pagamentos serão cobrados em uma base de pré-pago no dia que você começar a utilizar o serviço ou atualização e cobrirá o uso desse serviço ou atualizações para um período de subscrição mensal ou anual, conforme indicado. **Estas taxas não são reembolsáveis**.\n\n### Renovação automática\n\nA menos que você notifique o %{company_name} antes do final do período de subscrição aplicável que você deseja cancelar um serviço ou atualização, sua assinatura será renovada automaticamente e você nos autoriza a cobrar a taxa anual ou mensal de assinatura então aplicável (assim como qualquer impostos), utilizando qualquer cartão de crédito ou outro mecanismo de pagamento, há o registro para você. As inscrições podem ser cancelados a qualquer momento.\n\n\n\n## [5. Serviços](#5)\n\n### Hospedagem, Serviços de Suporte\n\ - \nServiços de Hospedagem e Suporte opcional pode ser fornecido pelo %{company_name} nos termos e condições para cada tipo de serviço. Ao inscrever-se para uma conta de serviços de hospedagem/Suporte, você concorda em cumprir com esses termos e condições.\n\n\n\n## [6. Responsabilidade dos Visitantes do Site](#6)\n\n%{company_name} não analisou e não pode rever, todo o material, incluindo programas informáticos, postado no site, e não pode, portanto, ser responsável pelo conteúdo, uso ou efeitos desse material. Ao trabalhar com o site, %{company_name} não representa nem implica que aprova o material postado lá, ou que acredita que tal material possa ser exato, útil ou não prejudicial. Você é responsável por tomar as precauções necessárias para proteger a si e seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivas. O site pode conter conteúdo que é ofensivo, indecente ou censurável, bem como o conteúdo que contenha imprecisões técnicas, erros tipográficos e outros erros. O site também podem conter material que viole a privacidade ou direitos de publicidade, ou infrinja a propriedade intelectual e outros direitos de propriedade, de terceiros, ou o download, cópia ou utilização que esteja sujeita aos termos e condições adicionais, declarada ou não declarada. O %{company_name} se exime de qualquer responsabilidade por qualquer dano resultante do uso pelos visitantes do site, ou de qualquer download por esses visitantes de conteúdo postado lá.\n\n\n\n## [7. Conteúdo Publicado em Outros Sites](#7)\n\nNós não revemos, e não podemos analizar, todo o material, incluindo software de computador, disponibilizado através dos sites e páginas da web para os links do %{company_domain}, e que apontam para %{company_domain}. O %{company_name} não tem qualquer controle sobre esses sistes não-%{company_domain} e páginas da web, e não é responsável por seu conteúdo ou a sua utilização. Ao conectar-se para um site não-%{company_domain} ou página da web, o %{company_name} não representa nem implica que aprova tal site ou página web. Você é responsável\ - \ por tomar as precauções necessárias para proteger a si e seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivas. O %{company_name} se isenta de qualquer responsabilidade por qualquer dano resultante do uso de sites não-%{company_domain} e páginas da web.\n\n\n\n## [8. Violação de Direitos Autorais e Política DMCA](#8)\n\nComo %{company_name} pede que os outros respeitem os seus direitos de propriedade intelectual, que respeite os direitos de propriedade intelectual de terceiros. Se você acredita que o material localizado em ou ligados por %{company_domain} viola seus direitos autorais, e se este site reside nos EUA, você é encorajado a notificar %{company_name} a política [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\"). %{company_name} irá responder a todos esses avisos, incluindo como necessário ou apropriado, removendo o material ilícito ou desabilitando todos os links para o material infrator. O %{company_name} encerrar o acesso do visitante e utilização do Website se, em circunstâncias apropriadas, o visitante está determinado a ser um infrator reincidente de direitos autorais ou outros direitos de propriedade intelectual do %{company_name} ou outros. No caso de rescisão, o %{company_name} não terá nenhuma obrigação de fornecer um reembolso de quaisquer montantes pagos anteriormente para %{company_name}.\n\n\n\n\n## [9. Propriedade Intelectual](#9)\n\nO presente Acordo não transfere do %{company_name} a você qualquer propriedade intelectual do %{company_name} ou de terceiros do partido, e todos os direitos, títulos e interesses relativos à propriedade permanecerá (entre as partes) apenas com %{company_name}. O %{company_name}, %{company_domain}, o logotipo %{company_domain}, e todas as outras marcas comerciais, marcas de serviço, gráficos e logotipos utilizados em conexão com %{company_domain}, ou no site são marcas comerciais ou marcas registradas de %{company_name} ou licenciadores do %{company_name}. Outras marcas comerciais, marcas de serviço, gráficos e logotipos\ - \ utilizados em conexão com o site podem ser marcas comerciais de terceiros. O seu uso do Site lhe concede nenhum direito ou licença para reproduzir ou utilizar qualquer %{company_name} ou marcas registradas de terceiros.\n\n\n\n## [10. Anúncios](#10)\n\nO %{company_name} reserva-se o direito de exibir anúncios em seu conteúdo, a menos que você tenha comprado uma atualização Ad-livre ou uma conta de Serviços.\n\n\n\n## [11. Atribuição](#11)\n\nO %{company_name} reserva-se o direito de exibir links de atribuição como ‘Powered by %{company_domain}’, autor do tema e atribuição de fonte no rodapé do conteúdo ou barra de ferramentas. Créditos no rodapé e na barra de ferramentas do %{company_domain} não podem ser removidos independentemente de upgrades comprados.\n\n\n\n## [12. Mudanças](#12)\n\nO %{company_name} reserva-se o direito de, a seu exclusivo critério, modificar ou substituir qualquer parte do presente Acordo. É sua responsabilidade verificar este Acordo periodicamente para mudanças. Seu uso continuado ou acesso ao site após a publicação de quaisquer alterações a este Acordo constitui aceitação dessas alterações. O %{company_name} também pode, no futuro, oferecer novos serviços e/ou recursos por meio do site (incluindo o lançamento de novas ferramentas e recursos). Esses novos recursos e/ou serviços estará sujeito aos termos e condições deste Contrato.\n\n\n\n## [13. Rescisão](#13)\n\nO %{company_name} poderá rescindir seu acesso a todo ou qualquer parte do Website, a qualquer momento, com ou sem justa causa, com ou sem aviso prévio, com efeito imediato. Se você deseja rescindir este Contrato ou sua conta no %{company_domain} (se você tiver um), você pode simplesmente deixar de usar o site. Todas as disposições do presente Acordo, que por sua natureza devem sobreviver a rescisão após a rescisão, incluindo, sem limitação, as disposições de propriedade, isenções de garantia, indenização e limitações de responsabilidade.\n\n\n\n## [14. Renúncia de Garantias](#14)\n\nO site é fornecido \"tal como está\". O %{company_name} e seus\ - \ fornecedores e licenciadores renunciam a todas as garantias de qualquer tipo, expressa ou implícita, incluindo, sem limitação, as garantias de comercialização, adequação a uma finalidade específica e não-violação. Nem o %{company_name} e nem os seus fornecedores e licenciadores, fazem qualquer garantia de que o site será livre de erros ou que cesso aos mesmos será contínuo ou ininterrupto. Se você está lendo esta, aqui está [um deleite](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Você entende que o seu download a partir, ou outra forma de obter conteúdos ou serviços por meio, o Site da Web é por sua própria conta e risco.\n\n\n\n## [15. Limitação de Responsabilidade](#15)\n\nEm nenhuma hipótese o %{company_name}, seus fornecedores ou licenciadores, serão responsáveis ​​em relação a qualquer matéria do presente acordo por força de contrato, negligência, responsabilidade estrita ou qualquer outra teoria legal ou equitativa para: (i) quaisquer danos especiais, incidentais ou danos consequentes; (ii) o custo de aquisição de produtos ou serviços substitutos; (iii) a interrupção do uso ou perda ou corrupção de dados; ou (iv) por quaisquer valores que excedam as taxas pagas por você para o %{company_name} nos termos deste contrato durante o período de 12 (doze) meses anteriores à causa de pedir. %{company_name} não terá nenhuma responsabilidade por qualquer falha ou atraso devido a questões alheias à sua vontade razoável. O disposto neste artigo não se aplicam à medida proibida pela lei aplicável.\n\n\n\n## [16. Representação Geral e Garantia](#16)\n\nVocê representa e garante que (i) o seu uso do site será em estrita conformidade com a [Política de Privacidade](/privacy) do %{company_name}, [Diretrizes da Comunidade](/guidelines), com este Acordo e com todas as leis aplicáveis e regulamentos (incluindo, sem limitação, quaisquer leis ou regulamentos locais em seu país, estado, cidade ou outra área governamental, em relação à conduta on-line e conteúdo aceitável, incluindo todas as leis aplicáveis ​​com relação à transmissão de dados técnicos\ - \ exportados do país em que este website reside ou do país onde você reside) e (ii) o uso do website não infrinja ou apropriação indevida de direitos de propriedade intelectual de terceiros.\n\n\n\n## [17. Indenização](#17)\n\nVocê concorda em indenizar e isentar o %{company_name}, seus contratados, e seus licenciadores, e seus respectivos conselheiros, diretores, funcionários e agentes de e contra todas e quaisquer reivindicações e despesas, incluindo honorários advocatícios, decorrentes de seu uso de do site, incluindo mas não limitado a sua violação deste Acordo.\n\n\n\n## [18. Diversos](#18)\n\nEste acordo constitui o acordo inteiro entre %{company_name} e você em relação à questão ora tratada, e só pode ser modificado por uma emenda por escrito assinado por um executivo autorizado do %{company_name}, ou pela postagem por %{company_name} de uma versão revisada. Exceto o definido em lei aplicável, se for o caso, disponha em contrário, o presente Acordo, qualquer acesso ou uso do Site serão regidos pelas leis do Estado da Califórnia, EUA, excluindo seus conflitos de provisões da lei, e o local adequado para quaisquer litígios decorrentes ou relacionados com qualquer do mesmo serão os tribunais estaduais e federais localizados no Condado de San Francisco, Califórnia. Exceto para pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de caução), qualquer litígio decorrente do presente Acordo serão resolvidos de acordo com as Regras de Arbitragem abrangentes da Arbitragem Judicial e Serviço de Mediação, Inc. (\"JAMS\") por três árbitros nomeados em conformidade com tais regras. A arbitragem terá lugar em San Francisco, Califórnia, no idioma Inglês ea decisão arbitral pode ser executada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Contrato terá direito a custos e honorários advocatícios. Se qualquer parte deste Contrato for considerada inválida ou inexequível, essa parte será interpretada de modo a refletir a intenção\ - \ original das partes, e as parcelas restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Contrato ou qualquer violação da mesma, em qualquer instância, não vai renunciar tal termo ou condição ou qualquer violação subsequente. Você pode transferir seus direitos sob este Contrato a qualquer partido que consente em, e concorda em ficar vinculado por seus termos e condições; O %{company_name} pode ceder seus direitos sob este Contrato sem qualquer condição. Este acordo será vinculam e reverterá em benefício das partes, seus sucessores e cessionários autorizados.\n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013. \n\nOriginalmente adaptado do WordPress [Termos de serviço](http://en.wordpress.com/tos/).\n" privacy_topic: title: "Política de Privacidade" - body: "\n\n## [Quais as informações que recolhemos?](#coleta)\n\nColetamos informações de você quando você se cadastra em nosso site e coletamos dados quando você participar do fórum, lendo, escrevendo, e avaliar o conteúdo compartilhado aqui. \n\nAo se cadastrar em nosso site, você pode ser solicitado a digitar seu nome e e-mail. Você pode, entretanto, visite nosso site, sem registrar. O seu endereço de e-mail será verificado por um e-mail contendo um link único. Se o link é visitado, sabemos que você controla o endereço de e-mail. \n\nQuando registrado e fazendo postagens, registramos o endereço IP que originou o post. Também podemos manter os logs do servidor, que incluem o endereço IP de todos os pedidos para o nosso servidor.\n\n\n\n## [Em que usamos as suas informações?](#uso)\n\nQualquer uma das informações que coletamos de você pode ser usado em uma das seguintes formas: \n\n* Para personalizar a sua experiência — sua informação nos ajuda a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso site — nós nos esforçamos continuamente para melhorar as nossas ofertas de site com base nas informações e feedback que recebemos de você. \n* Para melhorar o serviço ao cliente — sua informação nos ajuda a responder mais eficazmente às suas solicitações de serviço ao cliente e as necessidades de apoio. \n* Para enviar periodicamente e-mails — O endereço de e-mail que você fornece pode ser usado para enviar-lhe informações, as notificações que você quando há mudanças tópicos que solicitou ou em resposta a seu nome de usuário, responder a perguntas, e/ou outras solicitações ou perguntas.\n\n\n\n## [Como vamos proteger a sua informação?](#protecao)\n\nImplementamos uma série de medidas de segurança para manter a segurança de suas informações pessoais quando você entra, envia ou acessa suas informações pessoais.\n\n\n\n## [Qual é a sua política de retenção de dados?](#retencao-dados)\n\nNós vamos fazer um esforço de boa fé para: \n\n* Manter registros do servidor contendo o endereço\ - \ IP de todos os pedidos para este servidor não mais que 90 dias. \n* Manter os endereços de IP associados a usuários registrados e suas mensagens não mais que 5 anos.\n\n\n\n## [Nós usamos cookies?](#cookies)\n\nSim. Cookies são pequenos arquivos que um site ou seu fornecedor de serviços transfere para o disco rígido do seu computador através de seu navegador Web (se você permitir). Estes cookies permitem que o site reconhecer o seu browser e, se você tiver uma conta registrada, associá-lo com a sua conta registrada. \n\nNós usamos cookies para compreender e guardar as suas preferências para futuras visitas e compilar dados agregados sobre o tráfego ea interação no site, para que possamos oferecer um site melhor e ferramentas no futuro. Poderemos contratar prestadores de serviços de terceiros para nos ajudar a compreender melhor os nossos visitantes do site. Esses prestadores de serviços não estão autorizados a utilizar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar o nosso negócio.\n\n\n\n## [Podemos divulgar qualquer informação a terceiros?](#divulgar)\n\nNós não vendemos, trocamos, ou de outra forma transferrimos a terceiros as suas informações pessoalmente identificáveis. Isso não inclui terceiros de confiança que nos auxiliam no funcionamento do nosso site, conduzindo nosso negócio, ou serviço que a você, desde que as partes concordam em manter esta informação confidencial. Podemos também divulgar as suas informações quando acreditamos que é apropriado para cumprir a lei, fazer cumprir as nossas políticas do site, ou proteger nosso ou de outros direitos, propriedade ou segurança. No entanto, informações turísticas não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para marketing, publicidade, ou outros usos.\n\n\n\n## [Links de terceiros](#terceiros)\n\nOcasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros no nosso site. Estes sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade ou obrigações\ - \ pelo conteúdo e atividades desses sites. No entanto, buscamos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.\n\n\n\n## [Privacidade Online Infantil Protection Act Compliance](#coppa)\n\nNosso site, produtos e serviços são todos dirigidos a pessoas que tem pelo menos 13 anos de idade ou mais. Se o servidor for nos EUA, e você está sob a idade de 13, de acordo com as exigências da COPPA ([Lei de Proteção de Privacidade Online de Crianças] (http://en.wikipedia.org/wiki/Children)), não use este site.\n\n\n\n## [Somente Política de Privacidade Online](#online)\n\nEsta política de privacidade online se aplica somente às informações recolhidas pelo nosso site e não a informações coletadas offline.\n\n\n\n## [Seu Consentimento](#consentimento)\n\nAo utilizar nosso site, você concorda com a nossa política de privacidade web site.\n\n\n\n## [Alterações à nossa Política de Privacidade](#mudancas)\n\nSe nós decidirmos mudar nossa política de privacidade, colocaremos essas alterações nesta página. \n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013.\n" - static: - search_help: | -

      Dicas

      -

      -

        -
      • Resultados de título são priorizados, então quando em dúvida, pesquise pelos títulos
        • -
      • Palavras únicas, incomuns sempre produzirão os melhores resultados
        • -
      • Sempre que possível, pesquise com escopo em uma categoria, usuário ou tópico em particular.
        • -
      -

      -

      Opções

      -

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

      -

      - arco-íris category:parques status:open order:latest irá pesquisar por tópicos contendo a palavra "arco-íris" na categoria "parques" que não estiverem fechados ou arquivados, ordenados pela data do último post. -

      badges: long_descriptions: autobiographer: | - Blah blah blah - Blah blah blah + Este emblema é concedido por preencher seu perfil e selecionar uma foto de perfil. Deixar a comunidade conhecer mais sobre quem você é, e, quais são seus interesses, a torna melhor e mais conectada. first_like: | - Blah blah blah - Blah blah blah + Este emblema é concedito na primeira vez que você curtir uma m,ensagem usando o botão :heart: . Curtir mensagens é uma ótima maneira de dizer aos membros da sua comunidade que suas mensagens foram interessantes, úteis, legais ou divertidas. Compatilhe o amor! first_link: | - Blah blah blah - Blah blah blah + Este emblema é concedido na primeira vez que você põe um link para outro tópico numa mensagem. Linkar tópicos ajuda outros leitores a encontrar conversas interessantes relacionadas, monstrando ligações entre tópicos em ambas direções. first_quote: | - Blah blah blah - Blah blah blah + Este emblema é concedido na primeira vez que você cita uma mensagem na sua resposta. Citar seções relevantes de mensagens anteriories na sua resposta ajuda a manter a discussão focada e no assunto original. first_share: | - Blah blah blah - Blah blah blah + Este emblema é concedido na primeira vez que você compartilha um link para uma mensagem ou tópico usando o botão compartilhar. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e assim, crescer sua comunidade. read_guidelines: | - Blah blah blah - Blah blah blah + Este emblema é concedido por ler o guia da comunidade. Seguir e compartilhar estas simples regras ajuda a construir uma segura, divertida e sustentável comunidade. reader: | - Blah blah blah - Blah blah blah + Este emblema é concedido por ler um tópico longo. Ler é fundamental. Ler atentamente ajuda a seguir a conversa e leva a melhores, e mais completas, respostas. editor: | - Blah blah blah - Blah blah blah + Este emblema é concedido por editar sua mensagem. Não exite em editar sua mensagem a qualquer tempo para melhora-la , consertar pequenos enganos, ou adicionar qualquer coisa que você tenha esquecido. first_flag: | - Sinalizar é crítico para a saúde de sua comunidade. Se notar qualquer mensagem que requer atenção de um moderador por favor - não hesite em sinalizar. Você também pode usar o diálogo de sinalização para enviar mensagens para usuários a seu alcance - confiabilidade nível 1. + Este emblema é concedido por sinalizar uma mensagem. Sinalizar é critico para saúde da comunidade. Se você notar qualquer mensagem que necessita de atenção da moderação, por favor, não exite em sinalizar. Você pode também usar o diálogo de sinalização para enviar mensagem para outros usuários. nice_share: | - Blah blah blah - Blah blah blah + Este emblema é concedido por compartilhar um link para uma mensagem que foi visitada por 25 visitantes externos. Bom trabalho! Compartilhar links para discussões interessantes é uma excelente forma de crescer sua comunidade. welcome: | - Blah blah blah - Blah blah blah + Este emblema é concedido quando você recebe sua primeira curtida numa mensagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou divertido! anniversary: | - Blah blah blah - Blah blah blah + Este emblema é concedido quanto você é membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por fica por aqui e contribuir com nossa comunidade! good_share: | - Blah blah blah - Blah blah blah + Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 300 visitantes externos. Bom Trabalho! Você mostrou uma discussão interessante para um monte de novas pessoas e nos ajudou a crescer. great_share: | - Blah blah blah - Blah blah blah + Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 100 visitantes externos. Nossa! Você promoveu uma discussão interessante para uma grande nova audiência para esta comunidade, e nos ajudou a crescer bastante. nice_post: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar uma resposta que conseguiu 10 curtidas. Bom trabalho! nice_topic: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar um tópico que conseguiu 10 curtidas. Bom trabalho! good_post: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar uma resposta que conseguiu 25 curtidas. Bom trabalho! good_topic: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar um tópico que conseguiu 25 curtidas. Bom trabalho! great_post: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar um tópico que conseguiu 50 curtidas. Uau! great_topic: | - Blah blah blah - Blah blah blah + Este emblema é concedido por criar uma resposta que conseguiu 50 curtidas. Uau! basic: | - Blah blah blah - Blah blah blah + Este emblema é concedido quando você alcança o nível de confiança 1. Obrigado por permanecer por aqui e ler alguns tópicos para aprender sobre o que é nossa comunidade. Suas restrições de novo usuário foram suspensas, e você ganhou todas habilidades essenciais de comunidade, como mensagens pessoais, sinalizações, edições de wiki, e habilidade de postar imagens e múltiplos links. member: | - Blah blah blah - Blah blah blah - regular: | - Blah blah blah - Blah blah blah + Este emblema é concedido quando você alcança o nível de confiança 2. Obrigado por participar durante essas semanas da nossa comuniadde. Você pode agora enviar convites pessoais da sua página de usuário ou de tópocos individuais, criar mensagens de grupo, e algumas curtidas a mais por dia. + regular: |+ + Este emblema é concedido quando você alcança o nível de confiança 3. Obrigado por ser parte regular da nossa comunidade durante todos esses meses, um dos mais ativos leitores e colaborador confiável para o que faz essa comunidade grande. Você pode agora recategorizar e renomear tópicos, acessar a área privada do lounge, sinalizações mais fortes de spam, e muito mais curtidas por dia. + leader: | - Blah blah blah - Blah blah blah + Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia. admin_login: success: "Email Enviado" error: "Erro!" email_input: "Email do Administrador" submit_button: "Enviar Email" + discourse_hub: + access_token_problem: "Diga para um administrador: Por favor atualize as configurações do site para incluir a correta discourse_org_access_key." + performance_report: + initial_post_raw: Este tópico inclui relatórios de performance diários de seu site. + initial_topic_title: Relatórios de performance do Site diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 129ef0aef3..e132b92755 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -164,14 +164,6 @@ ro: - Critica constructivă e bine venită, criticați *ideea*, nu oamenii. Pentru detalii, [verificați regulile comune](/reguli). Acest panel v-a apărea doar pentru prima %{education_posts_text}. - avatar: | - ### Ce spuneți de o poză nouă pt cont? - - ați postat câteva discuții și răspunsuri, dar avatarul dvs nu este asa unic ca persoana dvs -- Este avatarul implicit. - - V-ați gândit să **[vizitați profilul de utilizator](%{profile_path})** și sa încărcați imaginea care vă reprezintă? - - Este mai ușor să urmăriți discuțiile din comunitate și să găsiți persoane interesante în conversații când fiecare are un avatar unic! dominating_topic: | ### Permite și altora să se alăture la conversație @@ -208,6 +200,8 @@ ro: base: warning_requires_pm: "Puteţi ataşa avertizări doar la mesajele private." too_many_users: "Puteţi trimite avertizări la un singur utilizator odată." + cant_send_pm: "Ne pare rău, nu puteți trimite un mesaj privat acelui utilizator." + no_user_selected: "Trebuie selectat un nume de utilizator valid." user: attributes: password: @@ -223,7 +217,6 @@ ro: no_info_other: "
      %{name} nu a introdus înca nimic în câmpul despre mine din profil
      " vip_category_name: "Lounge" vip_category_description: "O categorie dedicată exclusiv celor cu nivelul de încredere 3 sau mai mare" - meta_category_name: "Meta" meta_category_description: "Discuții despre acest forum, organizare, funcționare și cum îl putem îmbunătății." staff_category_name: "Personalul" staff_category_description: "Categorie privată pentru discuțiile personalului. Discuțiile sunt vizibile doar adminilor și moderatorilor." @@ -350,6 +343,18 @@ ro: one: "mai puţin de 1 minut în urmă" few: "mai puţin de %{count} minute în urmă" other: "mai puţin de %{count} minute în urmă" + x_minutes: + one: "acum 1 minut" + few: "acum %{count} minute" + other: "acum %{count} minute" + about_x_hours: + one: "acum o ora" + few: "acum %{count} ore" + other: "acum %{count} ore" + x_days: + one: "acum o zi" + few: "acum %{count} zile" + other: "acum %{count} zile" password_reset: choose_new: "Alegeți o parolă nouă" choose: "Alegeți o parolă" @@ -364,7 +369,6 @@ ro: please_continue: "Continuă cu %{site_name}" error: "S-a semnalat o eroare la schimbarea adresei de Email. Poate adresa deja e folosită?" activation: - action: "Activați contul dvs" already_done: "Ne pare rău, această adresă pentru confirmarea contului nu mai este valabilă. Poate contul dvs este deja activ?" please_continue: "Noul dvs cont este confirmat, iar acum sunteți autentificat." continue_button: "Continuă cu %{site_name}" @@ -557,7 +561,6 @@ ro: github_config_warning: 'Serverul e configurat să permită autentificarea și logarea cu GitHub (enable_github_logins), dar id-ul de client și valorile secrete nu sunt setate. Mergeți la Setările site-ului și modificați setarea. Vizualizați ghidul pentru mai multe informații.' s3_config_warning: 'Serverul este configurat să încarce fișierele cître s3, dar cel puțin una din următoarele setări nu sunt potrivite: id_cheie_acces_s3, cheia_acces_secret_s3 sau loc_încărcare_s3. Mergeți la setările site-ului și modificați setările. Vedeți "Cum să potrivesc imaginea încărcată la S3?" pentru a învăța mai multe.' image_magick_warning: 'Serverul este configurat să creeze thumbnail-uri din imagini mari, dar ImageMagick nu e instalat. Instalați ImageMagick downlodați ultima versiune.' - failing_emails_warning: 'sunt %{num_failed_jobs} de operații via email eșuate. Verificați fișierul config/discourse.conf și asigurați-vă că setările emailului sunt corecte. vedeți operațiunile eșuate în Sidekiq.' default_logo_warning: "Nu ați ales imaginile logo pentru site-ul dvs. Reactualiza-ți logo_url, logo_small_url și favicon_url în Setările site-ului." contact_email_invalid: "Emailul de contact al site-ului este invalid. Vă rugăm reactualizați emailul de contact în setările site-ului." title_nag: "Opțiunea titlul de site este încă la valoarea inițială. Vă rugăm reactualiza-ți cu titlul site-ului în setările site-ului." @@ -601,7 +604,6 @@ ro: min_topic_title_length: "Minimul de caractere permis per discuție" max_topic_title_length: "Maximul de caractere permis per discuție" min_search_term_length: "Minimul de caractere permis pentru o căutare validă" - allow_uncategorized_topics: "Permite discuțiilor să fie create fără o categorie." uncategorized_description: "Descrierea categoriei necategorisite. Lăsați liber pentru nicio descriere." allow_duplicate_topic_titles: "Permite discuții cu titluri duplicate sau identice." unique_posts_mins: "Câte minute până un utilizator poate posta iar cu același conținut" @@ -626,8 +628,6 @@ ro: post_excerpt_maxlength: "Lungimea maximă a unui extras / sumar dintr-o postare." post_onebox_maxlength: "Lungimea maximă a postării discursului-scurt în caractere." onebox_domains_whitelist: "O listă de domenii permise pentru discursul-scurt; aceste domenii ar trebuii să permită OpenGraph sau oEmbed. Testați-le la http://iframely.com/debug" - digest_logo_url: "Logo-ul alternativ folosit în capătul emailu-lui-rezumat din site. Dacă este gol, va fi folosit `logo_url`. eg: http://example.com/logo.png" - favicon_url: "O iconiță-favorită pentru site, verificați http://en.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Iconiță folosită pentru dispozitivele Apple. Mărimea recomandată este 144px pe 144px." notification_email: "Adresa autorului emailu-ului este folosită când se trimit emailuri esențiale de sistem. Domeniul specificat aici trebuie să aibă SPF, DKIM și rapoarte PTR inversate, setate corect pentru că email-ul să ajungă la destinație." email_custom_headers: "O listă delimitată vertical a capetelor de email preferențiale" @@ -640,8 +640,6 @@ ro: long_polling_interval: "Intervalul înainte de sondaj este dat în milisecunde " polling_interval: "Cât de des e intervalul de sondaj în milisecunde al utilizatorilor autentificați" anon_polling_interval: "Cat de des e intervalul de sondaj în milisecunde al clienților anonimi" - auto_track_topics_after: "Intervalul global de milisecunde până ce o discuție să fie urmărită automat, utilizatorii pot schimba (0 pt totdeauna, -1 pt niciodată)" - new_topic_duration_minutes: "Intervalul global oficial de minute cât o discuție e considerată nouă, utilizatorii pot schimba (-1 pt totdeauna, -2 pt ultima vizită)" cooldown_minutes_after_hiding_posts: "Numărul de minute pr care un utilizator trebuie să le aștepte până când poate edita sau ascunde o postare prin marcajele comune" num_flags_to_block_new_user: "Dacă postarea unui utilizator nou primește atâtea marcaje de spam de la num_utilizatori_blocare_utilizator_nou dferiti utilizatori, se vor ascunde toate postările respectivului și va fi incapacitat să mai posteze. 0 pt dezactivare." num_users_to_block_new_user: "Dacă postarea unui utilizator nou primește num_flags_to_block_new_user marcaje de spam de la atâția utilizatori, se vor ascunde toate postările respectivului și va fi incapacitat să mai posteze. 0 pt dezactivare." @@ -674,13 +672,9 @@ ro: invite_passthrough_hours: "Cât timp un utilizator poate folosii o cheie de invitație recuperată anterior pentru autentificare, în ore" invite_only: "Înregistrarea publică este dezactivată, toți utilizatorii noi trebuie să fie exclusiv invitați de un alt membru sau personalul site-ului." login_required: "Autentificarea e necesară pentru a citii conținutul site-ului, nu permite accesul anonim." - min_username_length: "Minimul de caractere pentru numele de utilizator. ATENȚIE: ORICE UTILIZATOR EXISTENT CU NUMELE MAI SCURT DE ATÂT NU VA PUTEA ACCESA SITE-UL." - max_username_length: "Maximul de carcatere pentru numele de utilizator. ATENȚIE: ORICE UTILIZATOR EXISTENT CU NUMELE MAI LUNG DE ATÂT NU VA PUTEA ACCESA SITE-UL.." min_password_length: "Lungimea minimă de caractere pentru parolă." block_common_passwords: "nu permite parole ce sunt în cele 10,000 cele mai cunoscute parole." sso_url: "URL-ul semnului singular în punctul de sfârșit" - sso_overrides_email: "Rescrie email-ul local cu email-ul extern de site din payload-ul SSO (ATENȚIE: discrepanțe pot apărea datorită normalizării email-urilor locale)" - sso_overrides_username: "Rescrie numele de utilizator local cu numele utilizator extern de site din payload-ul SSO (ATENȚIE: discrepanțe pot apărea datorită diferenței de lungime/cernite)" enable_local_logins: "Activează numele de utilizator local și a conturilor bazate pe logare cu parola. (Notă: Aceasta trebuie activiată pentru invitații pt a funcționa)" allow_new_registrations: "Permite înregistrarea noilor utilizatori . Debifați pentru a restricționa oricui să creeze un cont nou." enable_yahoo_logins: "Activează autentificarea cu Yahoo" @@ -698,7 +692,6 @@ ro: github_client_secret: "Secretul clientului pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications" allow_restore: "Permite rescrierea, ceea ce poate înlocuii TOATE datele din site! Lasăți necompletat decât dacă doriți să reluați o rezervă" maximum_backups: "Maximul de rezerve de pe disc. Rezervele vechi sunt șterse automat" - backup_daily: "Creează automat o rezervă a site-ului odată pe zi." enable_s3_backups: "Încarcă rezervele pe s3 când sunt complete. Fiți sigur că ați completat acreditarea s3." s3_backup_bucket: "Folosește compartimentul de legătură pentru a ține rezerve. Atenție: Asigurați-vă că este un compartiment privat." active_user_rate_limit_secs: "Cât de de se actializează câmpul 'last_seen_at', în secunde" @@ -767,13 +760,9 @@ ro: delete_all_posts_max: "Numărul maxim de postări ce pot fi șterse deodată folosind butonul Șterge toate postările. Dacă un utilizator are mai multe postări decât această valoare, postările nu pot fi șterse toate odată și utilizatorul nu poate fi șters." username_change_period: "Numărul de zile după înregistrare în care conturile își pot schimba numele de utilizator (0 la nu permite schimbarea numelui de utilizator)." email_editable: "Permite utilizatorilor să schimbe propria adresa de email după înregistrare." - allow_uploaded_avatars: "Permite utilizatorilor să încarce avatare preferențiale." - allow_animated_avatars: "Permite utilizatorilor să folosească avatare animate .gif. ATENȚIE: Pornește avatarele: reînprospătează rata de refresh după schimbarea acestei opțiuni." automatically_download_gravatars: "Descarcă Gravatare pentru utilizatori la crearea contului sau schimbarea email-ului." digest_topics: "Numărul maxim de discuții arătate în email-ul rezumat." digest_min_excerpt_length: "Numărul minimum de extrase din postări din email-ul rezumat, în caractere." - default_digest_email_frequency: "Cat de des utliziatorii primesc emailuri rezumat din oficiu. Utilizatorii pot schimba această opțiune în preferințe." - detect_custom_avatars: "Dacă sau nu să se verifice dacă utilizatorii au încărcat avatare preferențiale." max_daily_gravatar_crawls: "Numărul maxim de verificări făcute de Discourse pentru existența unui gravatar preferențial într-o zi" allow_profile_backgrounds: "Permite utilizatorilor să încarce fundaluri de profil." sequential_replies_threshold: "Numărul de postări la rând într-o discuție până să-i fie amintit utilizatorului că sunt prea multe răspunsuri secvențiale. " @@ -793,7 +782,6 @@ ro: embed_by_username: "Numele de utilizator Discourse al utilizatorului ce crează discuții încorporate." embed_username_key_from_feed: "Discourse username of the user who creates the embedded topics.." embed_truncate: "Truncate the embedded posts." - embed_category: "categoria discuțiilor încorporate." embed_post_limit: "Numărul maxim de postări de încorporat." embed_whitelist_selector: "Selector CSS pentru elementele ce sunt permise în încorporări." embed_blacklist_selector: "Selector CSS pentru elementele ce sunt scoase din încorporări" @@ -869,7 +857,6 @@ ro: characters: "trebuie să includă doar numere, litere și underscor-uri" unique: "trebuie să fie unice" blank: "trebuie să fie completat" - must_begin_with_alphanumeric: "trebuie să înceapă cu o literă sau un număr" email: not_allowed: "nu este permis din partea acelui furnizor de servicii email. Vă rugăm folosiți altă adresă email." blocked: "nu este permis." @@ -911,38 +898,8 @@ ro: subject_template: "[%{site_name}] Testul de trimitere Email" new_version_mailer: subject_template: "[%{site_name}] O nouă versiune de Discourse, reactializare valabilă" - text_body_template: | - O nouă versiune de [Discourse](http://www.discourse.org) este valabilă. - - Your version: %{installed_version} - New version: **%{new_version}** - - Poate ați dorii să: - - - Vedeți ce mai e nou în [ registrul de schimbări GitHub](https://github.com/discourse/discourse/commits/master). - - - Reactualizați vizitând [%{base_url}/admin/docker](%{base_url}/admin/docker) Și apăsând butonul "Actualizare". - - - Vizitați [meta.discourse.org](http://meta.discourse.org) pentru noutăți, disctii, și ajutor pentru Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] update Actualizare valabilă" - text_body_template: | - O nouă versiune de [Discourse](http://www.discourse.org) este valabilă. - - Versiunea actuală: %{installed_version} - Versiunea nouă: **%{new_version}** - - Poate ați dori să: - - - Vezi ce e nou în [registrul de schimbări GitHub](https://github.com/discourse/discourse/commits/master). - - - Reactualizați vizitând [%{base_url}/admin/docker](%{base_url}/admin/docker), Și apăsând butonul "Actualizare". - - - Vizitați [meta.discourse.org](http://meta.discourse.org) pentru noutăți, discutii, și ajutor pentru Discourse. - - ### Release notes - - %{notes} flags_reminder: please_review: "Vă rugăm revizionați-le." post_number: "postarea" @@ -1063,7 +1020,6 @@ ro: download_remote_images_disabled: subject_template: "Downloadul de imagini de legătura dezactivat" text_body_template: "Funcția `download_remote_images_to_local` a fost dezactivată pentru că limita de spațiu din `download_remote_images_threshold` a fost atinsă." - unsubscribe_link: "Pentru dezabonare de la aceste emailuri, vizitați pagina [preferințele utilizatorului](%{user_preferences_url})." subject_re: "Re: " subject_pm: "[PM] " user_notifications: @@ -1160,7 +1116,6 @@ ro: signup_after_approval: subject_template: "Ați fost aprobat pe site-ul %{site_name}!" signup: - subject_template: "[%{site_name}] Activați noul cont" text_body_template: | Bine ați venit la %{site_name}! @@ -1189,8 +1144,6 @@ ro: pasted_image_filename: "Lipire imagine" store_failure: "Încercare de încărcare eșuată #%{upload_id} pentru utilizatorul #%{user_id}." images: - fetch_failure: "Ne pare rău, s-a produs o eroare la încercarea de a recupera imaginea." - unknown_image_type: "Ne pare rău, dar fișierul pe care încercați să-l încărcați nu pare să fie o imagine." size_not_found: "Ne pare rău, nu am putut determina mărimea imaginii. Poate este coruptă?" flag_reason: sockpuppet: "Un utilizator nou a creat o discuție, iar un alt utilizator cu același IP a răspuns. Vedeți setarea flag_sockpuppets în site." @@ -1223,389 +1176,10 @@ ro: Editează prima postare în această discuție pentru a schimba conținutul paginii %{page_name}. guidelines_topic: title: "FAQ/Informații de ajutor" - body: | - - - ## [Acesta este un loc civilizat pentru discuții publice](#civilized) - - Vă rugăm tratați aceast forum de discuții ca și un parc public. Și noi, suntem o resursă împărțită a comunității; un loc unde se împart abilități, cunoștințe și interes prin conversații continue. - - Acestea nu sunt reguli grele ce nu pot fi urmate, sunt menite doar să ajute judecata umană a comunității noastre. Folosiți regulile pentru a-l menține că un loc curat, degajat menit pentru discursuri publice civilizate. - - - - ## [Pentru a îmbunătății discuția](#îmbunătățește) - - Ajutați-ne să facem aici un loc excelent pentru discuții ajutând mereu la îmbunătățirea discuțiilor în orice fel, cât de mic. Dacă nu sunteți sigur că postarea dvs se leagă la conversație, reformulați încă odată informația și încercați mai târziu. - - Discuțiile avute aici contează pentru noi, vrem să acționați ca și când ar conta și pentru voi. Fiți respectuoși față de discuții și de persoanele ce le întrețin, chiar dacă nu sunteți de acord cu ceea ce e discutat. - - Un mod de a inbunătății discuțiile ar fi acela de a descoperii pe cele deja existente. Vă rugăm petreceți ceva timp uitându-vă peste discuții înainte de a răspunde sau de a începe una proprie, așa veți avea șanse mai mari să cunoașteți persoane ce vă împărtășesc interesele. - - - - ## [Fiți de acord, Chiar și când nu sunteți de acord](#deacord) - - Poate aveți tendința să răspundeți la ceva prin afișarea dezacordului. E normal. Dar, Amintiți-vă să criticați idei nu persoane. Vă rugăm evitați: - - * Porecle. - * Atacul la persoană. - * Răspunsul la tonul unei postări în locul informației. - * Contrazicerea defectuoasă. - - Mai bine, Dați contra-argumente rezonabile ce pot îmbunătății conversația. - - - - ## [Participarea dvs. contează](#participare) - - Conversația pe care o avem aici da tonul tuturor. Ajutați la influențarea viitorului aceste comunități prin angajarea în discuții ce fac forumul un loc interesant de vizitat — și evitațile pe cele ce nu sunt interesante. - - Discourse oferă mijloace ce permit comunității să indentifice colectiv cele mai bune (și cele mai proaste) contribuții: favorite, semne de carte, aprecieri, marcaje, răspunsuri, editări, șamd. Folosiți aceste mijloace pentru a vă îmbunătății experienta dvs și a altora. - - Să încercăm să lăsăm parcul în condiții mai bune decât l-am găsit. - - - - ## [Dacă observați o problemă, marcați-o](#marcati-probleme) - - Moderatorii au o autoritate specială; Suntem responsabili de acest forum. dar și voi, de asemenea . cu ajutorul vostru, moderatorii pot fi facilitatorii comunității, nu doar oamenii de serviciu sau poliția. - - Când observați o purtare necorespunzătoare, nu răspunde-ți. Asta încurajează și mai mult, vă consuma energia, și irosește timpul tuturor. _Doar marcați-o_. Dacă suficiente marcaje se adună, se vor lua măsuri, ori automat, ori prin intervenția unui moderator. - - Pentru a menține comunitatea , moderatorii își rezerva dreptul de a scoate orice fel de conținut și orice cont de utilizator pentru orice motiv, oricând. Moderatorii nu previzualizează postările noi în niciun mod; Moderatorii și operatorii site-ului nu își asumă nicio responsabilitate pentru niciun conținut postat de comunitate. - - - - ## [Întotdeauna fiti-civilizati](#Fiti-civilizati) - - Nimic nu sabotează o conversație plăcută ca nepolitețea: - - * Fiți civilizați. Nu postați nimic ce o persoană rezonabilă ar putea considera ofensiv, abuziv, sau cuvinte de ură. - * Mențineți totul decent. Nu postați nimic obscen sau sexual explicit. - * Respectați-vă reciproc. Nu hartuiți sau supărați pe nimeni, nu vă dați drept altcineva și nu expuneți informațiile lor private. - * Respectați forumul nostru. Nu postați spam-uri și nu vandalizați în alte moduri forumul. - - Aceștia nu sunt termeni stricți definiți — evitați până și _aparenta_acestor lucruri. Dacă sunteți nesigur, întrebați-vă cum v-ați smtii dacă postarea dumneavoastră ar apărea pe prima pagină din New York Times. - - Acesta este un forum public, și motoarele de căutare arată aceste discuții. Păstrați limbajul, adresele și imaginile în limite normale pentru a fi vizualizate și de prieteni sau familie. - - - - ## [Mențineți ordonat](#mentineti-ordonat) - - Faceți efortul de a pune lucrurile în locul corespunzător, ca să putem acorda cât mai mult timp discuțiilor și nu curățeniei. Astfel: - - * Nu deschideți o discuție în categoria greșită. - * Nu postați același lucru în mai multe discuții. - * Nu postați răspunsuri fără conținut. - * Nu divagați discuția schimbându-i sensul. - * Nu semnați postările — fiecare postare are informația profilului dvs atașat. - - Decât să postați “+1” sau “De acord”, folosiți butonul pentru apreciere. Decât să duceți o discuție într-un alt sens ,folisti răspuns într-o nouă discuție. - - - - ## [Postați numai propriile informații](#furt) - - Nu puteți posta nimic digital ce aparține altcuiva fără permisune. Nu puteți posta descrieri despre un astfel de conținut, adrese către, sau alte metode de furt a proprietății intelectuale ce aparține altcuiva (software, video, audio, imagini), sau să încălcați legea în orice alt mod. - - - - ## [Termeni și condiții](#tsc) - - Da, limbajul legal este plictisitor, dar trebuie să ne protejăm – și prin extensie, utilizatorii și datele lor – împotriva celor rău intenționați. Avem [Termenii și condițiile](/tsc) ce descriu purtarea corespunzătoarea a voastră (și a noastră) și drepturile legate de conținut, intimitate și legi. Pentru a folosii acest serviciu, trebuie să fiți de acord [TSC](/tsc). tos_topic: title: "Acordul de servicii" - body: | - Următorii termeni și condiții ce guvernează folosirea site-ului %{company_domain} și tot ce conține acesta, Produsele și serviciile disponibile prin site-ul web, inclusiv, dar nu limitat la forumul % {company_domain} ,suportul de forum % {company_domain} și serviciul de găzduire % {company_domain}. Website-ul este deținut și operat de % {company_full_name} ("% {company_name}"). Site-ul Web este oferit sub rezerva acceptării dumneavoastră fără modificarea tutor termenilor și condițiilor conținute în acest document și toate celelalte regulile de operare, politicile (inclusiv, fără limitare, % {company_domain} ' [Politica de Confidențialitate] ( /confidențialitate) și [Liniile directoare comunitare] ( /faq)) și procedurile care pot fi publicate din când în când pe acest Site de % {company_name}. - - Vă rugăm citiți acest acord cu atenție înainte să începeți să folisiți website-ul. Accesând sau folosind orice parte a acestui site, sunteți de acord să vă supuneți termenilor și condițiilor cerute. Dacă nu sunteți de acord cu acestea, vă este interzis să folosiți acest website sau oricare dintre părțile lui. Acești termeni și condiții sunt considerați a fi o oferta din partea %{company_name}, acceptarea lor este express limitată în acești termeni. Acest website este dedicat celor ce au depășit vârsta de 13 ani. - - - - ## [1. Primul dvs. cont %{company_domain} (#1) - - Dacă creați un cont pe acest website, sunteți responsabil pentru securitatea acestuia precum și totate activitățile ce iau naștere din folosirea lui. Trebuie să notificați de îndată %{company_name} de orice pătrundere de securitate și folosință a contului dvs. %{company_name} nu va fi trasă la răspundere pentru niciun act de omisune din partea dvs, incluzând orice daună de orice fel rezultată în urma unui act de omisune. - - - - ## [2. Responsibilitatea Contribuitorilor](#2) - - Dacă postați materiale pe aces website, adrese, sau faceți disponibil dumneavoastră ( sau oricare altă parte terță), Veți fi responsabil deplin de aceste conținuturi și de orice rău rezultat din acestea. Acestea se aplică dacă contextul reprezintă text, elemente grafice, audio , sau software. Făcând contextul valabil, vă asumați răspunderea ca: - - * Descărcarea, copierea și utilizarea conținutului nu va încălca drepturile de proprietate, inclusiv, dar nu limitat la autor, patent, marcă comercială său secret comercial drepturi, a oricărei terțe părți; - * Dacă angajatorul dvs are drepturi de proprietate intelectuală să creeze, sau ați primit permisiunea din partea angajatorului dvs.pentru a posta sau a pune la dispoziție conținut, inclusiv, dar nu limitat la orice software, sau sunteți asigurat de la angajatorul dvs că sunt respectate toate drepturile conținutului; - * Sunteți de acord cu orice parte terță licențiată legată de conținut, și ați respectat toate lucrurile ce vă permit să treceți cu succes la utilizatorul final respectând termenii necesari; - * Conținutul nu conține și nu instalează viruși, worm-uri, malware, virus Troian sau orice alt content distructiv; - * Conținutul nu este spam, sau robot- sau generat aleatoriu și nu conține conținut comerical non etic sau nedorit menit să atragă atenția asupra unui alt site sau să mărească eficacitatea site-ului respectiv pe motoarele de căutare, sau alte acte nedemne (ca înșelătoriile) sau recipiente înșelătoare vis-a-vis de sursa materialului; - * Conținutul nu este pornografic, nu conține amenințări sau acte ce incita la violență, și nu încalca intimitatea sau drepturile publice unei terțe părți; - * Conținutul dvs. nu este obținerea de publicitate prin mesaje electronice nedorite, cum ar fi link-uri de tip spam pe grupuri de știri, liste de email, bloguri și site-uri, sau alte metode promoționale; - * Conținutul dvs. nu este numit într-un mod care induce în eroare cititorii dvs. de a crede că sunteți o altă persoană sau societate; și - * Aveți, în cazul de conținut ce include cod de computer, clasificate corect și / sau ce descrie tipul, natura, utilizările și efectele materiale, dacă se solicită acest lucru de către %{company_name} sau altcineva. - - - - ## [3.Conținutul utilizatorului de licență](#3) - - Contribuții ale utilizatorului sunt licențiate sub o [Licența de atribuții creative, comune, non-comerciale de tip distributiv 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_UȘ). Fără a limita oricare dintre aceste reprezentări sau garanții, %{company_name} are dreptul (dar nu și obligația), la discreția %{company_name} (i) să refuze sau să scoată orice conținut care, în opinia %{company_name}, încalcă orice politică a %{company_name} sau este în orice fel dăunătoare sau inacceptabilă, să rezilieze, sau refuze accesul la utilizarea site-ului de orice persoană sau entitate pentru orice motiv, la discreția %{company_name}. %{company_name} nu va avea nicio obligație să ofere răscumpărare de bani plătită anterior. - - - - - ## [4. Plata și reinoire](#4) - - ### Termeni generali - - Plățile opționale sau reactualizările sunt făcute valabile pe website. Când folosiți un serviciu opțional sau reactualizare contra-cost, sunteți de acord să plătiți ccompaniei %{company_name} suma anuală sau lunară indicată. Plată va fi luată printr-o metodă pre-pay din ziua în care începeți să utilizați serviciul său actualizarea și va asigura folosirea acesteia pe durata indicată. Aceste plăți nu sunt returnabile. - - ### Înnoire automată - - În cazul în care nu anunțați %{company_name} înainte de terminarea perioadei de abonare că doriți să opriți folosirea serviciului sau actualizării, abonamentul va fi reinoit automat și ne autorizează să colectăm suma aferentă (asemenea oricărei taxe) folosind orice mijloc de taxare despre care avem cunoștința din partea dvs. Abonamentul poate fi anulat oricând. - - - - ## [5. Servicii](#5) - - ### Găzduire, Servicii de suport - - Găzduirea opțională și serviciile de suport oferite de %{company_name} sub termenii și condițiile pentru asemenea servicii. Prin înscrierea la servicii de Găzduire/Suport sau cont de serviciu de Suport, sunteți de acord să vă supuneți termenilor și condițiilor. - - - - ## [6. Responsabilitățile utilizatorilor de pe site](#6) - - %{company_name} nu a vizionat, și nu poate viziona, toate materialele, incluzând programe, postări pe website, deci nu este responsabilă pentru aceste conținuturi, folosințe sau efecte. Folosind website-ul, %{company_name} nu reprezintă sau promovează materialul postat, nu e de părere că materialul este corect, folositor sau dăunător. Sunteți responsabil pentru a lua măsuri de precauție după cum este necesar pentru dvs. și sistemul pc în protejarea de viruși, viermi, cai troieni, și alte tipuri de conținut dăunător sau distructiv. Site-ul poate conține conținut care este ofensator, indecent, sau în caz contrar criticabil, precum și conținut care implică inexactități tehnice, greșeli ortografice, sau alte erori. Site-ul poate conține, de asemenea, materiale care încalcă drepturile de confidențialitate sau publicitate, sau încalcă proprietatea intelectuală și alte drepturi de proprietate intelectuală, ale unor terțe părți, sau de descărcarea, copierea sau utilizarea care este supusă termenilor și condițiilor suplimentare. % {Company_name} își declină orice responsabilitate pentru orice daună care rezultă din utilizarea de către vizitatori a Site-ului Web, sau de la orice descărcarea de către vizitatori a conținutului afișat. - - - - ## [7. Conținutul Postat pe alte Website-uri](#7) - - Nu am revizuit, și nu putem analiza, toate materialele, inclusiv programele de calculator, puse la dispoziție prin site-uri web și pagini web pentru care %{company_domain} afișează adrese, acele adrese către %{company_domain}. %{company_name} nu are control asupra celor ce %{company_domain} nu le dinte și nu este responsabilă pentru conținutul lor. Postând adresa către un non-%{company_domain} website, %{company_name} nu reprezintă sau promovează aceast website. Este necesar ca dumneavoastră să luați măsurile necesare împotriva atacurilor software de genul virușilor, viermilor, virușilor troian și restului de conținut distructiv. %{company_name} refuza orice responsabilitate în folosință dvs a oricăror non-%{company_domain} website-uri. - - - - ## [8. Încălcarea de Copyright și politica DMCA](#8) - - Cum % {company_name} cere altora să-și respecte drepturile de proprietate intelectuală, ea respectă drepturile de proprietate intelectuală ale altora. Dacă sunteți de părere că materialul postat pe %{company_domain} încalcă dreptul dvs de proprietate, iar acest website e pe teritoriul USA , sunteți încurajați să anunțați %{company_name} în conformitate cu actul %{company_name} [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) Politica ("DMCA"). %{company_name} va răspunde acestor notificări, inclusiv cum este necesar sau adecvat prin scoaterea materialului ilicit și dezactivarea toaturor link-urilor. %{company_name} va încheia accesul utilizatorului la website, dacă ,în repetate rânduri, utilizatorul e determinat să încalce aceste drepturi de copyright sau alte proprietăți intelectuale ale %{company_name}. În cazul unei asemenea excluderi, %{company_name} nu va avea obligația de a oferii remunerația financiară plătită precedent către %{company_name}. - - - - ## [9. Proprietatea intelectuală](#9) - - Acest acord nu este transferabil de la %{company_name} către orice altă %{company_name} sau părți terțe în ceea ce privește proprietatea intelecutala, cu taotae drepturile, titlurile și interesele acest tip de proprietate v-a rămâne sub proprietatea %{company_name}. %{company_name}, %{company_domain}, Logo-ul %{company_domain} și toate trademark-urile, logo-urile grafice folosite în legătură cu %{company_domain}, sau a Website-ului sunt trademark-uri sau mărci înregistrate %{company_name} sau a licenței %{company_name}. Celelalte mărci comerciale, mărci de servicii, grafică și siglele folosite în legătură cu site-ul pot fi mărci comerciale ale altor terțe părți. Folosirea Website-ului de către dvs nu dă dreptul reproducerii sau folosirii oricărei mărci înregistrate ale %{company_name} sau a altei terțe părți. - - - - ## [10. Reclamele](#10) - - %{company_name} își rezerva dreptul de a posta reclame cu conținutul dvs ,exceptând cazul în care ați cumpărat actualizare fara-anunțuri sau a unui cont de servicii. - - - - ## [11. contribuții](#11) - - %{company_name} își rezervă dreptul de a posta contribuții ca ‘prin intermediul %{company_domain},’ și atribute de font în subsol sau panoul de unelte. Informațiile din subsol și panoul de unelte %{company_domain} nu pot fi scoase indiferent de ce reactualizare beneficiați. - - - - ## [12. Schimbări](#12) - - %{company_name} își rezervă dreptul la propria discreție , să modifice oricare parte din acest acord. Este responsabilitatea dvs. să verificați acest acord periodic pentru schimbări.Accesarea website-ului după ce aceste modificări au fost făcute constituie acceptarea dvs. implicită a acestora. %{company_name} ar putea, pe viitor, să ofere noi servicii sau caracteristici (incluzând, lansarea unor noi unelte și resurse). și aceste servicii noi se vor supune aceluiași acord. - - - - ## [13. Termination](#13) - - %{company_name}poate termina accesul dvs. parțial sau total la website oricând, fără nicio cauză, fără nicio avertizare, efectiv imediat. Dacă doriți să anulați acest acord sau contul dvs. de pe %{company_domain}, puteți să vă oprii în a foslosii siteul.Toate dispozițiile prezentului acord care, prin natura lor, ar trebui să supraviețuiască reziliere vor supraviețui încetării, inclusiv, fără limitare, dispoziții de proprietate, condiții legale de garanție, indemnizație și limitările de răspundere. - - - - ## [14. Garanția de Disclaimer](#14) - - Site-ul este furnizat "ca atare". %{company_name}, furnizorii și deținătorii de licențe se exonerează de orice garanție, explicită sau implicită, incluzând, fără limitare, garanțiile de vandabilitate, adecvate pentru un anumit scop și non-încălcabile. Nici %{company_name} nici furnizorii și licențiatorii săi,nu fac orice garanție că site-ul va fi fără erori sau că acesta va fi procesat continuu sau neîntrerupt. Dacă chiar citiți asta, aici este [un tratat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Înțelegeți că descarcați de la, sau altfel spups obțineți informații prin intermediul Website-ului pe proriile riscuri. - - - - ## [15. Limitare de răspundere](#15) - - În nici un caz %{company_name}, furnizori sau licențiatorii săi nu vor răspunde cu privire la orice subiect a acestui acord sub​orice contract, neglijență, răspundere strictă sau altă teorie juridică sau echitabil pentru: (i) orice speciale, accidentale sau daunele indirecte; (ii) costul de achiziție pentru produse sau servicii de substituție; (iii) pentru întrerupere de utilizare sau pierderea sau coruperea datelor; sau (iv) pentru orice sume care depășesc taxele plătite de tine către %{company_name} în temeiul prezentului acord pe parcursul perioadei de douăsprezece (12) luni înainte de cauză de acțiune. %{company_name} nu va avea nici o responsabilitate pentru orice eșec sau întârziere din cauza problemelor de dincolo de controlul lor rezonabil. Cele de mai sus nu se vor aplica în măsura în care este interzis de legislația în vigoare.. - - - - ## [16. Reprezentarea generală și garanție](#16) - - Declarați și garantați că (i) utilizarea de către dvs. a site-ului va fi în strictă conformitate cu %{company_name} [Politica de confidențialitate](/intimitate), [Regulile comune](/reguli-comune), cu prezentul acord și cu toate legile și reglementările aplicabile (inclusiv, dar fără a se limita la orice lege sau reglementare locale din țară, stat, oraș, sau alt domeniu guvernamental, în ceea ce privește comportamentul on-line și conținut acceptabil, inclusiv toate legile aplicabile privind transmiterea de date tehnice exportate din țara în care locuiește acest site sau țara în care locuiți) și (îi) utilizarea de către dvs. a site-ului nu va încălca sau deturna drepturile de proprietate intelectuală ale unei terțe părți. - - - - ## [17. Despăgubiri](#17) - - Sunteți de acord să despăgubiți %{company_name}, subcontractorii săi și licențiatorii săi, precum și directorii respectivi, ofițerii, angajații de agenții, împotriva oricăror și tuturor creanțelor și cheltuielilor, incluzând onorariile avocaților, ce rezultă din utilizarea de către dvs. a site-ului, inclusiv, dar fără a se limita la încălcarea de către dvs. a acestui acord. - - - - ## [18. Diverse](#18) - - Prezentul acord constituie întregul acord între %{company_name} și tu cu privire la obiectul acestuia, și ele pot fi modificate doar de către un amendament scris, semnat de un executiv autorizat de %{company_name}, sau prin detașarea cu %{company_name} de o versiune revizuită. Cu excepția legii măsură aplicabilă, dacă este cazul, nu prevede altfel, prezentul acord, orice acces la sau utilizare a site-ului vor fi guvernate de legile statului California, Statele Unite ale Americii, cu excepția conflictelor cu prevederile legii, iar locul potrivit pentru orice litigii care decurg din sau în legătură cu oricare dintre acestea va fi instanța de stat și federală situate în San Francisco, California. Cu excepția cererilor de ordonanță prezidențială sau echitabila sau revendicării legate de drepturile de proprietate intelectuală (care pot fi introduse în orice instanță competentă, fără detașarea unei obligațiuni), orice litigiu care rezultă în temeiul prezentului acord se soluționează în cele din urmă, în conformitate cu Regulile de arbitraj cuprinzătoare ale Arbitraj judiciară și serviciu de mediere, Inc ("blocajelor") de către trei arbitri numiți în conformitate cu aceste reguli. Arbitrajul va avea loc în San Francisco, California, în limba engleză, iar decizia arbitrală poate fi aplicată în orice tribunal.Partea care prevalează în orice acțiune sau procedură de aplicare a prezentului acord are dreptul la costurile și onorariile avocaților. Dacă orice parte a acestui acord este ținut invalid sau inaplicabilă, acea parte va fi interpretată pentru a reflecta intenția inițială a părților, iar porțiunile rămase vor rămâne în vigoare și cu efecte depline. O renunțare de către oricare dintre părți a oricărui termen sau condiție a prezentului acord sau orice încălcare a acestora, în orice caz, nu se va renunța la astfel de termen sau condiție sau orice încălcare ulterioară a acestora. Puteți atribui drepturile dumneavoastră în temeiul prezentului acord pentru orice partid care consimte la, și este de acord să fie legat de, termenii și condițiile sale; %{company_name} poate cesiona drepturile sale în temeiul prezentului acord, fără condiție. Prezentul acord va fi obligatorie și va intra în vigoare în beneficiul părților, succesorilor lor și împuterniciții permise. - - Acest document este CC-BY-SA. Acesta a fost actualizat ultima dată 31 mai 2013. - - Inițial, adaptat de la [Termenii serviciului WordPress](http://en.wordpress.com/tos/). privacy_topic: title: "Politica de confidențialitate" - body: | - - - ## [Ce informații colectăm?](#colectăm) - - Colectăm informații de la dvs. când vă înregistrati pe site-ul nostru și colectăm date când participați la forum citind, scriind, și evaluând conținutul distribuit aici. - - Când va înregistrați pe site, vi se va cere numele și adresa e email. Puteți, totuși să vizitați site-ul fără a fi înregistrat. Emailul va fi verificat de un email ce conține o adresă unică. Dacă acea adresa e vizitată, știm că sunteți în controlul adresei de email respective. - - Când postați și sunteți autentificat, îregistrăm adresa IP a originii postării. Tot odată păstrăm și rapoarte de server ce includ adrese IP a orcăror cerințe de pe server. - - - - ## [La ce folosim informația?](#uz) - - Orice informație obținută de la dumneavoastră poate fi folosită în următoarele moduri: - - * Să personalizăm experienta dvs. — informația data de dvs. ne ajută să răspundem cerințelor dvs. individuale. - * Să îmbunătățim site-ul — încercat continuu să îmbunătățim site-ul pe baza informației și feed-back-ului oferit de dvs. - * Să îmbunătățim serviciul de clienți — informația dvs ne ajută să răspundem eficient în oferirea suportului necesar. - * Să trimitem periodic email-uri — Adresa de email data de dvs. poate fi flosita pentru a vă trimite informații,notificări cerute despre schimbări de discuție direct către numele de utiliztor, pentru a răspunde la întrebări, sau alte rugăminți și întrebări. - - - - ## [Cum protejăm informațiile?](#protecție) - - Am implementat o varietate de măsuri de protecție pentru a menține siguranța informațiilor personale când le introduceți, sau accesați. - - - - ## [Care este politica de retenție de date?](#retentie-date) - - Vom face un efort de bună credință să: - - * Păstrăm jurnalele de server care conțin adresa IP a tuturor cererilor de acest pe server nu mai mult de 90 zile. - * Păstrăm adresele IP asociate cu utilizatorii înregistrați și posturile lor, nu mai mult de 5 ani. - - - - ## [Folosim cookie-uri?](#cookie-uri) - - Da. Cookie-urile sunt mici fișiere trimise de site sau provider către hardul dvs. prin intermediul browser-ului de net (dacă este permis). Aceste cookie-uri permite site-ului să recunoască borwserul dvs., iar dacă aveți un cont, sa îl asocieze cu acesta. - - Folosim cookie-urile pentru a înțelege și a salva preferințele dvs. pe viitor și pentru a compila date despre traficul site-ului pentru a oferii o mai bună experiența pe site în viitor. Este posibil să contractăm o parte-terta ce oferă servicii pentru a înțelege mai bine vizitatorii site-ulu. Acestor provideri de servicii nu le este permis să folosească informațiile colectate în contul nostru cu excepția ajutorului oferit nouă pentru a îmbunătății experiență. - - - - ## [Dezvăluim informații partilor-terțe?](#Dezvăluire) - - Nu vindem , schimbăm, sau transferăm oricărei alte terțe-părți informații identificabile ce aparțin utilizatorilor. Aici nu se includ terțe-părți de încredere ce oferă asistentă în funcționarea site-ului nostru, buna funcționare a afacerilor , sau serviciile dedicate dvs., atât timp cât acele terțe-părți și-au asumat responsabilitatea de a menține acele informații confidențiale. Am putea oferii informații doar în cazul în care această acțiune este în limitele legale, în limitele politicii noastre, sau pentru a proteja alte drepturi ce ne aparțin, proprietăți, sau siguranțe. Totuși, informații non-personale identificabile despre vizitatori vor fi oferite părților terțe în scopuri de marketing, reclame, sau alte scopuri. - - - - ## [Adresele părților-terțe](#părți-terțe) - - Occazional, la discreția noastră, vom include sau oferii părților-terțe produse sau servicii pe site-ul nostru. Aceste site-uri ale partilor-terțe au politici de organizare separate și independente. Deci nu ne asumăm responsabilitatea sau vina pentru contextul și activitățile acestor site-uri. În orice caz, intenția noastră este de a proteja integritatea site-ului nostru și orice feed-back despre acestea este bine venit. - - - - ## [Actul de protecție online pentru copii](#coppa) - - Site-ul nostru, produsele și serviciile sunt menite să fie folosite de persoanele ce au depășit vârsta de 13 ani. Dacă serverul nu se află în USA, iar dvs. aveți vârstă sub 13 ani, conform actului COPPA ([Actul de protecție online pentru copii](http://en.wikipedia.org/wiki/Children)), nu folosiți serviciile acestui site. - - - ## [Politica de confidențialitate online](#online) - - Această politică de confidențialitate se aplică doar informațiilor colectate prin intermediul site-ului și nu offline. - - - - ## [Consimțământul dvs.](#Consimțământ) - - Folosind site-ul nosrtu, vă dați consimțământul în ceea ce privește politica de confidențialitate a site-ului. - - - - ## [Schimbări în politica de confidențialitate](#schimbări) - - Dacă decidem să schimbăm politica de confidențialitate, schimbările vor fi postate pe această pagină. - - Acest document este CC-BY-SA. A fost ultima oară actualizat la 31 mai 2013. - badges: - long_descriptions: - autobiographer: | - Blah blah blah - Blah blah blah - first_like: | - Blah blah blah - Blah blah blah - first_link: | - Blah blah blah - Blah blah blah - first_quote: | - Blah blah blah - Blah blah blah - first_share: | - Blah blah blah - Blah blah blah - read_guidelines: | - Blah blah blah - Blah blah blah - reader: | - Blah blah blah - Blah blah blah - editor: | - Blah blah blah - Blah blah blah - nice_share: | - Blah blah blah - Blah blah blah - welcome: | - Blah blah blah - Blah blah blah - anniversary: | - Blah blah blah - Blah blah blah - good_share: | - Blah blah blah - Blah blah blah - great_share: | - Blah blah blah - Blah blah blah - nice_post: | - Blah blah blah - Blah blah blah - nice_topic: | - Blah blah blah - Blah blah blah - good_post: | - Blah blah blah - Blah blah blah - good_topic: | - Blah blah blah - Blah blah blah - great_post: | - Blah blah blah - Blah blah blah - great_topic: | - Blah blah blah - Blah blah blah - basic: | - Blah blah blah - Blah blah blah - member: | - Blah blah blah - Blah blah blah - regular: | - Blah blah blah - Blah blah blah - leader: | - Blah blah blah - Blah blah blah admin_login: success: "Mesajul a fost trimis" error: "Eroare!" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 2f988dea9e..02b701b952 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -143,6 +143,7 @@ ru: rss_description: latest: "Последние темы" hot: "Популярные темы" + posts: "Последние сообщения" too_late_to_edit: "Это сообщение нельзя изменить или удалить, т.к. оно было создано очень давно." excerpt_image: "изображение" queue: @@ -191,13 +192,6 @@ ru: - Конструктивная критика приветствуется, но не забывайте критиковать *идеи*, а не людей. Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться пока вы создаете свои первые %{education_posts_text}. - avatar: |2 - - Вы создали несколько сообщений, однако ваш аватар не уникален -- он такой же, как и у всех новых пользователей. - - Вы можете изменить его, загрузив изображение **[на странице настроек](%{profile_path})** - - Очень удобно следить за обсуждениями и запоминать новых интересных людей, когда каждый имеет уникальный аватар! sequential_replies: | ### Рекомендуем вам совмещать ответы в одном сообщении @@ -259,14 +253,15 @@ ru: no_info_other: "
      %{name} еще не заполнил поле «Обо мне» в своём профайле.
      " vip_category_name: "Фойе" vip_category_description: "Раздел исключительно для пользователей с уровнем доверия 3 и выше." - meta_category_name: "Форум" + meta_category_name: "Обратная связь" meta_category_description: "Обсуждение этого форума: структура и расположение материалов на нем, идеи возможных улучшений в его работе, анонсы изменений на форуме." staff_category_name: "Персонал" staff_category_description: "Приватный раздел для персонала, в котором темы видны только администраторам и модераторам." assets_topic_body: "Это постоянная тема, для хранения изображений и файлов, используемых в дизайне сайта, доступная только сотрудникам. Не удаляйте её! \n\n\nВаши действия:\n\n\n1. Ответьте в эту тему.\n2. Загрузите все изображения, которые вы хотите использовать для логотипов, значков и т.д. сюда. (Используйте значок на панели инструментов в редакторе сообщений, перетащите мышкой, или вставьте изображения из буфера.) \n3. Сохраните свое сообщение.\n4. Щелкните правой кнопкой мыши изображении в новом сообщении, чтобы получить путь к загруженным изображениям, или щелкните значок редактирования и получите путь к изображениям. Скопируйте пути к изображениям.\n5. Вставьте эти пути в [Настройки сайта] (/admin/site_settings/category/required) .\n\n\nЕсли Вам нужно активировать дополнительные типы файлов, отредактируйте `authorized_extensions` во вкладке [Файлы] (/admin/site_settings/category/files)." lounge_welcome: title: "Добро пожаловать в Фойе" - body: "\nПоздравляем! :confetti_ball:\n\nЕсли вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).\n\nУвас появились новые возможности …\n\n* Вы можете редактировать заголовок любого обсуждения\n* Вы можете менять категорию обсуждения\n* С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)\n* Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше \n* Вы можете скрывать нежелательные сообщения в один клик\n\nС полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.\n\nСпасибо Вам за то что являетесь важным членом нашего сообщества!\n\n(Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется до тех пор пока вы придерживаетесь этих правил.)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n" + body: "\nПоздравляем! :confetti_ball:\n\nЕсли вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).\n\nУвас появились новые возможности …\n\n* Вы можете редактировать заголовок любого обсуждения\n* Вы можете менять категорию обсуждения\n* С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)\n* Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше \n* Вы можете скрывать нежелательные сообщения в один клик\n\nС полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.\n\nСпасибо Вам за то что являетесь важным членом нашего сообщества!\n\n(Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется\ + \ до тех пор пока вы придерживаетесь этих правил.)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n" category: topic_prefix: "Описание раздела %{category}" replace_paragraph: "[Замените данный текст кратким описанием нового раздела. Это описание будет отображаться в списке разделов, поэтому постарайтесь сделать его коротким (не более 200 символов).]" @@ -317,62 +312,62 @@ ru: other: "%{count} секунд" datetime: distance_in_words: - half_a_minute: "< 1мин" + half_a_minute: "< 1 мин" less_than_x_seconds: - one: "< 1с" - few: "< %{count}с" - many: "< %{count}с" - other: "< %{count}с" + one: "< 1 сек" + few: "< %{count} сек" + many: "< %{count} сек" + other: "< %{count} сек" x_seconds: - one: "1с" - few: "%{count}с" - many: "%{count}с" - other: "%{count}с" + one: "1 сек" + few: "%{count} сек" + many: "%{count} сек" + other: "%{count} сек" less_than_x_minutes: - one: "< 1м" - few: "< %{count}м" - many: "< %{count}м" - other: "< %{count}м" + one: "< 1 мин" + few: "< %{count} мин" + many: "< %{count} мин" + other: "< %{count} мин" x_minutes: - one: "1м" - few: "%{count}м" - many: "%{count}м" - other: "%{count}м" + one: "1 мин" + few: "%{count} мин" + many: "%{count} мин" + other: "%{count} мин" about_x_hours: - one: "1ч" - few: "%{count}ч" - many: "%{count}ч" - other: "%{count}ч" + one: "1 ч" + few: "%{count} ч" + many: "%{count} ч" + other: "%{count} ч" x_days: - one: "1д" - few: "%{count}д" - many: "%{count}д" - other: "%{count}д" + one: "1 дн" + few: "%{count} дн" + many: "%{count} дн" + other: "%{count} дн" about_x_months: - one: "1мес" - few: "%{count}мес" - many: "%{count}мес" - other: "%{count}мес" + one: "1 мес" + few: "%{count} мес" + many: "%{count} мес" + other: "%{count} мес" x_months: - one: "1мес" - few: "%{count}мес" - many: "%{count}мес" - other: "%{count}мес" + one: "1 мес" + few: "%{count} мес" + many: "%{count} мес" + other: "%{count} мес" about_x_years: - one: "1г" - few: "1г" - many: "%{count}г" - other: "%{count}г" + one: "1 год" + few: "%{count} года" + many: "%{count} лет" + other: "%{count} лет" over_x_years: - one: "> 1г" - few: "> 1г" - many: "> %{count}г" - other: "> %{count}г" + one: "> 1 года" + few: "> %{count} года" + many: "> %{count} лет" + other: "> %{count} лет" almost_x_years: - one: "1г" - few: "1г" - many: "%{count}г" - other: "%{count}г" + one: "1 год" + few: "%{count} года" + many: "%{count} лет" + other: "%{count} лет" distance_in_words_verbose: half_a_minute: "только что" less_than_x_seconds: @@ -381,13 +376,13 @@ ru: many: "только что" other: "только что" x_seconds: - one: "1 секунда назад" - few: "1 секунда назад" + one: "1 секунду назад" + few: "%{count} секунды назад" many: "%{count} секунд назад" other: "%{count} секунд назад" less_than_x_minutes: one: "менее 1 минуты назад" - few: "менее %{count} минуты назад" + few: "менее %{count} минут назад" many: "менее %{count} минут назад" other: "менее %{count} минут назад" x_minutes: @@ -402,17 +397,17 @@ ru: other: "%{count} часов назад" x_days: one: "1 день назад" - few: "1 день назад" - many: "%{count} дня назад" - other: "%{count} дня назад" + few: "%{count} дня назад" + many: "%{count} дней назад" + other: "%{count} дней назад" about_x_months: one: "около 1 месяца назад" - few: "около 1 месяца назад" + few: "около %{count} месяцев назад" many: "около %{count} месяцев назад" other: "около %{count} месяцев назад" x_months: one: "1 месяц назад" - few: "1 месяц назад" + few: "%{count} месяца назад" many: "%{count} месяцев назад" other: "%{count} месяцев назад" about_x_years: @@ -431,9 +426,8 @@ ru: many: "почти %{count} лет назад" other: "почти %{count} лет назад" password_reset: - no_token: "К сожалению данная ссылка на изменение пароля устарела. Нажмите на Вход, затем выберите \"Я забыл мой пароль\" для получения новой ссылки для восстановления пароля." - choose_new: "Пожалуйста, введите новый пароль" - choose: "Пожалуйста, выберите пароль" + choose_new: "Придумайте новый пароль" + choose: "Придумайте пароль" update: 'Обновить пароль' save: 'Установить пароль' title: 'Сбросить пароль' @@ -445,7 +439,6 @@ ru: please_continue: "Перейти на %{site_name}" error: "При смене электронного адреса произошла ошибка. Возможно, этот адрес уже используется?" activation: - action: "Активируйте вашу учетную запись" already_done: "Извините, ссылка на активацию учетной записи устарела. Возможно, ваша учетная запись уже активирована?" please_continue: "Ваша новая учетная запись успешно активирована, вы будете перенаправлены на главную страницу." continue_button: "Перейти на %{site_name}" @@ -513,6 +506,7 @@ ru: regular: title: "Обычная тема" banner: + title: "Тема-объявление" message: make: "Эта тема теперь является объявлением и будет отображаться сверху на всех страницах, пока пользователи не скроют его, каждый сам для себя." remove: "Эта тема теперь не является объявлением и больше не будет отображаться вверху всех страниц." @@ -530,120 +524,140 @@ ru: description: "Вы снова подписаны на рассылку." reports: visits: - title: "Посещения пользователей" - xaxis: "День" + title: "Визиты форумчан" + xaxis: "Дата" yaxis: "Количество визитов" signups: - title: "Новые пользователи" - xaxis: "День" - yaxis: "Количество новых пользователей" + title: "Регистрации" + xaxis: "Дата" + yaxis: "Количество регистраций" topics: - title: "Новые темы" - xaxis: "День" + title: "Темы" + xaxis: "Дата" yaxis: "Количество новых тем" posts: title: "Сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество новых сообщений" likes: title: "Симпатии" - xaxis: "День" - yaxis: "Количество новых симпатий" + xaxis: "Дата" + yaxis: "Количество выраженных симпатий" flags: title: "Жалобы" - xaxis: "День" - yaxis: "Количество жалоб" + xaxis: "Дата" + yaxis: "Количество поданных жалоб" bookmarks: title: "Закладки" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество новых закладок" starred: - title: "Отмечено" - xaxis: "День" - yaxis: "Количество отмеченных тем" + title: "Избранное" + xaxis: "Дата" + yaxis: "Тем добавлено в избранное" users_by_trust_level: - title: "Пользователей по уровню доверия" + title: "Пользователи по уровню доверия" xaxis: "Уровень доверия" yaxis: "Количество пользователей" emails: title: "Электронные письма" - xaxis: "День" - yaxis: "Количество электронных сообщений" + xaxis: "Дата" + yaxis: "Количество электронных писем" user_to_user_private_messages: title: "Личные сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество сообщений" system_private_messages: title: "Системные сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество сообщений" moderator_warning_private_messages: title: "Предупреждения модераторов" - xaxis: "День" - yaxis: "Количество сообщений" + xaxis: "Дата" + yaxis: "Количество предупреждений" notify_moderators_private_messages: - title: "Оповещений модераторам" - xaxis: "День" - yaxis: "Количество сообщений" + title: "Жалобы модераторам" + xaxis: "Дата" + yaxis: "Количество жалоб" notify_user_private_messages: - title: "Оповещение пользователю" + title: "Жалобы пользователям" xaxis: "День" - yaxis: "Количество сообщений" + yaxis: "Количество жалоб" top_referrers: - title: "Топ ссылающихся" + title: "Топ распространителей" xaxis: "Пользователь" - num_clicks: "Переходов" + num_clicks: "Заходов" num_topics: "Тем" top_traffic_sources: - title: "Топ источников траффика" + title: "Топ источников трафика" xaxis: "Домен" num_clicks: "Переходов" num_topics: "Тем" - num_users: "Количество пользователей" + num_users: "Пользователей" top_referred_topics: - title: "Топ ссылающихся тем" + title: "Топ тем, на которые ссылаются" xaxis: "Тема" - num_clicks: "Переходов" + num_clicks: "Заходов" page_view_anon_reqs: title: "Анонимы" xaxis: "Дата" - yaxis: "Анонимные запросы API" + yaxis: "Анонимные API запросы" page_view_logged_in_reqs: - title: "Пользователи" + title: "Форумчане" xaxis: "Дата" - yaxis: "Авторизованные запросы API" + yaxis: "Авторизованные API запросы" page_view_crawler_reqs: title: "Поисковики" xaxis: "Дата" - yaxis: "Запросы API поисковиков и кравлеров" + yaxis: "API запросы поисковиков" page_view_total_reqs: title: "Всего" xaxis: "Дата" - yaxis: "Всего запросов API" + yaxis: "Всего API запросов" + page_view_logged_in_mobile_reqs: + title: "Авторизованные API запросы" + xaxis: "Дата" + yaxis: "Авторизованные мобильные API запросы" + page_view_anon_mobile_reqs: + title: "Анонимные API запросы" + xaxis: "Дата" + yaxis: "Анонимные мобильные API запросы" http_background_reqs: title: "Фоновые" xaxis: "Дата" - yaxis: "Просмотров" + yaxis: "Запросы для обновлений в режиме реального времени" http_2xx_reqs: - title: "Статус 2xx (OK)" + title: "HTTP 2xx (OK)" xaxis: "Дата" - yaxis: "Запросов" + yaxis: "Успешные запросы (статус 2xx)" http_3xx_reqs: - title: "HTTP 3xx (Переадресация)" - xaxis: "День" - yaxis: "Переадресация (статус 3xx)" + title: "HTTP 3xx (переадресация)" + xaxis: "Дата" + yaxis: "Запросы с переадресацией (статус 3xx)" http_4xx_reqs: title: "HTTP 4xx (ошибка клиента)" - xaxis: "День" - yaxis: "Ошибки клиента (статус 4xx)" + xaxis: "Дата" + yaxis: "Запросы с ошибкой клиента (статус 4xx)" http_5xx_reqs: title: "HTTP 5xx (ошибка сервера)" - xaxis: "День" - yaxis: "Ошибки сервера (статус 5xx)" + xaxis: "Дата" + yaxis: "Запросы с ошибкой сервера (статус 5xx)" http_total_reqs: title: "Всего" - xaxis: "День" + xaxis: "Дата" yaxis: "Всего" + time_to_first_response: + title: "Время до первого ответа" + xaxis: "Дата" + yaxis: "Среднее время, часов" + topics_with_no_response: + title: "Темы без ответов" + xaxis: "Дата" + yaxis: "Всего" + mobile_visits: + title: "Визиты форумчан" + xaxis: "Дата" + yaxis: "Количество визитов" dashboard: rails_env_warning: "Ваш сервер работает в режиме %{env}." ruby_version_warning: "Вы используете версию Ruby 2.0.0, у которой имеются известные проблемы. Обновите версию до patch-247 или более новую." @@ -658,7 +672,6 @@ ru: s3_config_warning: 'Сервер сконфигурирован на загрузку файлов в хранилище S3, однако не указаны некоторые значения из списка: s3_access_key_id, s3_secret_access_key или s3_upload_bucket. Перейдите в Настройки сайта и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке How to set up image uploads to S3?.' s3_backup_config_warning: 'Сервер сконфигурирован на загрузку резервных копий в хранилище S3, однако не заданы все необходимые настройки : s3_access_key_id, s3_secret_access_key, s3_backup_bucket. Перейдите в настройки сайта и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке How to set up image uploads to S3?.' image_magick_warning: 'Сервер сконфигурирован на создание превью больших изображений, однако на сервере не установлен ImageMagick. Установите ImageMagick используя системный менеджер пакетов, или пройдите по ссылке для загрузки последней версии.' - failing_emails_warning: 'Провалено %{num_failed_jobs} почтовых задач. Проверьте файл config/discourse.conf и убедитесь, что почтовые настройки правильные. Просмотр проваленных задач Sidekiq.' default_logo_warning: "Установите графические логотипы для вашего сайта. Обновите параметры logo_url, logo_small_url и favicon_url в Настройках сайта." contact_email_missing: "Установите контактный email, чтобы мы могли оповестить вас о срочных делах, связанных с сайтом. Обновите параметры в Настройках сайта." contact_email_invalid: "Контактный адрес сайта некорректен. Обновите его в Настройках сайта." @@ -711,7 +724,6 @@ ru: max_topic_title_length: "Максимально допустимое количество символов в названии темы." min_private_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе." min_search_term_length: "Минимальное количество символов в поисковом запросе." - allow_uncategorized_topics: "Разрешить создание тем вне разделов." uncategorized_description: "Описание раздела для тем \"без раздела\". Будет скрыто есть оставить пустым." allow_duplicate_topic_titles: "Разрешить создание тем с одинаковыми названиями." unique_posts_mins: "Количество минут до того, как пользователь сможет разместить сообщение с тем же содержанием." @@ -738,11 +750,6 @@ ru: post_excerpt_maxlength: "Максимальная длина краткого изложения сообщения." post_onebox_maxlength: "Максимальная длина сообщения с форума Discourse в режиме умной вставки." onebox_domains_whitelist: "Список доменов, разрешенных для умной вставки. Эти домены должны поддерживать OpenGraph или oEmbed. Проверьте их по ссылке http://iframely.com/debug" - logo_url: "Логотип сайта, отображаемый сверху слева. Если оставить пустым, будет использован текст заголовка сайта." - digest_logo_url: "Альтернативный логотип для использования вверху письма-дайджеста. Если оставить пустым, будет использован логотип из настройки `logo_url`. Пример: http://example.com/logo.png" - logo_small_url: "Уменьшенный логотип вашего сайта, используется сверху слева вместо основного логотипа при прокрутке списка тем вниз. Если не указан, будет отображаться основной логотип." - favicon_url: "favicon вашего сайта, дополнительная информация: http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "Логотип для отображения вверху в мобильной версии сайта. Если оставить пустым, будет использован логотип из настройки `logo_url`." apple_touch_icon_url: "Иконка используемая для тач-устройств Apple. Рекомендуемый размер 144 x 144 px." notification_email: "Отправитель: E-mail использующийся при отправке всех системных писем. Домен, указанный здесь должен иметь правильно сконфигурированные SPF, DKIM и reverse PTR записи, для успешной отправки." email_custom_headers: "Разделенный чертой список дополнительных заголовков в почтовых сообщениях" @@ -760,8 +767,6 @@ ru: polling_interval: "Если не используется long polling, как часто следует вошедшим клиентам опрашивать сервер, в миллисекундах" anon_polling_interval: "Как часто следует анонимным клиентам опрашивать сервер, в миллисекундах" background_polling_interval: "Как часто следует клиентам опрашивать сервер, в миллисекундах (когда окно находится в фоновом режиме)" - auto_track_topics_after: "Глобальное количество миллисекунд по умолчанию до того, как тема начинает автоматически отслеживаться (0 - всегда, -1 - никогда)" - new_topic_duration_minutes: "Глобальное количество минут по умолчанию, в течение которых тема оценивается как новая, пользователи могут переназначать (-1 - всегда, -2 – для последнего посещения)" flags_required_to_hide_post: "Количество жалоб, по достижении которого сообщение автоматически скрывается, и личное сообщение об этом посылается автору (0 - никогда)" cooldown_minutes_after_hiding_posts: "Количество минут, которое должен подождать пользователь перед редактированием сообщения скрытого по жалобам" max_topics_in_first_day: "Максимальное количество тем, которое пользователь может создать в первый день на сайте" @@ -816,16 +821,12 @@ ru: invite_passthrough_hours: "Как долго пользователь может воспользоваться ключем приглашения для входа на сайт, указывается в часах" invite_only: "Публичная регистрация отключена. Регистрация только по приглашениям. Новые пользователи могут получить приглашения для регистрации от существующих пользователей или от редакции сайта." login_required: "Требовать авторизации для доступа к сайту, анонимный доступ запретить." - min_username_length: "Минимально допустимая длина псевдонима. ВНИМАНИЕ: СУЩЕСТВУЮЩИЕ ПОЛЬЗОВАТЕЛИ С ПСЕВДОНИМОМ КОРОЧЕ ЭТОГО ЗНАЧЕНИЯ НЕ СМОГУТ ПОЛЬЗОВАТЬСЯ САЙТОМ." - max_username_length: "Максимально допустимая длина псевдонима. ВНИМАНИЕ: СУЩЕСТВУЮЩИЕ ПОЛЬЗОВАТЕЛИ С ПСЕВДОНИМОМ ДЛИННЕЕ ЭТОГО ЗНАЧЕНИЯ НЕ СМОГУТ ПОЛЬЗОВАТЬСЯ САЙТОМ." + reserved_usernames: "Псевдонимы, запрещенные для регистрации" min_password_length: "Минимальная длина пароля" block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых частоиспользуемых паролей." enable_sso_provider: "Реализация протокола SSO провайдера через /session/sso_provider , необходимо установить sso_secret" sso_url: "URL точки единого входа" sso_secret: "Секретный набор символов, используемый для проверки подлинности зашиврованного входа с помощью SSO, убедитесь, что это 10 или более символов" - sso_overrides_email: "Заменяет локальный почтовый адрес на внешний предствленный SSO провайдером (ВНИМАНИЕ: расхождения могут возникать в процессе приведения в соответствие местных писем)" - sso_overrides_username: "Заменяет локальное имя пользователя на имя пользователя представленное SSO провайдером (ВНИМАНИЕ: расхождения могут возникать из-за различий в требованиях / длине имени пользователя)" - sso_overrides_name: "Заменяет имя пользователя на имя пользователя предоставляемое SSO провайдером" sso_overrides_avatar: "Использовать аватары предоставляемые внешним SSO провайдером. При этом настоятельно рекомендуется отключить функцию: разрешить закгрузку аватаров." enable_local_logins: "Включить внутреннюю систему учетных записей пользователей по логину и паролю. (Требуется для работы системы приглашений.)" allow_new_registrations: "Разрешить регистрацию новых пользователей. Выключите, чтобы запретить посетителям создавать новые учетные записи." @@ -844,7 +845,6 @@ ru: github_client_secret: "Клиентский секрет для идентификации с Github, зарегистрированный на https://github.com/settings/applications" allow_restore: "Позволить импорт, который может заменить ВСЕ данные сайта. Оставьте выключенным, если не планируете восстанавливать резервную копию" maximum_backups: "Максимальное количество резервных копий к сохранению. Более старые резервные копии будут автоматически удалены." - backup_daily: "Автоматически создавать резервную копию сайта раз в день." enable_s3_backups: "Загружать резервные копии на S3 по завершению. Убедитесь, что настройки S3 заполнены." s3_backup_bucket: "Адрес папки удаленного сервера для резервных копий. ВНИМАНИЕ: Убедитесь, что место назначения защищено от посторонних." active_user_rate_limit_secs: "Как часто мы обновляем поле 'last_seen_at', в секундах" @@ -874,6 +874,7 @@ ru: s3_access_key_id: "Amazon S3 access key для загрузки и хранения изображений" s3_secret_access_key: "Amazon S3 secret key для загрузки и хранения изображений" s3_region: "Географический регион Amazon S3, который будет использоваться для хранения изображений" + avatar_sizes: "Список автоматически сгенерированных размеров аватар." enable_flash_video_onebox: "Разрешить умную вставку ссылок sqf и flv (Adobe Flash). ВНИМАНИЕ: повышает риски безопасности сайта." default_invitee_trust_level: "Уровень доверия приглашенных пользователей по-умолчанию (от 0 до 4)." default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, Вы можете столкнуться с большим колличеством спама." @@ -926,6 +927,9 @@ ru: topic_views_heat_low: "После этого количества просмотров, поле просмотров слегка подсвечивается." topic_views_heat_medium: "После этого количества просмотров, поле просмотров умеренно подсвечивается." topic_views_heat_high: "После этого количества просмотров, поле просмотров заметно подсвечивается." + cold_age_days_low: "Колличество дней по истечению которого, дата последней активности в топике станет немного тусклее." + cold_age_days_medium: "Колличество дней по истечению которого, дата последней активности в топике станет значительно тусклее." + cold_age_days_high: "Колличество дней по истечению которого, дата последней активности в топике станет совсем тусклой." history_hours_low: "Колличество часов по истечению которого, пометка о редактировании данного поста будет слегка подсвечена. " history_hours_medium: "Колличество часов по истечению которого, пометка о редактировании данного поста будет подсвечена сильнее. " history_hours_high: "Колличество часов по истечению которого, пометка о редактировании данного поста будет сильно подсвечена. " @@ -938,7 +942,6 @@ ru: newuser_spam_host_threshold: "Сколько раз новый пользователь может разместить ссылку на один и тот же хост в сообщениях из `newuser_spam_host_posts`, чтобы это было воспринято как СПАМ?" white_listed_spam_host_domains: "Список доверенных доменов исключенных из тестирования на спам. У новых пользователей не будет ограничений на создание постов с ссылками на эти домены. " staff_like_weight: "Дополнительный весовой коэффициент для \"мне нравится\", поставленных персоналом (модераторами и администраторами)." - topic_view_duration_hours: "Пересчитывать колличество просмотров темы по IP/пользователей каждые N часов" levenshtein_distance_spammer_emails: "При проверке письма на спам, какое колличество символов должно быть разным" max_new_accounts_per_registration_ip: "Если обнаружено на одном IP (n) колличество аккаунтов с уровнем доверия 0 (и ни один аккаунт не принадлежит администраторам или TL2 и выше), прекратить регистрацию новых аккаунтов с этого IP." min_ban_entries_for_roll_up: "При нажатии на кнопку Roll Up, создаст новую запись запрет подсети, если есть по крайней мере (N) записей." @@ -970,18 +973,13 @@ ru: username_change_period: "Количество дней после регистрации, когда пользователь сможет изменить свой псевдоним (0 - запретить изменение псевдонима)." email_editable: "Позволять пользователям изменять свой адрес электронной почты после регистрации." logout_redirect: "Страница на которую будет перенаправлен пользователь после выхода, т.е. перейдет по ссылке (http://somesite.com/logout)" - allow_uploaded_avatars: "Разрешить пользователям загружать собственные картинки для аватарок." - allow_animated_avatars: "Разрешить пользователям использовать анимированные gif в аватарах. ПРЕДУПРЕЖДЕНИЕ: необходимо выполнить avatars:refresh rake task после изменения данной опции." allow_animated_thumbnails: "Генерировать анимированные миниатюры gif-картинок." default_avatars: "URL для аватара, который будет использован по умолчанию для новых пользователей, пока они не изменят его." automatically_download_gravatars: "Скачивать аватарку Gravatar пользователя во время создания учетной записи или изменения e-mail." digest_topics: "Максимальное количество тем в письме - сводке новостей." digest_min_excerpt_length: "Минимальная длина (в символах) вытяжки из сообщения в письме - сводке новостей." - default_digest_email_frequency: "Как часто пользователи получают дайджест по умолчанию. Возможно изменение этой настройки каждым пользователем." suppress_digest_email_after_days: "Не рассылать новости для пользователей, которые не заходили на сайт в течении (n) дней." disable_digest_emails: "Отключить рассылку новостей для всех пользователей." - default_external_links_in_new_tab: "Открывать внешние ссылки в новом окне. Пользователи могут изменить данное поведение в настройках." - detect_custom_avatars: "Проверять или нет, что пользователю необходимо загрузить собственный аватар" max_daily_gravatar_crawls: "Максимальное количество загрузок аватаорок с Gravatar за один день" public_user_custom_fields: "Список разрешенных дополнительных полей пользователей, которые могут быть отображены публично." staff_user_custom_fields: "Список разрешенных дополнительных полей пользователей, которые могут быть отображены для модераторов." @@ -993,31 +991,32 @@ ru: sequential_replies_threshold: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах." enable_mobile_theme: "Мобильные устройства используют адаптированную тему с возможностью переключения в обычный вид. Отключите данную настройку если вы хотите использовать собственный стиль для мобильных устройств." dominating_topic_minimum_percent: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах." + daily_performance_report: "Ежедневно анализировать логи сервера NGINX и отправлять сообщение с результатами анализа в тему, видимую только персоналу." suppress_uncategorized_badge: "Не показывать награду в списках тем для тех тем, которые вне разделов." global_notice: "Показать СРОЧНОЕ ВАЖНОЕ объявление на сайте всем пользователям и посетителям. Удалите содержание, чтобы отменить объявление. Разрешено использование HTML." disable_edit_notifications: "Отключить уведомления системы пользователя когда 'download_remote_images_to_local' активна." full_name_required: "Полное имя это обязательное поле для профиля пользователя." enable_names: "Отображать полное имя пользователя на его странице пользователя, карточке пользователя и в письмах. Выключите, чтобы спрятать полное имя отовсюду." display_name_on_posts: "Показывать полные имена пользователей в их сообщениях в дополнение к их @нику." + show_time_gap_days: "Если между двумя сообщениями в одной теме прошло столько дней, показывать этот промежуток текстом в теме между этими сообщениями." invites_per_page: "Приглашения по умолчанию отображаются на странице пользователя." short_progress_text_threshold: "После достижения указанного числа сообщений в теме, бар будет отображать только текущий номер сообщения. Если вы измените ширину бара, вы можете изменить это значение." default_code_lang: "Подсветка синтаксиса по умолчанию для блоков кода (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "Показывать предупреждение, когда кто-то пытается ответить в очень старую тему. Указывается в днях. Чтобы отключить 0." autohighlight_all_code: "Принудительно использовать подсветку кода для всех отформатированных блоков кода, даже когда они явно не указан язык." highlighted_languages: "Включить правила подсветки синтаксиса. (ВНИМАНИЕ: включение для многих языков может вызвать проблемы с производительностью) пример можно посмотреть на: https://highlightjs.org/static/demo/ " - embeddable_host: "Имя хоста которому разрешено использовать комменты с данного форума. Не указывайте http://" feed_polling_enabled: "ТОЛЬКО ДЛЯ ВЛОЖЕННЫХ: Встраивать ли вложенные сообщения в RSS/ATOM ленту" feed_polling_url: "URL адрес импорта RSS/ATOM ленты" embed_by_username: "Имя пользователя который созал вложенную тему" embed_username_key_from_feed: "Ключ для извлечения пользователя из ленты" embed_truncate: "Обрезать встроенные сообщения." - embed_category: "Категория встроенных тем" embed_post_limit: "Максимальное количество вложенных сообщений." embed_whitelist_selector: "CSS selector которые разрешины для использования." embed_blacklist_selector: "CSS selector которые запрещены для использования." notify_about_flags_after: "Если есть жалобы, которые не были обработаны после этого колличества часов, отправить уведомление по электронной почте на contact_email. Значение 0, чтобы отключить." enable_cdn_js_debugging: "Добавить права crossorigin для всех js включений для правильного отображения ошибок в /logs " show_create_topics_notice: "Если общее количество тем меньше 5, показывать персоналу соощбение с просьбой создать новые темы." + delete_drafts_older_than_n_days: Удалять черновики, которые старше (n) дней. vacuum_db_days: "Запускать VACUUM FULL ANALYZE для восстановления базы данных после миграций ( 0 отключает)" prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложенные файлы. ВНИМАНИЕ: при этом будут недоступны любые вложения кроме картинок." slug_generation_method: "Выберите метод генерации URL. 'encoded' будет изпользовать русские буквы в URL закодированные через проценты. 'none' не будет использовать перегенирацию." @@ -1072,19 +1071,9 @@ ru: redirected_to_top_reasons: new_user: "Добро пожаловать в наше сообщество! Вот самые популярные недавние темы." not_seen_in_a_month: "С возвращением! Т.к. вас не было какое-то время, мы собрали список популярных тем за время вашего отсутсвия. Вот они." - move_posts: - new_topic_moderator_post: - one: "Сообщение перенесено в новую тему: %{topic_link}" - few: "%{count} сообщений перенесены в новую тему: %{topic_link}" - many: "%{count} сообщений перенесены в новую тему: %{topic_link}" - other: "%{count} сообщений перенесены в новую тему: %{topic_link}" - existing_topic_moderator_post: - one: "Сообщение перенесено в уже существующую тему: %{topic_link}" - few: "%{count} сообщений перенесены в уже существующую тему: %{topic_link}" - many: "%{count} сообщений перенесены в уже существующую тему: %{topic_link}" - other: "%{count} сообщений перенесены в уже существующую тему: %{topic_link}" change_owner: post_revision_text: "Владелец сменен с %{old_user} на %{new_user}" + deleted_user: "Удаленный пользователь" emoji: errors: name_already_exists: "Название \"%{name}\" уже используется для другой иконки." @@ -1142,6 +1131,7 @@ ru: not_allowed_from_ip_address: "Вход с этого IP в качестве пользователя %{username} запрещен." admin_not_allowed_from_ip_address: "Вход с этого IP в качестве администратора запрещен." suspended: "Вы не можете войти до %{date}." + suspended_with_reason: "Учетная запись заблокирована до %{date}: %{reason}" errors: "%{errors}" not_available: "Недоступно. Попробуйте %{suggestion}?" something_already_taken: "Что-то пошло не так, возможно, имя пользователя или электронный ящик уже используются. Попробуйте восстановить ваш пароль." @@ -1149,6 +1139,7 @@ ru: omniauth_error_unknown: "В процессе входа на сайт произошла ошибка. Пожалуйста, повторите попытку." new_registrations_disabled: "Новые регистрации сейчас ограничены." password_too_long: "Максимальная длина пароля - 200 символов." + reserved_username: "Такой псевдоним не разрешен." missing_user_field: "Вы не заполнили все поля пользователя" close_window: "Аутентификация выполнена. Закройте это окно для продолжения." user: @@ -1159,10 +1150,12 @@ ru: characters: "должно состоять только из цифр и латинских букв" unique: "должно быть уникально" blank: "необходимо заполнить" - must_begin_with_alphanumeric: "должно начинаться с буквы или цифры" email: not_allowed: "недопустимый почтовый домен. Пожалуйста, используйте другой адрес." blocked: "не разрешено." + ip_address: + blocked: "Новые регистрации запрещены с вашего IP-адреса." + max_new_accounts_per_registration_ip: "Новые регистрации запрещены с вашего IP-адреса (достигнут лимит регистраций). Свяжитесь с администрацией." invite_mailer: subject_template: "%{invitee_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}" text_body_template: | @@ -1197,13 +1190,6 @@ ru: Это персональное приглашение от зарегистрированного пользователя, которому мы доверяем, поэтому вам не понадобиться авторизоваться на сайте. invite_password_instructions: subject_template: "Задайте пароль для вашей учетной записи на сайте %{site_name}" - text_body_template: | - Спасибо, что приняли приглашение на сайт %{site_name} -- добро пожаловать! - - Чтобы войти, нажмите следующую следующую ссылку и установите пароль: - %{base_url}/users/password-reset/%{email_token} - - Если вы не помните свой пароль или еще его не установили, выбирите "я забыл свой пароль" когда войдете на сайт и укажите свой имейл. test_mailer: subject_template: "[%{site_name}] Проверка доставки писем" text_body_template: | @@ -1247,35 +1233,31 @@ ru: new_version_mailer: subject_template: "[%{site_name}] Ихууу, доступна новая версия Discourse!" text_body_template: | - Доступна новая версия [Discourse](http://www.discourse.org). + Доступна новая версия [движка вашего форума](http://www.discourse.org). - Установленная версия: %{installed_version} + Ваша версия: %{installed_version} Новая версия: **%{new_version}** - Что дальше: + - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Узнать, что нового в [GitHub](https://github.com/discourse/discourse/commits/master). + - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Запустить обновление. Для этого перейдите по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) и нажмите на кнопку "Обновить". - - - Посетить сайт англоязычного сообщества Discourse [meta.discourse.org](http://meta.discourse.org), чтобы узнать о новостях, почитать интересные дискуссии или спросить о помощи или совете. + - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. new_version_mailer_with_notes: subject_template: "[%{site_name}] новые обновления" text_body_template: | - Доступна новая версия [Discourse](http://www.discourse.org). + Доступна новая версия [движка вашего форума](http://www.discourse.org). - Установленная версия: %{installed_version} + Ваша версия: %{installed_version} Новая версия: **%{new_version}** - Что дальше: + - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Узнать, что нового в [GitHub](https://github.com/discourse/discourse/commits/master). + - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Запустить обновление. Для этого перейдите по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) и нажмите на кнопку "Обновить". + - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. - - Посетить сайт англоязычного сообщества Discourse [meta.discourse.org](http://meta.discourse.org), чтобы узнать о новостях, почитать интересные дискуссии или спросить о помощи или совете. - - ### Release notes + ### Что новенького %{notes} flags_reminder: @@ -1292,6 +1274,16 @@ ru: few: "%{count} жалобы ожидают рассмотрения" many: "%{count} жалоб ожидают рассмотрения" other: "%{count} жалоб ожидают рассмотрения" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 сообщение ожидает проверки" + few: "[%{site_name}] %{count} сообщения ожидают проверки" + many: "[%{site_name}] %{count} сообщений ожидают проверки" + other: "[%{site_name}] %{count} сообщений ожидают проверки" + text_body_template: | + Привет, + + Поступили новые сообщения, требующие проверки. [Проверку можно выполнить тут](%{base_url}/queued-posts). flag_reasons: off_topic: "Сообщество считает, что ваше сообщение **не относится к теме**, учитывая ее заголовок и первое сообщение." inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нурашающим [кодекс чести](/guidelines)." @@ -1303,7 +1295,7 @@ ru: disagreed: "Спасибо за информацию. Уже рассматриваем." deferred: "Спасибо за информацию. Уже рассматриваем." deferred_and_deleted: "Спасибо за информацию. Сообщение удалено." - temporarily_closed_due_to_flags: "Эта тема временно закрыта из-за большого количества жалоб" + temporarily_closed_due_to_flags: "Эта тема временно закрыта из-за большого количества жалоб." system_messages: post_hidden: subject_template: "Сообщение скрыто по причине поступления множественных жалоб" @@ -1323,75 +1315,6 @@ ru: Тем не менее, если сообщение окажется скрытым второй раз, об этом будут оповещены модераторы, которые могут отреагировать на жалобы, вплоть до приостановления доступа к вашей учетной записи. Дополнительная информация доступна в [часто задаваемых вопросах](%{base_url}/guidelines). - usage_tips: - text_body_template: | - Несколько коротких советов, чтобы помочь вам освоиться на форуме: - - ## Прокручивайте страницу - - Здесь нет кнопок "Следующая страница" или номеров страниц – чтобы читать дальше, **просто крутите вниз!** - - Когда придут новые сообщения, они отобразятся автоматически. - - ## Где я? - - - Для поиска, перехода к своему профилю или отображения меню используйте **кнопку ☰ в правом верхнем углу**. - - - Клик на заголовок темы приведет к следующему непрочитанному сообщению. Используйте ссылки "Активность" и "Ответов" чтобы перейти в начало или конец темы. - - - Когда читаете тему, переходите в начало ↑, нажав на заголовок темы. Нажмите на зеленую панель в правом нижнем углу для управления навигацией или используйте кнопки home и end на клавиатуре. - - - - ## Как ответить? - - - Чтобы ответить на всю тему в целом, используйте кнопку "Ответить" в самом низу страницы. - - - Чтобы ответить на отдельное сообщение, используйте кнопку "Ответить" в теле этого сообщения. - - - Чтобы отклонить обсуждение в другом направлении, но сохранить эти темы как взаимосвязанные, используйте кнопку "Ответить в новой связанной теме" справа от сообщения. - - Чтобы процитировать чье-либо сообщение в вашем ответе, выделите текст, который вы хотите процитировать, и затем нажмите кнопку "Ответить". - - - - Чтобы упомянуть кого-либо в вашем ответе, укажите его имя. Введите с клавиатуры символ '@', и появится список автоматического дополнения с именами пользователей. - - - - Чтобы добавить [стандартные иконки Emoji](http://www.emoji.codes/), просто введите с клавиатуры символ ':' или традиционный смайлик ':)' :smile: - - ## Что еще я могу делать? - - Внизу каждого сообщения есть кнопки действий. - - - - Чтобы дать кому-то понять, что вам понравилось его сообщение, используйте кнопку **мне нравится**. Если вы заметили нарушение в сообщении, сообщите об этом приватно автору или команде сайта, нажав на кнопку **пожаловаться на сообщение**. - - Также вы можете **поделиться ссылкой на сообщение** или **добавить его в закладки**, чтобы в будущем найти это сообщение в своем профиле. - - ## Кто говорит со мной? - - Когда кто-то отвечает на ваше сообщение, цитирует ваше сообщение или упоминает вас с помощью '@', в правом верхнем углу сразу же появляется число. Нажмите на эту иконку чтобы перейти к **уведомлениям**. - - - - Не беспокойтесь о пропущенных ответах – мы отправим вам письмо на электронную почту о новых ответах (и сообщениях) если вас не будет в онлайне, когда они появятся. - - ## Что такое новые темы? - - По умолчанию, все темы младше двух дней считаются новыми, и любая тема, в которой вы приняли активное участие (отвечали, создали ее или читали достаточно долгое время) будет автоматически отслеживаться на предмет обновлений. - - Вы увидите синий "новый" и числовой индикаторы рядом с такими темами: - - - - Вы можете изменить настройки уведомлений и отслеживания с помощью списка внизу темы (то же самое касается и категорий). Чтобы изменить настройки отслеживания тем или классификацию тем как "новых", перейдите в [свои пользовательские настройки](%{base_url}/my/preferences). - - ## Почему я не могу делать некоторые вещи? - - Новые пользователи ограничены в некоторых правах по соображениям безопасности. В процессе вовлечения и участия в жизни сообщества, вы зарабатываете доверие, становитесь полноправным гражданином, и эти ограничения будут автоматически сняты. При достаточно высоком [уровне доверия](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), вы получите еще больше возможностей чтобы помогать нам вместе управлять сообществом. welcome_user: subject_template: "Добро пожаловать на %{site_name}!" text_body_template: | @@ -1428,7 +1351,7 @@ ru: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Резервное копирование успешно завершено" - text_body_template: "Резервная копия создана.\nПерейдите в [Админку > Резервные копии](/admin/backups), чтобы скачать её." + text_body_template: "Резервная копия создана.\nПерейдите в [Админку > Резервные копии](%{base_url}/admin/backups), чтобы её скачать." backup_failed: subject_template: "Резервное копирование не удалось" text_body_template: | @@ -1496,6 +1419,10 @@ ru: subject_template: "[%{site_name}] Неполадки с письмом - отсутствует текст" email_reject_parsing: subject_template: "[%{site_name}] Неполадки с письмом - Недопустимый контент." + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст **в самом верху письма**. email_reject_invalid_access: subject_template: "[%{site_name}] Системное сообщение -- Доступ запрещен" text_body_template: | @@ -1537,10 +1464,24 @@ ru: Мы не смогли найти адресата. Убедитесь что адресат указан в поле To: (а не в Cc: или Bcc:), и то что имейл указа верно. email_reject_topic_not_found: subject_template: "[%{site_name}] Системное сообщение -- Тема не найдена" + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Тема, в которую вы пишите, не существует. Возможно, она была удалена. Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_reject_topic_closed: subject_template: "[%{site_name}] Неполадки с письмом - Топик закрыт" + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Тема, в которую вы пишите, была закрыта, и поэтому новые сообщения не разрешены. Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_reject_auto_generated: subject_template: "[%{site_name}] системное сообщение - Автоматически сгенерирован ответ" + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Система обнаружила, что оно было сгенерировано автоматически, а такие письма не допустимы для автоматической отправки сообщений в форуме через электронную почту. + + Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_error_notification: subject_template: "[%{site_name}] Системное сообщение -- ошибка POP аутентификации" text_body_template: | @@ -1604,7 +1545,6 @@ ru: download_remote_images_disabled: subject_template: "Загрузка копий изображений выключена" text_body_template: "Настройка `download_remote_images_to_local` была отключена, т.к. диск заполнился до отменки, указанной в настройке `download_remote_images_threshold`." - unsubscribe_link: "Для того, чтобы отписаться от подобных сообщений, перейдите в [настройки профиля](%{user_preferences_url})." subject_re: "Re:" subject_pm: "[PM]" user_notifications: @@ -1763,7 +1703,6 @@ ru: (Если вам требуется помощь [администрации](%{base_url}/about), вы можете задать свой вопрос, просто ответив на данное письмо.) signup: - subject_template: "[%{site_name}] Активируйте свою учетную запись" text_body_template: | Добро пожаловать на сайт %{site_name}! @@ -1795,8 +1734,6 @@ ru: too_large: "Файл, который вы пытаетесь загрузить, слишком большой (максимальный разрешенный размер %{max_size_kb}%kb)." images: too_large: "Изображение, которое вы пытаетесь загрузить, слишком большое (максимальный разрешенный размер %{max_size_kb}%kb), пожалуйста, уменьшите размер изображения и повторите попытку." - fetch_failure: "Извините, во время извлечения изображения произошла ошибка." - unknown_image_type: "Файл, который вы загружаете, не является изображением." size_not_found: "Извините, мы не можем определить размер изображения. Возможно, изображение повреждено?" flag_reason: sockpuppet: "Новый пользователь создал тему и другой новый пользователь с того же IP адреса ответил. Для получения подробностей см. настройку сайта flag_sockpuppets." @@ -1829,298 +1766,34 @@ ru: Отредактируйте первое сообщение этой темы чтобы изменить содержание страницы {page_name}. guidelines_topic: title: "Руководство и часто задаваемые вопросы" - body: | - - - ## [Это цивилизованное место для публичной дискуссии](#civilized) - - Пожалуйста, относитесь к этому форуму с таким же уважением, с которым вы отнеслись бы к общественому парку. Наше сообщество — это место для обмена навыками, знаниями и интересами через общение. - - Здесь нет строгого и краткого свода правил, только лишь общее руководство по управлению нашим сообществом. Используйте эти рекомендации для того, чтобы сохранить этот форум чистым и хорошо освещенным местом для цивилизованного публичного общения. - - - - ## [Улучшайте дискуссию](#improve) - - Помогите нам сделать этот форум замечательным местом для общения, улучшая дискуссию любым возможным способом, даже незначительным. Если вы не уверены, что ваше сообщение улучшит дискуссию, подумайте еще раз, что вы хотите сказать на самом деле, или попытайтесь написать чуть позже. - - Темы, обсуждаемые на этом форуме, имеют для нас значение, и мы хотим, чтобы они имели значение для вас. Уважайте темы и людей, которые их обсуждают, даже если вы не согласны с чем-либо, что было сказано. - - Вы сможете улучшить дискуссию, изучив темы, которые уже обсуждаются. Пожалуйста, потратьте немного своего времени, исследуя существующие темы перед тем, как ответить или начать новую. Так вы сможете увеличить шанс встреть людей, разделяющих ваши интересы. - - - - ## [Будьте цивилизованны, даже если вы не согласны](#agreeable) - - Возможно, вы захотите ответить, не соглашаясь с чем-то. Это нормально. Но помните, что _следует критиковать идеи, а не людей_. Пожалуйста, избегайте: - - * Ругательства. - * Перехода на личности. - * Реакции на тон сообщения вместо его содержания. - * Рефлекторной, необдуманной реакции. - - Вместо этого приведите обоснованный контраргумент, который улучшит дискуссию. - - - - ## [Ваше участие имеет решающее значение](#participate) - - Обсуждения, которые мы ведем на этом форуме, задают тон каждому участнику. Помогите нам повлиять на будущее этого сообщества, активно включаясь в обсуждения, которые делают форум интересным местом, и избегая бесполезных. - - Форум предоставляет инструменты, которые позволяют сообществу совместно определять лучшие (и худшие) вклады: избранное, закладки, лайки, жалобы, ответы, правки и т. д. Используйте эти инструменты, чтобы улучшить свои собственные впечатления и впечатления других участников. - - Давайте сделаем так, чтобы после нашего прихода парк стал лучше, чем он был до нас. - - - - ## [Если вы заметили проблему, сообщите о ней](#flag-problems) - - Модераторы имеют особые полномочия; они в ответе за форум. Но и вы тоже. С вашей помощью модераторы могут стать помощниками сообщества, а не только уборщиками или полицейскими. - - Если вы заметили неприемлемое поведение, не отвечайте. Это поощряет такое поведение, признавая его, расходует ваши силы и тратит время каждого. _Пожалуйтесь_. Если накопится достаточно жалоб, будут приняты необходимые меры, либо автоматически, либо с привлечением модератора. - - В целях поддержки нашего сообщества модераторы оставляют за собой право удалить любые материалы и любого пользователя в любой момент времени и без объяснения причин. Модераторы не занимаются премодерацией новых сообщений; модераторы и операторы сайта не несут ответственности за содержание материалов, размещенных пользователями форума. - - - - ## [Всегда будьте цивилизованны](#be-civil) - - Ничто не вредит здоровому общению так, как грубость: - - * Будьте цивилизованны. Не публикуйте ничего такого, что разумный человек счел бы обидным, оскорбительным или враждебным. - * Содержите форум в чистоте. Не публикуйте непристойные или сексуально откровенные материалы. - * Уважайте друг друга. Не утомляйте и не раздражайте других, не выдавайте себя за кого-то, кем вы не являетесь, и не публикуйте персональные данные людей. - * Уважайте наш форум. Не публикуйте спам и не допускайте вандализма в любой форме. - - У нас нет строгих правил с точными определениями — избегайте даже _косвенного сходства_ с недопустимыми вещами. Если вы не уверены, спросите себя, как бы вы себя почувствовали, если ваше сообщение увидели близкие вам люди. - - Это публичный форум, и поисковые машины индексируют его содержимое. Помните, что ваши высказывания, ссылки и изображения могут увидеть несовершеннолетние и ваши друзья. - - - - ## [Будьте аккуратны](#keep-tidy) - - Старайтесь размещать вещи в правильных местах, чтобы мы могли потратить больше времени на общение и меньше на уборку. Поэтому: - - * Не начинайте тему в неподходящей для нее категории. - * Не публикуйте свое сообщение сразу в нескольких местах. - * Не публикуйте бессодержательные сообщения. - * Не отклоняйтесь от темы в середине обсуждения. - * Не подписывайте свои сообщения — к каждому сообщению автоматически прикреплена ссылка на ваш профиль. - - Вместо сообщений "+1" или "Согласен" используйте кнопку "Мне нравится". Вместо разворота темы в совершенно другом направлении используйте функцию "Ответить в новой связанной теме". - - - - ## [Публикуйте только то, на что у вас есть права](#stealing) - - Не следует размещать материалы, принадлежащие другим лицам, без их разрешения. Не следует размещать описания, ссылки или способы кражи чьей-либо интеллектуальной собственности (программы, видео, аудио, изображения) или способы нарушения любого другого закона. - - - - ## [Вы управляете форумом](#power) - - Этот сайт управляется [дружественным коллективом](/about) и *вами*, сообществом. Если у вас есть вопросы, касающиеся принципов работы форума, откройте новую тему в [категории meta](/c/meta) и давайте обсудим их! В случае возникновения критической или срочной проблемы, которая не может быть решена с помощью meta темы или жалобы, свяжитесь с нами через [страницу коллектива](/about). - - - - ## [Условия предоставления услуг](#tos) - - Да, юридические документы скучны, но мы должны защитить себя – и в расширительном смысле вас и вашу информацию – против недоброжелателей. У нас есть раздел [Условия предоставления услуг](/tos), описывающий ваше (и наше) поведение и права относительно содержимого, приватности и закона. Чтобы пользоваться нашими услугами, вы должны согласиться следовать нашим [условиям предоставления услуг](/tos). tos_topic: title: "Пользовательское соглашение" - body: "Настоящие правила регулируют все виды использования сайта %{company_domain}  а также всего контента, предоставляемых услуг и продуктов, в том числе, но не ограничиваясь, %{company_domain} комплекса программного обеспечения, %{company_domain} хостинга (\"Хостинг\"), (совместно объединённых и далее упоминаемое как Веб-сайт). Веб-сайт является собственностью и управляется компанией %{company_full_name} (\"%{company_name}\"). Настоящее соглашение является публичной офертой и принимается пользователем без оговорок, и включает в себя все остальные правила, (в том числе, но неограчиваясь %{company_domain}’s [Политика конфиденциальности](/privacy) и [Правила сообщества](/faq)) а также правила, которые могут быть опубликованы время от времени на этом Веб-сайте %{company_name} (в дальнейшем \"Соглашение\"). \n\nПожалуйста, внимательно прочитайте данное Соглашение, прежде чем начать пользоваться Веб-сайтом. Переходя на данный веб-сайт или используя любую его часть, вы обязуетесь выполнять правила и условия данного соглашения. Если вы не согласны со всеми правилами и условиями данного соглашения, вам запрещается переходить на Веб-сайт или пользоваться какими-либо услугами. Если данные правила и условия рассматриваются как предложение %{company_name}, его принятие недвусмысленно ограничено данными условиями. Доступ к Веб-сайту могут получить только лица не моложе 13 лет.\n\n\n\n## [1.  Ваша учетная запись и сайт на Веб-сайте %{company_domain}](#1)\nПри создании аккаунта на Веб-сайте вы несете ответственность за безопасность своей учетной записи, а также несете полную ответственность за все действия, осуществляемые из данной учетной записи. Вы обязаны незамедлительно уведомить %{company_name} о любом несанкционированном использовании учетной записи, а также о любом другом нарушении безопасности. %{company_name} не несет обязательств за любые действия (или бездействие) с вашей стороны, включая ущерб любого рода, который повлекли за собой такие действия (или бездействие).\n\n\n\n## [2. Обязанности публикаторов](#2)\n\nЕсли вы публикуете сообщения на Веб-сайте, комментируете записи, публикуете материал или ссылки на Веб-сайте либо любым другим способом открываете (или разрешаете любой третьей стороне открывать) доступ к материалу при помощи Веб-сайта (к любому подобному материалу, «Содержимому»), то вы несете полную ответственность за данное содержимое и любой ущерб, вызванный данным Содержимым. Данное условие применяется независимо от того, является ли рассматриваемое Содержимое\ - \ текстом, изображением, аудиофайлом или компьютерным программным обеспечением. Предоставляя доступ к Содержимому, вы заявляете и гарантируете следующее:\n• загрузка, копирование и использование Содержимого не нарушает имущественные права любой третьей стороны, включая, помимо прочего, авторские права, патентные права, права на товарные знаки или на коммерческую тайну.\n• если ваш сотрудник обладает правом на созданную вами интеллектуальную собственность, вы либо (i) получили от данного сотрудника разрешение на публикацию или открытие доступа к Содержимому, включая, помимо прочего, любое программное обеспечение; либо (ii) получили от данного сотрудника добровольный отказ от всех прав на Содержимое;\n• вы полностью соблюли права лицензирования любой третьей стороны, связанные с Содержимым, и сделали все необходимое для передачи конечным пользователям информации обо всех обязательных условиях;\n• Содержимое не содержит и не устанавливает вирусы, программы-«черви», вредоносное или троянское ПО, а также любое другое вредоносное или разрушительное содержимое;\n• Содержимое не является спамом, не генерируется автоматически или случайным образом и не содержит неэтичного либо нежелательного коммерческого содержимого, используемого с целью привлечь трафик на сторонние сайты или повысить рейтинг сторонних сайтов в поисковых системах; а также не производит иных незаконных действий (например, фишинг), и не вводит получателей информации в заблуждение касательно источника материала (например, при злоумышленном искажении информации);\n• Содержимое не является порнографией, не содержит угроз, не поощряет насилие и не нарушает права третьих сторон на конфиденциальность или публичные высказывания;\n• ваш блог не рекламируется при помощи нежелательных электронных сообщений и спам-ссылок в новостных группах, рассылках по электронной почте, других блогах и веб-сайтах, а также с использованием иных нежелательных методов продвижения;\n• в своем блоге вы не выдаете себя за другое лицо или компанию;\n• и при наличии Содержимого, включающего компьютерный код, вы точно определили категорию и (или) описали тип, характер, использование и результаты использования данных материалов в соответствии с запросом компании %{company_name} или иным образом.\nПередавая компании Automattic Содержимое для добавления на свой Веб-сайт, вы предоставляете Automattic глобальную, безвозмездную и неисключительную лицензию на воспроизведение, изменение, адаптацию и публикацию Содержимого, осуществляемую исключительно в целях демонстрации, распространения\ - \ и продвижения вашего блога. Данная лицензия дает %{company_name} право на предоставление доступа к опубликованному содержимому третьим сторонам, выбранным %{company_name} с целью анализа и распространения (но не публикации) вашего содержимого посредством услуг данных третьих сторон.\nВы также предоставляете другим пользователям %{company_domain} право на публикацию вашего Содержимого на других сайтах %{company_domain} и на добавление в ваше Содержимое их собственного Содержимого (т. е. на перепост вашего Содержимого в других блогах) при условии, что они используют только часть вашей публикации и оставят ссылку на ваш сайт, указывающую, что вы являетесь автором исходной публикации (осуществляется автоматически с помощью функции перепоста на %{company_domain}).\nЕсли вы удалите Содержимое, %{company_name} предпримет все возможное для его удаления с Веб-сайта. В то же время вы признаете, что сохраненную в кэше копию или сторонние ссылки на Содержимое невозможно сразу же сделать недоступными.\nНа основании данных заявлений или гарантий %{company_name} обладает неограниченным правом (но не обязательством) без объяснения причин (i) отказать в публикации или удалить любое содержимое, которое %{company_name} обоснованно считает вредоносным, нарушающим какую-либо политику %{company_name} или неприемлемым по любой другой причине; или (ii) приостановить или запретить доступ к Веб-сайту и использование Веб-сайта любому физическому или юридическому лицу без объяснения причин. %{company_name} не обязуется возместить любые ранее выплаченные суммы.\n\n\n\n## [3. Лицензирование публикуемых материалов](#3)\nМатериалы публикуемые пользователем на Веб-сайте регулируются [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US).\nПередавая компании %{company_name} Содержимое для добавления на свой Веб-сайт, вы предоставляете %{company_name} глобальную, безвозмездную и неисключительную лицензию на воспроизведение, изменение, адаптацию и публикацию Содержимого, осуществляемую исключительно в целях демонстрации, распространения и продвижения вашего блога. Данная лицензия дает %{company_name} право на предоставление доступа к опубликованному содержимому третьим сторонам, выбранным %{company_name} с целью анализа и распространения (но не публикации) вашего содержимого посредством услуг данных третьих сторон.\nВы также предоставляете другим пользователям %{company_domain} право на публикацию вашего Содержимого на других сайтах %{company_domain}\ - \ и на добавление в ваше Содержимое их собственного Содержимого (т. е. на перепост вашего Содержимого в других блогах) при условии, что они используют только часть вашей публикации и оставят ссылку на ваш сайт, указывающую, что вы являетесь автором исходной публикации (осуществляется автоматически с помощью функции перепоста на %{company_domain}).\nЕсли вы удалите Содержимое, %{company_name} предпримет все возможное для его удаления с Веб-сайта. В то же время вы признаете, что сохраненную в кэше копию или сторонние ссылки на Содержимое невозможно сразу же сделать недоступными.\nНа основании данных заявлений или гарантий %{company_name} обладает неограниченным правом (но не обязательством) без объяснения причин (i) отказать в публикации или удалить любое содержимое, которое %{company_name} обоснованно считает вредоносным, нарушающим какую-либо политику %{company_name} или неприемлемым по любой другой причине; или (ii) приостановить или запретить доступ к Веб-сайту и использование Веб-сайта любому физическому или юридическому лицу без объяснения причин. %{company_name} не обязуется возместить любые ранее выплаченные суммы.\n\n\n\n## [4. Оплата и продление](#4)\n\n• Общие условия На Веб-сайте доступны дополнительные платные услуги, например дополнительное пространство для хранения или приобретение домена (любые подобные услуги, далее «Платная услуга»). Выбирая Платную услугу, вы соглашаетесь выплачивать %{company_name} ежемесячный или ежегодный взнос за подписку, сумма которого указана для данной услуги. Взносы взимаются на условиях предоплаты в день оформления подписки на Платную услугу и включают плату за использование данной услуги в течение месяца или года, в соответствии с указанными условиями оформления подписки. Стоимость Платных услуг не подлежит возмещению.\n• Автоматическое продление Если вы не сообщили компании %{company_name} о своем желании отменить подписку на Платную услугу до завершения применимого периода подписки, данная подписка будет продлена автоматически. При этом вы предоставляете %{company_name} право на сбор применимой на тот момент ежегодной или ежемесячной платы за подписку на данную Платную услугу (с учетом любых налогов) с помощью имеющихся у компании сведений о любой кредитной карточке или другом способе оплаты, связанном с вами. Платные услуги можно в любой момент отменить в разделе «Покупки» на консоли вашего сайта.\n\n\n\n## [5. Услуги](#5)\n\nУслуги хостинга и поддержки. %{company_name} предоставляет услуги поддержки по соответствующим правилам\ - \ и условиям. Регистрируя учетную запись, вы соглашаетесь соблюдать данные правила и условия.\n\n\n\n## [6. Ответственность посетителей Веб-сайта](#6)\n %{company_name} не проверяет и не может проверить все материалы, включая компьютерное программное обеспечение, размещенные на Веб-сайте, и, как следствие, не может нести ответственность за содержимое, использование или результаты использования данных материалов. Осуществляя руководство Веб-сайтом, %{company_name} не заявляет и не подразумевает одобрение в отношении размещенных на нем материалов, а также собственную уверенность в том, что данные материалы точны, полезны и безопасны. Вы несете ответственность за принятие необходимых мер по защите себя и своих компьютерных систем от вирусов, «червей», троянского ПО и другого вредоносного или разрушительного содержимого. Представленное на Веб-сайте содержимое может являться оскорбительным, нецензурным или спорным, а также содержать технические, типографические и иные ошибки. Также на Веб-сайте может быть представлено содержимое, нарушающее право конфиденциальности, право на публичное высказывание или право на интеллектуальную собственность и другие имущественные права третьих сторон; а также содержимое, на загрузку, копирование или использование которого распространяются дополнительные указанные или негласные правила или условия. %{company_name} отказывается от любой ответственности за любой ущерб, причиненный в результате использования Веб-сайта посетителями или загрузки ими любого размещенного на нем содержимого.\n\n\n\n## [7. Содержимое, опубликованное на других веб-сайтах](#7)\n\nМы не проверяем и не можем проверить все материалы, включая компьютерное программное обеспечение, доступное на веб-сайтах и веб-страницах, на которые ссылается %{company_domain} и которые ссылаются на %{company_domain}. %{company_name} никоим образом не контролирует веб-сайты и веб-страницы, не входящие в портал %{company_domain}s, и не несет ответственности за их содержимое или использование. Оставляя ссылки на веб-сайты или веб-страницы, не входящие в %{company_domain}, %{company_name} не заявляет и не подразумевает одобрение в отношении подобных веб-сайтов или веб-страниц. Вы несете ответственность за принятие необходимых мер по защите себя и своих компьютерных систем от вирусов, «червей», троянского ПО и другого вредоносного или разрушительного содержимого. %{company_name} отказывается от любой ответственности за любой ущерб, вызванный использованием веб-сайтов и веб-страниц, не входящих в\ - \ %{company_domain}.\n\n\n\n## [8. Нарушение авторских прав и закона об авторском праве в цифровую эпоху](#8)\n\nКомпания %{company_name} просит других уважать ее права на интеллектуальную собственность и уважает права других на интеллектуальную собственность. Если вы считаете, что материал, расположенный или ссылающийся на %{company_domain}, нарушает ваши авторские права, просим вас уведомить об этом компанию %{company_name} в соответствии с политикой Automattic в отношении закона об авторском праве в цифровую эпоху (DMCA). %{company_name} ответит на любые подобные уведомления, в том числе, если это будет необходимо или целесообразно, посредством удаления нарушающего законы и права материала или блокировки всех ссылок на такой материал. %{company_name} лишит посетителя доступа к Веб-сайту и возможности использования Веб-сайта в случае, если в соответствующих обстоятельствах будет выяснено, что данный посетитель неоднократно нарушал авторские права или другие права на интеллектуальную собственность компании %{company_name} или других лиц. В случае подобной блокировки посетителя компания %{company_name} не обязана возместить любые суммы, ранее выплаченные компании %{company_name}.\n\n\n\n## [9. Интеллектуальная собственность](#9)\n\nДанное соглашение не является актом передачи компанией %{company_name} вам любого права на интеллектуальную собственность, принадлежащего %{company_name} или третьей стороне. Все права владения, пользования и распоряжения, связанные с данной собственностью, остаются (в рамках отношений между сторонами) в единоличной собственности %{company_name}. %{company_name}, %{company_domain}, логотип %{company_domain} и все остальные товарные знаки, знаки облуживания, графические символы и логотипы, используемые в связи с WordPress.com или Веб-сайтом, являются товарными знаками или зарегистрированными товарными знаками %{company_name} или лицензиаров %{company_name}. Другие товарные знаки, знаки обслуживания, графические символы и логотипы, используемые в связи с Веб-сайтом, могут являться товарными знаками других сторонних лиц. Использование Веб-сайта не дает вам право или лицензию на воспроизведение или иное использование любых товарных знаков %{company_name} или третьей стороны.\n\n\n\n## [10. Реклама](#10)\n\n%{company_name} оставляет за собой право на показ рекламы на странице с вашими материалами, если вы не приобрели платную услугу для устранения рекламы или учетную запись, включающую VIP-услуги.\n\n\n\n## [11.\ - \ Установление авторства](#11)\n\n  %{company_name} оставляет за собой право на отображение ссылок для установления авторства, например «Блог на портале %{company_domain}», автора темы и данных о разработчике шрифта в «подвале» или на панели инструментов вашего блога. Информацию об авторах в «подвале» и на панели инструментов %{company_domain} запрещается изменять или удалять, вне зависимости от приобретенных платных услуг.\n\n\n\n## [12. Изменения](#12)\n\nМы постоянно обновляем наши услуги и, как следствие, иногда мы вынуждены менять юридические условия их предоставления. Если в условия предоставления услуг внесены существенные изменения, мы сообщим о них путем публикации в одном из наших блогов или по электронной почте (либо с помощью другого средства связи) прежде, чем они вступят в силу. В уведомлении будет указан приемлемый период времени, по завершении которого новые условия вступят в силу. Если вы не согласны с нашими изменениями, вы должны прекратить использование %{company_domain} до истечения периода времени, указанного в уведомлении. На дальнейшее использование %{company_domain} будут распространяться новые условия. Тем не менее, любые разногласия, возникшие до внесения изменений, решаются на условиях (включая обязательную арбитражную оговорку для физических лиц), действовавших на момент возникновения данных разногласий.\n\n\n\n## [13. Прекращение обслуживания](#13)\n\n%{company_name} может закрыть доступ ко всему Веб-сайту или любым его частям в любой момент при наличии повода или без такового, с уведомлением или без такового; закрытие доступа осуществляется мгновенно. Чтобы расторгнуть данное Соглашение или прекратить действие учетной записи %{company_domain} (при ее наличии), вы можете просто прекратить пользоваться Веб-сайтом. Все положения данного Соглашения, которые по своему характеру должны остаться в силе после его расторжения, остаются в силе после расторжения соглашения, включая, помимо прочего, положения о владении, отказы от гарантийных обязательств, гарантии от убытков и ограничения ответственности.\n\n\n\n## [14. Отказ от гарантийных обязательств](#14)\n\nДанный Веб-сайт предоставляется «как есть». Настоящим компания %{company_name}, ее поставщики и лицензиары отказываются от любых гарантий любого рода, явных или подразумеваемых, включая, помимо прочего, гарантии коммерческого качества, пригодности для конкретных целей и отсутствия нарушений. Ни компания %{company_name}, ни ее поставщики и лицензиары не дают гарантий любого\ - \ рода об отсутствии ошибок на Веб-сайте и о постоянном или непрерывном доступе к Веб-сайту. Если вы действительно читаете этот текст, то вы заслужили награду. Вы осознаете, что загружаете или иным образом получаете содержимое или услуги посредством Веб-сайта на собственное усмотрение и под свою ответственность.\n\n\n\n## [15. Ограничение ответственности](#15)\n\nНи при каких обстоятельствах компания %{company_name} или ее поставщики/лицензиары не несут ответственности ни за какой предмет данного соглашения в связи с любым контрактом, небрежностью, безусловным обязательством, а также любой другой законодательной базой или правом справедливости в отношении: (i) любого намеренного, случайного или результативного ущерба; (ii) стоимости приобретения альтернативных продуктов или услуг; (iii) прерыванием использования, утратой или повреждением данных; или (iv) любыми суммами, превышающими суммы взносов, которые вы выплачивали %{company_name} по данному соглашению в период продолжительностью двенадцать (12) месяцев до возникновения обстоятельств, послуживших причиной иска. %{company_name} не несет ответственности за любой сбой или задержку по причинам, которые объективно не может контролировать. Вышеуказанное не применяется в той степени, в которой это запрещено применимым законом.\n\n\n\n## [16. Общая декларация и гарантия](#16)\n\nВы заявляете и гарантируете, что (i) будете использовать Веб-сайт в строгом соответствии с политикой конфиденциальности %{company_name}, условиями данного Соглашения, а также всеми применимыми законами и нормативными требованиями (включая, помимо прочего, любые местные законы или нормативные требования в вашей стране, штате, городе или другой государственной единице, которые относятся к поведению в Интернете и приемлемому содержимому, включая все применимые законы в отношении передачи технических данных, экспортированных из США или страны, в которой вы находитесь); и (ii) использование вами Веб-сайта не приведет к нарушению или незаконному присвоению прав любой третьей стороны на интеллектуальную собственность.\n\n\n\n## [17. Возмещение убытков](#17)\n\nВы соглашаетесь оградить от ответственности и защитить от претензий компанию %{company_name}, ее подрядчиков и лицензиаров, а также их соответствующих директоров, руководителей, сотрудников и представителей, в случае любых возможных претензий и расходов, включая расходы на юридическую поддержку, проистекающие из использования вами Веб-сайта (в том числе вызванные нарушением вами\ - \ условий данного Соглашения).\n\n\n\n## [18. Прочее](#18)\n\nДанное Соглашение является полным соглашением между %{company_name} и вами в отношении предмета данного документа. Соглашение может быть изменено только посредством поправки, оформленной в письменном виде и подписанной уполномоченным лицом со стороны %{company_name}, либо посредством публикации %{company_name} измененной версии. Кроме случаев, когда обратное установлено действующим законодательством (при наличии такового) на данное Соглашение, любой доступ к Веб-сайту и любое использование Веб-сайта распространяются законы штата Калифорния, США, за исключением противоречий нормам права. Надлежащую подсудность при любых разногласиях, проистекающих или связанных с указанными нормами, будут обеспечивать суды штата и федеральные суды округа Сан-Франциско, Калифорния. За исключением исков в отношении судебного запрета или средств судебной защиты по праву справедливости, касающихся прав на интеллектуальную собственность (которые могут рассматриваться в любом компетентном суде без судебного залога), любые разногласия, связанные с данным Соглашением, окончательно урегулируются в соответствии с Комплексными правилами арбитражного разбирательства Службы судебного арбитража и медиации (Judicial Arbitration and Mediation Service, Inc. («JAMS») посредством деятельности трех арбитражных судей, назначенных в соответствии с данными правилами. Арбитражный суд должен проходить в Сан-Франциско (штат Калифорния) на английском языке. Решение арбитражного суда может быть приведено в исполнение в любом суде. Сторона, выигравшая дело в рамках любого правового действия и судебного разбирательства по выполнению условий данного Соглашения, имеет право на возмещение расходов (включая расходы на юридические услуги). Если любая часть данного Соглашения признана недействительной или не обладающей исковой силой, данная часть должна быть истолкована в соответствии с исходным намерением сторон. Остальные части имеют полную юридическую силу. Отказ любой стороны от исполнения любого правила или условия данного Соглашения, а также нарушение сопутствующих положений не отменяет силу соответствующих правил и условий и не снимает со сторон ответственности за дальнейшие нарушения. Вы можете передать права по данному Соглашению любой стороне, которая выражает на то согласие и обязуется исполнять его правила и условия; %{company_name} также может передавать свои права по данному Соглашению без условий. Данное соглашение является обязательным для соблюдения и действует в\ - \ интересах самих сторон, их преемников и разрешенных правопреемников.\n\nЭтот документ соответствует CC-BY-SA. Последние изменения внесены в 31 мая 2013.\n\nАдоптированный текст содержится [WordPress Условия оказания услуг](https://ru.wordpress.com/tos/).\n" privacy_topic: title: "Политика конфиденциальности" - body: | - - - ## [Какую информацию мы собираем?](#collect) - - Мы собираем и обрабатываем данные которые вы передаете на сайт когда регистрируетесь на сайте, а так же когда читаете, пишите и другим спопособом используете материалы сайта. - - Когда вы регистрируетесь на сайте, у вас запрашиваются ваше имя и e-mail адресс. Вы так же можете посещать наш сайт без регистрации. Для проверки e-mail адресса мы направляем пользователю письмо с уникальной ссылкой. Если по ссылке был осуществлен переход мы считаем что именно вы контролируете это e-mail адресс. - - Во время регистрации и публикации материалов на сайте, мы записываем IP адресс с которого была произведена публикация. Мы также храним серверные логи в которых содержится информация об IP адрессе и каждом запросе с этого адреса к нашему серверу. - - - - ## [Как мы используем эту информацию?](#use) - - Любая информация которую мы собираем о вас может быть использованна в следующих случаях: - - * Для улучшения вашего взаимодействия с сервисом — информация о вас помогает нам улучшать сервис для вашего удобства. - * Для улучшения нашего сайта — мы постоянно стараимся улучшить наш сайт руководствуясь информацией полученной от наших пользователей. - * Для улучшения услуг, предоставляемых нашим пользователям — Информация о вас помогает нам более эффективно отвечать на запросы пользователей, сервесной поддержки и для поддержки сайта. - * Для рассылки информационных сообщений — email адрес, которые вы предоставили может быть использован для отправки вам информации, уведомлений об изменениях на которые вы подписались в темах или ответах в темах адрессованые вам, ответов на запросы, и / или другие вопросы. - - - - ## [Как мы защищаем информацию о вас?](#protect) - - Мы реализуем различные меры безопасности для обеспечения безопасности Вашей личной информации на всех стадиях: когда вы входите на сайт, публикуете материалы или просматриваете информацию о вас. - - - - ## [Какова ваша политика хранения данных?](#data-retention) - - Мы стараемся придерживаться следующих правил: - - * Логи содержащие IP адресс для всех ваших запросов хранятся не более 90 дней. - * IP адресс с которого была зарегистрированна учетная запись хранится не более 5 лет. - - - - ## [Используем ли мы cookies?](#cookies) - - Да. Cookies это небольшие файлы, которые сайт или сервис сохраняет на жесткий диск вашего компьютера с помощью веб браузера (если вы разрешили). Эти данные позволяеют сайту определять ваш браузер и если вы зарегистрированны на сайте, позволять вашему браузеру использовать данный аккаунт. - - Мы используем cookies для понимания какие настройки вы сделали на сайте и сохранения этих настроек для будующих визитов, а также для формирования статистики посещений сайта для того чтобы иметь возможность улучшать наш сайт и сервисы. Мы так же оставляем за собой право привлекать для анализа посещений нашего сайта сторонние компании. Сторонние компании могут получить от нас право на анализ собранных нами данных только в целях развития и совершенствования нашего бизнеса. - - - - ## [Какую информацию мы предоставляем третьим лицам?](#disclose) - - Мы не занимаемся торговлей, продаей, или другим распространением ваших персональных данных за пределы нашей компании. Это не относится к доверенным третьим лицам, которые помогают нам управлять нашим сайтом, вести наш бизнес, или предоставлять услуги, до тех пор пока они готовы хранить эти данные конфеденциально. Так же мы оставляем право за собой использовать информацию о вас в случаях когда это необходимо, в случаях предусмотренных действующим законодательством или политикой нашего сайта, а также для защиты наших или чужих прав, прав собственности или безопасности. Обезличенные данные могут быть переданы третьим лицам в использования в рекламных целях, или для других целей. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. - static: - search_help: | -

      Подсказки

      -

      -

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

      -

      Варианты

      -

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

      -

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

      badges: long_descriptions: autobiographer: | - Вздор вздор вздор - Вздор вздор вздор - first_like: | - Вздор вздор вздор - Вздор вздор вздор - first_link: | - Вздор вздор вздор - Вздор вздор вздор - first_quote: | - Вздор вздор вздор - Вздор вздор вздор - first_share: | - Вздор вздор вздор - Вздор вздор вздор - read_guidelines: | - Вздор вздор вздор - Вздор вздор вздор - reader: | - Вздор вздор вздор - Вздор вздор вздор - editor: | - Вздор вздор вздор - Вздор вздор вздор - first_flag: | - Система жалоб очень важна для поддержания здоровья нашего сообщества. Если вы заметите пост который заслуживает внимание модератора, пожалуйста не раздумывая отправляйте жалобу. Когда вы получите уровень доверия 1 вы сможете также отправлять сообщение пользователю. - nice_share: | - Вздор вздор вздор - Вздор вздор вздор - welcome: | - Вздор вздор вздор - Вздор вздор вздор - anniversary: | - Вздор вздор вздор - Вздор вздор вздор - good_share: | - Вздор вздор вздор - Вздор вздор вздор - great_share: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за заполнение + своей страницы профиля и выбор картинки профиля. Возможность узнать больше о дуг друге позволяет форумчанам сплотиться в тесное сообщество. nice_post: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за сообщение, собравшее 10 симпатий. Отличная работа! nice_topic: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за тему, собравшую 10 симпатий. Отличная работа! good_post: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за сообщение, собравшее 25 симпатий. Превосходная работа! good_topic: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за тему, собравшую 25 симпатий. Превосходная работа! great_post: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за сообщение, собравшее 50 симпаний. Вау! great_topic: | - Вздор вздор вздор - Вздор вздор вздор - basic: | - Вздор вздор вздор - Вздор вздор вздор - member: | - Вздор вздор вздор - Вздор вздор вздор - regular: | - Вздор вздор вздор - Вздор вздор вздор - leader: | - Вздор вздор вздор - Вздор вздор вздор + Эта награда выдается за тему, собравшую 50 симпаний. Вау! admin_login: success: "письмо отправлено" error: "Ошибка!" email_input: "Email Администратора" submit_button: "отправить письмо" + discourse_hub: + access_token_problem: "Пожалуйста, обновите настройки сайта, чтобы задать верный discourse_org_access_key." + performance_report: + initial_post_raw: Эта тема содержит ежедневные отчеты активности форума. + initial_topic_title: Отчеты активности форума diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index ed59ff9198..d3a52c980c 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -20,37 +20,49 @@ sq: is_reserved: "është i rezervuar" purge_reason: "Automatically deleted as abandoned, unactivated account" disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available." - anonymous: "Anonymous" + anonymous: "Anonim" errors: format: '%{attribute} %{message}' messages: too_long_validation: "is limited to %{max} characters; you entered %{length}." invalid_boolean: "Boolean jo i vlefshëm." - taken: "has already been taken" - accepted: must be accepted - blank: can't be blank - present: must be blank - confirmation: "doesn't match %{attribute}" - empty: can't be empty + taken: "është i marrë" + accepted: duhet të pranohet + blank: nuk mund të lihet bosh + present: mund të lihet bosh + confirmation: "nuk përputhet %{attribute}" + empty: nuk mund të lihet bosh equal_to: must be equal to %{count} even: must be even - exclusion: is reserved + exclusion: është i rezervuar greater_than: must be greater than %{count} greater_than_or_equal_to: must be greater than or equal to %{count} inclusion: is not included in the list - invalid: is invalid + invalid: është i pavlefshëm less_than: must be less than %{count} less_than_or_equal_to: must be less than or equal to %{count} - not_a_number: is not a number + not_a_number: nuk është një numër not_an_integer: must be an integer odd: must be odd record_invalid: 'Validation failed: %{errors}' restrict_dependent_destroy: one: "Cannot delete record because a dependent %{record} exists" many: "Cannot delete record because dependent %{record} exist" + too_long: + one: is too long (maximum is 1 character) + other: is too long (maximum is %{count} characters) + too_short: + one: is too short (minimum is 1 character) + other: is too short (minimum is %{count} characters) + wrong_length: + one: is the wrong length (should be 1 character) + other: is the wrong length (should be %{count} characters) other_than: "must be other than %{count}" template: body: 'There were problems with the following fields:' + header: + one: 1 error prohibited this %{model} from being saved + other: '%{count} errors prohibited this %{model} from being saved' embed: load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!" bulk_invite: @@ -61,6 +73,7 @@ sq: not_enough_space_on_disk: "There is not enough space on disk to upload this backup." not_logged_in: "Ju duhet të identifikoheni për këtë veprim." not_found: "The requested URL or resource could not be found." + invalid_access: "Ju nuk jeni të drejta për të parë burimin e kërkuar." read_only_mode_enabled: "The site is in read only mode. Interactions are disabled." too_many_replies: one: "We're sorry, but new users are temporarily limited to 1 reply in the same topic." @@ -108,7 +121,7 @@ sq: next_page: "faqja tjetër →" prev_page: "← faqe mëparshme" page_num: "Faqe %{num}" - home_title: "Home" + home_title: "Kryefaqja" topics_in_category: "Topics in the '%{category}' category" rss_posts_in_topic: "Burimi RSS i '%{topic}'" rss_topics_in_category: "RSS feed of topics in the '%{category}' category" @@ -120,13 +133,15 @@ sq: rss_description: latest: "Temat e fundit" hot: "Temat Kryesore" + posts: "Postimet e fundit" too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted." - excerpt_image: "image" + excerpt_image: "imazh" queue: delete_reason: "Deleted via post moderation queue" groups: errors: can_not_modify_automatic: "You can not modify an automatic group" + member_already_exist: "'%{username}' is already a member of this group." default_names: everyone: "të gjithë" admins: "admins" @@ -162,13 +177,13 @@ sq: For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. avatar: | - ### Pse nuk vendosni një fotografi tek llogaria juaj? + ### How about a picture for your account? - You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have. + You've posted a few topics and replies, but your profile picture isn't as unique as you are -- it's just a letter. - Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you? + Have you considered **[visiting your user profile](%{profile_path})** and uploading a picture that represents you? - It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar! + It's easier to follow discussions and find interesting people in conversations when everyone has a unique profile picture! sequential_replies: | ### Consider replying to several posts at once @@ -214,7 +229,7 @@ sq: warning_requires_pm: "You can only attach warnings to private messages." too_many_users: "You can only send warnings to one user at a time." cant_send_pm: "Sorry, you cannot send a private message to that user." - no_user_selected: "You must select a valid user." + no_user_selected: "Ju duhet të zgjidhni një përdorues të vlefshëm." user: attributes: password: @@ -232,7 +247,7 @@ sq: no_info_other: "
      %{name} hasn't entered anything in the About Me field of their profile yet
      " vip_category_name: "Lounge" vip_category_description: "A category exclusive to members with trust level 3 and higher." - meta_category_name: "Meta" + meta_category_name: "Reagimet e Faqes" meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it." staff_category_name: "Stafi" staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators." @@ -284,9 +299,9 @@ sq: regular: title: "anëtarë" leader: - title: "regular" + title: "i rregullt" elder: - title: "leader" + title: "udhëheqës" change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first" rate_limiter: slow_down: "You have performed this action too many times, try again later" @@ -372,6 +387,7 @@ sq: one: "almost 1 year ago" other: "almost %{count} years ago" password_reset: + no_token: "Sorry, that password change link is too old. Select the Log In button and use 'I forgot my password' to get a new link." choose_new: "Zgjidhni një fjalëkalim të ri" choose: "Ju lutem, zgjidhni një fjalëkalim" update: 'Rifresko Fjalëkalimin' @@ -381,16 +397,16 @@ sq: success_unapproved: "You successfully changed your password." continue: "Vazhdo tek %{site_name}" change_email: - confirmed: "Adresa e postës u rifreskua." - please_continue: "Continue to %{site_name}" + confirmed: "Adresa e postës u azhurnuar." + please_continue: "Vazhdo tek %{site_name}" error: "There was an error changing your email address. Perhaps the address is already in use?" activation: - action: "Aktivizoni llogarinë tuaj" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" please_continue: "Your new account is confirmed; you will be redirected to the home page." continue_button: "Vazhdo tek %{site_name}" welcome_to: "Mirë se vini tek %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" + missing_session: "We can not detect if your account was created, please ensure you have cookies enabled." post_action_types: off_topic: title: 'Jashtë teme' @@ -403,14 +419,14 @@ sq: email_title: '"%{title}" was flagged as spam' email_body: "%{link}\n\n%{message}" inappropriate: - title: 'Inappropriate' + title: 'i papërshtatshëm' description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' long_form: 'flagged this as inappropriate' notify_user: - title: 'Message @{{username}}' + title: 'Mezazh @{{username}}' description: 'This post contains something I want to talk to this person directly and privately about. Does not cast a flag.' long_form: 'messaged user' - email_title: 'Your post in "%{title}"' + email_title: 'Postimi juaj në "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: title: "Diçka tjetër" @@ -428,7 +444,7 @@ sq: long_form: 'pëlqyen këtë' vote: title: 'Voto' - description: 'Vote for this post' + description: 'Voto për këtë postim' long_form: 'voted for this post' topic_flag_types: spam: @@ -436,7 +452,7 @@ sq: description: 'This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.' long_form: 'flagged this as spam' inappropriate: - title: 'Inappropriate' + title: 'I papërshtatshëm' description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' long_form: 'flagged this as inappropriate' notify_moderators: @@ -452,6 +468,7 @@ sq: regular: title: "Regular Topic" banner: + title: "Banner Topic" message: make: "This topic is now a banner. It will appear at the top of every page until it is dismissed by the user." remove: "This topic is no longer a banner. It will no longer appear at the top of every page." @@ -464,7 +481,7 @@ sq: different_user_description: "You are currently logged in as a different user than the one who the digest was mailed to. Please log out and try again." not_found_description: "Sorry, we couldn't unsubscribe you. It's possible the link in your email has expired." resubscribe: - action: "Re-Subscribe" + action: "Ri-abonohu" title: "Re-Subscribed!" description: "You have been re-subscribed." reports: @@ -477,11 +494,11 @@ sq: xaxis: "Ditë" yaxis: "Number of new users" topics: - title: "Topics" + title: "Tema" xaxis: "Ditë" yaxis: "Number of new topics" posts: - title: "Posts" + title: "Postime" xaxis: "Ditë" yaxis: "Number of new posts" likes: @@ -559,6 +576,14 @@ sq: title: "Total" xaxis: "Day" yaxis: "Total API Requests" + page_view_logged_in_mobile_reqs: + title: "Logged In API Requests" + xaxis: "Ditë" + yaxis: "Mobile Logged In API Requests" + page_view_anon_mobile_reqs: + title: "Anon API Requests" + xaxis: "Dit" + yaxis: "Mobile Anon API Requests" http_background_reqs: title: "Background" xaxis: "Day" @@ -583,12 +608,25 @@ sq: title: "Total" xaxis: "Day" yaxis: "Total requests" + time_to_first_response: + title: "Time to first response" + xaxis: "Day" + yaxis: "Average time (hours)" + topics_with_no_response: + title: "Topics with no response" + xaxis: "Day" + yaxis: "Total" + mobile_visits: + title: "User Visits" + xaxis: "Day" + yaxis: "Number of visits" dashboard: rails_env_warning: "Your server is running in %{env} mode." ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later." host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname." gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' + queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' @@ -597,7 +635,6 @@ 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your config/discourse.conf file and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' default_logo_warning: "Set the graphic logos for your site. Update logo_url, logo_small_url, and favicon_url in Site Settings." contact_email_missing: "Enter a site contact email address so you can be reached for urgent matters regarding your site. Update it in Site Settings." contact_email_invalid: "The site contact email is invalid. Update it in Site Settings." @@ -650,7 +687,7 @@ sq: max_topic_title_length: "Maximum allowed topic title length in characters" min_private_message_title_length: "Minimum allowed title length for a message in characters" min_search_term_length: "Minimum valid search term length in characters" - allow_uncategorized_topics: "Allow topics to be created without a category." + allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off." uncategorized_description: "The description of the uncategorized category. Leave blank for no description." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -673,14 +710,16 @@ sq: category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." show_subcategory_list: "Show subcategory list instead of topic list when entering a category." fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity." + fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)." add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too." post_excerpt_maxlength: "Maximum length of a post excerpt / summary." post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters." onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug" - digest_logo_url: "The alternate logo used at the top of your site's email digest. If left blank `logo_url` will be used. eg: http://example.com/logo.png" - logo_small_url: "The small logo image at the top left of your site, seen when scrolling down. If left blank, a home glyph will be shown." - favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. If left blank `logo_url` will be used." + logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown." + digest_logo_url: "The alternate logo image used at the top of your site's email digest. Should be a wide rectangle shape. If left blank `logo_url` will be used." + logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown." + mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px." notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." email_custom_headers: "A pipe-delimited list of custom email headers" @@ -698,12 +737,11 @@ sq: polling_interval: "When not long polling, how often should logged on clients poll in milliseconds" anon_polling_interval: "How often should anonymous clients poll in milliseconds" background_polling_interval: "How often should the clients poll in milliseconds (when the window is in the background)" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging" max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site" + tl2_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl2 (member) by multiplying with this number" tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number" tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number" num_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable." @@ -712,6 +750,7 @@ sq: flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam." traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak." post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)." + must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -752,16 +791,18 @@ sq: invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours" invite_only: "Public registration is disabled, all new users must be explicitly invited by other members or staff." login_required: "Require authentication to read content on this site, disallow anonymous access." - min_username_length: "Minimum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES SHORTER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." - max_username_length: "Maximum username length in characters. WARNING: ANY EXISTING USERS WITH NAMES LONGER THAN THIS WILL BE UNABLE TO ACCESS THE SITE." + reserved_usernames: "Usernames for which signup is not allowed." min_password_length: "Minimum password length." block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords." + enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)" enable_sso_provider: "Implement Discourse SSO provider protocol at the /session/sso_provider endpoint, requires sso_secret to be set" sso_url: "URL of single sign on endpoint" sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)" + sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes." sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended" + sso_not_approved_url: "Redirect unapproved SSO accounts to this URL" enable_local_logins: "Enable local username and password login based accounts. (Note: this must be enabled for invites to work)" allow_new_registrations: "Allow new user registrations. Uncheck this to prevent anyone from creating a new account." enable_yahoo_logins: "Enable Yahoo authentication" @@ -779,7 +820,7 @@ sq: github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup" maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted" - backup_daily: "Automatically create a site backup once a day." + backup_frequency: "How frequently we create a site backup, in days." enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings." s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket." active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" @@ -796,6 +837,7 @@ sq: max_topics_per_day: "Maximum number of topics a user can create per day." max_private_messages_per_day: "Maximum number of messages users can create per day." max_invites_per_day: "Maximum number of invites a user can send per day." + max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day." suggested_topics: "Number of suggested topics shown at the bottom of a topic." limit_suggested_to_category: "Only show topics from the current category in suggested topics." clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting." @@ -808,6 +850,8 @@ sq: s3_access_key_id: "The Amazon S3 access key id that will be used to upload images." s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images." s3_region: "The Amazon S3 region name that will be used to upload images." + s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts." + avatar_sizes: "List of automatically generated avatar sizes." enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks." default_invitee_trust_level: "Default trust level (0-4) for invited users." default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam." @@ -860,6 +904,9 @@ sq: topic_views_heat_low: "After this many views, the views field is slightly highlighted." topic_views_heat_medium: "After this many views, the views field is moderately highlighted." topic_views_heat_high: "After this many views, the views field is strongly highlighted." + cold_age_days_low: "After this many days of conversation, the last activity date is slightly dimmed." + cold_age_days_medium: "After this many days of conversation, the last activity date is moderately dimmed." + cold_age_days_high: "After this many days of conversation, the last activity date is strongly dimmed." history_hours_low: "A post edited within this many hours has the edit indicator slightly highlighted" history_hours_medium: "A post edited within this many hours has the edit indicator moderately highlighted." history_hours_high: "A post edited within this many hours has the edit indicator strongly highlighted." @@ -872,7 +919,6 @@ sq: newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam." white_listed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains." staff_like_weight: "How much extra weighting factor to give staff likes." - topic_view_duration_hours: "Count new a topic view once per IP/User every N hours" levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match." max_new_accounts_per_registration_ip: "If there are already (n) trust level 0 accounts from this IP (and none is a staff member or at TL2 or higher), stop accepting new signups from that IP." min_ban_entries_for_roll_up: "When clicking the Roll up button, will create a new subnet ban entry if there are at least (N) entries." @@ -881,6 +927,10 @@ sq: num_flaggers_to_close_topic: "Minimum number of unique flaggers that is required to automatically pause a topic for intervention" num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention" auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag." + min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)" + auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time" + auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers" + auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post." reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" disable_emails: "Prevent Discourse from sending any kind of emails" @@ -893,6 +943,7 @@ sq: pop3_polling_host: "The host to poll for email via POP3." pop3_polling_username: "The username for the POP3 account to poll for email." pop3_polling_password: "The password for the POP3 account to poll for email." + log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs" email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category." email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email." email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set." @@ -904,18 +955,16 @@ sq: username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)." email_editable: "Allow users to change their e-mail address after registration." logout_redirect: "Location to redirect browser to after logout EG: (http://somesite.com/logout)" - allow_uploaded_avatars: "Allow users to upload custom avatars." - allow_animated_avatars: "Allow users to use animated gif avatars. WARNING: run the avatars:refresh rake task after changing this setting." + allow_uploaded_avatars: "Allow users to upload custom profile pictures." + allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting." allow_animated_thumbnails: "Generates animated thumbnails of animated gifs." default_avatars: "URLs to avatars that will be used by default for new users until they change them." automatically_download_gravatars: "Download Gravatars for users upon account creation or email change." digest_topics: "The maximum number of topics to display in the email digest." digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters." - default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences." suppress_digest_email_after_days: "Suppress digest emails for users not seen on the site for more than (n) days." disable_digest_emails: "Disable digest emails for all users." - default_external_links_in_new_tab: "Open external links in a new tab. Users can change this in their preferences." - detect_custom_avatars: "Whether or not to check that users have uploaded custom avatars." + detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures." max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day" public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publicly." staff_user_custom_fields: "A whitelist of custom fields for a user that can be shown to staff." @@ -927,37 +976,42 @@ sq: sequential_replies_threshold: "Number posts a user has to make in a row in a topic before being reminded about too many sequential replies. " enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive." dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic." + daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details" suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists." + permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures" global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)." disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active." full_name_required: "Full name is a required field of a user's profile." + enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere." display_name_on_posts: "Show a user's full name on their posts in addition to their @username." + show_time_gap_days: "If two posts are made this many days apart, display the time gap in the topic." invites_per_page: "Default invites shown on the user page." short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value." default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0." autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language." highlighted_languages: "Included syntax highlighting rules. (Warning: including too many langauges may impact performance) see: https://highlightjs.org/static/demo/ for a demo" - embeddable_host: "Host that can embed the comments from this Discourse forum. Hostname only, do not begin with http://" feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts." feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed." embed_by_username: "Discourse username of the user who creates the embedded topics." embed_username_key_from_feed: "Key to pull discourse username from feed." embed_truncate: "Truncate the embedded posts." - embed_category: "Category of embedded topics." embed_post_limit: "Maximum number of posts to embed." embed_whitelist_selector: "CSS selector for elements that are allowed in embeds." embed_blacklist_selector: "CSS selector for elements that are removed from embeds." notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send an email to the contact_email. Set to 0 to disable." enable_cdn_js_debugging: "Allow /logs to display proper errors by adding crossorigin permissions on all js includes." show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics." + delete_drafts_older_than_n_days: Delete drafts older than (n) days. vacuum_db_days: "Run VACUUM FULL ANALYZE to reclaim DB space after migrations (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working." + slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." enable_emoji: "Enable emoji" emoji_set: "How would you like your emoji?" enforce_square_emoji: "Force a square aspect ratio to all emojis." approve_post_count: "The amount of posts from a new user that must be approved" approve_unless_trust_level: "Posts for users below this trust level must be approved" + notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails." errors: invalid_email: "Invalid email address." invalid_username: "There's no user with that username." @@ -980,6 +1034,7 @@ sq: edited: "%{display_username} edited your post in %{link}" posted: "%{display_username} posted in %{link}" moved_post: "%{display_username} moved your post to %{link}" + private_message: "%{display_username} sent you a message: %{link}" invited_to_private_message: "%{display_username} invited you to a message: %{link}" invited_to_topic: "%{display_username} invited you to a topic: %{link}" invitee_accepted: "%{display_username} accepted your invitation" @@ -1005,13 +1060,14 @@ sq: not_seen_in_a_month: "Welcome back! We haven't seen you in a while. These are the most popular topics since you've been away." move_posts: new_topic_moderator_post: - one: "I moved a post to a new topic: %{topic_link}" - other: "I moved %{count} posts to a new topic: %{topic_link}" + one: "A post was split to a new topic: %{topic_link}" + other: "%{count} posts were split to a new topic: %{topic_link}" existing_topic_moderator_post: - one: "I moved a post to an existing topic: %{topic_link}" - other: "I moved %{count} posts to an existing topic: %{topic_link}" + one: "A post was merged into an existing topic: %{topic_link}" + other: "%{count} posts were merged into an existing topic: %{topic_link}" change_owner: post_revision_text: "Ownership transferred from %{old_user} to %{new_user}" + deleted_user: "a deleted user" emoji: errors: name_already_exists: "Sorry, the name '%{name}' is already used by another emoji." @@ -1033,6 +1089,9 @@ sq: autoclosed_enabled_lastpost_days: one: "This topic was automatically closed 1 day after the last reply. New replies are no longer allowed." other: "This topic was automatically closed %{count} days after the last reply. New replies are no longer allowed." + autoclosed_enabled_lastpost_hours: + one: "This topic was automatically closed 1 hour after the last reply. New replies are no longer allowed." + other: "This topic was automatically closed %{count} hours after the last reply. New replies are no longer allowed." autoclosed_enabled_lastpost_minutes: one: "This topic was automatically closed 1 minute after the last reply. New replies are no longer allowed." other: "This topic was automatically closed %{count} minutes after the last reply. New replies are no longer allowed." @@ -1054,6 +1113,7 @@ sq: not_allowed_from_ip_address: "You can't log in as %{username} from that IP address." admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." suspended: "You can't log in until %{date}." + suspended_with_reason: "Account suspended until %{date}: %{reason}" errors: "%{errors}" not_available: "Not available. Try %{suggestion}?" something_already_taken: "Something went wrong, perhaps the username or email is already registered. Try the forgot password link." @@ -1061,6 +1121,8 @@ sq: omniauth_error_unknown: "Something went wrong processing your log in, please try again." new_registrations_disabled: "New account registrations are not allowed at this time." password_too_long: "Passwords are limited to 200 characters." + email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters." + reserved_username: "That username is not allowed." missing_user_field: "You have not completed all the user fields" close_window: "Authentication is complete. Close this window to continue." user: @@ -1071,10 +1133,12 @@ sq: characters: "must only include numbers, letters and underscores" unique: "must be unique" blank: "must be present" - must_begin_with_alphanumeric: "must begin with a letter or number" email: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "is not allowed." + ip_address: + blocked: "New registrations are not allowed from your IP address." + max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member." invite_mailer: subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}" text_body_template: | @@ -1109,6 +1173,13 @@ sq: This invitation is from a trusted user, so you won't need to log in. invite_password_instructions: subject_template: "Set password for your %{site_name} account" + text_body_template: | + Thanks for accepting your invitation to %{site_name} -- welcome! + + Click this link to choose a password now: + %{base_url}/users/password-reset/%{email_token} + + (If the link above has expired, choose "I forgot my password" when logging in with your email address.) test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" text_body_template: | @@ -1160,7 +1231,7 @@ sq: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) and pressing the "Upgrade" button. + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. new_version_mailer_with_notes: @@ -1175,7 +1246,7 @@ sq: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Upgrade by visiting [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), and pressing the "Upgrade" button. + - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse. @@ -1192,6 +1263,14 @@ sq: subject_template: one: "1 flag waiting to be handled" other: "%{count} flags waiting to be handled" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 post waiting to be reviewed" + other: "[%{site_name}] %{count} posts waiting to be reviewed" + text_body_template: | + Hello, + + There are posts from new users that are waiting to be reviewed. [They can be approved or rejected here](%{base_url}/queued-posts). flag_reasons: off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post." inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)." @@ -1203,79 +1282,109 @@ sq: disagreed: "Thanks for letting us know. We're looking into it." deferred: "Thanks for letting us know. We're looking into it." deferred_and_deleted: "Thanks for letting us know. We've removed the post." - temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags" + temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags." system_messages: post_hidden: subject_template: "Post hidden due to community flagging" + text_body_template: | + Hello, + + This is an automated message from %{site_name} to inform you that your post was hidden. + + %{base_url}%{url} + + %{flag_reason} + + Multiple community members flagged this post before it was hidden, so please consider how you might revise your post to reflect their feedback. **You can edit your post after %{edit_delay} minutes, and it will be automatically unhidden.** + + However, if the post is hidden by the community a second time, it will remain hidden until handled by staff – and there may be further action, including the possible suspension of your account. + + For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines). usage_tips: text_body_template: | - A few quick tips to get you started: + Here are a few quick tips to get you started: - ## Keep scrolling + ## Reading - There are no next page buttons or page numbers – to read more, **just keep scrolling down!** + To read more, **just keep scrolling down!** - As new posts come in, they will appear automatically. + As new replies or new topics arrive, they will appear automatically – no need to refresh the page. - ## Where am I? + ## Navigation - - For search, your user page, or the menu, use the **icon ☰ buttons at the upper right**. + - For search, your user page, or the ☰ menu, use the **icon buttons at upper right**. - - Any topic title will take you to the next unread post. Use the last activity time and post count to enter at the top or bottom. + - Selecting a topic title will always take you to the **next unread reply** in the topic. To enter at the top or bottom, select the reply count or last reply date instead. - - While reading a topic, jump to the top ↑ by selecting the topic title. Select the green progress bar at the bottom right for full navigation controls, or use the home and end keys. + - + - While reading a topic, select the progress bar at the bottom right for full navigation controls. Quickly jump back to the top by selecting the topic title. Press ? for a list of super-speedy keyboard shortcuts. - ## How do I reply? + - - To reply to the overall topic, use the Reply button at the very bottom of the page. + ## Replying - - To reply to a specific post, use the Reply button on that post. + - To reply to the **topic in general**, use at the very bottom of the topic. - - To take the conversation in a different direction, but keep them linked together, use Reply as linked Topic to the right of the post. + - To reply to a **specific person**, use on their post. - To quote someone in your reply, select the text you wish to quote, then press any Reply button. + - To reply with **a new topic**, use to the right of the post. Both old and new topics will be automatically linked together. - + To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes! - To ping someone in your reply, mention their name. Type `@` and an autocompleter will pop up. + - + To notify someone about your reply, mention their name. Type `@` to begin selecting a username. - For [standard Emoji](http://www.emoji.codes/), just start typing `:` or the traditional smileys `:)` :smile: + - ## What else can I do? + To use [standard Emoji](http://www.emoji.codes/), just type `:` to match by name, or use the traditional smileys `;)` - There are action buttons at the bottom of each post. + - + To generate a summary for a link, paste it on a line by itself: - To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button. + - You can also **share** a link to a post, or **bookmark** it for later reference on your user page. + ## Actions - ## Who is talking to me? + There are action buttons at the bottom of each post: - When someone replies to your post, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it access your **notifications**. + - + To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! - Don't worry about missing a reply – you'll be emailed replies (and messages) if you aren't online when they arrive. + If you see a problem with someone's post, privately let them, or [our staff](%{base_url}/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. - ## When are conversations new? + ## Notifications - By default all conversations less than two days old are considered new, and any conversation you've participated in (replied to, created, or read for an extended period) will automatically be tracked. + When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**. - You will see the blue new and number indicators next to these topics: + - + Don't worry about missing a reply – you'll be emailed any notifications that arrive when you are away. - You can change the individual notification state of a topic via the control at the bottom of the topic (this can also be set per category). To change how you track topics, or the definition of new, see [your user preferences](%{base_url}/my/preferences). + ## Your Preferences - ## Why can't I do certain things? + - All topics less than **two days old** are considered new. - New users are somewhat limited for safety reasons. As you participate here, you'll gain the trust of the community, become a full citizen, and those limitations will automatically be removed. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain even more abilities to help us manage our community together. + - Any topic you've **actively participated in** (by creating, replying, or reading for an extended period) will be automatically tracked. + + You will see the blue new and unread number indicators next to these topics: + + + + You can change your notifications for any topic via the notification control at the bottom of the topic. + + + + You can also set notification state per category, if you want to watch every new topic in a specific category. + + To change any of these settings, see [your user preferences](%{base_url}/my/preferences). + + ## Community Trust + + As you participate here, over time you'll gain the trust of the community, become a full citizen, and new user limitations will be lifted. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain new abilities to help us manage our community together. welcome_user: subject_template: "Mirë se vini tek %{site_name}!" text_body_template: | @@ -1290,9 +1399,29 @@ sq: (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.) welcome_invite: subject_template: "Mirë se vini tek %{site_name}!" + text_body_template: | + Thanks for accepting your invitation to %{site_name} -- welcome! + + We've created a new account **%{username}** for you, and you are logged in. You can change your name by visiting [your user profile][prefs]. + + To log in again later: + + 1. Always **use the same email address from your original invitation** when logging in. Otherwise we won't be able to tell it's you! + + 2. Create a unique password for [your user profile][prefs], and use it to log in. + + %{new_user_tips} + + We believe in [civilized community behavior](%{base_url}/guidelines) at all times. + + Enjoy your stay! + + (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.) + + [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Backup completed successfully" - text_body_template: "The backup was successful.\nVisit the [admin > backup section](/admin/backups) to download your new backup." + text_body_template: "The backup was successful.\nVisit the [admin > backup section](%{base_url}/admin/backups) to download your new backup." backup_failed: subject_template: "Backup failed" text_body_template: | @@ -1330,6 +1459,7 @@ sq: %{logs} ``` csv_export_succeeded: + subject_template: "Data export complete" text_body_template: | Your data export was successful! :dvd: @@ -1340,6 +1470,7 @@ sq: 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_trust_level: + subject_template: "[%{site_name}] Email issue -- Insufficient Trust Level" text_body_template: | We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. @@ -1354,6 +1485,10 @@ sq: subject_template: "[%{site_name}] Email issue -- No Content" email_reject_parsing: subject_template: "[%{site_name}] Email issue -- Content unrecognized" + text_body_template: | + We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. + + We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies. email_reject_invalid_access: subject_template: "[%{site_name}] Email issue -- Invalid Access" text_body_template: | @@ -1390,8 +1525,22 @@ sq: None of the destination addresses are recognized. Please make sure that the site address is in the To: line (not Cc: or Bcc:), and that you are sending to the correct email address provided by staff. email_reject_topic_not_found: subject_template: "[%{site_name}] Email issue -- Topic Not Found" + text_body_template: | + We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. + + The topic you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member. + email_reject_topic_closed: + subject_template: "[%{site_name}] Email issue -- Topic Closed" + text_body_template: | + We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. + + The topic you are replying to is currently closed and no longer accepting replies. If you believe this is in error, contact a staff member. email_reject_auto_generated: subject_template: "[%{site_name}] Email issue -- Auto Generated Reply" + text_body_template: | + We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. + + Your email was marked as "auto generated", which we can't accept. If you believe this is in error, contact a staff member. email_error_notification: subject_template: "[%{site_name}] Email issue -- POP authentication error" text_body_template: | @@ -1455,7 +1604,6 @@ 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." - unsubscribe_link: "To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url})." subject_re: "Re: " subject_pm: "[PM] " user_notifications: @@ -1542,6 +1690,7 @@ sq: --- %{respond_instructions} digest: + why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}" subject_template: "[%{site_name}] Digest" new_activity: "New activity on your topics and posts:" top_topics: "Popular posts" @@ -1594,8 +1743,25 @@ sq: %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "You've been approved on %{site_name}!" + text_body_template: | + Welcome to %{site_name}! + + A staff member approved your account on %{site_name}. + + Click the following link to confirm and activate your new account: + %{base_url}/users/activate-account/%{email_token} + + If the above link is not clickable, try copying and pasting it into the address bar of your web browser. + + %{new_user_tips} + + We believe in [civilized community behavior](%{base_url}/guidelines) at all times. + + Enjoy your stay! + + (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.) signup: - subject_template: "[%{site_name}] Activate your new account" + subject_template: "[%{site_name}] Confirm your new account" text_body_template: | Welcome to %{site_name}! @@ -1627,14 +1793,14 @@ sq: too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)." images: too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}KB), please resize it and try again." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." spam_hosts: "This new user tried to create multiple posts with links to the same domain. See the newuser_spam_host_threshold site setting." email_log: no_user: "Can't find user with id %{user_id}" + anonymous_user: "User is anonymous" + suspended_not_pm: "User is suspended, not a message" seen_recently: "User was seen recently" post_not_found: "Can't find a post with id %{post_id}" notification_already_read: "The notification this email is about has already been read" @@ -1647,20 +1813,118 @@ sq: text_part_body_blank: "text_part.body is blank" body_blank: "body is blank" color_schemes: - base_theme_name: "Base" - about: "About" + base_theme_name: "Baza" + about: "Rreth" guidelines: "Guidelines" privacy: "Privacy" edit_this_page: "Edit this page" csv_export: - boolean_yes: "Yes" - boolean_no: "No" + boolean_yes: "Po" + boolean_no: "Jo" static_topic_first_reply: | Edit the first post in this topic to change the contents of the %{page_name} page. guidelines_topic: - title: "FAQ/Guidelines" + title: "Pyetjet/Udhëzimet" + body: | + + + ## [This is a Civilized Place for Public Discussion](#civilized) + + Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. + + These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. + + + + ## [Improve the Discussion](#improve) + + Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. + + The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. + + One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. + + + + ## [Be Agreeable, Even When You Disagree](#agreeable) + + You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: + + * Name-calling. + * Ad hominem attacks. + * Responding to a post’s tone instead of its actual content. + * Knee-jerk contradiction. + + Instead, provide reasoned counter-arguments that improve the conversation. + + + + ## [Your Participation Counts](#participate) + + The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. + + Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. + + Let’s try to leave our park better than we found it. + + + + ## [If You See a Problem, Flag It](#flag-problems) + + Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. + + When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. + + In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. + + + + ## [Always Be Civil](#be-civil) + + Nothing sabotages a healthy conversation like rudeness: + + * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. + * Keep it clean. Don’t post anything obscene or sexually explicit. + * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. + * Respect our forum. Don’t post spam or otherwise vandalize the forum. + + These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. + + This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. + + + + ## [Keep It Tidy](#keep-tidy) + + Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: + + * Don’t start a topic in the wrong category. + * Don’t cross-post the same thing in multiple topics. + * Don’t post no-content replies. + * Don’t divert a topic by changing it midstream. + * Don’t sign your posts — every post has your profile information attached to it. + + Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. + + + + ## [Post Only Your Own Stuff](#stealing) + + You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. + + + + ## [Powered by You](#power) + + This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). + + + + ## [Terms of Service](#tos) + + Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: - title: "Terms of Service" + title: "Termat e Shërbimit " body: | The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). @@ -1767,7 +2031,7 @@ sq: ## [14. Disclaimer of Warranties](#14) - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. @@ -1797,166 +2061,65 @@ sq: Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: - title: "Privacy Policy" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. + title: "Politika e Privatësisë" badges: long_descriptions: autobiographer: | - Blah blah blah - Blah blah blah + This badge is granted for filling out your user profile and selecting a profile picture. Letting the community know more about who you are and what you're interested in makes for a better, more connected community. first_like: | - Blah blah blah - Blah blah blah + This badge is granted the first time you like a post using the :heart: button. Liking posts is a great way to let your fellow community members know that what they posted was interesting, useful, cool, or fun. Share the love! first_link: | - Blah blah blah - Blah blah blah + This badge is granted the first time you place a link to another topic in a reply. Linking topics helps fellow readers find interesting related conversations, by showing connections between topics in both directions. first_quote: | - Blah blah blah - Blah blah blah + This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions focused and on topic. first_share: | - Blah blah blah - Blah blah blah + This badge is granted the first time you share a link to a reply or topic using the share button. Sharing links is a great way to show off interesting discussions with the rest of the world and grow your community. read_guidelines: | - Blah blah blah - Blah blah blah + This badge is granted for reading the community guidelines. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community. reader: | - Blah blah blah - Blah blah blah + This badge is granted for reading a long topic. Reading is fundamental. Reading closely helps you follow the conversation and leads to better, more complete replies. editor: | - Blah blah blah - Blah blah blah + This badge is granted for editing your post. Don't hesitate to edit your posts any time to improve them, fix small mistakes, or add anything you forgot. first_flag: | - Flagging is critical to the health of your community. If you notice any posts that require moderator attention please - do not hesitate to flag. You may also use the flagging dialog to send messages to users once you reach - trust level 1. + This badge is granted for flagging a post. Flagging is critical to the health of your community. If you notice any posts that require moderator attention please + do not hesitate to flag. You may also use the flagging dialog to send messages to fellow users. nice_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 25 outside visitors. Nice job! Sharing links to interesting discussions with friends is an excellent way to grow our community. welcome: | - Blah blah blah - Blah blah blah + This badge is granted when you receive your first like on a post. Congratulations, you've posted something that your fellow community members found interesting, cool, or useful! anniversary: | - Blah blah blah - Blah blah blah + This badge is granted when you've been a member for a year with at least one post in that year. Thanks for sticking around and contributing to our community! good_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 300 outside visitors. Good work! You've shown off an interesting discussion to a lot of new people and helped us grow. great_share: | - Blah blah blah - Blah blah blah + This badge is granted for sharing a link to a post that's visited by 100 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience for this community, and helped us grow in a big way. nice_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 10 likes. Nice job! nice_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a topic that gets 10 likes. Nice job! good_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 25 likes. Good work! good_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a topic that gets 25 likes. Good work! great_post: | - Blah blah blah - Blah blah blah + This badge is granted for creating a post that gets 50 likes. Wow! great_topic: | - Blah blah blah - Blah blah blah + This badge is granted for creating a reply that gets 50 likes. Wow! basic: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted, and you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post images and multiple links. member: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to more join our community. You can now send personal invitations from your user page or individual topics, create group messages, and a few more likes per day. regular: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months, one of the most active readers and a reliable contributor to what makes this community great. You can now recategorize and rename topics, access a private lounge area, more powerful spam flags, and lots more likes per day. leader: | - Blah blah blah - Blah blah blah + This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and set a positive example for the community in your deeds and words. You have the ability to edit all posts, take topic moderator actions such as pin, close, unlist, archive, split, and merge, and tons of likes per day. admin_login: success: "Email Sent" error: "Error!" email_input: "Admin Email" - submit_button: "Send Email" + submit_button: "Dërgo Email" + discourse_hub: + access_token_problem: "Tell an admin: Please update the site settings to include the correct discourse_org_access_key." + performance_report: + initial_post_raw: This topic includes daily performance reports for your site. + initial_topic_title: Raportet e performancës se faqes diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 008cd94fb4..28d96fba60 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -11,7 +11,7 @@ sv: short_date: "D MMM, YYYY" long_date: "MMMM D, YYYY h:mma" title: "Discourse" - topics: "Trådar" + topics: "Ämnen" posts: "inlägg" loading: "Laddar" powered_by_html: 'Drivs av Discourse, visas bäst med JavaScript påslaget' @@ -22,6 +22,7 @@ sv: disable_remote_images_download_reason: "Fjärrbilds nedladdning är inaktiverad eftersom det inte fanns tillräckligt mycket lagringsutrymme tillgängligt." anonymous: "Anonym" errors: + format: '%{attribute} %{message}' messages: too_long_validation: "är begränsad till %{max} karaktärer; du skrev in %{length}. " invalid_boolean: "Ogiltigt boolean." @@ -82,7 +83,7 @@ sv: other: "%{count} till svar" loading: "Laddar Discussion..." permalink: "Permalänk" - imported_from: "Detta är ett syskon diskussions ämne för det ursprungliga inlägget på %{link}" + imported_from: "Detta är ett kopplat diskussionsämne till det ursprungliga inlägget på %{link}" in_reply_to: "▶ %{username}" replies: one: "1 svar" @@ -118,16 +119,17 @@ sv: prev_page: "← föregående sida" page_num: "Sida %{num}" home_title: "Hem" - topics_in_category: "Trådar i kategorin '%{category}'" + topics_in_category: "Ämnen i kategorin '%{category}'" rss_posts_in_topic: "RSS-flöde för '%{topic}'" - rss_topics_in_category: "RSS-flöde för trådar i kategorin '%{category}'" + rss_topics_in_category: "RSS-flöde för ämnen i kategorin '%{category}'" author_wrote: "%{author} skrev:" num_posts: "Inlägg:" num_participants: "Deltagare" read_full_topic: "Läs hela ämnet" rss_description: - latest: "Senaste trådar" - hot: "Heta trådar" + latest: "Aktuella ämnen" + hot: "Heta ämnen" + posts: "Senaste inläggen" too_late_to_edit: "Inlägget skapades för långt tillbaka i tiden. Det kan inte lägre redigeras eller tas bort." excerpt_image: "bild" queue: @@ -135,6 +137,7 @@ sv: groups: errors: can_not_modify_automatic: "Du kan inte modifiera en automatisk grupp" + member_already_exist: "'%{username}' är redan medlem i denna grupp." default_names: everyone: "alla" admins: "administratörer" @@ -149,6 +152,52 @@ sv: until_posts: one: "1 inlägg" other: "%{count} inlägg" + new-topic: | + Välkommen till %{site_name} — **tack för att du startade en ny konversation!** + + - Låter titeln intressant om du läser det högt? Är det en bra sammanfattning? + + - Vem skulle kunna vara intresserad av detta? Varför är det viktigt? Vad för typ av svar förväntar du dig? + + - Inkludera vanligt förekommande ord i ditt ämne så att andra kan *hitta* det. För att gruppera ditt ämne med relaterade ämnen, välj en kategori. + + För mer, [see our community guidelines](/guidelines). + new-reply: | + Välkommen till %{site_name} — **tack för att du bidrar!** + + - Bidrar ditt svar något till konversationen på något sätt? + + - Var snäll mot andra medlemmar. + + - Konstruktiv kritik välkomnas, men kritisera då *idéer* och inte personer. + + För mer, [läs våra riktlinjer](/guidelines). Detta meddelande syns enbart vid dina första %{education_posts_text}. + sequential_replies: | + ### Överväg att svara på flera inlägg på en och samma gång + + Istället för flera svar i följd till ett ämne, kan du överväga ett enda svar som innehåller citat från tidigare inlägg eller @namn-referenser. + + Du kan redigera ditt tidigare svar och lägga till ett citat genom att markera text och välja knappen citera som dyker upp. + + Det blir lättare för alla att läsa ämnen som har färre in-på-djupet-svar istället för flera små, individuella svar. + dominating_topic: | + ### Låt andra gå med i konversationen + + Detta ämne är uppenbarligen viktigt för dig – du har postat mer än %{percent}% av alla svar här. + + Är du säker på att du ger tillräckligt med tid till andra personer att också få dela med sig av deras synpunkt? + too_many_replies: | + ### Du har nått svarsgränsen för detta ämne + + Tyvärr, men nya användare är tillfälligt begränsade till %{newuser_max_replies_per_topic} svar i samma ämne. + + Istället för att lägga till ytterligare ett svar, vänligen överväg att redigera dina tidigare svar, eller besök andra ämnen. + reviving_old_topic: | + ### Återuppliva detta ämne? + + Senaste svaret i detta ämne är nu över %{days} dagar gammalt. Ditt svar kommer att lyfta upp ämnet till toppen av listan och notifiera alla tidigare involverade i ämnet. + + Är du säker på att du vill fortsätta denna gamla konversation? activerecord: attributes: category: @@ -188,7 +237,8 @@ sv: vip_category_description: "En kategori exklusiv för medlemmar med en pålitlighetsnivå av 3 eller högre." meta_category_description: "Diskussion om den här webbplatsen, dess organisation, hur den fungerar och hur vi kan förbättra den." staff_category_name: "Personal" - staff_category_description: "Privat kategori för personal diskussioner. Ämnen här är bara synliga till administratörer och moderatorer." + staff_category_description: "Privat kategori för personaldiskussioner. Ämnen är bara synliga för administratörer och moderatorer." + assets_topic_body: "Detta är ett permanent ämne, endast synligt för personal, med syfte att lagra bilder och filer som ska användas till webbplatsens design. Radera ej detta ämne!\n\n\nSå här fungerar det:\n\n\n1. Svara på detta ämne.\n2. Ladda upp alla bilder du vill använda som logotyp, favicon och så vidare här. (Använd verktygfältets uppladdningsikon i inläggsredigeraren, eller dra-och-släpp eller klistra in bilder)\n3. Skicka ditt svar för att posta det.\n4. Högerklicka på bilderna i ditt nya inlägg för att få sökvägen till de uppladdade bilderna, eller klicka på redigera-ikonen för att redigera inlägget och på så sätt hämta sökvägen till bilderna. Kopiera bildernas sökväg. \n5. Klistra in bildernas sökvägar i de [grundläggande inställningarna](/admin/site_settings/category/required).\n\n\nOm du behöver möjliggöra uppladdning av flera olika filtyper, redigera `authorized_extensions` i [inställningarna för filer](/admin/site_settings/category/files)." lounge_welcome: title: "Välkommen till loungen" category: @@ -302,24 +352,24 @@ sv: other: "nästan %{count} år sedan" password_reset: choose_new: "Var god välj ett nytt lösenord" - choose: "Var god välj ett nytt lösenord" + choose: "Var god välj ett lösenord" update: 'Uppdatera Lösenord' save: 'Välj lösenord' title: 'Återställ Lösenord' success: "Du har lyckats med att byta ditt lösenord och är nu inloggad." success_unapproved: "Du lyckades med att byta ditt lösenord." - continue: "Continue to %{site_name}" + continue: "Fortsätt till %{site_name}" change_email: confirmed: "Din e-post har uppdaterats." please_continue: "Fortsätt till %{site_name}" error: "Det uppstod ett fel med ändringen av din e-postadress. Adressen kanske redan används?" activation: - action: "Aktivera ditt konto" already_done: "Tyvärr, denna kontoaktiveringslänk är inte längre giltig. Kanske är ditt konto redan aktiverat?" please_continue: "Ditt nya konto är verifierat; du kommer att skickas till startsidan." continue_button: "Fortsätt till %{site_name}" welcome_to: "Välkommen till %{site_name}!" approval_required: "En moderator måste manuellt godkänna ditt nya konto innan du kan komma åt detta forum. Du kommer få ett mail när ditt konto har godkänts!" + missing_session: "Vi kan inte upptäcka om ditt konto skapades. Se till att ha cookies aktiverade." post_action_types: off_topic: title: 'Off-Topic' @@ -330,15 +380,19 @@ sv: description: 'Detta inlägg är en annons. Den bidrar inte till eller är inte relevant för det aktuella ämnet, utan är promotion.' long_form: 'flagga detta som spam' email_title: '"%{title}" flaggades som skräp' + email_body: "%{link}\n\n%{message}" inappropriate: title: 'Olämpligt' description: 'Detta inläggs innehåll är inkluderar saker som som en förnuftig person skulle betrakta som stötande, kränkande eller överträdelse av våra community riktlinjerr.' long_form: 'flagga detta som olämpligt' notify_user: title: 'Meddela @{{username}}' + description: 'Detta inlägg innehåller något som jag, direkt och privat, vill tala med denna person om. Detta ger ingen flagga.' email_title: 'Du postade i "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: + title: "Övrigt" + description: 'Detta inlägg kräver en moderators uppmärksamhet av ett annat skäl än de som nämns ovan.' long_form: 'flaggade det här för granskning av moderator' email_title: 'Ett inlägg i "%{title}" kräver uppmärksamhet från en moderator' email_body: "%{link}\n\n%{message}" @@ -361,16 +415,30 @@ sv: long_form: 'flaggad som spam' inappropriate: title: 'Olämpligt' + description: 'Detta ämne har innehåll som en förnuftig person skulle anse som stötande, kränkande eller våldsamt gentemot våra riktlinjer.' long_form: 'flaggad som olämplig' notify_moderators: + title: "Annat" + description: 'Detta ämne kräver en moderators uppmärksamhet baserat på riktlinjerna, användarvillkoren, eller an annat skäl som inte nämns ovan.' long_form: 'flaggade det här för granskning av moderator' + email_title: 'Ämnet "%{title}" kräver moderators uppmärksamhet' + email_body: "%{link}\n\n%{message}" + flagging: + you_must_edit: '

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

      ' + user_must_edit: '

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

      ' archetypes: regular: - title: "Vanlig Tråd" + title: "Vanligt ämne" + banner: + message: + make: "Detta ämne är nu en banner. Den dyker upp i toppen av alla sidor tills den blir avfärdad av användaren." + remove: "Detta ämne är inte längre en banner. Den kommer inte att dyka upp i toppen av varje sida." unsubscribed: title: 'Avprenumererad' description: "Du har blivit avprenumererad. Vi kommer inte att kontakta dig igen!" oops: "Om du inte menade att göra detta, klicka nedan." + error: "Fel vid avprenumeration" + preferences_link: "Du kan också avprenumerera från sammanfattningsmejlen via dinainställningar" not_found_description: "Tyvärr, vi kunde inte avprenumerera dig. Det är möjligt att länken i ditt mail har löpt ut." resubscribe: action: "Återprenumerera" @@ -382,24 +450,25 @@ sv: xaxis: "Dag" yaxis: "Besök" signups: - xaxis: "Day" - yaxis: "Number of new users" + title: "Nya användare" + xaxis: "Dag" + yaxis: "Antalet nya användare" topics: - title: "Topics" - xaxis: "Day" - yaxis: "Number of new topics" + title: "Ämnen" + xaxis: "Dag" + yaxis: "Antalet nya ämnen" posts: - title: "Posts" - xaxis: "Day" - yaxis: "Number of new posts" + title: "Inlägg" + xaxis: "Dag" + yaxis: "Antalet nya inlägg" likes: - title: "Likes" - xaxis: "Day" - yaxis: "Number of new likes" + title: "Gillningar" + xaxis: "Dag" + yaxis: "Antalet nya gillningar" flags: - title: "Flags" - xaxis: "Day" - yaxis: "Number of flags" + title: "Flaggor" + xaxis: "Dag" + yaxis: "Antalet flaggor" bookmarks: title: "Bokmärken" xaxis: "Dag" @@ -407,15 +476,15 @@ sv: starred: title: "Favoriserad" xaxis: "Dag" - yaxis: "Antal favoriserade trådar" + yaxis: "Antal favoriserade ämnen" users_by_trust_level: - title: "Users per Trust Level" - xaxis: "Trust Level" - yaxis: "Number of Users" + title: "Användare per förtroendenivå" + xaxis: "Förtroendenivå" + yaxis: "Antal användare" emails: - title: "Emails Sent" - xaxis: "Day" - yaxis: "Number of Emails" + title: "E-post skickade" + xaxis: "Dag" + yaxis: "Antalet mejl" user_to_user_private_messages: title: "Användare-till-användare" xaxis: "Dag" @@ -440,16 +509,16 @@ sv: title: "Toppreferenter" xaxis: "Användare" num_clicks: "Klick" - num_topics: "Trådar" + num_topics: "Ämnen" top_traffic_sources: title: "Vanligaste trafikkällor" xaxis: "Domän" num_clicks: "Klick" - num_topics: "Trådar" + num_topics: "Ämnen" num_users: "Användare" top_referred_topics: - title: "Mest refererade trådar" - xaxis: "Tråd" + title: "Mest refererade ämnen" + xaxis: "Ämne" num_clicks: "Klick" page_view_anon_reqs: title: "Anonym" @@ -465,6 +534,10 @@ sv: title: "Total" xaxis: "Dag" yaxis: "Totala API-anrop" + page_view_logged_in_mobile_reqs: + xaxis: "Dag" + page_view_anon_mobile_reqs: + xaxis: "Dag" http_background_reqs: title: "Bakgrund" xaxis: "Dag" @@ -481,14 +554,26 @@ sv: http_total_reqs: title: "Totala" xaxis: "Dag" + time_to_first_response: + title: "Tid till första respons" + xaxis: "Dag" + topics_with_no_response: + title: "Ämnen med ingen respons" + xaxis: "Dag" + yaxis: "Totalt" dashboard: rails_env_warning: "Your server is running in %{env} mode." ruby_version_warning: "Du använder en version av Ruby 2.0.0 som är känd för att ha problem. Uppgradera till patch-nivå 247 eller senare." host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname." gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' - memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' + memory_warning: 'Din server körs med mindre än 1 GB minne. Minne på minst 1 GB är rekommenderat.' s3_config_warning: 'Servern är konfigurerad till att ladda upp filer till s3, men minst en av följande inställningar är inte satt: s3_access_key_id, s3_secret_access_key eller s3_upload_bucket. Gå till Inställningar och uppdatera dem. Se "How to set up image uploads to S3?" för att lära dig mer.' + default_logo_warning: "Ange de grafiska logotyperna för din webbplats. Uppdatera logo_url, logo_small och favicon_url i Inställningar." + contact_email_missing: "Ange en e-postadress för webbplatsen så att du kan nås vid brådskande ärenden. Uppdatera i webbplatsinställningar." + contact_email_invalid: "Webbplatsens e-postadress för kontakt är ogiltig. Uppdatera den i Inställningar." + title_nag: "Ange namnet på webbplatsen. Uppdatera titel i Inställningar." + site_description_missing: "Ange en beskrivning om din webbplats i en mening, som dyker upp i sökresultat. Uppdatera site_description i Inställningar." consumer_email_warning: "Din sida är konfigurerad till att använda Gmail (eller någon annan konsumenttjänst) för att skicka email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." content_types: education_new_reply: @@ -497,43 +582,66 @@ sv: education_new_topic: title: "New User Education: First Topics" description: "Pop up just-in-time guidance automatically displayed above the composer when new users begin typing their first two new topics." + usage_tips: + description: "Guidning och viktig information för nya användare." welcome_user: title: "Välkommen: Ny användare" + description: "Ett meddelande som skickas automatiskt till alla nya användare vid registrering." welcome_invite: title: "Välkommen: Inbjuden användare" + description: "Ett meddelande som skickas automatiskt till alla nya inbjudna användare när de accepterar inbjudan från en annan användare." login_required_welcome_message: title: "Inloggning krävs: Välkomstmeddelande" description: "Välkomstmeddelande som visas för utloggade användare när inställningen för 'inloggning krävs' är aktiv. " login_required: title: "Inloggning krävs: Huvudsida" + description: "Texten som visas för obehöriga användare när inloggning krävs på webbplatsen." head: title: "HTML-sidhuvud" description: "HTML som kommer infogas mellan taggarna och ." top: title: "Längst upp på sidorna" + description: "HTML som läggs till i toppen på varje sida (efter sidhuvudet, före navigeringen av ämnets titel)." bottom: title: "Botten av sidorna" + description: "HTML som läggs till före taggen ." site_settings: + censored_words: "Ord som automatiskt ersätts med ■■■■" + delete_old_hidden_posts: "Auto-radera alla dolda inlägg som varit dolda i mer än 30 dagar." default_locale: "Standardspråk för den här instansen av Discourse (ISO 639-1-kod)" allow_user_locale: "Tillåt användare att själva välja språk" min_post_length: "Minsta tillåtna inläggslängd i antal tecken" + min_first_post_length: "Minst antal tillåtna tecken i första inlägget (ämnestext)" + min_private_message_post_length: "Minst antal tillåtna tecken i inlägg för meddelanden" + min_search_term_length: "Minsta giltiga teckenlängd på sökterm" + uncategorized_description: "Beskrivningen av den okategoriserade kategorin. Lämna tomt för ingen beskrivning." + allow_duplicate_topic_titles: "Tillåt ämnen med identiska rubriker." unique_posts_mins: "Hur många minuter innan en användare kan göra ett inlägg med precis samma innehåll igen" + title: "Namnet på denna webbplats som används i titel-taggen." + site_description: "Beskriv denna webbplats i en mening, som sedan används i meta-description-taggen." queue_jobs: "Köa diverse jobb i sidekiq, om urkryssat så körs köer infogat" - favicon_url: "En favicon för till webbplats, se http://en.wikipedia.org/wiki/Favicon" + fixed_category_positions: "Om markerad, kommer du kunna ordna kategorier i en bestämd ordning. Om omarkerad, sorteras kategorierna baserat på aktivitet." apple_touch_icon_url: "Ikon som används för Apples touch-enheter. Rekommenderad storlek är 144*144 pixlar." enable_long_polling: "Message bus used for notification can use long polling" anon_polling_interval: "How often should anonymous clients poll in milliseconds" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" - max_topics_in_first_day: "Maximalt antal trådar en användare får skapa under sin första dag på sidan" + max_topics_in_first_day: "Max antal ämnen en användare får skapa under sin första dag på webbplatsen" max_replies_in_first_day: "Maximalt antal svar en användare får skapa under sin första dag på sidan" notify_mods_when_user_blocked: "Om en användare blockeras automatiskt, skicka ett meddelande till alla moderatorer." + ga_tracking_code: "Google analytics (ga.js) spårningskod, exempelvis: UA-12345678-9; se http://google.com/analytics" + allow_moderators_to_create_categories: "Tillåt moderatorer att skapa nya kategorier" + top_menu: "Bestäm vilka objekt som visas i hemsidans navigation, och i vilken ordning. Exempel: latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply" track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs" + site_contact_username: "Ett giltigt personalanvändarnamn att skicka alla automatiserade meddelanden ifrån. Om lämnad blank används det System-kontot." + send_welcome_message: "Skicka ett välkomstmeddelande till alla nya användare tillsammans med en snabbstartsguide." + show_email_on_profile: "Visa en användares e-postadress på deras profil (endast synlig för de själva och för personal)" + enable_badges: "Aktivera utmärkelsesystemet" + new_version_emails: "Skicka ett mejl till contact_email när en ny version av Discourse finns tillgängligt." port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80." force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default." invite_expiry_days: "How long user invitation keys are valid, in days" + min_password_length: "Minsta lösenordslängd." enable_yahoo_logins: "Enable Yahoo authentication" enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret" twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com" @@ -546,11 +654,75 @@ sv: github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours" - min_trust_to_create_topic: "Minsta förtroendenivå som krävs för att skapa en ny tråd" + rate_limit_create_topic: "Efter att ha skapat ett ämne, måste användare vänta (n) sekunder innan de kan skapa ett nytt." + rate_limit_create_post: "Efter att ha skrivit ett inlägg, måste användare vänta (n) sekunder innan de skriver ett nytt." + rate_limit_new_user_create_topic: "Efter att ha skapat ett ämne, måste nya användare vänta (n) sekunder innan de kan skapa ett nytt." + rate_limit_new_user_create_post: "Efter att ha skrivit ett inlägg, måste nya användare vänta (n) sekunder innan de kan skriva ett nytt." + max_likes_per_day: "Max antal gilla per användare och dag." + max_flags_per_day: "Max antal flaggningar per användare och dag." + max_bookmarks_per_day: "Max antal bokmärken per användare och dag." + max_edits_per_day: "Max antal redigeringar per användare och dag." + max_topics_per_day: "Max antal ämnen en användare kan skapa per dag." + max_private_messages_per_day: "Max antal meddelanden användare kan skapa per dag." + max_invites_per_day: "Max antal inbjudningar en användare kan skicka per dag." + max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag." + suggested_topics: "Antal föreslagna ämnen som visas i botten av ett ämne." + limit_suggested_to_category: "Visa bara ämnen från den aktuella kategorin bland föreslagna ämnen." + avatar_sizes: "Lista på automatiskt genererade avatar-storlekar." + default_invitee_trust_level: "Förvald förtroendenivå (0-4) för inbjudna användare." + default_trust_level: "Förvald förtroendenivå (0-4) för alla nya användare. VARNING! En ändring av detta sätter dig i stor risk för skräppost." + tl1_requires_topics_entered: "Antal ämnen en användare måste öppna innan en befordran till förtroendenivå 1." + tl1_requires_read_posts: "Antal inlägg en ny användare måste läsa innan en befordran till förtroendenivå 1." + tl1_requires_time_spent_mins: "Antal minuter en ny användare måste läsa inlägg innan en befordran till förtroendenivå 1." + tl2_requires_topics_entered: "Antal ämnen en användare måste besöka innan en befordran till förtroendenivå 2." + tl2_requires_read_posts: "Antal inlägg en användare måste läsa innan en befordran till förtroendenivå 2." + tl2_requires_time_spent_mins: "Antalet minuter en användare måste läsa inlägg innan en befordran till förtroendenivå 2." + tl2_requires_days_visited: "Antalet dagar en användare måste besöka webbplatsen innan en befordran till förtroendenivå 2." + tl2_requires_likes_received: "Antalet gillningar en användare måste mottaga innan en befordran till förtroendenivå 2." + tl2_requires_likes_given: "Antalet gillningar en användare måste ge innan en befordran till förtroendenivå 2." + tl2_requires_topic_reply_count: "Antalet ämnen en användare måste svara på innan en befordran till förtroendenivå 2." + tl3_requires_days_visited: "Minsta antal dagar en användare måste ha besökt webbplatsen de senaste 100 dagarna för att bli kvalificerad till en befordran till förtroendenivå 3. (0 till 100)" + tl3_requires_topics_replied_to: "Minsta antalet ämnen en användare behöver ha svarat på de senaste 100 dagarna för att bli kvalificerad till en befordran till förtroendenivå 3. (0 eller högre)" + tl3_requires_topics_viewed_all_time: "Minsta antalet ämnen en användare måste ha tittat på för att bli kvalificerad för förtroendenivå 3." + tl3_requires_posts_read_all_time: "Minsta antalet inlägg en användare måste ha läst för att bli kvalificerad för förtroendenivå 3." + tl3_requires_likes_received: "Minsta antalet mottagna gillningar under de senaste 100 dagarna för att bli kvalificerad för en befordran till förtroendenivå 3." + min_trust_to_create_topic: "Lägsta förtroendenivå som krävs för att skapa ett nytt ämne." + newuser_max_links: "Antalet länkar en ny användare kan lägga till i ett inlägg." + newuser_max_images: "Antalet bilder en ny användare kan lägga till i ett inlägg." + newuser_max_attachments: "Antalet bilagor en ny användare kan lägga till i ett inlägg." + newuser_max_mentions_per_post: "Max antal @namn-omnämningar en ny användare kan göra i ett inlägg." + newuser_max_replies_per_topic: "Max antal svar en ny användare kan göra i ett enda ämne innan någon svarar dem." + max_mentions_per_post: "Max antal @namn-omnämningar vem som helst kan göra i ett inlägg." + create_thumbnails: "Skapa miniatyrer och \"lightboxa\" bilder som är för stora för att passa in i ett inlägg." + email_time_window_mins: "Vänta (n) minuter innan något notifikationsmejl skickas ut, för att ge användare chansen att redigera och slutföra deras inlägg." + title_max_word_length: "Den maximala tillåtna ordlängden, i tecken, i ett ämnes titel." title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/" + category_colors: "En lista över tillåtna hexadecimala färgvärden för kategorier." + category_style: "Visuell still för kategori-utmärkelser." + topic_views_heat_low: "Efter så här många visningar, blir visningsfältet något betonat." + topic_views_heat_medium: "Efter så här många visningar, blir visningsfältet måttligt betonat." + topic_views_heat_high: "Efter så här många visningar, blir visningsfältet starkt betonat." + cold_age_days_low: "Efter så här många dagars konversation, blir sista aktivitetsdatumet något nedtonat." + cold_age_days_medium: "Efter så här många dagars konversation, blir datumet för sista aktiviteten måttligt nedtonat." + cold_age_days_high: "Efter så här många dagars konversation, blir datumet för sista aktiviteten starkt nedtonat." + history_hours_low: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn något betonat." + history_hours_medium: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn måttligt betonat." + history_hours_high: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn starkt betonat." faq_url: "Om du har en FAQ någon annanstans som du vill använda, skriv den fullständiga URL:en här." privacy_policy_url: "Om du har ett dokument med en integritetspolicy någon annanstans som du vill använda, skriv den fullständiga URL:en här." - default_digest_email_frequency: "Hur ofta användare får emailutskick som standard. De kan ändra detta val under sina inställningar." + auto_respond_to_flag_actions: "Aktivera automatiskt svar vid hantering av en flagga." + reply_by_email_enabled: "Aktivera möjlighet att svara på ämnen via e-post." + disable_emails: "Förhindra Discourse från att skicka någon form av e-post" + pop3_polling_ssl: "Använd SSL vid anslutning till POP3-servern. (Rekommenderat)" + email_editable: "Tillåt användare att ändra deras e-postadress efter registrering." + enable_user_directory: "Tillhandahåll en bläddringsbar användarkatalog" + allow_anonymous_posting: "Tillåt användare att växla till anonymt läge" + anonymous_posting_min_trust_level: "Lägsta förtroendenivå som krävs för att aktivera anonyma inlägg" + allow_profile_backgrounds: "Tillåt användare att ladda upp profilbakgrunder." + full_name_required: "Fullständigt namn är ett obligatoriskt fält i en användares profil." + display_name_on_posts: "Visa en användares fullständiga namn på deras inlägg som tillägg till deras @användarnamn." + show_time_gap_days: "Om två inlägg är gjorda med så här många dagar emellan, visa tidsskillnaden i ämnet." + enable_emoji: "Aktivera emoji" errors: invalid_email: "Felaktig e-postadress." invalid_username: "Det finns ingen användare med detta användarnamn." @@ -558,62 +730,226 @@ sv: invalid_integer_min: "Värdet måste vara %{max} eller större." invalid_integer_max: "Värdet får inte vara större än %{max}." invalid_integer: "Värdet måste vara ett heltal." + must_include_latest: "Toppmenyn måste inkludera 'senaste'-fliken." + invalid_string: "Ogiltigt värde." + invalid_string_min_max: "Måste vara mellan %{min} och %{max} tecken." + invalid_string_min: "Måste vara minst %{min} tecken." + invalid_string_max: "Måste vara högst %{max} tecken." notification_types: - mentioned: "%{display_username} mentioned you in %{link}" - liked: "%{display_username} liked your post in %{link}" - replied: "%{display_username} replied to your post in %{link}" - quoted: "%{display_username} quoted your post in %{link}" - edited: "%{display_username} edited your post in %{link}" - posted: "%{display_username} posted in %{link}" - moved_post: "%{display_username} moved your post to %{link}" - invitee_accepted: "%{display_username} accepted your invitation" + mentioned: "%{display_username} nämnde dig i %{link}" + liked: "%{display_username} gillade ditt inlägg i %{link}" + replied: "%{display_username} svarade på ditt inlägg i %{link}" + quoted: "%{display_username} citerade ditt inlägg i %{link}" + edited: "%{display_username} redigerade ditt inlägg i %{link}" + posted: "%{display_username} skrev i %{link}" + moved_post: "%{display_username} flyttade ditt inlägg till %{link}" + private_message: "%{display_username} har skickat ett meddelande till dig: %{link}" + invited_to_private_message: "%{display_username} har bjudit in dig till en privat konversation: %{link}" + invited_to_topic: "%{display_username} har bjudit in dig till ett ämne: %{link}" + invitee_accepted: "%{display_username} accepterade din inbjudan" + linked: "%{display_username} länkade dig i %{link}" + granted_badge: "Du förtjänade %{link}" search: + within_post: "#%{post_number} av %{username}" types: - category: 'Categories' - user: 'Users' - original_poster: "Original Poster" - most_posts: "Most Posts" - most_recent_poster: "Most Recent Poster" - frequent_poster: "Frequent Poster" - move_posts: - existing_topic_moderator_post: - one: "Jag flyttade ett inlägg till en existerande tråd: %{topic_link}" - other: "Jag flyttade %{count} inlägg till en existerande tråd: %{topic_link}" + category: 'Kategorier' + topic: 'Resultat' + user: 'Användare' + sso: + account_not_approved: "Konto inväntar godkännande. Du kommer att få ett e-postmeddelande när kontot väl är godkänt." + original_poster: "Ursprunglig skribent" + most_posts: "Mest inlägg" + most_recent_poster: "Senaste skribent" + frequent_poster: "Flitig skribent" topic_statuses: - archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way." - archived_disabled: "This topic is now unarchived. It is no longer frozen, and can be changed." - closed_enabled: "This topic is now closed. New replies are no longer allowed." - closed_disabled: "This topic is now opened. New replies are allowed." - autoclosed_disabled: "Den här tråden är nu öppen. Nya svar är tillåtna." - pinned_disabled: "This topic is now unpinned. It will no longer appear at the top of its category." + archived_enabled: "Detta ämne är nu arkiverat. Det är fryst och kan inte förändras på något sätt." + archived_disabled: "Detta ämne är nu oarkiverat. Det är inte längre fruset, och kan ändras." + closed_enabled: "Detta ämne är nu stängt. Nya svar tillåts inte längre." + closed_disabled: "Detta ämne är nu öppnat. Nya svar är tillåtna." + autoclosed_enabled_days: + one: "Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet." + other: "Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna." + autoclosed_enabled_hours: + one: "Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna." + autoclosed_enabled_minutes: + one: "Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_days: + one: "Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_hours: + one: "Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_minutes: + one: "Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_disabled: "Detta ämne är nu öppet. Nya svar är tillåtna." + autoclosed_disabled_lastpost: "Detta ämne är nu öppnat. Nya svar är tillåtna." + pinned_enabled: "Detta ämne är nu klistrat. Det dyker upp i toppen av dess kategori tills den blir avklistrad av personal för alla, eller av enskilda användare för de själva." + pinned_disabled: "Detta ämne är nu oklistrat. Det dyker längre inte upp i toppen av dess kategori." login: - not_approved: "Your account hasn't been approved yet. You will be notified by email when you are ready to log in." - incorrect_username_email_or_password: "Incorrect username, email or password" - wait_approval: "Thanks for signing up. We will notify you when your account has been approved." - active: "Your account is active and ready." - not_activated: "You can't log in yet. We sent an activation email to you. Please follow the instructions in the email to activate your account." + not_approved: "Ditt konto har inte blivit godkänt ännu. Du kommer att meddelas via e-post när du kan logga in." + incorrect_username_email_or_password: "Felaktigt användarnamn, e-post eller lösenord" + wait_approval: "Tack för din registrering. Vi meddelar dig när ditt konto blivit godkänt." + active: "Ditt konto är aktiverat och redo att användas." + not_activated: "Du kan inte logga in ännu. Vi har skickat ett aktiveringsmejl till dig. Vänligen följ instruktionerna i mejlet för att aktivera ditt konto." + not_allowed_from_ip_address: "Du kan inte logga in som %{username} från den IP-adressen." + admin_not_allowed_from_ip_address: "Du kan inte logga in som admin från den IP-adressen." suspended: "Du kan inte logga in förrän %{date}." + suspended_with_reason: "Konto avstängt t.o.m. %{date}: %{reason}" errors: "%{errors}" - not_available: "Not available. Try %{suggestion}?" - something_already_taken: "Something went wrong, perhaps the username or email is already registered. Try the forgot password link." - omniauth_error_unknown: "Something went wrong processing your log in, please try again." + not_available: "Inte tillgänglig. Testa %{suggestion}?" + something_already_taken: "Något gick fel. Kanske är användarnamnet eller e-postadressen redan registrerat. Testa glömt lösenord-länken." + omniauth_error_unknown: "Något gick fel med din inloggning, var god och försök igen." + password_too_long: "Lösenord har en gräns på 200 tecken." + missing_user_field: "Du har inte fyllt i alla användarfält" user: + no_accounts_associated: "Inga kopplade konton" username: - unique: "must be unique" - blank: "must be present" - must_begin_with_alphanumeric: "must begin with a letter or number" + short: "måste var minst %{min} tecken" + long: "får högst vara %{max} tecken" + characters: "får endast innehålla nummer, bokstäver och understreck" + unique: "måste vara unikt" + blank: "måste finnas" email: - not_allowed: "is not allowed from that email provider. Please use another email address." + not_allowed: "är inte en tillåten e-postleverantör. Vänligen använd en annan e-postadress." blocked: "är inte tillåtet." + ip_address: + blocked: "Nya registreringar är inte tillåtna från din IP-adress." + max_new_accounts_per_registration_ip: "Nya registreringar är inte tillåtet från din IP-adress (maxgräns uppnådd). Kontakta personal." + invite_mailer: + subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}" + text_body_template: | + %{invitee_name} har bjudit in dig till en diskussion + + > **%{topic_title}** + > + > %{topic_excerpt} + + på + + > %{site_title} -- %{site_description} + + Om du är intresserad, klicka på länken nedan: + + %{invite_link} + + Denna inbjudan är från en betrodd användare, så du kan direkt delta och svara i diskussionen. + invite_forum_mailer: + subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}" + text_body_template: | + %{invitee_name} har bjudit in dig till + + > **%{site_title}** + > + > %{site_description} + + Om du är intresserad, klicka på länken nedan: + + %{invite_link} + + Denna inbjudan kommer från en betrodd användare, så du behöver inte logga in. + invite_password_instructions: + subject_template: "Ange lösenord för ditt konto på %{site_name}" test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" + new_version_mailer: + subject_template: "[%{site_name}] Ny version av Discourse, uppdatering tillgänglig" + text_body_template: | + En ny version av [Discourse](http://www.discourse.org) finns tillgängligt. + + Din version: %{installed_version} + Ny version: **%{new_version}** + + Du kanske vill: + + - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Uppgradera från din webbläsare på [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse. + new_version_mailer_with_notes: + subject_template: "[%{site_name}] uppdatering tillgänglig" + text_body_template: | + En ny version av [Discourse](http://www.discourse.org) finns tillgängligt. + + Din version: %{installed_version} + Ny version: **%{new_version}** + + Du kanske vill: + + - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Uppgradera från din webbläsare på [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse. + + ### Release notes + + %{notes} + flags_reminder: + flags_were_submitted: + one: "Dessa flaggor skickades in för mer än 1 timme sedan." + other: "Dessa flaggor skickades in för mer än %{count} timmar sedan." + please_review: "Var god och granska dessa." + post_number: "inlägg" + subject_template: + one: "1 flagga väntar på att bli hanterad" + other: "%{count} flaggor väntar på att bli hanterade" + flag_reasons: + off_topic: "Ditt inlägg blev flaggat som **off-topic**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av titeln och det första inlägget." + inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](/guidelines)." + spam: "Ditt inlägg blev flaggat som **skräppost**. Medlemmarna i forumet kände att det är reklam, något som är överdrivet säljande istället för att vara nyttigt eller relevant för ämnet." + notify_moderators: "Ditt inlägg blev flaggat **för moderators uppmärksamhet**. Medlemmarna i forumet kände att något i inlägget kräver manuellt ingripande av personal." + flags_dispositions: + agreed: "Tack för att du meddelade oss. Vi håller med om att det finns ett problem och vi undersöker det. " + agreed_and_deleted: "Tack för att du meddelade oss. Vi håller med om att det finns ett problem och vi har raderat inlägget." + disagreed: "Tack för att du meddelande oss. Vi undersöker det." + deferred: "Tack för att du meddelande oss. Vi undersöker det." + deferred_and_deleted: "Tack för att du meddelande oss. Vi har raderat inlägget." + temporarily_closed_due_to_flags: "Detta ämne är tillfälligt stängt på grund av ett stort antal flaggor." system_messages: post_hidden: subject_template: "Post hidden due to community flagging" welcome_user: subject_template: "Välkommen till %{site_name}!" + text_body_template: | + Tack för att du gått med i %{site_name}, och välkommen! + + %{new_user_tips} + + Vi tror på ett [civiliserat beteende](%{base_url}/guidelines) vid alla tillfällen. + + Njut av din vistelse! + + (Om du som ny användare behöver komma i kontakt med vår [personal](%{base_url}/about), svara bara på detta meddelande) welcome_invite: subject_template: "Välkommen till %{site_name}!" + text_body_template: | + Tack för att du accepterade din inbjudan till %{site_name} -- välkommen! + + Vi har skapat ett nytt konto **%{username}** till dig och du är inloggad. Du kan byta namn genom att besöka [din användarprofil][prefs]. + + För att logga in senare: + + 1. Använda alltid **samma e-postadress som från din ursprungliga inbjudan** när du loggar in. Annars vet vi inte att det är du! + + 2. Skapa ett unikt lösenord för [din användarprofil][prefs], och använd det för att logga in. + + %{new_user_tips} + + Vi tror på ett [civiliserat beteende](%{base_url}/guidelines) vid alla tillfällen. + + Njut av din vistelse! + + (Om du som ny användare behöver komma i kontakt med vår [personal](%{base_url}/about), svara bara på detta meddelande.) + + [prefs]: %{user_preferences_url} + backup_succeeded: + subject_template: "Säkerhetskopia skapades utan problem" + backup_failed: + subject_template: "Säkerhetskopiering misslyckades" restore_succeeded: text_body_template: "Återställningen lyckades." restore_failed: @@ -627,74 +963,86 @@ sv: text_body_template: |+ Hej, - det här är ett automatiskt meddelande från %{site_name} för att informera dig om att ditt konto har blivit avblockerat efter en granskning av personalen. + Det här är ett automatiskt meddelande från %{site_name} för att informera dig om att ditt konto har blivit avblockerat efter en granskning från personalen. - Du kan nu skapa nya svar och trådar igen. + Du kan nu skapa nya svar och ämnen igen. pending_users_reminder: subject_template: one: "1 användare väntar på godkännande" other: "%{count} användare väntar på godkännande" - unsubscribe_link: "To unsubscribe from these emails, visit your [user preferences](%{user_preferences_url})." + subject_re: "Sv:" user_notifications: previous_discussion: "Föregående Svar" unsubscribe: title: "Unsubscribe" - description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:" + description: "Inte intresserad av att få dessa mejl? Inga problem! Klicka nedan för att avprenumerera." + reply_by_email: "För att svara, svara på detta mejl eller besök %{base_url}%{url} i din webbläsare." visit_link_to_respond: "För att svara, besök %{base_url}%{url} i din webbläsare." posted_by: "Postat av %{username} den %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} har bjudit in dig till en privat konversation '%{topic_title}'" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} har bjudit in dig till ett ämne '%{topic_title}'" user_replied: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} replied to your post in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_quoted: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} quoted you in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_mentioned: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} mentioned you in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_posted: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} posted in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} digest: - new_activity: "New activity on your topics and posts:" + new_activity: "Ny aktivitet i dina ämnen och inlägg:" top_topics: "Populära inlägg" - other_new_topics: "Populära trådar" - click_here: "click here" - from: "%{site_name} digest" + other_new_topics: "Populära ämnen" + click_here: "klicka här" + from: "%{site_name} sammanfattning" read_more: "Läs Mer" + more_topics_category: "Fler nya ämnen:" forgot_password: - subject_template: "[%{site_name}] Password reset" + subject_template: "[%{site_name}] Återställning av lösenord" text_body_template: | - Somebody asked to reset your password on [%{site_name}](%{base_url}). + Någon bad om att få återställa ditt lösenord på [%{site_name}](%{base_url}). - If it was not you, you can safely ignore this email. + Om detta inte var du, kan du utan problem ignorera detta mejl. - Click the following link to choose a new password: + Klicka på följande länk för att välja ett nytt lösenord: %{base_url}/users/password-reset/%{email_token} + set_password: + subject_template: "[%{site_name}] Ange lösenord" + admin_login: + subject_template: "[%{site_name}] Logga in" + account_created: + subject_template: "[%{site_name}] Ditt nya konto" authorize_email: subject_template: "[%{site_name}] Confirm your new email address" text_body_template: | @@ -704,32 +1052,50 @@ sv: signup_after_approval: subject_template: "Du har blivit godkänd på %{site_name}!" signup: - subject_template: "[%{site_name}] Activate your new account" text_body_template: "Välkommen till %{site_name}!\n\nKlicka på följande länk för att bekräfta och aktivera ditt nya konto:\n%{base_url}/users/activate-account/%{email_token}\n\nOm länken ovan inte går att klicka på kan du kopiera och klistra in länken i adressfältet i din webbläsare. \n" page_not_found: + title: "Sidan du sökte existerar inte eller är privat." + popular_topics: "Populära" + recent_topics: "Senaste" see_more: "Mer" + search_title: "Sök på sajten" + search_google: "Google" + login_required: + welcome_message: | + #[Välkommen till %{title}](#welcome) + Ett konto krävs för att logga in. Var god och skapa ett konto eller logga in för att fortsätta. + terms_of_service: + title: "Användarvillkor" + signup_form_message: 'Jag har läst och accepterat Användarvillkoren.' deleted: 'raderad' upload: pasted_image_filename: "Inklistrad bild" + attachments: + too_large: "Tyvärr, filen du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb)." images: + too_large: "Tyvärr, bilden du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb). Ändra storleken och försök igen." size_not_found: "Vi beklagar, men vi kunde inte avgöra bildens storlek. Kanske är din bildfil skadad?" + email_log: + no_user: "Kan inte hitta användare med id %{user_id}" + anonymous_user: "Användare är anonym" + seen_recently: "Användare sågs senast" + post_not_found: "Kan inte hitta ett inlägg med id %{post_id}" + post_deleted: "inlägg raderades av författaren" + user_suspended: "användare blev avstängd" + message_blank: "meddelande är tomt" about: "Om" guidelines: "Riktlinjer" + privacy: "Integritet" edit_this_page: "Redigera denna sida" csv_export: boolean_yes: "Ja" boolean_no: "Nej" + guidelines_topic: + title: "FAQ/Riktlinjer" tos_topic: title: "Villkor" - badges: - long_descriptions: - nice_post: | - Bla bla bla - Bla bla bla - nice_topic: | - Bla bla bla - Bla bla bla admin_login: success: "E-post skickat" error: "Fel!" + email_input: "E-post till administratör" submit_button: "Skicka e-post" diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml index c42b92ea57..2a40ce4212 100644 --- a/config/locales/server.te.yml +++ b/config/locales/server.te.yml @@ -159,14 +159,6 @@ te: మరింత సమాచారం కోసం ,[వర్గ మార్గదర్శక సూత్రాలను చూడండి](/guidelines).ఈ పట్టిక మొదట మీకే కనిపిస్తుంది%{education_posts_text}. - avatar: | - ###మీ ఖాతాకి ఒక కొత్త చిత్రం గురించి? - - మీరు కొన్ని విషయాలు మరియు ప్రత్యుత్తరాలను పోస్ట్ చేసారు, కానీ మీ అవతార్ మీలాగా ఏకైకం కాదు - ఇది అందరూ కొత్త వినియోగదారులు అదే అప్రమేయ అవతార్ అవుతుంది. - - మీరు ఆలోచించారా **[మీ వినియోగదారు ప్రొఫైల్ సందర్శించడం](%{profile_path})** మరియు మీరు ఎగుమతి చేసిన చిత్రం మిమ్మల్ని సూచిస్తుందా ? - - ప్రతి ఒక్కరూ ఒక ఏకైక అవతార్ కలిగిఉన్నప్పుడు సంఘ చర్చలు జరపడానికి మరియు సభ్యుల ఆసక్తికరమైన సంభాషణలు కనుగొనేందుకు ఇది చాలా సులభం ! activerecord: attributes: category: @@ -203,7 +195,6 @@ te: no_info_other: "
      %{పేరు} ఇంకా వారి ప్రొఫైల్ లో ఎబౌట్ మీ స్థానంలో ఏమీ చేర్చలేదు
      " vip_category_name: "అడ్డా" vip_category_description: "నమ్మకం స్థాయి మూడు లేదా ఆపై ఉన్న సభ్యులకు మాత్రమే పరిమితమైన వర్గం" - meta_category_name: "మెటా" meta_category_description: "ఈ సైటు గురించి చర్చ. ఎలా మొదలైంది. ఎలా పని చేస్తుంది. ఇంకా ఎలా మెరుగు పరచవచ్చు." staff_category_name: "సిబ్బంది" staff_category_description: "సిబ్బంది చర్చలకు ప్రైవేటు వర్గం. విషయాలు కేవలం అధికారులకు మరియు నిర్వాహకులకు మాత్రమే కనిపిస్తాయి." @@ -330,7 +321,6 @@ te: please_continue: "%{site_name} కు కొనసాగండి" error: "మీ ఈమెయిల్ చిరునామా మార్చడంలో దోషం. బహుశా ఆ చిరునామా ఈసరికే వాడుకలో ఉందా?" activation: - action: "మీ ఖాతాను చేతనం చేయండి" already_done: "క్షమించాలి. ఖాతా ధృవపరుచు లంకె కాలాతీతమైంది. బహుశా మీ ఖాతా ఇప్పటికే చేతనమై ఉందేమో?" please_continue: "మీ ఖాతా ధృవపర్చబడింది. మీరిప్పుడు తొలిపుటకు మళ్లించబడతారు." continue_button: "%{site_name} కు కొనసాగండి." @@ -567,7 +557,6 @@ te: min_topic_title_length: "శీర్షిక కు అనుమతించే అక్షరాల కనిష్ఠ పొడవు" max_topic_title_length: "శీర్షిక కు అనుమతించే అక్షరాల గరిష్ఠ పొడవు" min_search_term_length: "శోధనకు అవసరమయ్యే అక్షరాల కనీస పొడవు" - allow_uncategorized_topics: "అనుమతించే విషయాలు వర్గం లేకుండా సృష్టించబడుతున్నాయి." uncategorized_description: "వర్గీకరించని వర్గం యొక్క వివరణ. ఎటువంటి వివరణ లేని వాటిని ఖాళీగా వదిలివేయండి." allow_duplicate_topic_titles: "సమరూపమైన,నకిలీ శీర్షికలతో విషయాలను అనుమతించు." unique_posts_mins: "ఒక వినియోగదారు ఎన్ని నిమిషాల తర్వాత మళ్ళీ అదే విషయంతో ఒక టపా చేయవచ్చు " @@ -642,7 +631,6 @@ te: characters: "కేవలం సంఖ్యలు, అక్షరాలు మరియు అండర్ స్కోరు మాత్రమే ఉండాలి. " unique: "ఏకైకంగా ఉండాలి" blank: "తప్పనిసరిగా ఉండాలి" - must_begin_with_alphanumeric: "తప్పనిసరిగా సంఖ్యతోగాని, అక్షరంతోగాని మొదలవ్వాలి" email: not_allowed: "ఆ ఈమెయిల్ ప్రొవైడరును అనుమంతిచుటలేదు. దయచేసి మరో ఈమెయిల్ చిరునామా రాయండి" blocked: "అనుమతించుటలేదు" @@ -681,8 +669,6 @@ te: deleted: 'తొలగించారు' upload: images: - fetch_failure: "క్షమించండి, చిత్రం తెచ్చుటలో తప్పిదము ఉంది." - unknown_image_type: "క్షమించండి, మీరు ఎగుమతి చేయడానికి ప్రయత్నించిన ఫైల్ చిత్రం వలె కనిపించడం లేదు." size_not_found: "క్షమించండి, కానీ మేము చిత్రం యొక్క పరిమాణం నిర్ణయించలేదు. బహుశా మీ చిత్రం పాడై ఉండవచ్చు?" email_log: seen_recently: "వినియోగదారు కొత్తగా చూశారు" @@ -703,47 +689,7 @@ te: boolean_no: "లేదు" guidelines_topic: title: "తఅప్ర/మార్గదర్శకాలు" - body: "\n\n## [బహిరంగ చర్చకు ఇది ఒక నాగరిక స్థానం](#నాగరికత )\n\nదయచేసి ఈ చర్చావేదికను ఒక పబ్లిక్ పార్క్ తో సమానంగా పరిగణించండి.మనకి చాలా ఉపయుక్తమైన భాగస్వామ్య సమాజ పంపిణీ వనరు — కొనసాగుతున్న సంభాషణ ద్వారా నైపుణ్యాలు, జ్ఞానం మరియు ఆసక్తులు పంచుకోవడానికి ఒక చోటు.\n\nఇవి కఠినమైన మరియు ధృడమైన నియమాలు కావు, కేవలం మన సంఘంలో మానవతీర్పుకు\ - \ ఉపకరణాలు.\nనాగరిక ప్రజా సంభాషణ కోసం స్వచ్ఛమైన,మరింత ఆహ్లాదకరమైన స్థానంగా ఉంచడానికి ఈ మార్గదర్శకాలను ఉపయోగించండి.\n\n\n\n## [చర్చను మెరుగుపరచండి](#మెరుగుపరచు)\n\nదీనిని గొప్ప చర్చావేదిక గా తయారుచేయడానికి మీరు ఎల్లప్పుడూ చర్చను మెరుగుపరచడానికి ఏదో విధంగా, చిన్న సహాయమైనా చేయండి. మీరు మీ టపాకి సంభాషణని జత చేసింది లేనిది ఖచ్చితంగా తెలియకపోతే\ - \ , మీరు ఏమి చెప్పదలుచుకున్నారో ఆలోచించండి మరియు మరలా ప్రయత్నించండి.\n\nఇక్కడ చర్చించబడిన విషయాలు మనకు సంబంధించినవి, మరియు మీ విషయంగా భావించండి.విషయం గురించి చర్చించే వ్యక్తుల పట్ల , ఎవరైనా చెప్పినదాని పట్ల విభేధించినా మర్యాదతో వ్యవహరించండి.\n\nచర్చ మెరుగుదలకు ఇప్పటికే ఒక మార్గం కనుగొనడం జరిగింది.మీరు ఏ విషయానికైనా బదులివ్వడానికి లేదా కొత్తగా మొదలు పెట్టడానికి\ - \ ముందు బ్రౌజింగ్ కోసం కొంత సమయం వెచ్చించండి,మరియు మీ అభిరుచులను పంచుకోవడానికి ఒక మంచి సమావేశానికి అవకాశం కల్పిస్తాము.\n\n\n\n## [మీరు విభేధించినప్పటికీ ,సమ్మతంగా వ్యవహరించండి](#సమ్మతి)\n\nమీరు ఏ విషయంతోనైనా విభేధించాలి అనుకొంటే , అది బాగుంది కానీ , గుర్తుంచుకోండి_ఆలోచనలను విమర్శించండి, వ్యక్తులను కాదు_దయచేసి నివారించండి.\n\n*పేరు\ - \ పిలవండి.\n*మానవ దాడులు.\n*అసలు విషయం బదులుగా టపా యొక్క ధ్వనితో సమాధానం ఇస్తుంది.\n*స్వల్ప వైరుధ్యాలు.\n\nబదులుగా, సంభాషణను మెరుగుపర్చడానికి హేతుబధ్దమైన ప్రతివాదనకు అవకాశం కల్పించండి.\n\n\n\n## [మీరు పాల్గొన్న సంఖ్య](#పాల్గొను)\n\nఇక్కడ ఉన్న సంభాషణలన్నింటికీ మేము ఒక ధ్వని ఏర్పాటు చేశాము.ఈ చర్చాస్థలాన్ని మరింత ఆసక్తికరంగా తయారుచేయుటకు\ - \ ఈ వర్గం యొక్క భవిష్యత్‌ను ప్రభావితం చేసే చర్చల్లో పాల్గొని మాకు సహాయం చేయండి — మరియు చేయలేనివి వదిలేయండి.\n\nడిస్కోర్స్ మీకు సమిష్టిగా ఉత్తమ (మరియు చెత్త) రచనలు గుర్తించడానికి సాధ్యమయ్యే వర్గ ఉపకరణాలు అందిస్తుంది.ఇష్టాలు, బుక్‌మార్క్‌లు, జెండాలు, ప్రత్యుత్తరాలు, సవరణలు, మరియు మొదలగునవి.చాలా, మీరు మరియు ప్రతి ఒక్కరూ సొంత అనుభవాన్ని చాలా మెరుగుపరచడానికి\ - \ ఈ సాధనాలను ఉపయోగించండి.\n\nదీని కంటే ఒక మెరుగైన వేదిక దొరికితే , దీనిని వదలడానికి ప్రయత్నించండి.\n\n\n\n## [మీరు ఒక సమస్యని గుర్తించినట్లయితే, కేతనం చెయ్యండి](#సమస్య-కేతనం)\n\nపరిశీలకులు ప్రత్యేక అధికారం కలిగియున్నారు;ఈ చర్చాస్థలంనకు వారే భాధ్యులు.కానీ మీరు కూడా, మీ సహాయంతో పరిశీలకులు వర్గ దోహదకారులుగా ఉంటారు,కాపలాదారులు లేదా\ - \ రక్షకభటులుగా కాదు.\n\nమీరు చెడు ప్రవర్తన చూసినప్పుడు, సమాధానం ఇవ్వకండి. ఇది గుర్తించడం ద్వారా చెడు ప్రవర్తనను ప్రోత్సహిస్తున్నట్లే , మీ శక్తి ఖర్చవుతుంది, మరియు ప్రతి ఒక్కరి సమయం వృధా అవుతుంది. _కేవలం కేతనించండి_.తగినన్ని కేతనాలు వచ్చి ఉంటే ,స్వయంచాలకంగా గాని లేదా పరిశీలకుని జోక్యంతో గాని చర్య తీసుకోబడుతుంది. \n\nమన వర్గం నిర్వహించే క్రమంలో , పరిశీలకులు\ - \ ఏ సమయంలోనైనా మరియు ఏ కారణం చేతనైనా, ఏ విషయాన్నైనా, ఏ వినియోగదారుని ఖాతానైనా తొలగించే హక్కు కలిగియుంటారు.పరిశీలకులు కొత్త టపాలను ఏ విధంగానూ ముందుగా చూడరు; పరిశీలకులు మరియు సైట్ నిర్వాహకులు ఈ వర్గంలోని టపాల లోని విషయం పట్ల ఏ భాధ్యత తీసుకోరు.\n\n\n\n## [ఎల్లప్పుడూ మర్యాదగా వ్యవహరించు](#మర్యాద)\n\nఆరోగ్యకరమైన సంభాషణ చెడిపోయేలా,అమర్యాదగా\ - \ వ్యవహరించకండి.\n\n*మర్యాదతో మెలగండి.ఒక సహేతుకమైన వ్యక్తిని గురించి హానికర, అసంబద్ధ టపాలు లేదా ద్వేషపూరిత ప్రసంగాన్ని చేయవద్దు.\n*స్వఛ్చంగా ఉంచండి. ఎటువంటి అశ్లీలమైన లేదా ప్రత్యక్ష లైంగిక పరమైన టపాలు చేయవద్దు.\n*పరస్పరం గౌరవించుకోండి. వేధించడం లేదా భాధ కలిగించడం,వ్యక్తులను అనుకరించడం,వారి ఆంతరంగిక విషయాలు బహిర్గతపరచడం చేయకండి.\n*మన చర్చావేదికను గౌరవించండి.ఎటువంటి\ - \ స్పామ్ సందేశాలు లేదా హాని కలిగించే టపాలు చేయకండి.\n\nఇవి మిశ్రమ నిబంధనలు,ఖచ్చితమైన నిర్వచనాలు లేవు — ఈ పనుల యొక్క రూపాన్ని కూడా తొలగించండి.మీకు తెలియకుంటే, మీ టపా న్యూ యార్క్ టైమ్స్ ముందు పేజీలో ప్రత్యేక వ్యాసంగా వేయబడితే అని మీరు ఎలాంటి భావన పొందుతారో మిమ్మల్ని మీరే ప్రశ్నించుకోండి.\n\nఇది బహిరంగ చర్చావేదిక, మరియు సెర్చ్ ఇంజన్స్ ఈ చర్చలను సూచిస్తాయి.భాష,\ - \ లంకెలు మరియు చిత్రాలను కుటుంబం మరియు స్నేహితులు కొరకు సురక్షితంగా ఉంచండి.\n\n\n\n## [చక్కగా ఉంచండి](#చక్కగా ఉంచండి)\n\nసంగతులు సరైన స్థానంలో పెట్టడానికి కృషిచేయండి.ఎందుకంటే మేము ఎక్కువ సమయం చర్చలమీద మరియు తక్కువ శుభ్రత మీద పెట్టదలచుకొన్నాం.\n\n*ఒక తప్పు వర్గంలో విషయాన్ని మొదలుపెట్టకండి.\n*ఒకే విషయాన్ని బహుళవిషయాలకు వైరుధ్యమైన\ - \ టపాలు చేయవద్దు.\n *ప్రత్యుత్తరంగా విషయం లేని టపాలు చేయవద్దు.\n*విషయాన్ని మధ్యలో దారి మళ్ళించకండి.\n*మీ టపాలకు సంతకం చేయకండి — ప్రతి టపా మీ వ్యక్తిగత వివరాల సమాచారాన్ని కలిగిఉంటుంది.\n\nమీ టపాలు \"+1\" లేదా \"అంగీకారం\" కంటే ఎక్కువ అయితే , లైక్ బటన్ ని ఉపయోగించండి. అయితే మౌలికంగా విభిన్న దిశలో ఇప్పటికే తీసుకొని ఉన్నదాని కంటే ఎక్కువగా ఉంటే, అనుబంధ విషయాన్ని\ - \ సమాధానంగా ఉపయోగించండి.\n\n\n\n## [మీ సొంత విషయాన్ని మాత్రమే టపా చేయండి](#దొంగతనము)\n\nమీరు ఎవరికో చెందిన విషయాన్ని వారి అనుమతి లేకుండా టపా చేయకూడదు.మీరు, ఏ ఇతర చట్టాన్ని అతిక్రమించి వర్ణనలు, లింకులు, లేదా పద్ధతులు ఒకరి మేధో సంపత్తి నుండి దొంగిలించిన \n(సాఫ్ట్వేర్, వీడియో, ఆడియో, చిత్రాలు) టపా చెయ్యకూడదు.\n\n\n\ - \n## [మీరే ఆధారం](#శక్తి)\n\nఈ సైట్ మీ [స్నేహపూర్వక స్థానిక సిబ్బంది] ద్వారా నిర్వహించబడుతుంది. మీకు ఇంకా ఇక్కడ విషయాలు ఎలా పని చేస్తాయి అని ఏవైనా ప్రశ్నలు ఉంటే ,ఒక కొత్త విషయాన్ని తెరచి [మెటా వర్గం](/c/మెటా) చర్చించండి! ఒక మెటా అంశం లేదా కేతనం ఒక క్లిష్టమైన లేదా తక్షణ సమస్యగా ఉండి ఉంటే , మమ్మల్ని [సిబ్బంది పేజ్](/గురించి) ద్వారా సంప్రదించండి.\n\n\n\n## [సేవా నిబంధనలు](#నిబంధనలు)\n\nఅవును, చట్టం విసుగు ప్రక్రియ,– మరియు పొడగింపు ద్వారా, మీరు మరియు మీ సమాచారం – ప్రతికూలమైన చర్యలకు వ్యతిరేకంగా కానీ మనల్ని మనంరక్షించుకోవాలి.మనం [సేవా నిబంధనలు]ను విషయానికి సంబంధించిన మీ (మరియు మా) ప్రవర్తన మరియు హక్కులను వివరిస్తూ గోప్యతా మరియు చట్టాలు ఉన్నాయి.ఈ సేవలను ఉపయోగించుకోవడానికి, మనం కట్టుబడి\ - \ ఉండాలి.[నిబంధనలు](/నిబంధనలు).\n" tos_topic: title: "సేవా నిబంధనలు" privacy_topic: title: "ప్రైవసీ పోలసీ" - static: - search_help: | -

      సూచనలు

      -

      -

        -
      • టైటిల్ వెతుకులాటలో, ఏదైనా సందేహం ఉన్నప్పుడు, ప్రాధాన్యతాక్రమంను బట్టి సరిపోలుతుంది
        • -
      • ప్రత్యేక, అసాధారణ పదాలు ఎల్లప్పుడూ ఉత్తమ ఫలితాలను ఇస్తాయి
        • -
      • వీలైనప్పుడల్లా, మీరు ఒక నిర్దిష్ట వర్గం, వినియోగదారు, లేదా అంశం శోధించడానికి అవకాశం ఉంటుంది
        • -
      -

      -

      ఆప్షన్‌లు

      -

      - <పట్టిక> -

    క్రమము:చూపులుక్రమము:తాజా
    స్థాయి:తెరచివుంచుస్థాయి:మూసిఉంచుస్థాయి:భద్రపరచుస్థాయి:సమాధానంలేనిస్థాయి:ఒకేవినియోగదారు
    వర్గం:ఫోవినియోగదారు:ఫో
    ఇష్టాలలోటపాలలోవీక్షణాలలోట్రాకింగ్‌లోవ్యక్తిగతాలలో
    బుక్‌మార్క్‌లలో
    -

    -

    - ఇంధ్రధనస్సు వర్గం:నిలుపు స్థాయి:తెరుచు స్థాయి:తాజా ఏదేని విషయంలో "రెయిన్‌బో" అన్న పదo ఉంటే "నిలుపు" వర్గం లోని మూసివేసిన లేదా భద్రపరచిన దానిలో,ఆఖరి టపా తేదిని బట్టి వెదకండి. -

    diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index eea2bfc804..b47160534c 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -7,7 +7,7 @@ tr_TR: dates: - short_date_no_year: "D MMM" + short_date_no_year: "G AAA" short_date: "D MMM, YYYY" long_date: "MMMM D, YYYY h:mma" title: "Discourse" @@ -61,6 +61,12 @@ tr_TR: other: '%{count} hata bu %{model} kaydının alınmasını engelledi' embed: load_from_remote: "Gönderi yüklenirken bir hata oluştu." + site_settings: + min_username_length_exists: "En kısa kullanıcı adının üstünde en küçük kullanıcı adı uzunluğu ayarlayamazsınız." + min_username_length_range: "En büyük değerin üstünde en küçük değer ayarlayamazsınız." + max_username_length_exists: "En uzun kullanıcı adının altında en büyük kullanıcı adı uzunluğu ayarlayamazsınız." + max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız." + default_categories_already_selected: "Bir başka listede kullanılan bir kategoriyi seçemezsiniz." bulk_invite: file_should_be_csv: "Yüklenen dosya csv veya txt formatında olmalı. " backup: @@ -126,6 +132,7 @@ tr_TR: rss_description: latest: "En son konular" hot: "Sıcak konular" + posts: "Son gönderiler" too_late_to_edit: "Gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez ya da silinemez. " excerpt_image: "resim" queue: @@ -147,25 +154,25 @@ tr_TR: education: until_posts: other: "%{count} gönderi" - new-topic: "%{site_name} &mdash sitesine hoşgeldiniz; **yeni bir sohbet başlattığınız için teşekkür ederiz! ** \n\n- Başlık konunuz yüksek sesle okuduğunuzda ilgi çekici duyuluyor mu? İyi bir özet mi?\n\n- Bununla kim ilgilenirdi? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz?\n\n- Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisinde sıkça kullanılan kelimeler bulundurun. Konunuzun benzer konularla gruplanması için bir kategori seçin. \n\nDaha fazlası için, [topluluk yönergelerimize bakın](/guidelines). Bu panel sadece ilk gönderinizde %{education_posts_text} gözükür.\n" + new-topic: "%{site_name} forumuna hoşgeldiniz — **yeni bir sohbet başlattığınız için teşekkür ederiz! **\n\n- Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi?\n\n- Bununla kim ilgilenirdi? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz?\n\n- Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisine sıkça kullanılan kelimeler dahil edin. Konunuzun benzer konularla gruplanması için bir kategori seçin. \n\nDaha fazlası için, [topluluk yönergelerimize bakın](/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür.\n" new-reply: | - %{site_name} &mdash sitesine hoşgeldiniz; katılımınız için teşekkür ederiz! + %{site_name} forumuna hoşgeldiniz — **katılımınız için teşekkür ederiz!** - - Cevabınız sohbetin gelişmesine yardımcı oluyor mu? + - Cevabınız sohbeti bir şekilde geliştiriyor mu? - Topluluğun diğer üyelerine karşı nazik olun. - - Yapıcı eleştirici her zaman kabul edilir, ama fikirleri eleştirin, insanları değil. + - Yapıcı eleştirici her zaman kabul edilir, ama *fikirleri* eleştirin, insanları değil. - Daha fazlası için, [topluluk yönergelerine bakın](/guidelines). Bu yazı sadece ilk gönderinizde %{education_posts_text} gözükür. + Daha fazlası için, [topluluk yönergelerine bakın](/guidelines). Bu yazı sadece ilk %{education_posts_text} için görünür. avatar: | - ### Hesabın için bir fotoğraf yüklemeye ne dersin? + ### Hesabının bir resmi olsun istemez misin? - Birkaç konu açtın ve cevap bıraktın, fakat avatarın hala kendine has değil - tüm yeni kullanıcıların sahip olduğu varsayılan avatar. + Birkaç konu ve cevap gönderdin, fakat profil resmin senin kadar eşsiz değil - sadece bir harf. - **[Profil sayfana](%{profile_path})** gitmeyi ve seni temsil eden özel bir resim yüklemeyi düşündün mü? + Hiç **[kullanıcı profiline girmeyi](%{profile_path})** ve seni ifade eden bir resim yüklemeyi düşündün mü? - Herkesin kendine has avatarı olduğunda, topluluktaki tartışmaları takip etmek ve sohbet esnasında ilginç insanlarla tanışmak daha kolay! + Herkes eşsiz bir profil resmine sahip olduğunda tartışmaları takip etmek ve tartışmalarda ilgi çekici insanlar bulmak daha kolaydır! sequential_replies: "### Birden fazla gönderiyi aynı anda cevaplayabilirsin \n\nAynı konuya ardı ardına cevaplar yazmak yerine, lütfen önceki gönderilerden alıntı veya @isim referansları içeren tek bir cevap yaz. \n\nHerhangi bir yazıyı seçince çıkan alıntılayarak cevapla butonuna tıklayarak alıntı ekleyebilir, bir önceki cevabınızı düzenleyebilirsiniz. \n\nAz sayıda derinlemesine cevaplardan oluşan konuların okunması, çok fazla kısa ve tekil cevaplardan oluşan konulardan herkes için daha kolay oluyor.\n" dominating_topic: "###Sohbete başkalarının katılmasına izin verin\n\nBu konunun sizin için önemli olduğunu görüyoruz – buradaki cevapların %{percent}% oranından daha fazlasını siz göndermişsiniz. \n\nDiğerlerinin de kendi fikirlerini paylaşmaları için onlara yeteri kadar zaman tanıdığınıza emin misiniz?\n" too_many_replies: "### Bu konu için cevap limitinizi doldurdunuz\n\nÜzgünüz, ancak geçici olarak, yeni kullanıcılar aynı konu içinde en fazla %{newuser_max_replies_per_topic} cevap yazabiliyorlar. \n\nYeni bir cevap yazmak yerine, önceki cevaplarınızı düzenlemeyi, ya da başka konulara göz atmayı düşünün.\n" @@ -212,7 +219,7 @@ tr_TR: no_info_other: "
    %{name} profilinde Hakkımda kısmına henüz bir şey girmedi
    " vip_category_name: "Lobi" vip_category_description: "Güven seviyesi 3 ve üzerinde olan üyelere özel kategori." - meta_category_name: "Meta" + meta_category_name: "Site geri bildirimi" meta_category_description: "Bu site, sitenin organizasyonu, nasıl çalıştığı ve nasıl geliştirilebileceği ile ilgili tartışma alanı." staff_category_name: "Görevliler" staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece admin ve moderatörlere gözükür." @@ -326,7 +333,7 @@ tr_TR: almost_x_years: other: "yaklaşık %{count} yıl önce" password_reset: - no_token: "Üzgünüz, şifre değiştirme bağlantısı güncel değil. Yeni bağlantı almak için tekrar giriş yapın ve 'Şifremi unuttum\"'u seçin." + no_token: "Üzgünüz, bu şifre değiştirme bağlantısı çok eski. Yeni bir bağlantı almak için lütfen 'Giriş Yap' tuşuna basın ve 'Parolamı unuttum'u seçin." choose_new: "Lütfen yeni bir parola seçin" choose: "Lütfen parola seçin" update: 'Parolayı Güncelle' @@ -340,7 +347,7 @@ tr_TR: please_continue: "%{site_name} adresine devam edin" error: "E-posta adresiniz değiştirilirken bir hata oluştu. Bu adres zaten kullanımda olabilir." activation: - action: "Hesabınızı etkinleştirin" + action: "Hesabınızı etkinleştirmek için buraya tıklayın" already_done: "Üzgünüz, hesap doğrulama linki artık geçerli değil. Hesabınız zaten etkin olabilir mi?" please_continue: "Hesabınız doğrulandı; şimdi ana sayfaya yönlendirileceksiniz." continue_button: "%{site_name} adresine devam edin" @@ -408,6 +415,7 @@ tr_TR: regular: title: "Standart Konu" banner: + title: "Manşet Konusu" message: make: "Bu konu artık bir manşettir. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir." remove: "Bu konu artık manşet değildir. Artık her sayfanın en üstünde yer belirmeyecektir." @@ -425,7 +433,7 @@ tr_TR: description: "Tekrar abone oldunuz." reports: visits: - title: "Kullanıcı Ziyaretleri" + title: "Kullanıcı ziyaretleri" xaxis: "Gün" yaxis: "Ziyaret sayısı" signups: @@ -461,11 +469,11 @@ tr_TR: xaxis: "Güven Seviyesi" yaxis: "Kullanıcı Sayısı" emails: - title: "Gönderilen E-postalar" + title: "Gönderilen e-postalar" xaxis: "Gün" yaxis: "E-posta Sayısı" user_to_user_private_messages: - title: "Kullanıcıdan Kullanıcıya" + title: "Kullanıcıdan kullanıcıya" xaxis: "Gün" yaxis: "Mesaj sayısı" system_private_messages: @@ -473,48 +481,56 @@ tr_TR: xaxis: "Gün" yaxis: "Mesaj sayısı" moderator_warning_private_messages: - title: "Moderatör Uyarısı" + title: "Moderatör uyarıları" xaxis: "Gün" yaxis: "Mesaj sayısı" notify_moderators_private_messages: - title: "Moderatörleri Bilgilendir" + title: "Moderatör bilgilendirme" xaxis: "Gün" yaxis: "Mesaj sayısı" notify_user_private_messages: - title: "Kullanıcıyı Bilgilendir" + title: "Kullanıcı bilgilendirme" xaxis: "Gün" yaxis: "Mesaj sayısı" top_referrers: - title: "En Çok Atıfta Bulunanlar" + title: "En çok atıfta bulunanlar" xaxis: "Kullanıcı" num_clicks: "Tıklamalar" num_topics: "Konular" top_traffic_sources: - title: "En İyi Trafik Kaynakları" + title: "En iyi trafik kaynakları" xaxis: "Alan Adı" num_clicks: "Tıklamalar" num_topics: "Konular" num_users: "Kullanıcılar" top_referred_topics: - title: "En Çok Atıfta Bulunulan Konular" + title: "En çok atıfta bulunulan konular" xaxis: "Konu" num_clicks: "Tıklamalar" page_view_anon_reqs: title: "Anonim" xaxis: "Gün" - yaxis: "Anonim API İstekleri" + yaxis: "Anonim API istekleri" page_view_logged_in_reqs: - title: "Giriş Yapılmış" + title: "Oturum açıldı" xaxis: "Gün" - yaxis: "Giriş Yapılmış API İstekleri" + yaxis: "Giriş Yapmış Kişilerden API İstekleri" page_view_crawler_reqs: - title: "Ağ Gezgini" + title: "Arama botları" xaxis: "Gün" - yaxis: "Ağ Gezgini API İstekleri" + yaxis: "Bot API istekleri" page_view_total_reqs: title: "Toplam" xaxis: "Gün" - yaxis: "Tüm API İstekleri" + yaxis: "Tüm API istekleri" + page_view_logged_in_mobile_reqs: + title: "Giriş Yapmış Kişilerden API İstekleri" + xaxis: "Gün" + yaxis: "Mobilden Giriş Yapmış Kişilerden API İstekleri" + page_view_anon_mobile_reqs: + title: "Anonim API İstekleri" + xaxis: "Gün" + yaxis: "Mobil Anonim API İstekleri" http_background_reqs: title: "Arkaplan" xaxis: "Gün" @@ -539,12 +555,25 @@ tr_TR: title: "Toplam" xaxis: "Gün" yaxis: "Toplam istekler" + time_to_first_response: + title: "İlk yanıtın verilme süresi" + xaxis: "Gün" + yaxis: "Ortalama süre (saat)" + topics_with_no_response: + title: "Hiç yanıtlanmamış konular" + xaxis: "Gün" + yaxis: "Toplam" + mobile_visits: + title: "Kullanıcı Ziyaretleri" + xaxis: "Gün" + yaxis: "Ziyaret sayısı" dashboard: rails_env_warning: "Sunucunuz %{env} modunda çalışıyor." ruby_version_warning: "Problemli olduğu bilinegelen Ruby 2.0.0 sürümünü kullanmaktasınız. Yama seviyesi 247 veya daha yenisine güncelleme yapınız." host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak varsayılan değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz." gc_warning: 'Sunucunuz, Ruby''nin varsayılan çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: Discourse için Ruby on Rails Ayarları.' sidekiq_warning: 'Sidekiq çalışmıyor. E-posta yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. Sidekiq ile ilgili bilgi burada.' + queue_size_warning: 'Kuyruğa eklenmiş işlerin sayısı fazla: %{queue_size}. Bu Sidekiq işlem(ler)indeki bir sorunu işaret ediyor olabilir, ya da daha fazla Sidekiq işçisi eklemeniz gerekiyor olabilir.' memory_warning: 'Sunucunuz toplam 1GB''tan az bellek ile çalışıyor. En az 1GB bellek tavsiye edilmektedir.' google_oauth2_config_warning: 'Sunucu Google OAuth2 (enable_google_oauth2_logins) ile üyelik oluşturulması ve giriş yapılmasına elveriyor, fakat the kullanıcı IDsi and gizli kullanıcı değerleri henüz ayarlanmamış. Site Ayarları sayfasına gidin ve ayarları güncelleyin. Daha fazla bilgi için bu yönetmeliğe bakın.' facebook_config_warning: 'Sunucu Facebook (enable_facebook_logins) ile üyelik oluşturulması ve giriş yapılmasına izin veriyor, fakat app ID ve gizli app değerleri henüz ayarlanmamış. Site Ayarları sayfasına gidin ve ayarları güncelleyin. Daha fazla bilgi için bu yönetmeliğe bakın.' @@ -553,7 +582,6 @@ tr_TR: s3_config_warning: 'Sunucu s3''e dosya 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_upload_bucket. Site Ayarları sayfasına gidin ve ayarları güncelleyin. Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın.' 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. Site Ayarları sayfasına gidin ve ayarları güncelleyin. Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın.' 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 son sürümünü indirin.' - failing_emails_warning: 'Başarısız sonuçlanmış %{num_failed_jobs} e-posta işlemi bulunuyor. config/discourse.conf dosyanızı kontrol edin ve e-posta sunucu ayarlarınızın doğru olduğundan emin olun. Sidekiq''deki başarısız işlemlere gözatın.' default_logo_warning: "Siteniz için logo grafikleri yükleyin. Site Ayarları'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 Site Ayarları'nda iletişim e-postanızı güncelleyin." contact_email_invalid: "Site iletişim e-postası geçersiz. İletişim e-postanızı Site Ayarları sayfasından güncelleyin." @@ -606,7 +634,7 @@ tr_TR: max_topic_title_length: "Konu başlığında izin verilen en fazla karakter sayısı" min_private_message_title_length: "Mesaj başlıkları için izin verilen en az karakter sayısı" min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı" - allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver." + allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver. DİKKAT: Bu özelliği kapamadan önce kategorisiz tüm konuları kategorize etmeniz lazım." uncategorized_description: "Kategorisiz kategorisinin tanıtımı. Boş bırakabilirsiniz." allow_duplicate_topic_titles: "Aynı başlık ile birden çok konu açılmasına izin ver." unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika" @@ -629,15 +657,17 @@ tr_TR: category_featured_topics: "/categories sayfasında yer alan kategori başına düşen konu sayısı. Bu değeri değiştirirseniz, değişikliğin kategoriler sayfasına yansıması 15 dakika kadar sürebilir." show_subcategory_list: "Bir kategoriye girildiğinde konu listesi yerine alt kategori listesini göster." fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler aktivite sırasına göre listelenir. " + fixed_category_positions_on_create: "Seçerseniz, konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)." add_rel_nofollow_to_user_content: "İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri \"rake post:rebake\" ile rebake etmeniz gerekir." + exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. tld.com'a izin verirseniz otomatik olarak sub.tld.com'a da izin verilir." post_excerpt_maxlength: "Gönderi alıntısının / özetinin en fazla uzunluğu." post_onebox_maxlength: "Kutulanmış bir Discourse gönderisinin en fazla karakter uzunluğu" onebox_domains_whitelist: "Kutulamaya izin verilen alan adları listesi; bu alan adları OpenGraph ya da oEmbed desteklemeliler. http://iframely.com/debug adresinden test edebilirsiniz." - logo_url: "Sitenizin sol üstünde yer alacak logo resmi; boş bırakılırsa, sitenin ismi gözükecek." - digest_logo_url: "Sitenizin özet e-postalarının üst kısmında kullanılacak logo. Boş bırakılırsa `logo_url` kullanılacak. örn: http://example.com/logo.png" - logo_small_url: "Sitenizin sol üstünde yer alacak, sayfayı aşağı kaydırdığınızda gözükecek küçük logo. Boş bırakılırsa, ana sayfa glifi gözükecek." - favicon_url: "Site favikonunuz. Bakın; http://en.wikipedia.org/wiki/Favicon" - mobile_logo_url: "Mobil sitenizin sol üstünde yer alacak sabit pozisyonlu logo resmi. Boş bırakılırsa `logo_url` kullanılacak." + logo_url: "Sitenin üst solundaki logo resmi, geniş dikdörtgen şeklinde olmalıdır. Boş bırakılırsa site başlığı gösterilecektir." + digest_logo_url: "Sitenin e-posta özetinin üstünde kullanılan diğer logo resmi. Geniş dikdörtgen şeklinde olmalıdır. Boş bırakılırsa `logo_url` kullanılacaktır." + logo_small_url: "Sitenin üst solundaki küçük logo resmi, kare şeklinde olmalıdır, aşağıya doğru kaydırılırken görünür. Boş bırakılırsa bir ev oyması gösterilecektir." + favicon_url: "Site simgesi, bilgi için http://en.wikipedia.org/wiki/Favicon adresine bakınız, bir CDN ile doğru şekilde çalışmak için png olmalıdır." + mobile_logo_url: "Mobil sitenin üst solunda kullanılan sabit konumlu logo resmi. Kare şeklinde olmalıdır. Boş bırakılırsa, `logo_url` kullanılacaktır. Örneğin: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Apple dokunmatik cihazları için kullanılan ikon. Önerilen boyut; 144 x 144 pixel." notification_email: "Tüm önemli sistem e-postaları için kullanılacak olan gönderen e-posta adresi. E-postaların başarıyla ulaşması için buraya girilen alan adının SPF, DKIM ve reverse PTR kayıtlarının doğru yapılması lazım." email_custom_headers: "Sınırlandırılmış özel e-posta başlıkları listesi" @@ -655,8 +685,6 @@ tr_TR: polling_interval: "Uzun sorgular yapılmadığı zaman, kaç mili saniyede bir giriş yapmış kullanıcılar poll yapmalı" anon_polling_interval: "Kaç mili saniyede bir anonim kullanıcılar sorgu yapmalı" background_polling_interval: "(Pencere arkaplanda olduğu zaman) kaç mili saniyede bir kullanıcılan sorgu yapmalı" - auto_track_topics_after: "Bir konu otomatik olarak takip edilmeye başlanılmadan önce varsayılan global mili saniye süre, kullanıcılar bu ayarı geçersiz kılabilir (her zaman için 0, hiç bir zaman için -1 girin)" - new_topic_duration_minutes: "Bir konunun yeni sayılması için varsayılan global dakika süre, kullanıcılar bu ayarı geçersiz kılabilir (her zaman için -1, son ziyaret için -2 girin)" flags_required_to_hide_post: "Bir postun otomatik olarak gizlenmesi ve yazarına Özel Mesaj gönderilmesi için gereken bayrak sayısı (Hiç bir zaman için 0 girin)" cooldown_minutes_after_hiding_posts: "Topluluk tarafından bayraklanarak gizlenen gönderiyi düzenleyebilmek için, kullanıcının beklemesi gereken dakika süresi " max_topics_in_first_day: "Kullanıcının sitedeki ilk gününde, oluşturabileceği en fazla konu sayısı" @@ -669,6 +697,7 @@ tr_TR: notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere mesaj yolla." flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel spam olarak işaretle. " traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan kullan." + allow_html_tables: "Çizelgelerin HTML etiketleri kullanılarak Markdown ile oluşturulmasına izin verin, TABLE, THEAD, TD, TR, TH kabul edilir (çizelge içeren tüm eski gönderilerin yenilenmesini gerektirir)" post_undo_action_window_mins: "Kullanıcıya tanınan, bir gönderide yapılan yeni aksiyonları (beğenme, bayraklama, vs) geri alabilme dakika süresi" must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir. UYARI: yayındaki bir site için bunu etkinleştirmek görevli olmayan hesapların erişimini iptal edecek." ga_tracking_code: "Google analytics (ga.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics" @@ -711,16 +740,18 @@ tr_TR: 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. " login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme." - min_username_length: "Kullanıcı adında olması gereken en az karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA KISA BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. " - max_username_length: "Kullanıcı adında olabilecek en fazla karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA UZUN BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. " + 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." + reserved_usernames: "Üyelik için izin verilmeyen kullanıcı adları." min_password_length: "En az parola uzunluğu." block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme." + enable_sso: "Dış bir site aracılığı ile tek oturum açma sistemini etkinleştir. (UYARI: etkinleştirildiği takdirde, doğru yapılandırılmamışsa bazı kişilerin, SİZ DAHİL, oturum açmasını engelleyebilir! Ayrıca davetiye sistemini de devre dışı bırakır.)" enable_sso_provider: "/session/sso_provider son noktasında Discourse SSO sağlayıcı protokolünü uygula, sso_secret değerinin seçilmiş olmasını gerektirir" sso_url: "Bitiş noktasındaki tek oturum açma URL'i" sso_secret: "SSO bilgisinin kritopgrafik şekilde doğrulanması için kullanılan gizli string, 10 karakter veya daha uzun olduğundan emin olun" - sso_overrides_email: "SSO yararlı yükündeki dış site e-postasını yerel e-postanın üzerine yazar (DİKKAT: yerel e-postaların normalizasyon sürecinde uyuşmazlıklar doğabilir)" - sso_overrides_username: "SSO yararlı yükündeki dış site kullanıcı adını yerel kullanıcı adının üzerine yazar (DİKKAT: kullanıcı adı uzunlukları/gereksinimleri arasındaki farklılıklardan ötürü uyuşmazlıklar yaşanabilir)" - sso_overrides_name: "SSO yükünden, dış sitedeki tam adı yerel tam adın üzerine yazar " + sso_overrides_email: "SSO yararlı yükündeki dış sitedeki e-postayı, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel e-postanın üzerine yazar (DİKKAT: yerel e-postaların normalizasyon sürecinde uyuşmazlıklar doğabilir)" + sso_overrides_username: "SSO yararlı yükündeki dış sitedeki kullanıcı adını, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel kullanıcı adının üzerine yazar. (DİKKAT: kullanıcı adı uzunluklarıyla ilgili kurallardaki farklılıklardan ötürü uyuşmazlıklar doğabilir)" + sso_overrides_name: "SSO yararlı yükündeki dış sitedeki tam adı, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel tam adın üzerine yazar." sso_overrides_avatar: "SSO yararlı yükündeki dış site avatarını kullanıcı avatarının üzerine yazar Eğer etkinleştirildiyse, allow_uploaded_avatars ayarının devre dışı bırakılması şiddetle önerilir" sso_not_approved_url: "Bu bağlantıya onaylanmamış SSO hesaplarını yönlendir." enable_local_logins: "Yerel kullanıcı adı ve parola bazlı hesap girişlerini etkinleştir. (Not: davetiyelerin çalışabilmesi için bu ayarın etkinleştirilmesi gerekli)" @@ -740,7 +771,8 @@ tr_TR: github_client_secret: "Github doğrulaması için gereken, https://github.com/settings/applications adresinde kayıtlı client secret" allow_restore: "Geri almaya izin ver. Tüm sitedeki verileri değiştirebilir! Bir yedeklemeyi geri yüklemeyi planlamıyorsanız devre dışı bırakın." maximum_backups: "Diskte tutulacak en fazla yedek sayısı. Eski yedekler otomatik olarak silinir." - backup_daily: "Siteyi günde bir kere otomatik olarak yedekle." + automatic_backups_enabled: "Yedek sıklığında tanımlandığı gibi yedekleri otomatik çalıştır" + backup_frequency: "Hangi sıklıkta bir site yedeği oluştururuz, gün olarak." enable_s3_backups: "Tamamlanınca yedeklemeleri S3'e yükle. ÖNEMLİ: Dosyalar ayarında doğru S3 girilmesini gerektirir" s3_backup_bucket: "Yedeklemelerin yüklenmesi için uzak biriktirme yeri. UYARI: Özel bir biriktirme yeri olduğundan emin olun" active_user_rate_limit_secs: "'last_seen_at' alanını ne kadar sıklıkta güncelliyoruz, saniye olarak" @@ -772,6 +804,8 @@ tr_TR: s3_region: "Resimleri yüklemek için kullanılacak olan Amazon S3 region name." s3_cdn_url: "Tüm s3 öğeleri için CDN URL adresi. (örneğin: https://cdn.somewhere.com). UYARI: bu ayarı değiştirdikten sonra tüm eski gönderileri rebake etmelisiniz." avatar_sizes: "Otomatik üretilen avatar ölçülerinin listesi." + external_system_avatars_enabled: "Dışsal sistem avatarları hizmeti kullan." + external_system_avatars_url: "Dışsal sistem avatarları hizmetinin URL'i. İzin verilen değiştirimler şunlardır: {username} {first_letter} {color} {size}" enable_flash_video_onebox: "Kutularda swf ve flv (Adobe Flash) yerleştirmelerine izin ver. UYARI: güvenlik açıkları doğurabilir" default_invitee_trust_level: "Davet edilen kullanıcılar için varsayılan güven seviyesi (0-4)." default_trust_level: "Tüm yeni kullanıcılar için varsayılan güven seviyesi (0-4). DİKKAT! Bu ayarı değiştirmeniz ciddi spam riski doğurabilir." @@ -824,6 +858,9 @@ tr_TR: topic_views_heat_low: "Bu kadar görüntülemeden sonra, görüntülemeler alanı hafifçe vurgulanacak." topic_views_heat_medium: "Bu kadar görüntülemeden sonra, görüntülemeler alanı kısmen vurgulanacak." topic_views_heat_high: "Bu kadar görüntülemeden sonra, görüntülemeler alanı belirgin şekilde vurgulanacak." + cold_age_days_low: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi hafifçe vurgulanır." + cold_age_days_medium: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi kısmen vurgulanır." + cold_age_days_high: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi belirgin şekilde vurgulanır." history_hours_low: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge hafifçe vurgulanacak. " history_hours_medium: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge kısmen vurgulanacak. " history_hours_high: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge belirgin şekilde vurgulanacak. " @@ -836,7 +873,6 @@ tr_TR: newuser_spam_host_threshold: "Yeni bir kullanıcı, `newuser_spam_host_posts` gönderileri içerisinde aynı makineye, kaç kere bağlantı paylaşınca spam olarak algılansın." white_listed_spam_host_domains: "Spam barındırma testinden hariç tutulan alan adı listesi. Yeni kullanıcıların, bu alan adlarına bağlantı içeren gönderi oluşturmaları hiç bir zaman engellenmeyecek." staff_like_weight: "Görevlilerin beğenilere verilecek ekstra ağırlık faktörü." - topic_view_duration_hours: "Her IP/Kullanıcı başına N saatte için konu görüntülenmesini yeni say" levenshtein_distance_spammer_emails: "Spam e-postaları eşleştirilirken, bulanık eşleşme için tahammül edilecek karakter sayısı farklılığı." max_new_accounts_per_registration_ip: "Eğer bu IP'den güven seviyesi 0 olan halihazırda (n) hesap varsa (hiçbiri görevli, GS2 ya da daha yüksek seviyede biri değilse), bu IP'den yeni üyelik kabul etme. " min_ban_entries_for_roll_up: "Topla butonuna tıklandığında, (N) adetten fazla giriş varsa yeni bir subnet engelleme girişi yaratılacak." @@ -845,6 +881,10 @@ tr_TR: num_flaggers_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken en az tekil bayrak sayısı" num_flags_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken en az etkin bayrak sayısı " auto_respond_to_flag_actions: "Bir bayrağı kaldırırken otomatik cevaplamayı etkinleştir" + min_first_post_typing_time: "Milisaniye olarak bir kullanıcının ilk gönderisini yazarken geçmesi gereken en küçük süre, bu süre geçmezse gönderi otomatik olarak onaylanma kuyruğuna girer. Devre dışı bırakmak için 0'a ayarlayın (tavsiye edilmez)." + auto_block_fast_typers_on_first_post: "min_first_post_typing_time'ı karşılamayan kullanıcıları otomatik olarak engelle." + auto_block_fast_typers_max_trust_level: "Hızlı yazıcıları otomatik engellemek için en büyük güven seviyesi." + auto_block_first_post_regex: "Eğer eşleşirse kullanıcının ilk gönderisinin engellenmesi ve onaylanma kuyruğuna gitmesine neden olan harf büyüklüğü duyarsız düzenli ifade. Örnek: reklam|a[bc]a düzenli ifadesi reklam, aba ya da aca içeren ilk gönderilerin engellenmesi ve onaylanma kuyruğuna gitmesine neden olacaktır. Sadece ilk gönderiler için geçerlidir." reply_by_email_enabled: "Konulara e-posta üzerinden cevap yazmayı etkinleştir." reply_by_email_address: "Email ile cevapla özelliği için gelen e-posta adresi şablonu, örnek: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" disable_emails: "Discourse'un herhangi bir e-posta göndermesine izin verme" @@ -857,6 +897,7 @@ tr_TR: pop3_polling_host: "POP3 üzerinden e-postaların sorgulanacağı sunucu" pop3_polling_username: "E-postaların sorgulanacağı POP3 hesabının kullanıcı adı." pop3_polling_password: "E-postaların sorgulanacağı POP3 hesabının parolası." + log_mail_processing_failures: "Bütün e-posta işleme hatalarını http://yoursitename.com/logs adresine logla." email_in: "Kullanıcıların e-posta aracılığıyla yeni konu oluşturabilmesine izin ver (pop3 sorgulaması gerektirir). Adresleri her kategorinin \"Ayarlar\" sekmesinden düzenleyin." email_in_min_trust: "Bir kullanıcının e-posta aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken en az güven seviyesi." email_prefix: "E-postaların konu bölümünü belirten [etiket]. Boş bırakılırsa 'title' yazacak." @@ -868,18 +909,16 @@ tr_TR: username_change_period: "Kayıt sonrası, kullanıcı adınının değiştirilebileceği gün sayısı. (Kullanıcı adının değiştirilebilmesini devre dışı bırakmak için 0 girin)" email_editable: "Kullanıcıların kayıt olduktan sonra e-posta adreslerini değiştirmesine izin ver." logout_redirect: "Çıkış yaptıktan sonra tarayıcının yönlendirileceği sayfa, ÖRN: (http://somesite.com/logout)" - allow_uploaded_avatars: "Kullanıcıların kendilerine özel avatarlar yüklemesine izin ver. " - allow_animated_avatars: "Kullanıcıların animasyonlu gif avatarları kullanmalarına izin ver. UYARI: bu ayarı değiştirdikten sonra avatars:refresh rake görevini çalıştırın." + allow_uploaded_avatars: "Kullanıcıların özel profil resimleri yüklemelerine izin ver." + allow_animated_avatars: "Kullanıcıların hareketli gif profil resimleri kullanmalarına izin ver. UYARI: Bu ayarı değiştirdikten sonra avatars:refresh rake görevini çalıştırın." allow_animated_thumbnails: "Animasyonlu giflerin, animasyonlu küçük resmini oluşturur." default_avatars: "Yeni kullanıcılar için, onlar değiştirene kadar, varsayılan olarak kullanılacak avatarların URL'leri." automatically_download_gravatars: "Hesap oluşturma veya e-posta değişikliği esnasında kullanıcılar için Gravatarları indir" digest_topics: "Özet e-postalarda yer alacak en fazla konu sayısı. " digest_min_excerpt_length: "Özet e-postalarında, gönderi alıntılarında olması gereken en az karakter sayısı." - default_digest_email_frequency: "Varsayılan olarak, özet e-postalar hangi sıklıkta gönderilsin? Üyeler, ayarlar sayfasından bu değeri değiştirebilir." suppress_digest_email_after_days: "Siteye (n) günden fazla süredir uğramayan kullanıcılar için özet e-posta gönderimini durdur" disable_digest_emails: "Tüm kullanıcılar için özet e-postalarını devre dışı bırak." - default_external_links_in_new_tab: "Dış bağlantıları yeni sekmede aç. Üyeler, ayarlar sayfasından bu ayarı değiştirebilir." - detect_custom_avatars: "Olsun ya da olmasın kullanıcıların özel avatar yükleyip yüklemediğini kontrol et." + detect_custom_avatars: "Kullanıcıların özel profil resimleri yükleyip yüklemediklerini kontrol et ya da etme." 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." @@ -891,31 +930,34 @@ tr_TR: sequential_replies_threshold: "Kullanıcının ardarda çok fazla cevap gönderdiğine dair uyarı alması için, bir konuda üstüste yapması gereken gönderi sayısı. " enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir stil kullanıyorsanız bunu devredışı bırakın." dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir." + daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş." suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme." + permalink_normalizations: "Kalıcı bağlantıları eşleştirmeden önce aşağıdaki regex'i uygula, mesela: /(\\/topic.*)\\?.*/\\1 konu yönlendirmelerindeki sorgu dizelerini kaldırır. Formatlama regex+string, yakalamalara erişmek \\1 vs." global_notice: "Tüm ziyaretçilere İVEDİ ACİL DURUM global manşet uyarısı göster, saklamak için boş bırakın (HTML kullanılabilir)." disable_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır" full_name_required: "Kullanıcı profili için tam ad zorunlu bir alandır." enable_names: "Kullanıcıların tam adlarını profillerde, kullanıcı kartlarında ve e-postalarda göster. Tam adların hiç bir yerde görünmemesi için devre dışı bırak." display_name_on_posts: "Gönderilerde @kullanıcıadı'na ek olarak kullanıcının tam adını da göster." + show_time_gap_days: "İki gönderinin tarihleri arasında bu kadar gün farkı varsa, konuda zaman aralığına yer ver." invites_per_page: "Varsayılan olarak kullanıcı sayfasında gösterilen davetler." short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz, bu değeri de değiştirmeniz gerekebilir." default_code_lang: "GitHub kod bloklarına (lang-auto, ruby, python vs.) uygulanacak, varsayılan programlama dili sözdizimi vurgulaması." warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı mesajı çıkacak. Bu özelliği devre dışı bırakmak için 0 girin. " autohighlight_all_code: "Tüm önceden formatlanan kod bloklarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula." highlighted_languages: "Dahil edilen sözdizimi vurgulama kuralları. (Dikkat: çok fazla dili dahil etmek performansı etkileyebilir) Demo için https://highlightjs.org/static/demo/ adresine bakınız" - embeddable_host: "Bu Discourse forumundan yorumların yerleştirilebileceği sunucu. Sadece sunucu, http:// ile başlamayın" feed_polling_enabled: "SADECE YERLEŞTİRME İÇİN: RSS/ATOM beslemesinin gönderi olarak yerleştirilip yerleştirilemeyeceği." feed_polling_url: "SADECE YERLEŞTİRME İÇİN: Yerleştirilecek RSS/ATOM beslemesinin URL'i." embed_by_username: "Yerleştirilmiş konuları oluşturan kullanıcıya ait Discourse kullanıcı adı. " embed_username_key_from_feed: "Beslemeden Discourse kullanıcı adını çekmek için kullanılacak anahtar" embed_truncate: "Yerleştirilmiş gönderileri kırp." - embed_category: "Yerleştirilmiş konular kategorisi." embed_post_limit: "Yerleştirilecek en fazla gönderi sayısı." embed_whitelist_selector: "Yerleştirmelerde kullanılmasına izin verilen öğeler için CSS seçicisi." embed_blacklist_selector: "Yerleştirmelerden çıkartılmış öğeler için CSS seçicisi." notify_about_flags_after: "Bu kadar saat geçmesine rağmen hala ilgilenilmemiş bayraklar varsa, contact_email adresine e-posta gönder. Devre dışı bırakmak için 0 girin. " enable_cdn_js_debugging: "/logs 'ların asli hataları tüm js içeriklerine crossorigin izinleri ekleyerek göstermesine izin ver." show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, adminden yeni konular oluşturmasını isteyen bir uyarı mesajı göster. " + delete_drafts_older_than_n_days: (n) günden eski taslakları sil. + show_logout_in_header: "Başlık çubuğundaki kullanıcı açılır listesinde oturumu kapatı göster" vacuum_db_days: "Geçiş sonra DB alanı geri kazanmak için TAM VAKUM ANALİZİ'ni çalıştırın (devre dışı bırakmak için 0 girin)" prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir." slug_generation_method: "Slug üretim yöntemi seçin. 'kodlanmış' seçeneği yüzde kodlamalı metin oluşturur. 'hiçbiri' seçeneği slug'ı devre dışı bırakır." @@ -924,6 +966,22 @@ tr_TR: enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla" approve_post_count: "Yeni bir kullanıcıdan onaylanması gereken gönderi sayısı" approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir" + notify_about_queued_posts_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş konular varsa, iletişim adresine e-posta gönder. Devre dışı bırakmak için 0 girin." + default_email_digest_frequency: "Öntanımlı olarak kullanıcılar hangi sıklıkta özet e-postalar alırlar." + default_email_private_messages: "Öntanımlı olarak birisi bir kullanıcıya mesaj attığında e-posta gönder." + default_email_direct: "Öntanımlı olarak birisi bir kullanıcı hakkında alıntı yapma, cevaplama, bahsetme ya da davet etme eylemlerini gerçekleştirdiğinde e-posta gönder." + default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder." + default_email_always: "Öntanımlı olarak kullanıcı etkin olsa bile e-posta bildirimi gönder." + default_other_new_topic_duration_minutes: "Konunun yeni olarak düşünülmesi için genel varsayılan koşul." + default_other_auto_track_topics_after_msecs: "Bir konunun otomatik olarak takip edilmesi için geçmesi gereken genel varsayılan zaman." + default_other_external_links_in_new_tab: "Harici linkleri, öntanımlı olarak, yeni bir sekmede aç." + default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile cevaplamayı, öntanımlı olarak, etkinleştir." + default_other_dynamic_favicon: "Tarayıcı simgesinde, öntanımlı olarak, yeni/güncellenmiş konu sayısını göster." + default_other_disable_jump_reply: "Kullanıcılar cevapladıktan sonra, öntanımlı olarak, onların gönderilerine atlama." + default_other_edit_history_public: "Gönderi değişikliklerini, öntanımlı olarak, herkese açık yap." + default_categories_watching: "Öntanımlı olarak, izlenen kategorilerin listesi." + default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi." + default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi." errors: invalid_email: "Geçersiz e-posta adresi." invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor." @@ -972,11 +1030,12 @@ tr_TR: not_seen_in_a_month: "Hoşgeldiniz! Bir süredir yoktunuz. Bunlar sizin yokluğunuzda en popüler olan konular." move_posts: new_topic_moderator_post: - other: "%{count} gönderiyi yeni bir konuya taşıdım: %{topic_link}" + other: "%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}" existing_topic_moderator_post: - other: "%{count} gönderiyi var olan konulardan birine taşıdım: %{topic_link}" + other: "%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}" change_owner: post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı" + deleted_user: "silinmiş kullanıcı" emoji: errors: name_already_exists: "Üzgünüz, '%{name}' ismi zaten bir başka emoji tarafından kullanılıyor." @@ -1016,6 +1075,7 @@ tr_TR: not_allowed_from_ip_address: "Bu IP adresinden %{username} kullanıcı adı ile giriş yapamazsınız." admin_not_allowed_from_ip_address: "Bu IP adresinden admin olarak giriş yapamazsınız." suspended: "%{date} tarihine kadar giriş yapamazsınız." + suspended_with_reason: "Hesap %{date} tarihine kadar yasaklanmıştır. Sebep: %{reason}" errors: "%{errors}" not_available: "Uygun değil. Bunu denemeye ne dersiniz? %{suggestion}" something_already_taken: "Bir şeyler ters gitti. Kullanıcı adı veya e-posta zaten kayıtlı olabilir. Parolamı Unuttum bağlantısını deneyin." @@ -1023,6 +1083,8 @@ tr_TR: omniauth_error_unknown: "Girişiniz yapılırken bir şeyler ters gitti, lütfen tekrar deneyin." new_registrations_disabled: "Şu an yeni hesap oluşturulamıyor. " password_too_long: "Parolalar maksimum 200 karakter olabilir." + email_too_long: "Vermiş olduğun e-posta çok uzun. E-posta kutusu isimleri 254, alan adı isimleri ise 253 karakterden daha uzun olamaz." + reserved_username: "Bu kullanıcı adını kullanamazsın." missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız" close_window: "Doğrulama tamamlandı. Devam etmek için bu pencereyi kapatın." user: @@ -1033,10 +1095,16 @@ tr_TR: characters: "sadece rakam, harf ve altçizgi bulundurabilir " unique: "özgün olmalı" blank: "bulunmalı" - must_begin_with_alphanumeric: "harf ya da sayı ile başlamalı" + must_begin_with_alphanumeric: "bir harf, rakam ya da alt çizgi ile başlamalı" + must_end_with_alphanumeric: "bir harf, sayı yada alt tire ile bitmeli" + must_not_contain_two_special_chars_in_seq: "2 ya da daha fazla uzunlukta özel karakter dizisi (.-_) içermemeli" + must_not_contain_confusing_suffix: ".json ya da .png gibi kafa karıştırıcı bir son ek içermemeli" email: not_allowed: "için o e-posta sağlayıcısına izin verilmiyor. Lütfen başka bir email adresi kullanın. " blocked: "için izin yok." + ip_address: + blocked: "Mevcut IP adresiniz üzerinden yeni kayıt işlemine izin verilmiyor." + max_new_accounts_per_registration_ip: "Mevcut IP adresiniz üzerinden yeni kayıt işlemine izin verilmiyor. (Belirlenen maksimum limit aşıldı.) Bir yetkili ile iletişime geçin." invite_mailer: subject_template: "%{invitee_name} sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. " text_body_template: "%{invitee_name} sizi \n\n> %{site_title} -- %{site_description} \n\nsitesindeki\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\ntartışmasına davet ediyor.\n\nEğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n\nBu davet güvenilir bir kullanıcı tarafından gönderilmiştir, cevap yazarak tartışmaya hemen katılabilirsiniz.\n" @@ -1057,51 +1125,25 @@ tr_TR: invite_password_instructions: subject_template: "%{site_name} hesabınız için parola oluşturun" text_body_template: | - %{site_name} sitesine olan davetinizi kabul ettiğiniz için teşekkür ederiz -- hoşgeldiniz! + %{site_name}'e olan davetiyeni kabul ettiğin için teşekkür ederiz -- hoşgeldin! - Aşağıdaki bağlantıya tıklayarak parola seçin: + Şimdi bir şifre seçmek için şu bağlantıya tıklayın: %{base_url}/users/password-reset/%{email_token} - Eğer şifrenizi hatırlamıyorsanız ya da henüz bir şifreniz yoksa, e-posta adresinizle giriş yaparken "Şifremi unuttum"'u seçin. + (Eğer yukarıdaki bağlantının süresi dolmuşsa e-posta adresinizle giriş yaparken "Parolamı unuttum" bağlantısına tıklayınız.) test_mailer: subject_template: "[%{site_name}] E-posta Ulaştırma Testi" - text_body_template: "Bu aşağıdaki adresten gönderilen bir test e-postasıdır.\n\n[**%{base_url}**][0]\n\nE-postaların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri e-postaları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız e-postalarda \"gönderen\" adresi olarak belirlediğiniz alan adı, e-postalarınızın doğrulanacağı alan adıdır.**\n\n- E-posta başlıklarındaki önemli ipuçlarını yakalayabilmek için e-posta istemcinizde e-postaların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her e-postanın sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde e-posta yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. Eğer ISP'niz doğru reverse DNS pointer kaydı girmezse, büyük ihtimal e-postalarınızın hiç biri yerine ulaşmayacaktır.\n\n- Alan adınızın [SPF kaydı][8] doğru mu? Buradan [SPF kaydınızı test edin][1]. SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın. \n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu e-postaların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi e-posta sunucunuzu kullanıyorsanız, e-posta sunucunuzun IPlerinin [hiç bir e-posta karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, e-postanızın bir çok e-posta servisi tarafından reddedilmesine sebep olacaktır. \n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te ücretsiz hesap açmak. Tabi, gene, DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek!) \n\nUmarız bu e-posta ulaştırma testini başarıyla atlatmışsınızdır. \n\nİyi şanslar, \n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız \n\n[0]: %{base_url} \n[1]: http://www.kitterman.com/spf/validate.html\ - \ \n[2]: http://mxtoolbox.com/ReverseLookup.aspx \n[3]: http://www.dkim.org/ \n[4]: http://whatismyipaddress.com/blacklist-check \n[7]: http://dkimcore.org/tools/dkimrecordcheck.html \n[8]: http://www.openspf.org/SPF_Record_Syntax [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing\n" + text_body_template: "Bu aşağıdaki adresten gönderilen bir test e-postasıdır.\n\n[**%{base_url}**][0]\n\nE-postaların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri e-postaları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız e-postalarda \"gönderen\" adresi olarak belirlediğiniz alan adı, e-postalarınızın doğrulanacağı alan adıdır.**\n\n- E-posta başlıklarındaki önemli ipuçlarını yakalayabilmek için e-posta istemcinizde e-postaların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her e-postanın sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde e-posta yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. Eğer ISP'niz doğru\ + \ reverse DNS pointer kaydı girmezse, büyük ihtimal e-postalarınızın hiç biri yerine ulaşmayacaktır.\n\n- Alan adınızın [SPF kaydı][8] doğru mu? Buradan [SPF kaydınızı test edin][1]. SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın. \n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu e-postaların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi e-posta sunucunuzu kullanıyorsanız, e-posta sunucunuzun IPlerinin [hiç bir e-posta karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, e-postanızın bir çok e-posta servisi tarafından reddedilmesine sebep olacaktır. \n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te\ + \ ücretsiz hesap açmak. Tabi, gene, DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek!) \n\nUmarız bu e-posta ulaştırma testini başarıyla atlatmışsınızdır. \n\nİyi şanslar, \n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız \n\n[0]: %{base_url} \n[1]: http://www.kitterman.com/spf/validate.html \n[2]: http://mxtoolbox.com/ReverseLookup.aspx \n[3]: http://www.dkim.org/ \n[4]: http://whatismyipaddress.com/blacklist-check \n[7]: http://dkimcore.org/tools/dkimrecordcheck.html \n[8]: http://www.openspf.org/SPF_Record_Syntax [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing\n" new_version_mailer: subject_template: "[%{site_name}] Yeni Discourse versiyonu, güncelleme var" - text_body_template: |2 - [Discourse'un](http://www.discourse.org) yeni versiyonu hazır. - - Sizin kullandığınız versiyon: %{installed_version} - Yeni versiyon: **%{new_version}** - - Aşağıdakileri uygulayabilirsiniz: - - - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - - - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - - - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org) + text_body_template: | + [Discourse'un](http://www.discourse.org) yeni versiyonu hazır. Sizin kullandığınız versiyon: %{installed_version} Yeni versiyon: **%{new_version}** Aşağıdakileri uygulayabilirsiniz: - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org) new_version_mailer_with_notes: subject_template: "[%{site_name}] güncellemesi var" - text_body_template: |+ - [Discourse'un](http://www.discourse.org) yeni versiyonu hazır. - - Sizin kullandığınız versiyon: %{installed_version} - Yeni versiyon: **%{new_version}** - - Aşağıdakileri uygulayabilirsiniz: - - - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - - - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - - - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org) - - ### Yeni sürüm notları - - %{notes} - + text_body_template: | + [Discourse'un](http://www.discourse.org) yeni bir versiyonu hazır. Sizin kullandığınız versiyon: %{installed_version} Yeni versiyon: **%{new_version}** Aşağıdakileri uygulayabilirsiniz: - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master). - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz. - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org) ### Yeni sürüm notları %{notes} flags_reminder: flags_were_submitted: other: "Bu bayraklar %{count} saat önce verildi." @@ -1110,6 +1152,12 @@ tr_TR: how_to_disable: '"Bayraklarla ilgili bilgilendirme süresi" ayarından bu hatırlatma e-postasının gönderimini devre dışı bırakabilir ya da sıklığını değiştirebilirsiniz. ' subject_template: other: "İlgilenilmesi gereken %{count} bayrak var" + queued_posts_reminder: + subject_template: + other: "[%{site_name}] %{count} konu incelenmeyi bekliyor." + text_body_template: | + Merhaba, + Yeni kullanıcılar tarafından oluşturulmuş ve onayınızı bekleyen konular bulunuyor. [Konuları şuradan inceleyebilirsiniz.](%{base_url}/queued-posts). flag_reasons: off_topic: "Gönderiniz **konu-dışı** olarak bayraklandı: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğine uygun olmadığını düşünüyor. " inappropriate: "Gönderiniz **uygunsuz** olarak bayraklandı: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](/guidelines) aykırı olduğunu düşünüyor." @@ -1121,7 +1169,7 @@ tr_TR: disagreed: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz." deferred: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz." deferred_and_deleted: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Gönderiyi kaldırdık." - temporarily_closed_due_to_flags: "Bu konu, topluluk tarafından bayraklanma sayısı çok olduğu için geçici olarak kapatıldı" + temporarily_closed_due_to_flags: "Bu konu topluluk tarafından çok fazla rapor edildiği için geçici olarak kapatılmıştır." system_messages: post_hidden: subject_template: "Topluluk tarafından bayraklandığı için gönderiniz gizlendi" @@ -1140,8 +1188,12 @@ tr_TR: Daha fazla bilgi için, lütfen [topluluk yönergelerine bakın](%{base_url}/guidelines). usage_tips: - text_body_template: "Hemen başlayabilmeniz için bir kaç pratik tavsiye: \n\n## Sayfayı aşağı kaydırmaya devam edin\n\nFarkettiğiniz gibi bir sonraki sayfa butonu ya da sayfa sayısı yok - daha fazla okumak için, **sayfayı aşağı kaydırmanız yeterli!** \n\nYeni gönderiler geldikçe, otomatik olarak görünecekler. \n\n## Neredeyim?\n\n- Arama, kullanıcı sayfanız veya menü için **sağ üstteki ☰ ikonlu butona** tıklayın.\n\n- Herhangi bir konu başlığı sizi bir sonraki okunmamış gönderiye götürür. En üst veya en alta gitmek için son aktivite zamanı ve gönderi sayısını kullanın.\n\n- Bir konuyu okurken, konu başlığına tıklayarak en üste ↑ gidin. Tüm navigasyonla ilgili kontroller için sağ alttaki yeşil ilerleme barını seçin, veya home ve end tuşlarını kullanın. \n\n\n\n## Nasıl cevaplarım?\n\n- Genel olarak konuya cevap vermek için, sayfanın en altındaki Cevapla butonunu kullanın.\n\n- Belirli bir gönderiye cevap vermek için, o gönderinin altında bulunan Cevapla butonunu kullanın. \n\n- Sohbeti bölmeden başka bir yöne çekmek için, gönderinin sağındaki Bağlantılı Konu Oluştururarak Cevapla'ya tıklayın.\n\nCevabınızda birinden alıntı yapmak için, alıntı yapmak istediğiniz metni seçin ve sonrasında herhangi bir Cevapla butonuna tıklayın.\n\n\n\nCevabınızda birine ping atmak istiyorsanız, o kişinin isminden bahsedin. `@` yazdığınız an otomatik tamamlayıcı pop-up'ı belirecektir.\n\n\n\n[Standart Emoji](http://www.emoji.codes/) için, `:` yazın ya da gülücük `:)` atın :smile:\n\n## Başka neler yapabilirim?\n\nHer gönderinin altında aksiyon butonları var.\n\n\n\nBirine gönderisini beğendiğinizi belirtmek istiyorsanız, **beğen** butonunu kullanın. Gönderiyle ilgili bir sorun görüyorsanız, görevlilere durumu bildirmek için **bayrakla** butonunu kullanın.\n\n**Paylaş** butonu aracılığıyla gönderiye bir bağlantı paylaşabilir, veya **işaretle** butonu ile gönderiyi işaretleyip sonrasında kullanıcı sayfanızdan kolayca ulaşabilirsiniz.\n\n## Kim benimle konuşuyor?\n\nBiri gönderinize cevap verir, gönderinizi alıntılar ya da `@kullanıcıadı` nızdan bahsederse, sayfanızın en sağ üstünde bir sayı hemen beliriverir. Bu sayıya tıklayarak **bildiriler**inize ulaşabilirsiniz.\n\n\n\nBir cevabı kaçıracaksınız diye kaygılanmayın – çevrimiçi değilseniz direk cevaplar (ve mesajlar) geldikçe tarafınıza bilgilendirme e-postası atılır.\n\n## Hangi durumda sohbetler yeni sayılır?\n\nVarsayılan olarak, üzerinden henüz iki gün geçmemiş tüm sohbetler yeni sayılır. Katıldığınız (cevapladığınız, oluşturduğunuz, veya uzun bir süre okuduğunuz) tüm sohbetler otomatik olarak takip edilir.\n\nBu konuların yanında mavi yeni ve sayı işaretlerini göreceksiniz.\n\n\n\nHerhangi bir konunun bildiri durumunu o konunun altın bulunan kontrol aracılığıyla değiştirebilirsiniz. (Bu ayar kategori bazında da yapılabilir.) Konuları nasıl takip ettiğinizi ya da yeninin tanımını değiştirmek için, [kullanıcı ayarlarınıza](%{base_url}/my/preferences) göz atın.\n\n## Bazı şeyleri niye yapamıyorum?\n\nGüvenlik sebeplerin ötürü yeni kullanıcılar bazı kısıtlamalara tabidir. Burada sohbetlere katıldıkça, topluluğun güvenini kazanırsınız, onun tam bir parçası haline gelirsiniz ve bu limitler de otomatik olarak kalkar. Yeterli yükseklikteki [güvenlik seviyelerinde](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ise topluluğumuzu birlikte yönetmemize yardımcı olabilmenizi sağlayacak yetkiler kazanırsınız.\n" + text_body_template: "Hemen başlayabilmeniz için bir kaç pratik tavsiye: \n\n## Okuma\n\nDaha fazla okumak için, **sayfayı aşağı kaydırmanız yeterli!** \n\nYeni cevaplar ve konular oluşturuldukça, otomatik olarak görünecekler. \n\n## Gezinme\n\n- Arama, kullanıcı sayfanız veya menü için **sağ üstteki ☰ ikonlu butona** tıklayın. \n\n- Herhangi bir konu başlığı sizi bir sonraki okunmamış gönderiye götürür. En üst veya en alta gitmek için gönderi sayısına veya son cevap tarihini tıklayın.\n\n \n\n- Bir konuyu okurken, tüm navigasyonla ilgili kontroller için sağ alttaki yeşil ilerleme barını seçin. Hızlıca en yukarıya gitmek için konu başlığına tıklayın. Klavye kısayollarını görüntülemek için ? tuşuna basın. \n\n \n\n## Cevaplama \n\n- **Genel olarak konuya** cevap vermek için, sayfanın en altındaki Cevapla butonunu kullanın. \n\n- **Belirli bir kişiye** cevap vermek için, o gönderinin altında bulunan Cevapla butonunu kullanın. \n\n- **Yeni bir konu\" oluşturarak cevaplamak için, gönderinin sağında çıkan ikonuna tıklayın. Eski ve yeni konular birbirleriyle otomatik olarak ilişkilendirilecek.\n\nAlıntı yapmak için, alıntı yapmak istediğiniz metni seçin ve sonrasında herhangi bir Cevapla butonuna tıklayın. Çoklu alıntılar için adımları tekrarlayın! \n\n \n\nBirine cevabınızla ilgili bildiri gitmesini istiyorsanız, o kişinin isminden bahsedin. Kullanıcı adı seçimine başlamak için `@` yazın. \n\n \n\n[Standart Emoji](http://www.emoji.codes/) için, `:` yazın ya da gülücük `;)` atın \n\nBir bağlantı için özet oluşturmak istiyorsanız, bağlantıyı kopyalayıp tek başına bir satıra yapıştırın:\n\n\n\n## Aksiyonlar\n\nHer gönderinin altında aksiyon butonları vardır. \n\nBirine gönderisini beğendiğinizi belirtmek istiyorsanız, **beğen** butonunu\ + \ kullanın. Sevginizi paylaşın!\n\nBirinin gönderisiyle ilgili bir sorun görüyorsanız, özelden bu kişileri veya [görevlileri](%{base_url}/about) uyarmak için **bayrakla** butonunu kullanın. **Paylaş** butonu aracılığıyla gönderiye bir bağlantı paylaşabilir, veya **işaretle** butonu ile gönderiyi işaretleyip sonrasında kullanıcı sayfanızdan kolayca ulaşabilirsiniz. \n\n## Bildiriler \n\nBiri gönderinize cevap verir, gönderinizi alıntılar ya da `@kullanıcıadı` nızdan bahsederse, sayfanızın en sağ üstünde bir sayı hemen beliriverir. Bu sayıya tıklayarak **bildiriler**inize ulaşabilirsiniz. \n\n\n\nBir cevabı kaçıracaksınız diye kaygılanmayın – çevrimiçi olmadığınız zaman gelen bildiriler size e-postalanır.\n\n## Seçenekleriniz\n\nÜzerinden henüz **iki gün geçmemiş** tüm konular yeni sayılır. \n\n**Aktif\ + \ olarak katıldığınız** (oluşturduğunuz, cevapladığınız, veya uzun bir süre okuduğunuz) tüm sohbetler otomatik olarak takip edilir. \n\nBu konuların yanında, yeni ve okunmamışlar gönderilerin sayılarını gösteren mavi işaretler göreceksiniz: \n\n \n\nHerhangi bir konunun bildiri ayarını o konunun altında bulunan bildiri kontrolü aracılığıyla değiştirebilirsiniz. \n\n \n\nBildiri ayarlarını kategori bazında da değiştirebilirsiniz, eğer belirli bir kategorideki her yeni konuyu gözlemek istiyorsanız. Bu ayarların herhangi birini değiştirmek için, [kullanıcı ayarlarınıza](%{base_url}/my/preferences) göz atın. \n\n## Topluluğun Güveni\n\nBurada sohbetlere katıldıkça, topluluğun güvenini kazanırsınız,\ + \ onun tam bir parçası haline gelirsiniz ve yeni kullanıcılar için konulan limitler kalkar. Yeterli yükseklikteki [güvenlik seviyelerinde](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ise topluluğumuzu birlikte yönetmemize yardımcı olabilmenizi sağlayacak yetkiler kazanırsınız.\n" welcome_user: subject_template: "%{site_name} sitesine hoşgeldiniz!" text_body_template: "%{site_name} sitesine katıldığınız için teşekkür ederiz, hoşgeldiniz!\n\n%{new_user_tips}\n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n" @@ -1150,7 +1202,7 @@ tr_TR: text_body_template: "%{site_name} davetiyenizi onayladığınız için teşekkürler -- hoşgeldiniz! \n\nSizin için yeni bir hesap oluşturduk: **%{username}**, ve sisteme girişiniz yapıldı. [Kullanıcı profilinizi][prefs] ziyaret ederek kullanıcı adınızı değiştirebilirsiniz. \n\nDaha sonra tekrar giriş yapmak için: \n\n1. Giriş yaparken her zaman **ilk davetiyenizdekiyle aynı email adresini kullanın**. Yoksa sizin olduğunuzu anlayamayız! \n\n2. [Kullanıcı profiliniz][prefs] için yeni bir şifre oluşturun ve o şifre ile giriş yapın. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.) \n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "Yedekleme başarıyla tamamlandı" - text_body_template: "Yedekleme başarıyla tamamlandı.\n\n[admin > backup section](/admin/backups) bölümünden yeni yedeği indirebilirsiniz." + text_body_template: "Yedekleme işlemi başarıyla tamamlandı.\nYeni yedeğinizi [Yönetici Paneli > Yedekler](%{base_url}/admin/backups) adresinden indirebilirsiniz." backup_failed: subject_template: "Yedekleme başarısız" text_body_template: "Yedekleme başarısız oldu. \n\nKayıtlar burada:\n\n```\n\n%{logs}\n\n```\n\n" @@ -1213,6 +1265,8 @@ tr_TR: subject_template: "[%{site_name}] E-posta sorunu -- İçerik Yok" email_reject_parsing: subject_template: "[%{site_name}] E-posta sorunu -- Tanımlanamayan içerik" + text_body_template: | + Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. E-postada herhangi bir cevap bulamadık. **Cevabınızın e-posta'nın en üstünde yer aldığından emin olun** -- aralardaki cevapları işleyemiyoruz. email_reject_invalid_access: subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz giriş" text_body_template: | @@ -1249,10 +1303,16 @@ tr_TR: Gönderilen adreslerinin hiçbiri bilinmiyor. Site adresinin To: kısmında olduğundan (Cc: ya da Bcc: değil) ve görevliler tarafından sağlanan doğru email adresine yolladığınızdan emin olun. email_reject_topic_not_found: subject_template: "[%{site_name}] E-posta sorunu -- Konu Bulunamadı" + text_body_template: | + Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. Konu bulunamadı, silinmiş olabilir. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin. email_reject_topic_closed: subject_template: "[%{site_name}] E-posta sorunu -- Konu Kapatıldı" + text_body_template: | + Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. Konu kapatılmış. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin. email_reject_auto_generated: subject_template: "[%{site_name}] E-posta sorunu -- Otomatik Üretilmiş Cevap" + text_body_template: | + Üzgünüz, ama %{destination} (titled %{former_title}) adresine yollamak istediğiniz e-posta başarısız oldu. Otomatik olarak üretilmiş e-posta cevaplarını kabul edemiyoruz. Bir hata olduğuna inanıyorsanız, lütfen bir görevli ile iletişime geçin. email_error_notification: subject_template: "[%{site_name}] E-posta sorunu -- POP doğrulama hatası" text_body_template: | @@ -1305,7 +1365,10 @@ tr_TR: download_remote_images_disabled: subject_template: "Uzaktaki resimlerin indirilmesi devre dışı bırakıldı" text_body_template: "`download_remote_images_to_local` ayarı harddisk alanı limiti `download_remote_images_threshold` aşıldığı için devre dışı bırakıldı." - unsubscribe_link: "Bu e-postalara aboneliğinizi iptal etmek için [kullanıcı ayarları](%{user_preferences_url}) sayfanızı ziyaret edin." + unsubscribe_link: | + Bu e-postaların üyeliklerinden çıkmak için [user preferences](%{user_preferences_url})'i ziyaret edin. + + Bu belirli konuda bildirim almayı durdurmak için [buraya tıklayın](%{unsubscribe_url}). subject_re: "Cvp:" subject_pm: "[ÖM]" user_notifications: @@ -1458,7 +1521,7 @@ tr_TR: subject_template: "%{site_name} sitesinde hesabınız onaylandı!" text_body_template: "%{site_name} sitesine hoşgeldiniz! \n\n%{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.\n\nAşağıdaki linke tıklayın ve yeni hesabınızı aktive edin: %{base_url}/users/activate-account/%{email_token} \n\nEğer link tıklanabilir değilse, linki kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n" signup: - subject_template: "[%{site_name}] Yeni hesabınızı etkinleştirin" + subject_template: "[%{site_name}] Yeni hesabınızı onaylayın" text_body_template: | %{site_name} sitesine hoşgeldiniz! @@ -1486,12 +1549,11 @@ tr_TR: unauthorized: "Üzgünüz, yüklemeye çalıştığınız dosya izinli değil (authorized extensions: %{authorized_extensions})." pasted_image_filename: "Yapıştırılan resim" store_failure: "#%{user_id} kullanıcısı için yükleme #%{upload_id} kaydedilemedi." + file_missing: "Affedersiniz, yükleme için bir dosya sağlamalısınız." attachments: too_large: "Üzgünüz, yüklemeye çalıştığınız dosya çok büyük (en fazla %{max_size_kb}KB olabilir)." images: too_large: "Üzgünüz, yüklemeye çalıştığınız resim çok büyük (en fazla %{max_size_kb}KB olabilir), lütfen küçültüp tekrar deneyin." - fetch_failure: "Üzgünüz, resim çekilirken hata oluştu." - unknown_image_type: "Üzgünüz ama yüklemeye çalıştığınız dosya resim dosyası değil. " size_not_found: "Üzgünüz, resminizin büyüklüğünü tespit edemedik. Dosya bozuk olabilir mi?" flag_reason: sockpuppet: "Yeni bir kullanıcı bir konu oluşturdu ve aynı IP adresinden başka bir yeni kullanıcı cevap yazdı. Site ayarları sayfasında flag_sockpuppets değerine göz atın." @@ -1524,424 +1586,67 @@ tr_TR: %{page_name} sayfasının içeriğini değiştirmek için bu konuya ait ilk gönderiyi düzenleyin. guidelines_topic: title: "SSS/Yönergeler" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Powered by You](#power) - - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "Üyelik Sözleşmesi" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Gizlilik İlkeleri" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. - static: - search_help: | -

    Öneriler

    -

    -

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

    -

    Seçenekler

    -

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

    -

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

    badges: long_descriptions: autobiographer: | - Blah blah blah - Blah blah blah + Bu rozet profilini doldurduğunda ve profil resmini seçtiğinde verilir. Kim olduğun ve nelerle ilgilendiğin hakkında topluluğa daha fazla bilgi vermen daha iyi ve daha yakın bir topluluğun oluşmasına yardım eder. first_like: | - Blah blah blah - Blah blah blah + Bu rozet :heart: tuşunu kullanarak bir gönderiyi ilk kez beğendiğinizde verilir. Gönderileri beğenmek hemcins topluluk üyelerinin ilgi çekici, faydalı, havalı ve eğlenceli nelerin gönderildiğini bilmelerini sağlamak için mükemmel bir yoldur. Sevgiyi paylaş! first_link: | - Blah blah blah - Blah blah blah + Bu rozet bir cevapta başka bir konuya bir bağlantı verdiğinde verilir. Konuları bağlamak, her iki yönde konular arasındaki ilişkiyi göstererek, hemcins okuyucuların ilgi çekici ve ilgili konuşmaları bulmalarına yardım eder. first_quote: | - Blah blah blah - Blah blah blah + Bu rozet bir cevapta ilk kez bir gönderiden alıntı yaptığınızda verilir. Cevabında önceki gönderilerin ilgili bölümlerinden alıntı yapmak tartışmaların odaklanmış halde ve konu içinde tutulmasına yardımcı olur. first_share: | - Blah blah blah - Blah blah blah + Bu rozet paylaş tuşunu kullanarak bir cevaba ya da konuya ilk kez bir bağlantı paylaştığında verilir. Bağlantıları paylaşmak dünyanın geri kalanıyla yapılan ilginç tartışmalarla gösteriş yapmak ve topluluğunu büyütmek için mükemmel bir yoldur. read_guidelines: | - Blah blah blah - Blah blah blah + Bu rozet topluluk kurallarını okunmasına verilir. Bu basit kuralları benimsemek ve paylaşmak güvenli, eğlenceli ve sürdürülebilir bir topluluğun inşa edilmesine yardım eder. reader: | - Blah blah blah - Blah blah blah + Bu rozet uzun bir konuyu okumaya verilir. Okumak temeldir. Yakından okumak tartışmayı takip etmene ve daha iyi, daha eksiksiz cevaplar yazmana yardım eder. editor: | - Blah blah blah - Blah blah blah - first_flag: "Bayraklama topluluğunuzun sağlığı için kritiktir. Moderatörün ilgisini gerektiren herhangi bir gönderi farkederseniz \nlütfen bayraklamaktan çekinmeyin. Güven seviyesi 1'e ulaştığınızda, kullanıcılara mesaj göndermek için de\nbayraklamayı kullanabilirsiniz.\n" + Bu rozet gönderini değiştirmene verilir. Geliştirmek, küçük hataları gidermek ya da unuttuğun bir şeyi eklemek için gönderilerini değiştirmekten hiçbir zaman çekinme. + first_flag: | + Bu rozet bir gönderinin işaretlenmesine verilir. İşaretleme, topluluğunun sağlığı için çok önemlidir. Yönetici incelemesi gereken herhangi bir gönderi görürseniz lütfen işaretlemekten çekinmeyin. Ayrıca hemcins kullanıcılara mesajlar göndermek için işaretleme diyaloğunu da kullanabilirsiniz. nice_share: | - Blah blah blah - Blah blah blah + Bu rozet bir gönderide paylaşılan bir bağlantının 25 yabancı ziyaretçi tarafından ziyaret edilmesine verilir. Tebrikler! İlginç tartışmalara bağlantıları arkadaşlarla paylaşmak topluluğumuzu büyütmek için harika bir yoldur. welcome: | - Blah blah blah - Blah blah blah + Bu rozet bir gönderide ilk beğeninizi aldığınızda verilir. Tebrikler, hemcins topluluk üyelerinin ilginç, havalı ya da kullanışlı bulduğu bir şeyler gönderdin. anniversary: | - Blah blah blah - Blah blah blah + Bu rozet en az bir gönderiye sahip olunan bir yıllık üyeliğe verilir. Buralarda olup topluluğumuza katkıda bulunduğunuz için teşekkür ederiz. good_share: | - Blah blah blah - Blah blah blah + Bu rozet bir gönderide paylaşılan bir bağlantı, 300 yabancı ziyaretçi tarafından ziyaret edildiğinde verilir. İyi iş! Bir sürü yeni kişiye ilgi çekici bir tartışma gösterdin ve böylece büyümemize yardımcı oldun. great_share: | - Blah blah blah - Blah blah blah + Bu rozet bir gönderide paylaşılan bir bağlantının 100 yabancı ziyaretçi tarafından ziyaret edilmesine verilir. Vay be! Bu topluluk için ilginç bir tartışmayı yeni kocaman bir izleyici kitlesine terfi ettirdin ve büyümemize önemli bir katkı sağladın. nice_post: | - Blah blah blah - Blah blah blah + Bu rozet bir cevap 10 beğeni aldığında verilir. İyi iş! nice_topic: | - Blah blah blah - Blah blah blah + Bu rozet bir konu 10 beğeni aldığında verilir. İyi iş! good_post: | - Blah blah blah - Blah blah blah + Bu rozet bir cevap 25 beğeni aldığında verilir. İyi iş! good_topic: | - Blah blah blah - Blah blah blah + Bu rozet bir konu 25 beğeni aldığında verilir. İyi iş! great_post: | - Blah blah blah - Blah blah blah + Bu rozet bir gönderi 50 beğeni aldığında verilir. Vay be! great_topic: | - Blah blah blah - Blah blah blah + Bu rozet bir cevap 50 beğeni aldığında verilir. Vay be! basic: | - Blah blah blah - Blah blah blah + Bu rozet güven seviyesi 1'e ulaştığında verilir. Bir süredir buralarda olduğun ve topluluğumuzun ne hakkında olduğu konusunda birkaç konu okuduğun için teşekkür ederiz. Yeni kullanıcı kısıtlamaların kaldırıldı ve kişisel mesajlaşma, işaretleme, wiki düzenleme, resim ve birden çok bağlantı gönderme yeteneği gibi ana topluluk yeteneklerini aldın. member: | - Blah blah blah - Blah blah blah + Bu rozet güven seviyesi 2'ye ulaştığında verilir. Haftalar boyunca buralarda olup katkıda bulunduğun için teşekkür ederiz. Artık kullanıcı sayfandan ya da konularından kişisel davetler gönderebilir, grup mesajları oluşturabilir ve günlük birkaç daha fazla beğeni ekleyebilirsin. regular: | - Blah blah blah - Blah blah blah + Bu rozet güven seviyesi 3'e ulaştığında verilir. Aylardır topluluğumuzun düzenli bir parçası, bu topluluğu harika yapan en etkin okuyucu ve güvenilir katkıcılardan biri olduğun için teşekkür ederiz. Artık konuların kategorilerini ve isimlerini değiştirebilirsin, özel bir lobi alanına erişebilir, daha güçlü spam işaretleri koyabilir ve günlük çok daha fazla beğeni ekleyebilirsin. leader: | - Blah blah blah - Blah blah blah + Bu rozet güven seviyesi 4'e ulaştığında verilir. Eylem ve kelimelerin ile topluluk için olumlu bir izlenim bırakman sebebiyle forum kadrosu tarafından bu topluluğun bir önderi seçildin. Artık tüm gönderileri düzenleyebilir, sabitleme, kapatma, listelememe, arşivleme, ayırma ve birleştirme gibi yönetici eylemlerini yapabilir ve günlük yığınca beğeni ekleyebilirsiniz. admin_login: success: "E-posta Gönderildi" error: "Hata!" - email_input: "Admin E-postası" + email_input: "Yönetici e-postası" submit_button: "E-posta Gönder" discourse_hub: access_token_problem: "Admin'e iletin: Lütfen doğru discourse_org_access_key içerecek şekilde site ayarlarını güncelleyin." + performance_report: + initial_post_raw: Bu konu siteniz hakkında günlük performans raporlarını içerir. + initial_topic_title: Site performansı raporları diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml index 1390def3f9..b187edd567 100644 --- a/config/locales/server.uk.yml +++ b/config/locales/server.uk.yml @@ -75,14 +75,6 @@ uk: trust_level_3: "trust_level_3" trust_level_4: "trust_level_4" education: - avatar: | - ### Як щодо нового зображення для Вашого профілю? - - Ви опублікували декілька тем та відповідей, але Ваша аватарка не є такою ж унікальною, як і Ви -- це звичайна аватарка, яку за замовчуванням отримують всі нові користувачі. - - Чи не хотіли б Ви **[відвідати свій профіль](%{profile_path})** та завантажити зображення, що представляло б Вас? - - Легше стежити за обговореннями спільноти і шукати цікавих людей в цих обговореннях, коли кожен має унікальну аватарку! dominating_topic: | ### Дайте можливість іншим включитися до обговорення @@ -152,7 +144,6 @@ uk: confirmed: "Адресу вашої електронної скриньки оновлено." error: "Під час зміни адреси Вашої електронної скриньки трапилася помилка. Можливо, ця адреса вже використовується?" activation: - action: "Активувати ваш обліковий запис" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" welcome_to: "Ласкаво просимо до сайта %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" @@ -289,7 +280,6 @@ uk: github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' 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 the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' 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 download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your config/discourse.conf file and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." content_types: education_new_reply: @@ -320,21 +310,17 @@ uk: default_locale: "Мова за замовчуванням для цього екземпляра Discourse (Код ISO 639-1)" allow_user_locale: "Allow users to choose their own language interface preference" min_search_term_length: "Мінімальна дозволена довжина пошукової фрази у символах" - allow_uncategorized_topics: "Дозволити створювати теми без категорії." allow_duplicate_topic_titles: "Дозволити теми з однаковими, дублюючими назвами." unique_posts_mins: "How many minutes before a user can make a post with the same content again" queue_jobs: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! За замовчуванням, додавати завдання до черги в sidekiq. Якщо вимкнути, Ваш сайт зламається." crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини і висоти." category_featured_topics: "Кількість тем на одну категорію, що показуються на сторінці /categories. Після зміни цього значення, оновлення категорій займе до 15 хвилин." show_subcategory_list: "Показувати перелік підкатегорій замість переліку тем при вході у категорію." - favicon_url: "Піктограма Вашого сайта, див. http://uk.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Піктограма, що використовується для сенсорних пристроїв Apple. Рекмоендований розмір 144px на 144px." email_custom_headers: "Список заголовків електронної пошти, розділених вертикальною рискою" use_https: "Чи повинна повна адреса сайта (Discourse.base_url) використовувати https (чи просто http)? ВМИКАЙТЕ ЦЕ ТІЛЬКИ ЯКЩО HTTPS ВЖЕ НАЛАШТОВАНО І ВІН ПРАЦЮЄ!" enable_long_polling: "Message bus used for notification can use long polling" anon_polling_interval: "How often should anonymous clients poll in milliseconds" - auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" - new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Кількість скарг, необхідних для того, щоб допис було автоматично приховано, а його авторові було надіслано приватне повідомлення (0, щоб вимкнути)" max_topics_in_first_day: "Максимальна кількість тем, які користувач може створити на сайті в перший день" max_replies_in_first_day: "Максимальна кільість відповідей, які користувач може створити на сайті в перший день" @@ -351,8 +337,6 @@ uk: invite_expiry_days: "Скільки днів ключі запрошення користувачів лишаються чинними" min_password_length: "Мінімальна довжина пароля." sso_url: "URL of single sign on endpoint" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" enable_yahoo_logins: "Увімкнути вхід через Yahoo" enable_twitter_logins: "Увімкнути вхід через Twitter; потребує twitter_consumer_key та twitter_consumer_secret" twitter_consumer_key: "Consumer key для входу через Twitter, зареєстрований на http://dev.twitter.com" @@ -382,8 +366,6 @@ uk: delete_all_posts_max: "Максимальне число дописів, які можна видалити за один раз кнопкою \"Видалити всі дописи\". Якщо користувач має більше дописів, ніж це число, їх не можна буде видалити за один раз, і користувача також." username_change_period: "Кількість днів після реєстрації, протягом яких новим обліковим записам можна змінювати своє ім'я користувача (0 щоб заборонити зміну імені користувача)." email_editable: "Дозволити користувачам змінювати свою електронну скриньку після реєстрації." - default_digest_email_frequency: "Як часто користувачі отримують листи зі стислим викладом новин за замовчуванням. Вони можуть змінити це у своїх налаштуваннях." - default_external_links_in_new_tab: "Відкривати нові посилання у новій вкладці. Користувачі можуть змінити це у своїх налаштуваннях." allow_profile_backgrounds: "Дозволити користувачам завантажувати фони профілю." enable_mobile_theme: "Мобільні пристрої використовуватимуть тему, дружню для них, з можливістю перемикатися на повний сайт. Відключіть це, якщо хочете використовувати власну, повністю чутливу, таблицю стилів." display_name_on_posts: "Показувати повні імена користувачів на їх дописах у додаток до їх @username." @@ -391,7 +373,6 @@ uk: short_progress_text_threshold: "Після того, як кількість дописів в темі перевищить це число, індикатор просування по темі показуватиме тільки номер поточного допису. Якщо Ви зміните ширину індикатора, Вам, ймовірно, знадобиться змінити це значення." default_code_lang: "Мова програмування для підсвітки синтаксису, що за замовчуванням застосовуватиметься для блоків коду GitHub (lang-auto, ruby, python і т. ін.)" embed_truncate: "Обрізати вбудовані повідомлення. " - embed_category: "Категорія вбудованих тем. " errors: invalid_integer: "Значення має бути цілим." regex_mismatch: "Значення не відповідає потрібному формату." @@ -443,7 +424,6 @@ uk: characters: "must only include numbers, letters and underscores" unique: "має бути унікальним" blank: "має бути наявним" - must_begin_with_alphanumeric: "must begin with a letter or number" email: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "не допускається." @@ -484,7 +464,6 @@ uk: [Будь ласка, розгляньте їх в адміністративній секції](%{base_url}/admin/users/list/pending). download_remote_images_disabled: subject_template: "Завантаження віддалених зображені відключено" - unsubscribe_link: "Щоб відписатися від цих листів, відідайте [сторінку своїх налаштувань](%{user_preferences_url})." user_notifications: previous_discussion: "Попередні відповіді" unsubscribe: @@ -572,7 +551,6 @@ uk: signup_after_approval: subject_template: "Вас було схвалено на сайті %{site_name}!" signup: - subject_template: "[%{site_name}] Активуйте свій новий обліковий запис" text_body_template: | Вітаємо у %{site_name}! @@ -597,8 +575,6 @@ uk: pasted_image_filename: "Вставлене зображення" store_failure: "Не вдалося зберегти завантаження #%{upload_id} для користувача #%{user_id}." images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 0af033048a..0fed9c0499 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -61,6 +61,13 @@ zh_CN: other: 有 %{count} 错误使得 %{model} 无法被保存 embed: load_from_remote: "载入帖子时遇到错误。" + site_settings: + min_username_length_exists: "你不能将最小用户名长度设置为大于当前最短的用户名" + min_username_length_range: "你不能将最小值设置为大于最大值。" + max_username_length_exists: "你不能将最大用户名长度设置为小于当前最长的用户名。" + max_username_length_range: "你不能将最大值设置为小于最小值。" + default_categories_already_selected: "你不能选择一个已经用于另一个列表的分类。" + s3_upload_bucket_is_required: "你没有填写 “ s3_upload_bucket”，不能启用上传至 S3。" bulk_invite: file_should_be_csv: "上传的文件应为 csv 或 txt 格式。" backup: @@ -126,6 +133,7 @@ zh_CN: rss_description: latest: "最新主题" hot: "最热主题" + posts: "最新帖子" too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。" excerpt_image: "图片" queue: @@ -168,13 +176,13 @@ zh_CN: 欲查看更多，[请查看我们的社群准则](/guidelines)。此信息面板只会在你发表前 %{education_posts_text} 时显示。 avatar: | - ### 为你的账户添加一张图片吧？ + ### 给你的账户设置头像如何？ - 你已经发表了一些主题和回复，但是你的头像不能展示你的独一无二——你使用的是新用户默认的头像。 + 你已经发表了一些主题和回复，但是你的个人头像并不像你一样独特——只是一些字母而已。 - 你考虑**[访问你的用户资料页面](%{profile_path})**并且上传一个展示你的自定义头像吗？ + 你考虑过**[访问你的用户页面](%{profile_path})**，再上传一个代表你的图片？ - 当每一个人都有一个独立的头像时更容易跟随社群讨论并且在交流中找到有意思的人们！ + 当所有人都有独特的头像时，这会让专注讨论和找到有趣的人更加轻松。 sequential_replies: | ### 考虑一次性回复多个帖子 @@ -238,7 +246,7 @@ zh_CN: no_info_other: "
    %{name} 尚未在他们的资料中的关于我部分填写任何信息
    " vip_category_name: "贵宾室" vip_category_description: "高于信任等级3的用户参与讨论的分类。" - meta_category_name: "站务" + meta_category_name: "页面反馈" meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。" staff_category_name: "职员" staff_category_description: "职员私有的分类。只有管理员和版主才能阅览主题。" @@ -352,7 +360,7 @@ zh_CN: almost_x_years: other: "将近 %{count} 年前" password_reset: - no_token: "抱歉，密码修改链接已过期。再登录一次并选择“我忘记了密码”获得一个新的链接。" + no_token: "抱歉，密码修改链接已过期。选择登录按钮再使用“我忘记了密码”获得一个新链接。" choose_new: "请选择一个新密码" choose: "请选择一个密码" update: '更新密码' @@ -366,7 +374,7 @@ zh_CN: please_continue: "转入到 %{site_name}" error: "在修改你的电子邮箱地址时出现了错误，可能此邮箱已经在论坛中使用了？" activation: - action: "激活你的帐号" + action: "点击这儿激活你的账户" already_done: "抱歉，此帐号激活链接已经失效。可能你的帐号已经被激活了？" please_continue: "你的新帐号已激活；即将转到主页。" continue_button: "转入到 %{site_name}" @@ -434,6 +442,7 @@ zh_CN: regular: title: "常规主题" banner: + title: "横幅主题" message: make: "本主题现在是横幅主题。它将出现在每页的顶部，除非用户将其隐藏。" remove: "本主题已经不再是横幅主题。它将不在每个页面的顶部显示。" @@ -541,6 +550,14 @@ zh_CN: title: "总量" xaxis: "天" yaxis: "总 API 请求" + page_view_logged_in_mobile_reqs: + title: "已登录的 API 请求" + xaxis: "天" + yaxis: "移动端已登录 API 请求" + page_view_anon_mobile_reqs: + title: "匿名 API 请求" + xaxis: "天" + yaxis: "移动端匿名 API 请求" http_background_reqs: title: "后台" xaxis: "天" @@ -565,12 +582,25 @@ zh_CN: title: "总量" xaxis: "天" yaxis: "总请求数" + time_to_first_response: + title: "第一个回复时间" + xaxis: "天" + yaxis: "平均时间（小时）" + topics_with_no_response: + title: "没有回复的帖子" + xaxis: "天" + yaxis: "总量" + mobile_visits: + title: "用户访问" + xaxis: "天" + yaxis: "访问次数" dashboard: rails_env_warning: "你的服务器运行在 %{env} 模式。" ruby_version_warning: "你正在使用 Ruby 2.0.0，这个版本有较多的问题。请升级至 p247 或更新版。" host_names_warning: "你的 config/database.yml 文件使用的是缺省的 localhost 主机名。请更改成你的站点主机名。" gc_warning: '你的服务器使用的是缺省的 ruby 垃圾回收参数，这个配置无法提供最高性能。请阅读此性能调优文档：Tuning Ruby and Rails for Discourse。' sidekiq_warning: 'Sidekiq 不在运行。很多任务，例如发送电子邮件，是异步的被 sidekiq 调度执行的。请确保至少运行一个 sidekiq 进程。了解 Sidekiq。' + queue_size_warning: '队列中有较多任务，为 %{queue_size} 个。这可能是因为 Sidekiq 进程的问题导致，或者需要更多的 Sidekiq 进程。' memory_warning: '你的服务器环境内存少于 1GB，我们建议至少要有 1GB 内存。' google_oauth2_config_warning: '服务器允许使用 Google Oauth2 登录（enable_google_oauth2_logins），但是 client id 和 client secret 没有被设定。 到站点设置更新此设定。 参考设定指南。' facebook_config_warning: '服务器允许使用 Facebook 账号登录（enable_facebook_logins），但是 app id 和 app secret 没有被设定。 到站点设置更新此设定。参考设定指南。' @@ -579,7 +609,7 @@ zh_CN: s3_config_warning: '服务器被配置为上传文件到 s3，但是至少有一个值未被设定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到站点设置更新此设定。参考如何设置图片上传至 S3。' s3_backup_config_warning: '服务器被配置为上传备份到 s3，但是至少有一个值未被设定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到站点设置更新此设定。参考如何设置图片上传至 S3。' image_magick_warning: '服务器被设置为给大图片创建缩略图，但是 ImageMagick 没有被安装。用你最喜爱的包管理器安装 ImageMagick 或下载最新版。' - failing_emails_warning: '%{num_failed_jobs} 个 email 任务失败。请检查 config/discourse.conf 文件是否正确配置了邮件服务器。在 Sidekiq 中查看失败的任务。' + failing_emails_warning: '有 %{num_failed_jobs} 个邮件任务失败。请检查 app.yml 文件是否正确配置了邮件服务器。查看 Sidekiq 中失败的任务。' default_logo_warning: "设置你站点的图形logo。请在站点设置中配置logo_url、logo_small_url和favicon_url。" contact_email_missing: "输入一个站点联系人的邮件地址，这样在用户在网站出现紧急状况时能够找到你。在站点设置中更新它。" contact_email_invalid: "站点联系邮箱不正确。在站点设置中修改。" @@ -632,7 +662,7 @@ zh_CN: max_topic_title_length: "标题允许的最大字符数" min_private_message_title_length: "消息标题允许的最小字符数" min_search_term_length: "搜索条件允许的最少字符数" - allow_uncategorized_topics: "允许发表未分类的帖子" + allow_uncategorized_topics: "允许发表没有分类的帖子。警告：如果又任何未分类的帖子，你必须给他们重新分类后才能关闭该选项。" uncategorized_description: "未分类分类的描述。留空则无描述。" allow_duplicate_topic_titles: "允许主题有相同，重复的标题" unique_posts_mins: "多少分钟之后才允许一个用户再次发表包含相同内容的帖子" @@ -655,16 +685,17 @@ zh_CN: category_featured_topics: "在分类 /categories 页面中每个分类显示的主题数目。在修改这个值之后，分类页面需要 15 分钟后完成更新。" show_subcategory_list: "进入分类时显示子分类列表而不是主题列表。" fixed_category_positions: "如果选择，你将可以设置一个固定的分类顺序。如果不选择，分类将按照活动的顺序显示。" + fixed_category_positions_on_create: "如果选择了，目录排序将会在话题创建对话框中被包含(要求固定目录位置选项)" add_rel_nofollow_to_user_content: "添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须重新调制所有帖子，以该命令：“rake posts:rebake”" exclude_rel_nofollow_domains: "不添加 nofollow 链接的域名列表。填写 tld.com 将自动包括 sub.tld.com。最少你应该填写顶级域名来让爬虫获得所有内容。如果你的网站包含其他域名，增加他们。" post_excerpt_maxlength: "帖子摘要的最大字符长度" post_onebox_maxlength: "Onebox 处理后的 Discourse 帖子的最大字符长度" onebox_domains_whitelist: "对这些站点启用 Onebox 的域名列表；这些域名应该支持 OpenGraph 或 oEmbed。在此测试他们：http://iframely.com/debug" - logo_url: "出现在你站点左上角的标志图片；如果留空，将显示站点标题文字。" - digest_logo_url: "站点邮件摘要使用的标志。如果留空，则使用 `logo_url`。例如：http://example.com/logo.png" - logo_small_url: "出现在你站点左上角的小号标志图片，当滚动后可见。如果留空，将显示主页图标。" - favicon_url: "你的站点图标（favicon），参考 http://zh.wikipedia.org/wiki/Favicon" - mobile_logo_url: "移动浏览器左上角的固定标志图片。如果留空 `logo_url` 将被使用。" + logo_url: "在你站点左上角出现的小号标志图片，应为一个长方形。如果留空，将显示站点标题文字。" + digest_logo_url: "邮件摘要中使用的替代标志。应为长方形。如果留空，将使用 `logo_url`。" + logo_small_url: "在你站点左上角的小号标志图片，应为正方形，当滚动时才可见。如果留空，将显示主页图标。" + favicon_url: "你的站点图标（favicon），参考 http://zh.wikipedia.org/wiki/Favicon，如果要正确地通过 CDN 分发，它必须是 png 图片" + mobile_logo_url: "移动站点左上角的固定标志图片。应为正方形。如果留空，`logo_url` 将被使用。如：http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Apple 触摸设备使用的图标。推荐 144x144 大小。" notification_email: "这个表格：被用于发送所有重要系统邮件的邮箱地址。指定的域名必须正确设置 SPF、DKIM 和反向 PTR 记录以发送邮件。" email_custom_headers: "一个逗号分离的自定义邮件头部" @@ -682,8 +713,6 @@ zh_CN: polling_interval: "当不再长轮询时，已登录的客户端多久应该轮询一次，以毫秒为单位" anon_polling_interval: "匿名客户端轮询时间间隔（单位：毫秒）" background_polling_interval: "客户端轮询的间隔，以毫秒计（当窗口在后台时）" - auto_track_topics_after: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置，用户可以覆盖此设置（0 为始终，-1 为从不）" - new_topic_duration_minutes: "一个主题在多少分钟之内被系统判断为新主题的全局缺省设置，用户可以覆盖此设置（-1 为始终，-2 为最后一次访问）" flags_required_to_hide_post: "一个帖子累计多少个标记之后会被自动隐藏，并向帖子作者发送私信通知（0 为从不）" cooldown_minutes_after_hiding_posts: "当一个帖子因为标记而隐藏之后，用户需要等待多少分钟才能编辑帖子" max_topics_in_first_day: "新用户在第一天内最多可以创建的主题数" @@ -696,6 +725,7 @@ zh_CN: notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个消息给所有管理员。" flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。" traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行" + allow_html_tables: "允许在输入 Markdown 时输入表格 HTML 标签，TABLE、THEAD、TD、TR、TH 将被白名单（需要对所有包含表格的老帖子做彻底的 rebake）" post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数" must_approve_users: "新用户在被允许访问站点前需要由职员批准。警告：在运行的站点中启用将解除所有非职员用户的访问权限！" ga_tracking_code: "Google 分析追踪代码（ga.js），例如：UA-12345678-9。参考 http://google.com/analytics" @@ -725,6 +755,7 @@ zh_CN: email_token_valid_hours: "“忘记密码”/“激活账户” token 有效的小时数(n)。" email_token_grace_period_hours: "“忘记密码”/“激活账户” token 在使用后仍旧有效的小时数(n)。" enable_badges: "启用徽章系统" + enable_whispers: "允许用户发送密语给职员" allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。" email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net" email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" @@ -738,21 +769,23 @@ zh_CN: invite_passthrough_hours: "用户多久才能使用一个已经使用过的邀请代码，以小时计" invite_only: "公开注册已禁用，新用户必须被其他成员或职员邀请。" login_required: "需要验证才能继续在该站阅读，不允许匿名访问。" - min_username_length: "最小用户名长度。警告：所有现用户名小于此限制长度的用户都将无法访问站点。" - max_username_length: "最大用户名长度。警告：所有现用户名大于此限制长度的用户都将无法访问站点。" + min_username_length: "最小用户名长度。" + max_username_length: "最大用户名长度。" + reserved_usernames: "注册时不可使用的用户名。" min_password_length: "最小密码长度。" block_common_passwords: "不允许使用 10,000 个最常用的密码。" enable_sso: "启用通过外部站点单点登录（警告：用户的邮件地址必须被外部站点验证！）" enable_sso_provider: "在 /session/sso_provider endpoint 实现 Discourse SSO 提供方协议，要求设置 sso_secret" sso_url: "单点登录 URL 入口点" sso_secret: "秘密字符串，用于验证秘密的 SSO 信息，请保证是 10 个字符或者更长" - sso_overrides_email: "用 SSO 信息中的外部邮件地址覆盖本地邮件地址（警告：因为对本地邮件的统一处理，这个邮件地址可能不同）" - sso_overrides_username: "用 SSO 信息中的外部用户名覆盖用户名（警告：因为对本地用户名的统一处理，用户名的长度或者要求可能不同）" - sso_overrides_name: "从 SSO 负荷中的外部站点全名中覆盖本地全名" + sso_overrides_email: "每一次登录时，用 SSO 信息中的外部站点的邮件地址覆盖本地邮件地址，并且阻止本地的邮件地址修改。（警告：因格本地邮件的正规化，邮件地址可能会有所差异）" + sso_overrides_username: "每一次登录时，用 SSO 信息中的外部站点的用户名覆盖本地用户名，并且阻止本地的用户名修改。（警告：因格本地用户名的长度和其他要求，用户名可能会有所差异）" + sso_overrides_name: "每一次登录时，用 SSO 信息中的外部站点的全名覆盖本地全名，并且阻止本地的全名修改。" sso_overrides_avatar: "用单点登录信息中的外部站点头像覆盖用户头像。如果启用，强烈建议禁用 allow_uploaded_avatars" sso_not_approved_url: "重定向未受许可的单点登录账号至这个 URL" enable_local_logins: "启用本地用户名和密码验证。（注意：邀请特性需要该选项）" allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。" + enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。" enable_yahoo_logins: "启用 Yahoo 帐号验证登录" enable_google_oauth2_logins: "启用 Google Oauth2 验证。这是目前 Google 推荐的验证方案。需要 key 和 secret。" google_oauth2_client_id: "Google 应用的 Client ID" @@ -768,7 +801,8 @@ zh_CN: github_client_secret: "Github 帐号验证的客户端密码（Client secret），到 https://github.com/settings/applications 来注册获取" allow_restore: "允许导入数据，这将能替换所有全站数据！除非你计划导入数据，否则请保持设置为 false" maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除" - backup_daily: "每天自动创建站点备份。" + automatic_backups_enabled: "按照定义的备份频率运行自动备份计划" + backup_frequency: "自动创建站点备份的频率，以天为单位。" enable_s3_backups: "当完成备份后上传备份到 S3。重要：需要在文件设置中填写有效的 S3 验证资料。" s3_backup_bucket: "远端备份 bucket。警告：确认它使私有的 bucket。" active_user_rate_limit_secs: "更新'最后一次见到'数据的间隔，单位为秒" @@ -800,6 +834,8 @@ zh_CN: s3_region: "将用于上传图片的 Amazon S3 区域名。" s3_cdn_url: "用户 S3 资料的 CDN URL（例如：https://cdn.somewhere.com）。警告：在改变该设置后你必须重制所有老帖子。" avatar_sizes: "自动生成的头像大小列表。" + external_system_avatars_enabled: "使用外部系统头像服务。" + external_system_avatars_url: "外部系统头像服务的 URL 地址。可选参数是 {username} {first_letter} {color} {size}" enable_flash_video_onebox: "在 Onebox 启用嵌入 swf 和 flv 链接（Adobe Flash）。警告：可能增加安全风险。" default_invitee_trust_level: "受邀用户的缺省信任等级（0-4）。" default_trust_level: "所有新用户的缺省信任等级（0-4）。警告！改变此项将提高广告泛滥的风险。" @@ -867,7 +903,7 @@ zh_CN: newuser_spam_host_threshold: "用户在一篇帖子中能添加多少此指向同一主机的链接，取决于之前该用户有`newuser_spam_host_threshold`篇帖子被认为是垃圾帖。" white_listed_spam_host_domains: "广告主机白名单域名列表。新用户可以任意链接至这些域名。" staff_like_weight: "职员赞时的额外权重。" - topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录主题访问数" + topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的主题访问" levenshtein_distance_spammer_emails: "当匹配广告邮件时，模糊匹配判断差异的字符数。" max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是职员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。" min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录" @@ -876,6 +912,10 @@ zh_CN: num_flaggers_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的独立标记者" num_flags_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的有效标记" auto_respond_to_flag_actions: "当处理标记时启用自动回复。" + min_first_post_typing_time: "用户发表第一帖时打字的最小时间（以毫秒计），如果没有达到该阈值，帖子将自动进入需要批准队列。设置为 0 禁用（不推荐）" + auto_block_fast_typers_on_first_post: "自动封禁没有达到首贴输入时间 min_first_post_typing_time 要求的用户" + auto_block_fast_typers_max_trust_level: "自动封禁输入过于快速的用户的最高信任等级" + auto_block_first_post_regex: "大小写不相关的正则表达式，如果匹配成功，会导致该用户不能发表第一帖，而是进入审核队列。例如：求下载|谢谢楼[主猪]，会阻止包含求下载、谢谢楼主或谢谢楼猪的帖子。该选项只适用于首贴。" reply_by_email_enabled: "启用通过邮件回复。" reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com" disable_emails: "禁止 Discourse 发送任何邮件" @@ -888,6 +928,7 @@ zh_CN: pop3_polling_host: "需用 POP3 向该地址轮询电子邮件的主机。" pop3_polling_username: "轮询 POP3 账户所用的用户名。" pop3_polling_password: "轮询 POP3 账户所用的密码。" + log_mail_processing_failures: "记录所有邮件失败处理日志至 http://yoursitename.com/logs" email_in: "允许用户通过邮件发表新主题（需要 pop3 轮询）。在每一个分类的“设置”标签页配置地址。" email_in_min_trust: "能通过邮件发表新主题的最低用户信任等级。" email_prefix: "邮件主题中使用的 [标签]。留空将缺省使用 'title'。" @@ -899,18 +940,16 @@ zh_CN: username_change_period: "用户在注册多少天内可以更改他们的用户名（0 表示禁用用户名更改）" email_editable: "允许用户在注册后改变他们的邮箱地址。" logout_redirect: "登出后重定向至的地址。如：http://somesite.com/logout" - allow_uploaded_avatars: "允许用户上传他们自己的自定义头像。" - allow_animated_avatars: "允许用户使用 gif 动画头像。警告：更改后运行 avatars:refresh 这个 rake 任务。" + allow_uploaded_avatars: "允许用户上传自定义个人头像。" + allow_animated_avatars: "允许用户使用动画个人头像。警告：更改设置后运行 avatars:refresh 这个 rake 任务。" allow_animated_thumbnails: "为动画 gif 生成动态缩略图。" default_avatars: "在用户更改头像前的默认头像 URL" automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。" digest_topics: "邮件摘要中显示的最大主题数目。" digest_min_excerpt_length: "在邮件摘要中每个帖子最少显示的字符数量。" - default_digest_email_frequency: "用户收到摘要邮件的默认间隔。用户可以在参数设置中更改这个设置。" suppress_digest_email_after_days: "不发送摘要邮件给超过 (n) 天未出现的用户。" disable_digest_emails: "为所有用户禁用摘要邮件。" - default_external_links_in_new_tab: "在新标签页中打开外部链接。用户可以在参数设置中更改这个设置。" - detect_custom_avatars: "是否检测用户上传了自定义头像。" + detect_custom_avatars: "检测用户是否上传了自定义个人头像。" max_daily_gravatar_crawls: "一天内 Discourse 将自动检查 gravatar 自定义头像的次数" public_user_custom_fields: "可公开显示的用户自定义属性白名单" staff_user_custom_fields: "可给职员公开显示的用户自定义属性白名单。" @@ -922,25 +961,26 @@ zh_CN: sequential_replies_threshold: "用户可以在一个主题内多次回复而不被提醒连续发送多个回复的通知。" enable_mobile_theme: "为移动设备启用移动友好的主题，但也能切换回完整站点。如果你想要使用自定义的响应式主题请禁用它。" dominating_topic_minimum_percent: "用户在主题中的帖子占到多少百分比时使得用户主导话题。" + daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到职员才能看到的主题" suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。" + permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(\\/topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式，以及在字符串使用 \\1 等等来访问捕获内容" global_notice: "为所有访客显示“紧急的”全局横幅，留空隐藏它（可以使用 HTML）" disable_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。" full_name_required: "全名是用户个人信息的必填项。" enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用将在所有地方隐藏全名。" display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。" + show_time_gap_days: "如果两个帖子发表间隔多天，在主题中显示时间间隔提示。" invites_per_page: "默认在用户页显示邀请。" short_progress_text_threshold: "在主题中的帖子数超过这个设定后，进度条将只显示当前的帖子数。如果你更改了进度条的宽度，你需要修改这个值。" default_code_lang: "默认语法高亮语言，使用 GitHub 代码块（lang-auto、ruby、python或者其他等等。）" warn_reviving_old_topic_age: "当有人开始回复最后一贴超过一定天数前的主题时，将有一个警告显示，不鼓励他们复活一个老的讨论。将其设置为 0 以禁用。" autohighlight_all_code: "即使未显式设定语言，仍为所有预编排代码块应用语法高亮。" highlighted_languages: "包含语法高亮规则。（警告：包含太多的语言可能会印象性能）见：https://highlightjs.org/static/demo/ 查看演示" - embeddable_host: "能从这个 Discourse 论坛嵌入评论的主机。\n仅主机名，不要以 http:// 开头" feed_polling_enabled: "仅用于嵌入：是否将 RSS/ATOM 订阅为帖子。" feed_polling_url: "仅用于嵌入：RSS/ATOM 订阅的 URL。" embed_by_username: "创建嵌入主题的 Discourse 的用户名。" embed_username_key_from_feed: "从流中获取 discourse 用户名的 Key。" embed_truncate: "截断嵌入的帖子。" - embed_category: "嵌入主题的分类。" embed_post_limit: "嵌入帖子的最大数量。" embed_whitelist_selector: "在嵌入页面加入元素 CSS 选择器。" embed_blacklist_selector: "在嵌入页面移除元素 CSS 选择器。" @@ -948,6 +988,7 @@ zh_CN: enable_cdn_js_debugging: "为包含的 js 启动跨源访问 /logs 权限以显示合适的错误。" show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。" delete_drafts_older_than_n_days: 删除超过 n 天得草稿。 + show_logout_in_header: "在顶栏的用户下拉菜单中显示登出" vacuum_db_days: "在数据库迁移后使用完整扫描回收数据库空间（设置 0 为禁用）" prevent_anons_from_downloading_files: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。" slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。" @@ -956,6 +997,22 @@ zh_CN: enforce_square_emoji: "强制为所有 emojis 设置正方形比例。" approve_post_count: "新用户需要被审核的帖子数量" approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核" + notify_about_queued_posts_after: "如果有帖子等待了设定的小时数后仍在等候处理，发送一封邮件给联络邮件地址。设为 0 将禁用这些邮件。" + default_email_digest_frequency: "用户默认收到摘要邮件的默认频率。" + default_email_private_messages: "默认在有人发消息给用户时发送一封邮件通知。" + default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。" + default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。" + default_email_always: "即使用户活跃时，仍默认发送邮件通知。" + default_other_new_topic_duration_minutes: "一个主题在多少分钟之内被系统判断为新主题的全局缺省设置" + default_other_auto_track_topics_after_msecs: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置" + default_other_external_links_in_new_tab: "默认在新的标签页打开外部链接" + default_other_enable_quoting: "默认在高亮选择文字时启用引用回复" + default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的主题数量" + default_other_disable_jump_reply: "默认不在用户回复后跳转到新帖子位置" + default_other_edit_history_public: "将帖子修订历史默认公开。" + default_categories_watching: "分类列表默认跟踪。" + default_categories_tracking: "分类列表默认追踪。" + default_categories_muted: "分类列表默认不显示。" errors: invalid_email: "电子邮箱地址无效。" invalid_username: "没有这个用户名的用户。" @@ -1004,11 +1061,12 @@ zh_CN: not_seen_in_a_month: "欢迎回来！我们已经好久没见到你了。这些是你不在时的最热门主题。" move_posts: new_topic_moderator_post: - other: "我已经移动了 %{conut} 个帖子到新的主题：%{topic_link}" + other: "%{count} 个帖子被分离到了新主题：%{topic_link}" existing_topic_moderator_post: - other: "我已经移动了 %{conut} 个帖子到了一个已存在的主题：%{topic_link}" + other: "%{count} 个帖子被何明至已存在的主题：%{topic_link}" change_owner: post_revision_text: "所有权从 %{old_user} 转移至 %{new_user}" + deleted_user: "已经删除的用户" emoji: errors: name_already_exists: "抱歉，名字 '%{name}' 已经被另一个 emoji 使用。" @@ -1056,6 +1114,8 @@ zh_CN: omniauth_error_unknown: "在处理你的登录过程中发生了错误，请重试。" new_registrations_disabled: "现在不允许注册新账户。" password_too_long: "密码不能超过 200 个字符。" + email_too_long: "你输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。" + reserved_username: "该用户名不可被使用。" missing_user_field: "你还没有填写完所有用户字段" close_window: "验证已经完成。关闭窗口以继续。" user: @@ -1066,7 +1126,10 @@ zh_CN: characters: "必须只包含字母、数字和下划线" unique: "必须是唯一的" blank: "必须存在" - must_begin_with_alphanumeric: "必须以字母或数字开头" + must_begin_with_alphanumeric: "必须以一个字母或数字或下划线开头" + must_end_with_alphanumeric: "必须以字母或数字结尾或是下划线" + must_not_contain_two_special_chars_in_seq: "必须不包括连续的 2 个或更多的特殊字符（.-_）" + must_not_contain_confusing_suffix: "必须不包含奇怪的后缀，例如 .json 或 .png 等等。" email: not_allowed: "本站不允许使用该邮箱服务商提供的电子邮箱，请使用其它邮箱地址。" blocked: "不被允许。" @@ -1108,12 +1171,12 @@ zh_CN: invite_password_instructions: subject_template: "为 %{site_name} 账户设置密码" text_body_template: | - 感谢你接受来自感谢您接受来自%{site_name}的邀请——欢迎！ + 感谢你接受来自%{site_name}的邀请——欢迎！ 点击下面的链接立即选择一个密码： %{base_url}/users/password-reset/%{email_token} - 如果你不记得你的密码，或者你没有设置密码，在通过邮件地址登录时选择“我忘记了密码”。 + （如果链接已经过期，在登录时用，选择“我忘记了密码”，再次输入你的邮箱即可。） test_mailer: subject_template: "[%{site_name}] 电子邮件发送测试" text_body_template: | @@ -1157,18 +1220,18 @@ zh_CN: new_version_mailer: subject_template: "[%{site_name}] 有新的 Discourse 版本，可供升级" text_body_template: | - 有新版本的 Discourse 可供升级。 + 有新版本的 [Discourse](http://www.discourse.org) 可供升级。 你的版本：%{installed_version} 新版本：**%{new_version}** 你可能想要： - - 查看 [GitHub 改动日志](https://github.com/discourse/discourse/commits/master) 中的更新内容。 + - 查看[GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中更新的内容。 - - 访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)，然后按下“升级”按钮。 + - 浏览器访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) 升级。 - - 访问 [meta.discourse.org](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。 + - 访问 [meta.discourse.org（英文）](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](http://meta.discoursecn.org) 获得支持。 new_version_mailer_with_notes: subject_template: "[%{site_name}] 可以升级" text_body_template: | @@ -1179,11 +1242,11 @@ zh_CN: 你可能想要： - - 查看[GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中的更新内容。 + - 查看[GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中更新的内容。 - - 访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) ，然后按下“升级”按钮。 + - 浏览器访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) 升级。 - - 访问 [meta.discourse.org](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。 + - 访问 [meta.discourse.org（英文）](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](http://meta.discoursecn.org) 获得支持。 ### 发行注记 @@ -1196,6 +1259,13 @@ zh_CN: how_to_disable: '你可以通过修改“notify about flags after”设置项以禁用或改变邮件提醒设置。' subject_template: other: "%{count} 个标记需要被处理" + queued_posts_reminder: + subject_template: + other: "[%{site_name}] %{count} 个帖子等待审核" + text_body_template: | + 你好， + + 新用户的帖子等待被审核。[你可以审核通过或者禁止他们](%{base_url}/queued-posts)。 flag_reasons: off_topic: "你的帖子被标记为 **偏离主题**：鉴于当前的主题标题和第一个帖子，社群成员们感觉它不适合处于这个主题中。" inappropriate: "你的帖子被标记为 **不恰当**：社群成员感觉它有冒犯或者侮辱的意味，亦或是它违反了[社群准则](/guidelines)。" @@ -1207,7 +1277,7 @@ zh_CN: disagreed: "感谢通知我们。我们正在了解情况。" deferred: "感谢通知我们。我们正在调查情况。" deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。" - temporarily_closed_due_to_flags: "帖子因为多次社群标记暂时关闭" + temporarily_closed_due_to_flags: "主题因为大量的社群标记暂时关闭" system_messages: post_hidden: subject_template: "%{site_name} 提示：由于论坛用户标记，系统隐藏了你的帖子" @@ -1227,75 +1297,89 @@ zh_CN: 想了解更多，请查看我们的[社群指引](%{base_url}/guidelines)。 usage_tips: text_body_template: | - 这条消息包含了一些可以让你快速开始的技巧提示。 + 这是一条包含了一些可以让你快速开始的技巧提示的消息： - ## 保持滚动 + ## 阅读 - 没有下一页按钮或者页码——要阅读更多，**只需要继续向下滚动页面！** + 要阅读更多，**只需要继续向下滚动页面！** - 当新的帖子加载后，它们会自动显示。 + 当有新的回复或者新主题时，他们将自动地出现 —— 没有必要刷新页面。 - ## 我在哪儿？ + ## 导航 - - 要搜索，访问你的用户页面或者菜单，使用 **右上角的图标☰按钮**。 + - 要搜索，用你的用户页面，或者使用☰菜单，这个**右上角的图标**。 - - 任何主题标题点击后都将引导你至下一个未读的帖子。使用最后一次活动时间和帖子数量跳至主题顶部或底部。 + - 点击主题标题将引导你至该主题**下一个未读**的帖子。要跳至主题顶部或底部，分别点击回复数量或者最后一次回复时间。 - - 当在阅读主题时，通过点击帖子标题回到顶部 ↑。点击右下角的绿色进度条使用完整导航控制，或使用键盘上的 home 和 end键。 + - + - 当在阅读主题时，点击右下角的进度条打开导航控制。点击帖子标题可回到顶部。按键盘上的 ? 键获取快速键盘快捷键列表。 - ## 我怎么回复？ + - - 要回复整个主题，使用页面最底下的回复按钮 。 + ## 回复 - - 要回复特定的帖子，使用那个帖子的回复按钮 。 + - 要回复**整个主题**，使用页面最底下的 。 - - 如果你想把讨论导向另一个方向，但是保持讨论之间的联系，请使用帖子右侧的“回复为联结主题”。 + - 要回复**特定的人**，使用他们帖子的 。 - 若想在你的回复中引用什么，选择想要引用的文字，然后点击任何回复按钮。 + - 要用**一个新主题**回复，使用帖子右边的 。老的和新的主题将自动被链接至一起。 - 每一个帖子最下方有功能按钮。 + 要插入引用，选择想要引用的文字，然后点击任何回复按钮。重复以上操作创建多个引用！ - + - （要引用整个帖子，使用编辑器工具栏的导入引用按钮。） + 要提醒某人你的回复，提到他们的用户名。键入 `@` 开始选择一个用户名。 - 要在你的回复中提到某人，键入 `@`，自动完成将会弹出。 + - + 要使用[标准绘文字（Emoji）](http://www.emoji.codes/)，先键入 `:` 用名字匹配，或使用传统表情符 `;)` - 要使用[标准绘文字（Emoji）](http://www.emoji.codes/)，先键入`:`或传统表情符`:)` :smile: + - ## 我还能做什么？ + 要生成链接概要，直接将链接粘贴至单独的一行： - + - 要让别人知道你喜欢他们的帖子，使用 **赞** 按钮。如果你觉得一个帖子有问题，请使用 **标记** 按钮以私下地让它们或者我们的职员了解情况。 + ## 操作 - 你可以分享一个帖子的链接，或者是收藏一个帖子以在用户也中引用他们。 + 每一个帖子底部有几个操作按钮： - ## 谁在跟我交谈？ + - 当有人回复你的帖子，引用你的帖子或者使用`@用户名`提及到你的时候，一个数字将会立即出现在页面右上角。使用它查看 **通知**。 + 要让别人知道你喜欢并且感谢他们的帖子，使用**赞**按钮。分享爱！ - + 如果你觉得某人的帖子有问题，使用**标记**按钮私下让他或者[我们的职员](%{base_url}/about)知道。你也可以**分享**至该帖子的链接，或者标记**书签**以供以后在你的用户页查看。 - 不用担心错过他人的回复 —— 当别人回复你的帖子（和消息）时你不在站点上，你将会收到邮件提醒。 + ## 通知 - ## 哪一个是新讨论？ + 当有人回复你、引用你的帖子或者提到`@你`的时候，一个数字将会立即出现在页面右上角。使用它查看**通知**。 - 默认情况，小于两天的对话都是新对话。并且所有你参与的讨论（回复过的、创建的或阅读了很长一段时间的）将自动被追踪。 + - 你将会在主题名字附近见到蓝底的数字指示： + 不用担心错过他人的回复 —— 当你不在时，你将会收到邮件提醒。 - + ## 你的设置 - 你可以通过帖子下方的控制选项改变每一个主题的通知状态（也可以设置每一个分类的状态）。要改变你追踪帖子的方式，或近期主题的范围，查看[你的用户设置](%{base_url}/my/preferences)。 + - 所有小于**两天**的主题算新主题。 - ## 为什么我不能做某些事？ + - 任何你**积极参与**的主题（通过创建、回复或者阅读很长时间）将被自动追踪。 - 新用户因为某些安全原因被限制。只要你参与了讨论，你将会得到社群的信任，成为一个真正的成员，并且这些限制将自动被移除。当达到了一个足够的[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，你将会得到适当的权限帮助管理社群。 + 你将会在主题名字附近见到蓝色的新主题提示和未读帖子数字指示： + + + + 你可以通过主题下方的通知控制改变通知状态。 + + + + 你也可以为每个分类设置通知状态，比如你可以要监控一个主题的每一个新主题。 + + 要修改任何设置，见[你的用户设置](%{base_url}/my/preferences)。 + + ## 社群信任 + + 因为你的积极参与，你将渐渐获得社群信任，成为一个真正的公民，针对新用户的限制将被移除。当达到了一个足够的[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，你将会得到适当的能力一起帮助管理社群。 welcome_user: subject_template: "欢迎来到 %{site_name}！" text_body_template: | @@ -1313,7 +1397,7 @@ zh_CN: text_body_template: "感谢你接受邀请加入%{site_name} —— 欢迎！\n\n我们为你创建了账号：**%{username}**，同时你已经登录了。你可以在任何时候访问[你的用户设置][prefs]来修改它。\n\n要再次登入，或者：\n\n1. 永远 **使用收到邀请的邮箱地址**登录，。否则我们就无法分辨是不是你本人！\n\n2. 在 %{site_name} 的[用户设置][prefs]页面创建一个密码，然后使用该密码来登入。 \n\n%{new_user_tips}\n\n我们始终相信[讨论应该文明](%{base_url}/guidelines)。\n\n好好享受你在论坛的时光吧！\n\n（如果你在新用户级别需要和[职员](%{base_url}/about)沟通的话，直接回复这个消息。）\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "备份成功完成" - text_body_template: "备份成功。\n访问[管理 > 备份](/admin/backups)下载你的新备份文件。" + text_body_template: "备份成功。\n\n访问[管理 > 备份](%{base_url}/admin/backups)下载你的新备份文件。" backup_failed: subject_template: "备份失败" text_body_template: | @@ -1376,11 +1460,11 @@ zh_CN: email_reject_empty: subject_template: "[%{site_name}] 电子邮件错误 -- 无内容" text_body_template: | - 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 + 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件没有成功。 - 我们没有在你的邮件中找到任何内容。请确定你的回复位于邮件的最上方 —— 我们不能处理行内回复。 + 我们不能找到你邮件中的任何回复内容。 - 如果你确实包含了内容但还收到了这个通知，试试包含 HTML 内容（而非纯文本）。 + 如果你**确定**你的邮件中有回复内容，试试用更简单的格式。 email_reject_parsing: subject_template: "[%{site_name}] 电子邮件错误 -- 内容无法识别" text_body_template: | @@ -1501,7 +1585,10 @@ zh_CN: download_remote_images_disabled: subject_template: "远程图片下载已禁用。" text_body_template: "`download_remote_images_to_local` 设定已被禁用，因为已经达到 ``download_remote_images_threshold` 设定中的磁盘空间限制。" - unsubscribe_link: "如果你希望取消这些邮件的订阅，请访问你的[用户设置](%{user_preferences_url})。" + unsubscribe_link: | + 要取消订阅这些邮件，访问你的[用户设置](%{user_preferences_url})。 + + 不想再接受这类主题的通知，[点击这里](%{unsubscribe_url})。 subject_re: "回复：" subject_pm: "[私信]" user_notifications: @@ -1588,12 +1675,12 @@ zh_CN: --- %{respond_instructions} digest: - why: "在你上一次于 %{last_seen_at} 访问后，在 %{site_link} 上的简洁的摘要。" + why: "在你上一次于 %{last_seen_at} 访问后，%{site_link}的简洁摘要。" subject_template: "[%{site_name}] 摘要" new_activity: "在你的主题和帖子里的动态：" top_topics: "热门帖子" other_new_topics: "热门主题" - unsubscribe: "这封来自 %{site_link} 的摘要邮件是你一段时间没有访问后发送给你的。点击 %{unsubscribe_link} 取消订阅。" + unsubscribe: "这是封来自%{site_link}的摘要邮件，因为你长时间没有访问而发送。%{unsubscribe_link}取消订阅。" click_here: "点击此处" from: "%{site_name} 摘要" read_more: "阅读更多" @@ -1659,7 +1746,7 @@ zh_CN: （如果你在新用户级别需要和[职员](%{base_url/about)沟通的话，直接回复这个消息。） signup: - subject_template: "[%{site_name}] 激活你的新帐号" + subject_template: "[%{site_name}] 确认你的新账户" text_body_template: | 欢迎来到 %{site_name}！ @@ -1687,13 +1774,14 @@ zh_CN: unauthorized: "抱歉，你没有上传文件的权限（验证扩展：%{authorized_extensions}）。" pasted_image_filename: "粘贴的图像" store_failure: "用户#%{user_id} 上传的 #%{upload_id} 保存失败。" + file_missing: "抱歉，你必须选择一个文件上传。" attachments: too_large: "抱歉，你试图上传的文件太大了（最大限制为%{max_size_kb}%KB）。" images: too_large: "抱歉，你试图上传的图片太大了（最大限制为%{max_size_kb}%KB），请裁剪它并重试。" - fetch_failure: "抱歉，获取图片时发生错误。" - unknown_image_type: "抱歉，你上传的文件似乎不是一张图片。" size_not_found: "抱歉，我们无法获取图片大小，请检查你的图片是否已损坏。" + avatar: + missing: "抱歉，但是你选用的头像没有存储在服务器上。你能再重新上传一次么？" flag_reason: sockpuppet: "新用户创建了主题，而另外一个新用户以同一个 IP 在该主题回复。查看站点设置的 flag_sockpuppets。" spam_hosts: "新用户试图创建链接到同一个域名的多个帖子。查看站点设置的 newuser_spam_host_threshold。" @@ -1725,17 +1813,145 @@ zh_CN: 编辑本主题的第一帖以改变 %{page_name} 页面的内容。 guidelines_topic: title: "FAQ/指引" - body: "\n\n## [文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是硬性规定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的公开论坛。\n\n\n\n## [改善讨论](#improve)\n\n帮助我们做一些帮助改善讨论的事，这样能帮助我们让这个地方变成一个参与讨论的好地方。\n\n这里被讨论的主题对我们很重要，并且如果他们对你也很重要，请和我们一样严肃对待他们。即使你不同意别人的话，但是也要尊重正在讨论这些主题的人们。\n\n改进讨论的一个方式是探索已经发生过的事。请在回复或者开始你自己的主题前花一些时间浏览，这样你更有机会遇见和你有共同爱好的人。\n\n\n\n## [尊重，当你不同意时](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回应帖子的语气而不是它的真正内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。\n\n\n\n## [你的参与有价值](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与那些让论坛变成一个有意思的地方，来帮助我们改善社群的未来 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复、编辑或者其他。使用这些工具改善你自己的体验，和其他人的体验。\n\n让我们留下一个比发现它之前更好的社群。\n\n\n\n## [如果你看见了一个问题，标记它](#flag-problems)\n\n版主有特别的权力；他们对论坛负责。但是你也是。通过你的帮助，版主能促进社群的发展，而不是守卫或者警察。\n\n当你见到不合适的行为，不要回应它。这种承认变相鼓励了这种不合适的行为，浪费了你的经历，并且浪费了每一个人的时间。_是要标记它。_如果收到了足够的标记，会有相应的处理，无论是自动地或版主的介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和其他用户的权力。版主不能预览任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。\n\n\n\n## [永远文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为会冒犯、滥用或招致怨恨的言论。\n* 保持干净。不要发表任何淫秽或性暗示的东西。\n* 尊重其他人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款没有准确的定义 — 避免任何_可能_的这些事。如果你不确定，问问自己这些是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意语言、链接和家庭和朋友的图片的安全。\n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类开始一个新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字信息。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何不符合其他法律的事。\n\n\n\n## [有你参与](#power) \n\n这个站点由[一群友善的职员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站务](/c/meta)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[职员页面](/about)联系我们。\n\n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（或者我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" + body: "\n\n## [这是一个文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是死规矩或者是草率决定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的文明的公开论坛。 \n\n\n\n## [改善讨论](#improve)\n\n帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。\n\n这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。\n\n改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。 \n\n\n\n## [即使你不同意他人时，尊重他人](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回复帖子无关于帖子的内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。 \n\n\n\n## [你的参与有意义](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。\n\n让我们创造一个更美好的社群。\n\n\n\n## [如果你发现问题了，标记它](#flag-problems)\n版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社群监察者，而不仅是守卫或者警察。\n\n当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。 \n\n\n\n## [永远保持文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。\n* 拒绝色情。不要发表任何淫秽或性暗示的东西。\n* 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款不是法律条文，并且没有准确的定义 — 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意发表的语言、链接和图片，不要在其中包含你的家庭和朋友。 \n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类发表新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [只发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字资产。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何违反法律的内容。 \n\n\n\n## [有你参与](#power)\n\n这个站点由[一群友善的职员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站点反馈](/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[职员页面](/about)联系我们。\n\ + \n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" tos_topic: title: "服务条款" - body: "下面的条款及条件适用于 %{company_domain} 网站的所有内容、服务和产品，其方式通过网站，其中包括，但不限于 %{company_domain} 论坛软件、%{company_domain} 支持论坛和在 %{company_domain} 托管服务（“托管”）（一起称为，网站）。该网站属于 %{company_full_name}（“%{company_name}”）并由其运营。该网站要求你必须接受所有本文中所包含的条款和条件以及其他所有的规则、政策（包括修改，但不限于 %{company_domain} 的[隐私政策](/privacy)、[社群准则](/FAQ)和程序（统称“协议”），并可能不时由 %{company_name} 发布。\n\n访问或使用本网站之前，请仔细阅读本协议。访问或使用网站的任何部分，即代表你同意成为受本协议的条款和条件。如果你不同意所有的条款和本协议的条件，那么你可能无法访问网站或使用任何服务。若这些条款和条件被认为是与 %{company_name} 的合同，则你必须接受这些条款。本网站只提供给 13 岁以上个人。\n\n \n\n## [1. 你的 %{company_domain} 帐号]（#1） \n\n如果你在网站上创建一个帐户，你有责任维护你的帐号安全，你对帐户下发生的所有活动完全负责。你必须立即通知 %{company_name} 关于你的帐户的任何未经授权或任何其他违反安全的使用。%{company_name} 不会对你的任何行或不作为，包括因该等作为或不作为而导致的任何种类的任何损失承担任何责任。 \n\n \n\n## [2. 提供者的责任]（#2） \n\n如果你张贴的材料有关于别的网站的链接，或以其他方式（或允许任何第三方进行）张贴别的网站的材料（不论何等材料，“内容”），你需对此完全负责，包括使用因该内容所造成的任何损害。不管所讨论的内容是文字、图形、音频文件或计算机软件。你声明和保证： \n\n* 下载、复制和使用内容不会侵犯专有权利，包括但不限于著作权，专利，商标或商业秘密权利的任何第三方；\n* 如果你的雇主对你的创造拥有知识产权，你必须以(i)获准从你的雇主发布或提供的内容，包括但不限于任何软件，或(ii)由你的雇主放弃拥有内容的所有权利；\n* 你已完全遵守有关该内容的第三方条约，并同意了所有面向最终用户所需的任何条款；\n* 内容不包含或安装任何病毒、蠕虫、恶意软件、特洛伊木马或其他有害或破坏性的内容；\n* 内容不是垃圾，不是机器的或随机生成的，并且不包含设计来吸引流量到第三方网站或助推第三方网站的搜索引擎排名，或者进一步非法行为不道德或不想要的广告内容（诸如网络钓鱼）或误导接受者为对材料的来源（如欺骗）；\n* 内容不色情，不包含威胁或煽动暴力，并没有侵犯任何第三方的隐私或公开权；\n* 你的内容不是不受欢迎的电子讯息，如新闻组垃圾链接、邮件列表、博客和网站，以及类似的不请自来的宣传方式宣传；\n* 你的内容不是在误导读者，以你是另外一个人或公司的方式；和 \n* 你应在内容中包含计算机代码，准确地分类和/或所描述的类型、性质、用途和材料的影响，是否请求 %{company_name} 或以其他方式这样做的情况下。 \n\n \n\n## [3.用户内容授权]（#3） \n\n用户贡献使用 [知识共享 署名-非商业性使用-相同方式共享3.0 Unported之许可](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh_CN)授权。在不限制任何该等陈述或保证的情况下，%{company_name} 有权利（但没有义务）在 %{company_name} 的全权酌情决定下(i)根据 %{company_name} 的合理意见，任何违反 %{company_name} 政策或以任何方式伤害或使他人反感的情况能拒绝或删除任何内容；或(ii)以任何理由终止或拒绝任何个人和组织访问和使用本网站。%{company_name} 有唯一裁量权。%{company_name} 没有义务退还先前支付的任何款项。 \n\n\n \n\n## [4. Payment and Renewal](#4)\n\n### General Terms\n\nOptional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated.\ - \ Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.\n\n### Automatic Renewal\n\nUnless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.\n\n\n\n## [5. Services](#5)\n\n### Hosting, Support Services\n\nOptional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.\n\n\n\n## [6. Responsibility of Website Visitors](#6)\n\n%{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions,\ - \ stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.\n\n\n\n## [7. Content Posted on Other Websites](#7)\n\nWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.\n\n\n\n## [8. Copyright Infringement and DMCA Policy](#8)\n\nAs %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination,\ - \ %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.\n\n\n\n## [9. Intellectual Property](#9)\n\nThis Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.\n\n\n\n## [10. Advertisements](#10)\n\n%{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\n\n\n\n## [11. Attribution](#11)\n\n%{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.\n\n\n\n## [12. Changes](#12)\n\n%{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions\ - \ of this Agreement.\n\n\n\n## [13. Termination](#13)\n\n%{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.\n\n\n\n## [14. Disclaimer of Warranties](#14)\n\nThe Website is provided \"as is\". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\n\n\n## [15. Limitation of Liability](#15)\n\nIn no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond\ - \ their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.\n\n\n\n## [16. General Representation and Warranty](#16)\n\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.\n\n\n\n## [17. Indemnification](#17)\n\nYou agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.\n\n\n\n## [18. Miscellaneous](#18)\n\nThis Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual\ - \ property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.\n\n这份文件以 CC-BY-SA 授权下发布。最后更新时间为2013年5月31日。 \n\n本来改编自[WordPress的服务条款](http://en.wordpress.com/tos/)。\n" + body: | + The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). + + Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. + + + + ## [1. Your %{company_domain} Account](#1) + + If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. + + + + ## [2. Responsibility of Contributors](#2) + + If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: + + * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; + * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; + * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; + * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; + * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); + * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; + * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; + * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and + * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. + + + + ## [3. User Content License](#3) + + User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. + + + + + ## [4. Payment and Renewal](#4) + + ### General Terms + + Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. + + ### Automatic Renewal + + Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. + + + + ## [5. Services](#5) + + ### Hosting, Support Services + + Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. + + + + ## [6. Responsibility of Website Visitors](#6) + + %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. + + + + ## [7. Content Posted on Other Websites](#7) + + We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. + + + + ## [8. Copyright Infringement and DMCA Policy](#8) + + As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. + + + + ## [9. Intellectual Property](#9) + + This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. + + + + ## [10. Advertisements](#10) + + %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. + + + + ## [11. Attribution](#11) + + %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. + + + + ## [12. Changes](#12) + + %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. + + + + ## [13. Termination](#13) + + %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. + + + + ## [14. Disclaimer of Warranties](#14) + + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + + + + ## [15. Limitation of Liability](#15) + + In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. + + + + ## [16. General Representation and Warranty](#16) + + You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. + + + + ## [17. Indemnification](#17) + + You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. + + + + ## [18. Miscellaneous](#18) + + This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. + + This document is CC-BY-SA. It was last updated May 31, 2013. + + Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "隐私政策" body: | @@ -1755,10 +1971,10 @@ zh_CN: 从你那收集的任何数据将以以下方式使用： - * 改进你的个人体验 — 你的信息帮助我们更好地满足你的个人需求。 - * 改进我们的站点 — 我们基于信息和我们从你那收到的反馈不断地试图改进我们的站点。 - * 改善我们的客户服务 — 你的信息帮助我们更有效地回应用户服务请求和支持。 - * 用于发送阶段性的邮件 — 你提供的邮件地址可能用于接受信息、你想看到的通知或与你用户名有关的回复和询问，或是其他的请求和问题。 + * 改进你的个人体验 — 你的信息帮助我们更好地满足你的个人需求。 + * 改进我们的站点 — 我们基于信息和我们从你那收到的反馈不断地试图改进我们的站点。 + * 改善我们的客户服务 — 你的信息帮助我们更有效地回应用户服务请求和支持。 + * 用于发送阶段性的邮件 — 你提供的邮件地址可能用于接受信息、你想看到的通知或与你用户名有关的回复和询问，或是其他的请求和问题。 @@ -1772,8 +1988,8 @@ zh_CN: 我们将善意地： - * 保存 90 天内的所有向服务器的包含 IP 地址的请求。 - * 保存 5 年内已注册用户和与他们的帖子有关的 IP 地址。 + * 保存 90 天内的所有向服务器的包含 IP 地址的请求。 + * 保存 5 年内已注册用户和与他们的帖子有关的 IP 地址。 @@ -1799,8 +2015,7 @@ zh_CN: ## [儿童在线隐私保护法案合规](#coppa) - 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据 COPPA（[儿童在线隐私保护法案合规 - ](http://en.wikipedia.org/wiki/Children)），不要使用这个站点。 + 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据 COPPA（[儿童在线隐私保护法案合规](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)），不要使用这个站点。 @@ -1823,100 +2038,79 @@ zh_CN: 文档以 CC-BY-SA 发布。最后更新时间为2013年5月31日。 static: search_help: | -

    小技巧

    +

    小技巧

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

    -

    选项

    +

    选项

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

    -

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

    +

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

    badges: long_descriptions: autobiographer: | - 啦啦啦 - 啦啦啦 + 该徽章授予给填写了用户页面并选择了用户头像的成员。让社群更多地了解你是谁以及你感兴趣的内容能帮助创造一个更好的更团结的社群。 first_like: | - 啦啦啦 - 啦啦啦 - first_link: | - 啦啦啦 - 啦啦啦 + 该徽章授予给第一次使用 :heart: 按钮赞了帖子的成员。给帖子点赞是一个极好的让社群成员知道他们的帖子有意思、有用、酷炫或者好玩的方法。分享爱！ + first_link: |+ + 该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。 + first_quote: | - 啦啦啦 - 啦啦啦 + 该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。 first_share: | - 啦啦啦 - 啦啦啦 - read_guidelines: | - 啦啦啦 - 啦啦啦 + 该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社群增长。 + read_guidelines: |+ + 该徽章授予给阅读了社群指引的成员。遵守和分享简单的指引能帮助打造一个安全、有趣和可持续的社群。 + reader: | - 啦啦啦 - 啦啦啦 + 该徽章授予给阅读了一个较长的主题的成员。阅读是最基础的。详细阅读帮助你更好地了解讨论并帮助你编写更好的、更完整的回复。 editor: | - 啦啦啦 - 啦啦啦 + 该徽章授予给编辑自己帖子的成员。任何时候都不要犹豫编辑你的帖子以改善他们、改正小错误或者增加你忘记的内容。 first_flag: | - 标记对你社群的健康及其重要。如果你注意任何需要版主注意的帖子，请不要犹豫直接标记。当你达到信任等级 1 时，你也可以使用标记对话框发送消息给用户。 + 该徽章授予给标记过帖子的用户。标记对社群的健康很重要。如果你注意到了任何需要版主注意的帖子，请不要犹豫，直接标记 它。你可能也使用了标记对话框向用户发送了消息。 nice_share: | - 啦啦啦 - 啦啦啦 + 该徽章授予给分享帖子的链接至超过 25 个外部访客的成员。干得好！分享有趣的讨论给朋友是一个帮助社群成长的极好方式。 welcome: | - 啦啦啦 - 啦啦啦 + 该徽章授予给帖子收到了第一个赞的成员。恭喜，有社群成员发现你发表的内容有意思、酷炫或者有用！ anniversary: | - 啦啦啦 - 啦啦啦 + 该徽章授予给在社群超过一年并且这一年中至少发布了一个帖子的成员。谢谢你的关注和对我们社群的贡献！ good_share: | - 啦啦啦 - 啦啦啦 + 该徽章授予给分享帖子的链接至超过 300 个外部访客的成员。做得真棒！你已经把一个有意思的讨论分享给了许多新人，并且帮助了社群成长。 great_share: | - 啦啦啦 - 啦啦啦 - nice_post: | - 啦啦啦 - 啦啦啦 + 该徽章授予给分享帖子的链接至超过 100 个外部访客的成员。哇！你已经把一个有趣的主题分享给了许多新读者，并且帮助了社群成长。 + nice_post: |+ + 该徽章授予给创建了得到 10 个赞的回复的成员。干得好！ + nice_topic: | - 啦啦啦 - 啦啦啦 + 该徽章授予给创建了得到 10 个赞的主题的成员。干得好！ good_post: | - 啦啦啦 - 啦啦啦 + 该徽章授予给创建了得到 25 个赞的回复的成员。干得好！ good_topic: | - 啦啦啦 - 啦啦啦 + 该徽章授予给创建了得到 25 个赞的主题的成员。干得好！ great_post: | - 啦啦啦 - 啦啦啦 + 该徽章授予给创建了得到 50 个赞的帖子的成员。哇！ great_topic: | - 啦啦啦 - 啦啦啦 + 该徽章授予给创建了得到 50 个赞的回复的成员。哇！ basic: | - 啦啦啦 - 啦啦啦 + 该徽章授予给用户等级达到 1 的成员。感谢你在社群里花了一些时间并且阅读了一些帖子，了解了我们的社群。你的新用户限制已经被取消，并且你已经被授予了所有基本的社群权限，必须个人消息、标记、维基编辑和发布图片和多个链接的能力。 member: | - 啦啦啦 - 啦啦啦 + 该徽章授予给用户等级达到 2 的成员。感谢你在社群的这几周时间。你现在已经可以在你的用户页或者主题中发送私人邀请、创建群组消息，以及每天可以赞更多次了。 regular: | - 啦啦啦 - 啦啦啦 + 该徽章授予给用户等级达到 3 的成员。感谢你在社群的这几月的活跃参与，并且是我们最活跃的读者质疑，也是社群中的可靠贡献者。你现在可以重新分类和重命名主题、访问隐藏的贵宾分类、使用更多强大的防骚扰标记功能，以及每天可以赞更多次了。 leader: | - 啦啦啦 - 啦啦啦 + 该徽章授予给用户等级达到 4 的成员。你是由职员选择的社群领袖，鉴于你在社群的话语和贡献，你为社群树立了一个正面的例子。你有权限编辑所有的帖子，使用主题管理操作，例如置顶、关闭、不在列表中显示、存档、分割和合并，并且可以每天点赞非常多次。 admin_login: success: "邮件已发送" error: "错误！" @@ -1924,3 +2118,6 @@ zh_CN: submit_button: "发送邮件" discourse_hub: access_token_problem: "告诉管理员：请更新站点设置，应使用正确的 discourse_org_access_key。" + performance_report: + initial_post_raw: 这个主题包括你网站的每日性能报告 + initial_topic_title: 网站性能报告 diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 0521ed3cd9..188a26cd84 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -192,7 +192,6 @@ zh_TW: no_info_other: "
    %{name} 尚未在他/她自我簡介中的“關於我”部分填寫任何資訊
    " vip_category_name: "貴賓室" vip_category_description: "信任等級高於 3 的用戶討論的分類" - meta_category_name: "Meta" meta_category_description: "討論這個網站、整體的組織規劃、社群的運作方式、以及我們該如何改善這些事務。" staff_category_name: "管理員" staff_category_description: "讓工作人員進行討論的私人分類。此分類下的討論話題只有管理員與板主才看得到。" @@ -295,7 +294,6 @@ zh_TW: please_continue: "繼續連接至 %{site_name}" error: "修改你的電郵位址時發生錯誤，可能此郵箱已有人使用了。" activation: - action: "啟用您的帳號" already_done: "抱歉，此帳號啟用連結已經失效。可能你的帳號已經啟用了。" please_continue: "你的新帳號已啟用；即將轉到主頁。" continue_button: "繼續連接至 %{site_name}" @@ -499,7 +497,6 @@ zh_TW: s3_config_warning: '伺服器被設定為上傳文件到 s3，但是至少有一個值未被設定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到設定更新此設定。參考如何設置圖片上傳至 S3。' s3_backup_config_warning: '伺服器被設置為上傳備份到 s3，但是至少有一個值未被設定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到設定更新此設定。參考如何設置圖片上傳至 S3。' image_magick_warning: '伺服器被設置為給大圖片創建縮略圖，但是 ImageMagick 沒有被安裝。使用你喜愛的包裝管理器安裝 ImageMagick 或下載最新版。' - failing_emails_warning: '%{num_failed_jobs}個 email 任務失敗。請檢查 config/environments/production.rb 內 config.action_mailer 項目是否已正確設定。在 Sidekiq 中檢視失敗的任務。' default_logo_warning: "設置你網站的圖形logo。請在設定中配置logo_url、logo_small_url和favicon_url。" contact_email_missing: "輸入一個網站聯絡人的電郵地址，這樣在用戶在網站出現緊急狀況時能夠找到你。在設定中更新它。" contact_email_invalid: "網站聯絡電郵不正確。在設定中修改。" @@ -547,7 +544,6 @@ zh_TW: min_topic_title_length: "標題允許的最小文字數" max_topic_title_length: "標題允許的最大文字數" min_search_term_length: "搜尋條件允許的最小文字數" - allow_uncategorized_topics: "允許發表未分類的討論話題" uncategorized_description: "\"未分類\"的分類的描述，留空則無描述" allow_duplicate_topic_titles: "允許話題有相同，重複的標題" unique_posts_mins: "使用者再次發表包含相同內容文章的間隔時間" @@ -574,10 +570,6 @@ zh_TW: post_excerpt_maxlength: "文章摘要的最大文字長度" post_onebox_maxlength: "Onebox 處理後的 Discourse 帖子的最大字符長度" onebox_domains_whitelist: "對這些站點啟用 Onebox 的域名列表；這些域名應該支持 OpenGraph 或 oEmbed。在此測試它們：http://iframely.com/debug" - logo_url: "出現在你的網站左上角的標誌圖片；如果留空，將顯示網站標題。" - digest_logo_url: "電郵摘要使用的標誌。如果留空，則使用 `logo_url`。例如：http://example.com/logo.png" - logo_small_url: "出現在你網站左上角的小標誌圖片，當滾動後可見。如果留空，將顯示主頁圖標。" - favicon_url: "你的網站圖示 (favicon)，參考 http://zh.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Apple 觸碰設備使用的圖示，建議 144 X 144px 大小" notification_email: "這個表格：被用於發送所有重要系統郵件的郵箱地址。指定的域名必須正確設置 SPF、DKIM 和反向 PTR 記錄以發送郵件。" email_custom_headers: "自定義的電子郵件標題的管道分隔列表" @@ -594,8 +586,6 @@ zh_TW: polling_interval: "當不再長輪詢時，已登錄的客戶端應該多久輪詢一次（單位 毫秒）" anon_polling_interval: "匿名使用者用戶端輪詢時間間隔（單位 毫秒）" background_polling_interval: "客戶端輪詢的間隔，以毫秒計（當視窗在後台時）" - auto_track_topics_after: "經過多少毫秒之後一個討論話題就會被自動追蹤的全域預設值，用戶可以覆寫此設定 ( 0 為總是，-1 為永不 )" - new_topic_duration_minutes: "一個討論話題在多少分鐘之內被視為新的討論話題的全域預設值，用戶可以覆寫此設定 ( -1 為總是，-2 為上一次瀏覽 )" flags_required_to_hide_post: "一篇文章累計多少個投訴之後會被自動隱藏，並向文章作者發送私人訊息通知（0為從不）" cooldown_minutes_after_hiding_posts: "如果一個文章因為標記而隱藏，用戶需要等待多少分鐘才能編輯該文章" max_topics_in_first_day: "新用戶第一天在這個站最大能建立的話題數量" @@ -642,15 +632,11 @@ zh_TW: invite_passthrough_hours: "邀請號碼如已被使用，用戶仍可使用多少小時" invite_only: "已經禁止開放註冊，新的使用者必須取得其他用戶，或是管理員的邀請" login_required: "需要登入才能進入網站，不允許匿名操作" - min_username_length: "最少帳戶名長度。警告：所有現有帳戶名少於此長度限制的用戶都將無法登入網站。" - max_username_length: "最大帳戶名長度。警告：所有現有帳戶名大於此限制長度的用戶都將無法登入網站。" min_password_length: "最小密碼長度" block_common_passwords: "不允許使用 10,000 個最常用的密碼" enable_sso_provider: "在 /session/sso_provider endpoint 必須設定 sso_secret 以實現 Discourse SSO 提供方協定" sso_url: "單點登入 URL 入口點" sso_secret: "秘密字符串，用於驗證秘密的 SSO 訊息，請確保由 10 個字或以上組成" - sso_overrides_email: "用 SSO 訊息中的外部電郵地址覆蓋本機電郵地址（警告：因為對本機電郵的統一處理，這個電郵地址可能不同）" - sso_overrides_username: "用 SSO 訊息中的外部帳戶名覆蓋本機帳戶名（警告：因為對本機帳戶名的統一處理，帳戶名的長度或者要求可能不同）" sso_overrides_avatar: "用 SSO 訊息中的外部網站頭像覆蓋用戶頭像。如果啟用，建議禁用 allow_uploaded_avatars" enable_local_logins: "啟用網站用戶名稱和密碼驗證 ( 注意：這必須啟用邀請才能有動作 )" allow_new_registrations: "允許新用戶註冊，如果取消選取，則沒有人能夠註冊" @@ -669,7 +655,6 @@ zh_TW: github_client_secret: "Github 帳號驗證的用戶端密碼（Client secret），到 https://github.com/settings/applications 來註冊獲取" allow_restore: "允許還原資料，注意此動作可能覆蓋「所有」網站資料！除非你計畫還原備份檔，否則請保持此設定為 false" maximum_backups: "磁碟備份的最大數量，舊的將會自動刪除" - backup_daily: "每日自動對網站進行備份" enable_s3_backups: "當完成備份後上傳備份到 S3。重要：需要在文件設定中填寫有效的 S3 驗證資料。" s3_backup_bucket: "遠端備份 bucket ，注意：請確定是私有的 bucket" active_user_rate_limit_secs: "更新“最後一次見到”資料的頻率，單位為秒" @@ -759,7 +744,6 @@ zh_TW: newuser_spam_host_threshold: "用戶在一篇文章中能添加多少此指向同一主機的連結，取決於之前該使用者有`newuser_spam_host_threshold`篇文章被認為是垃圾文章。" white_listed_spam_host_domains: "域名的白名單列表，新用戶可以任意連結到這些主機，而不會因防止廣告的測試過濾被檔下" staff_like_weight: "管理員按讚時所給予的額外加權係數。" - topic_view_duration_hours: "計算每個IP/用戶每N小時一次新的查看話題" levenshtein_distance_spammer_emails: "當比對廣告Email時，數字與文字將仍使用模糊比對" max_new_accounts_per_registration_ip: "如果已經有了從這個 IP 創建的 (n) 個信任等級0的賬戶（並且沒有一個是職員或者是信任等級2以上的用戶），不再允許來自該 IP 地址的註冊請求。" min_ban_entries_for_roll_up: "當點擊折疊按鈕且不少於 (N) 條記錄時，將會創建一個子網禁止記錄。" @@ -772,18 +756,13 @@ zh_TW: delete_user_max_post_age: "不允許刪除首發表文章超過 (x) 天的用戶" email_editable: "允許用戶在註冊後改變他們的 EMail" logout_redirect: "登出後移到的網址。如：(http://somesite.com/logout)" - allow_uploaded_avatars: "允許用戶上傳自定義的個人圖示" - allow_animated_avatars: "允許使用者使用 GIF 動畫當個人圖示，警告：這會執行 avatars:refresh 這個 rake task" allow_animated_thumbnails: "為 gif 動畫生成動態縮略圖。" default_avatars: "新用戶將會使用的默認頭像的網址。" automatically_download_gravatars: "當用戶註冊或更改EMail時下載 Gravatars 圖片" digest_topics: "EMail 摘要中顯示的最大話題數量" digest_min_excerpt_length: "EMail 摘要中每篇文章最少顯示的字元數量" - default_digest_email_frequency: "用戶收到摘要郵件的默認間隔。用戶可以在設定中更改。" suppress_digest_email_after_days: "不發送摘要郵件給超過 (n) 天閒置的用戶。" disable_digest_emails: "禁用發送摘要郵件給所有用戶。" - default_external_links_in_new_tab: "以新分頁開啟所有外部連結，用戶可於個人偏好設定更改設定。" - detect_custom_avatars: "是否檢測用會上傳了自訂的個人圖示" max_daily_gravatar_crawls: "一天內 Discourse 將自動檢查 Gravatar 自訂個人圖示的次數" public_user_custom_fields: "用戶可設定公開顯示的自定欄位白名單。" staff_user_custom_fields: "用戶可設定只給管理員顯示的自定欄位白名單。" @@ -793,7 +772,6 @@ zh_TW: invites_per_page: "默認在用戶頁顯示的邀請。" autohighlight_all_code: "即使未顯示特定語言，仍為所有預編排程式套用程式碼顏色提示" embed_truncate: "截斷 embed 過的文章" - embed_category: "embedded 話題的分類" embed_post_limit: "文章內 embed 的最大數量" embed_whitelist_selector: "在 embeds 頁面允許 CSS 元素選擇器" embed_blacklist_selector: "在 embeds 頁面移除 CSS 元件選擇器" @@ -837,11 +815,6 @@ zh_TW: most_posts: "大部分文章" most_recent_poster: "當前大部分文章作者" frequent_poster: "頻繁發文者" - move_posts: - new_topic_moderator_post: - other: "移動了 %{count} 篇文章到新的標題: %{topic_link}" - existing_topic_moderator_post: - other: "移動了 %{count} 篇文章到已存在的標題: %{topic_link}" change_owner: post_revision_text: "所有權從 %{old_user} 轉移至 %{new_user}" topic_statuses: @@ -877,7 +850,6 @@ zh_TW: characters: "必須只包含字母和數位" unique: "必須是唯一的" blank: "必須存在" - must_begin_with_alphanumeric: "必須以字母或數位開頭" email: not_allowed: "本站不允許使用該郵箱服務商提供的電子郵箱，請使用其它郵箱位址。" blocked: "不被允許。" @@ -968,7 +940,6 @@ zh_TW: other: "%{count} 個用戶等待審核" download_remote_images_disabled: subject_template: "停用下載遠端圖片" - unsubscribe_link: "如果你希望取消這些郵件的訂閱，請瀏覽 [用戶偏好設定](%{user_preferences_url})。" subject_re: "回覆：" subject_pm: "[私訊]" user_notifications: @@ -1061,7 +1032,6 @@ zh_TW: signup_after_approval: subject_template: "你已受到 %{site_name} 的認可！" signup: - subject_template: "[%{site_name}] 啟用你的新帳號" text_body_template: | 歡迎來到 %{site_name}！ @@ -1085,8 +1055,6 @@ zh_TW: pasted_image_filename: "貼上的圖片" store_failure: "用戶 #%{user_id} 上傳 #%{upload_id} 儲存失敗" images: - fetch_failure: "抱歉，獲取圖片時發生錯誤。" - unknown_image_type: "抱歉，你上傳的檔似乎不是一張圖片。" size_not_found: "抱歉，我們無法獲取圖片大小，請檢查你的圖片是否已損壞。" flag_reason: spam_hosts: "此新用戶嘗試發表多篇含有指向相同網域之連結的文章。請見網站設定中的 newuser_spam_host_threshold。" @@ -1120,3 +1088,8 @@ zh_TW: title: "服務條款" privacy_topic: title: "隱私政策" + admin_login: + success: "已發送郵件" + error: "錯誤" + email_input: "管理者郵件" + submit_button: "送出電子郵件" diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf index e8f326d7a6..712b991e86 100644 --- a/config/nginx.sample.conf +++ b/config/nginx.sample.conf @@ -25,8 +25,12 @@ map $http_x_forwarded_proto $thescheme { https https; } +log_format log_discourse '[$time_local] $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"'; + server { + access_log /var/log/nginx/access.log log_discourse; + listen 80; gzip on; gzip_vary on; @@ -80,12 +84,23 @@ server { root $public; add_header ETag ""; - location ~* \.(eot|ttf|woff|woff2|ico)$ { + location ~* assets/.*\.(eot|ttf|woff|woff2|ico)$ { expires 1y; add_header Cache-Control public; add_header Access-Control-Allow-Origin *; } + location = /srv/status { + access_log off; + log_not_found off; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $thescheme; + proxy_pass http://discourse; + break; + } + location ~ ^/assets/ { expires 1y; # asset pipeline enables this @@ -101,7 +116,7 @@ server { } # cache emojis - location ~ /_?emoji/ { + location ~ /_?emoji.*\.(png|gif|jpg|jpeg)$/ { expires 1y; add_header Cache-Control public; } @@ -158,7 +173,7 @@ server { # This big block is needed so we can selectively enable # acceleration for backups and avatars # see note about repetition above - location ~ ^/(letter_avatar|user_avatar|highlight-js|stylesheets) { + location ~ ^/(letter_avatar|user_avatar|highlight-js|stylesheets|favicon/proxied) { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/config/redis.yml b/config/redis.yml deleted file mode 100644 index 5e8b2b5c34..0000000000 --- a/config/redis.yml +++ /dev/null @@ -1,21 +0,0 @@ -defaults: &defaults - host: <%= GlobalSetting.redis_host %> - port: <%= GlobalSetting.redis_port %> - password: <%= GlobalSetting.redis_password %> - db: <%= GlobalSetting.redis_db %> - -development: - <<: *defaults - -profile: - <<: *defaults - -test: - <<: *defaults - db: 1 - -staging: - <<: *defaults - -production: - <<: *defaults diff --git a/config/routes.rb b/config/routes.rb index c6fbdca9c1..187b51d2cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,8 @@ require_dependency "permalink_constraint" # This used to be User#username_format, but that causes a preload of the User object # and makes Guard not work properly. -USERNAME_ROUTE_FORMAT = /[A-Za-z0-9\_]+/ unless defined? USERNAME_ROUTE_FORMAT +USERNAME_ROUTE_FORMAT = /[A-Za-z0-9\_.\-]+/ unless defined? USERNAME_ROUTE_FORMAT + BACKUP_ROUTE_FORMAT = /[a-zA-Z0-9\-_]*\d{4}(-\d{2}){2}-\d{6}\.(tar\.gz|t?gz)/i unless defined? BACKUP_ROUTE_FORMAT Discourse::Application.routes.draw do @@ -23,7 +24,11 @@ Discourse::Application.routes.draw do mount Logster::Web => "/logs", constraints: AdminConstraint.new end - resources :about + resources :about do + collection do + get "live_post_counts" + end + end resources :directory_items @@ -65,6 +70,7 @@ Discourse::Application.routes.draw do get "groups/:type" => "groups#show", constraints: AdminConstraint.new get "groups/:type/:id" => "groups#show", constraints: AdminConstraint.new + get "users/:id.json" => 'users#show' , id: USERNAME_ROUTE_FORMAT, defaults: {format: 'json'} resources :users, id: USERNAME_ROUTE_FORMAT do collection do get "list/:query" => "users#index" @@ -132,7 +138,11 @@ Discourse::Application.routes.draw do get "customize" => "color_schemes#index", constraints: AdminConstraint.new get "customize/css_html" => "site_customizations#index", constraints: AdminConstraint.new + get "customize/css_html/:id/:section" => "site_customizations#index", constraints: AdminConstraint.new get "customize/colors" => "color_schemes#index", constraints: AdminConstraint.new + get "customize/permalinks" => "permalinks#index", constraints: AdminConstraint.new + get "customize/embedding" => "embedding#show", constraints: AdminConstraint.new + put "customize/embedding" => "embedding#update", constraints: AdminConstraint.new get "flags" => "flags#index" get "flags/:filter" => "flags#index" post "flags/agree/:id" => "flags#agree" @@ -140,14 +150,17 @@ Discourse::Application.routes.draw do post "flags/defer/:id" => "flags#defer" resources :site_customizations, constraints: AdminConstraint.new scope "/customize" do - resources :site_text, constraints: AdminConstraint.new + resources :site_texts, constraints: AdminConstraint.new resources :site_text_types, constraints: AdminConstraint.new resources :user_fields, constraints: AdminConstraint.new resources :emojis, constraints: AdminConstraint.new end + resources :embeddable_hosts, constraints: AdminConstraint.new resources :color_schemes, constraints: AdminConstraint.new + resources :permalinks, constraints: AdminConstraint.new + get "version_check" => "versions#show" resources :dashboard, only: [:index] do @@ -250,6 +263,7 @@ Discourse::Application.routes.draw do get "users/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} + get "users/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json} get "users/:username" => "users#show", as: 'user', constraints: {username: USERNAME_ROUTE_FORMAT} put "users/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT} put "users/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -268,6 +282,8 @@ Discourse::Application.routes.draw do get "users/:username/staff-info" => "users#staff_info", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/invited" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT} + get "users/:username/invited_count" => "users#invited_count", constraints: {username: USERNAME_ROUTE_FORMAT} + get "users/:username/invited/:filter" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT} post "users/action/send_activation_email" => "users#send_activation_email" get "users/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -275,14 +291,16 @@ Discourse::Application.routes.draw do get "users/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} delete "users/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT} - get "users/by-external/:external_id" => "users#show" + # The external_id constraint is to allow periods to be used in the value without becoming part of the format. ie: foo.bar.json + get "users/by-external/:external_id" => "users#show", constraints: {external_id: /[^\/]+/} get "users/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/deleted-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} - get "user-badges/:username" => "user_badges#username" + get "user-badges/:username.json" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json} + get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT} - post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar" - get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/ } - get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/ } + post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: {username: USERNAME_ROUTE_FORMAT} + get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT} + get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT } get "highlight-js/:hostname/:version.js" => "highlight_js#show", format: false, constraints: { hostname: /[\w\.-]+/ } @@ -364,6 +382,7 @@ Discourse::Application.routes.draw do resources :categories, :except => :show post "category/:category_id/move" => "categories#move" + post "categories/reorder" => "categories#reorder" post "category/:category_id/notifications" => "categories#set_notifications" put "category/:category_id/slug" => "categories#update_slug" @@ -390,7 +409,7 @@ Discourse::Application.routes.draw do end Discourse.filters.each do |filter| - get "#{filter}" => "list##{filter}" + get "#{filter}" => "list##{filter}", constraints: { format: /(json|html)/ } get "c/:category/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}" get "c/:category/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}" get "c/:parent_category/:category/l/#{filter}" => "list#parent_category_category_#{filter}", as: "parent_category_category_#{filter}" @@ -400,6 +419,7 @@ Discourse::Application.routes.draw do get "top" => "list#top" get "search/query" => "search#query" + get "search" => "search#show" # Topics resource get "t/:id" => "topics#show" @@ -409,7 +429,10 @@ Discourse::Application.routes.draw do put "topics/bulk" put "topics/reset-new" => 'topics#reset_new' post "topics/timings" - get "topics/similar_to" + + get 'topics/similar_to' => 'similar_topics#index' + resources :similar_topics + get "topics/feature_stats" get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: {username: USERNAME_ROUTE_FORMAT} get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -418,16 +441,19 @@ Discourse::Application.routes.draw do get 'embed/comments' => 'embed#comments' get 'embed/count' => 'embed#count' + get 'embed/info' => 'embed#info' get "new-topic" => "list#latest" # Topic routes get "t/id_for/:slug" => "topics#id_for_slug" get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/} - get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: {topic_id: /\d+/} get "t/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/} - get "t/:slug/:topic_id/summary" => "topics#show", defaults: {summary: true}, constraints: {topic_id: /\d+/, post_number: /\d+/} - get "t/:topic_id/summary" => "topics#show", constraints: {topic_id: /\d+/, post_number: /\d+/} + get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: {topic_id: /\d+/} + get "t/:slug/:topic_id/summary" => "topics#show", defaults: {summary: true}, constraints: {topic_id: /\d+/} + get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/} + get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/} + get "t/:topic_id/summary" => "topics#show", constraints: {topic_id: /\d+/} put "t/:slug/:topic_id" => "topics#update", constraints: {topic_id: /\d+/} put "t/:slug/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/} put "t/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/} @@ -454,6 +480,7 @@ Discourse::Application.routes.draw do post "t/:topic_id/move-posts" => "topics#move_posts", constraints: {topic_id: /\d+/} post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: {topic_id: /\d+/} post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: {topic_id: /\d+/} + put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: {topic_id: /\d+/} delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: {topic_id: /\d+/} put "t/:topic_id/bookmark" => "topics#bookmark", constraints: {topic_id: /\d+/} put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: {topic_id: /\d+/} @@ -477,6 +504,7 @@ Discourse::Application.routes.draw do end end post "invites/reinvite" => "invites#resend_invite" + post "invites/link" => "invites#create_invite_link" post "invites/disposable" => "invites#create_disposable_invite" get "invites/redeem/:token" => "invites#redeem_disposable_invite" delete "invites" => "invites#destroy" @@ -503,6 +531,8 @@ Discourse::Application.routes.draw do get "cdn_asset/:site/*path" => "static#cdn_asset", format: false + get "favicon/proxied" => "static#favicon", format: false + get "robots.txt" => "robots_txt#index" Discourse.filters.each do |filter| diff --git a/config/site_settings.yml b/config/site_settings.yml index c514c80297..cff228d7d9 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -12,6 +12,7 @@ # type: email - Must be a valid email address. # type: username - Must match the username of an existing user. # type: list - A list of values, chosen from a set of valid values defined in the choices option. +# type: enum - A single value, chosen from a set of valid values in the choices option. # # A type:list setting with the word 'colors' in its name will make color values have a bold line of the corresponding color # @@ -42,7 +43,6 @@ required: client: true default: '/images/d-logo-sketch-small.png' digest_logo_url: - client: false default: '' mobile_logo_url: client: true @@ -69,9 +69,7 @@ basic: default: 5 min: 0 limit_suggested_to_category: - client: false default: false - default_external_links_in_new_tab: false track_external_right_clicks: client: true default: false @@ -107,8 +105,9 @@ basic: post_menu: client: true type: list - default: 'like|share|flag|edit|bookmark|delete|admin|reply' + default: 'like-count|like|share|flag|edit|bookmark|delete|admin|reply' choices: + - like-count - like - edit - flag @@ -146,7 +145,11 @@ basic: category_style: client: true default: 'bullet' - enum: 'CategoryStyleSetting' + type: enum + choices: + - bar + - box + - bullet preview: 'Category' enable_mobile_theme: client: true @@ -168,12 +171,20 @@ basic: fixed_category_positions: client: true default: false + + fixed_category_positions_on_create: + client: true + default: false + show_subcategory_list: default: false client: true enable_badges: client: true default: true + enable_whispers: + client: true + default: false login: invite_only: @@ -191,6 +202,9 @@ login: allow_new_registrations: client: true default: true + enable_signup_cta: + client: true + default: true enable_google_oauth2_logins: client: true default: false @@ -258,6 +272,9 @@ users: default: 20 min: 8 max: 60 + reserved_usernames: + type: list + default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support" min_password_length: client: true default: 8 @@ -270,7 +287,6 @@ users: default: '' hidden: true username_change_period: 3 - auto_track_topics_after: 240000 email_editable: true logout_redirect: client: true @@ -364,7 +380,9 @@ posting: min_body_similar_length: client: true default: 15 - enable_private_messages: true + enable_private_messages: + default: true + client: true ninja_edit_window: 300 post_edit_time_limit: 86400 edit_history_visible_to_public: @@ -377,6 +395,9 @@ posting: traditional_markdown_linebreaks: client: true default: false + allow_html_tables: + client: true + default: false suppress_reply_directly_below: client: true default: true @@ -399,17 +420,17 @@ posting: newuser_max_links: 2 newuser_max_images: client: true - default: 0 + default: 1 newuser_max_attachments: client: true default: 0 - uncategorized_category_id: - default: -1 - hidden: true post_excerpt_maxlength: 300 display_name_on_posts: client: true default: false + show_time_gap_days: + default: 7 + client: true short_progress_text_threshold: client: true default: 10000 @@ -445,6 +466,9 @@ posting: approve_unless_trust_level: default: 0 enum: 'TrustLevelSetting' + notify_about_queued_posts_after: + default: 24 + min: 0 email: email_time_window_mins: @@ -453,9 +477,6 @@ email: email_posts_context: 5 digest_min_excerpt_length: 100 digest_topics: 20 - default_digest_email_frequency: - default: 7 - enum: 'DigestEmailSiteSetting' suppress_digest_email_after_days: 365 disable_digest_emails: default: false @@ -473,6 +494,7 @@ email: pop3_polling_port: 995 pop3_polling_username: '' pop3_polling_password: '' + log_mail_processing_failures: false email_in: default: false client: true @@ -488,12 +510,8 @@ email: short_email_length: 2800 files: - max_image_size_kb: - client: true - default: 3072 - max_attachment_size_kb: - client: true - default: 3072 + max_image_size_kb: 3072 + max_attachment_size_kb: 3072 authorized_extensions: client: true default: 'jpg|jpeg|png|gif' @@ -557,6 +575,14 @@ files: avatar_sizes: default: '20|25|32|45|60|120' type: list + external_system_avatars_enabled: + default: true + client: true + shadowed_by_global: true + external_system_avatars_url: + default: "https://avatars.discourse.org/letter/{first_letter}/{color}/{size}.png" + client: true + regex: '^https?:\/\/.+[^\/]' trust: default_trust_level: @@ -610,6 +636,7 @@ trust: tl3_promotion_min_duration: default: 14 min: 0 + max: 20000 tl3_requires_likes_given: default: 30 min: 0 @@ -660,6 +687,10 @@ spam: num_flaggers_to_close_topic: 5 num_flags_to_close_topic: 12 auto_respond_to_flag_actions: true + min_first_post_typing_time: 3000 + auto_block_fast_typers_on_first_post: true + auto_block_fast_typers_max_trust_level: 0 + auto_block_first_post_regex: "" rate_limits: unique_posts_mins: @@ -668,7 +699,7 @@ rate_limits: default: 5 rate_limit_create_topic: 15 rate_limit_create_post: 5 - rate_limit_new_user_create_topic: 60 + rate_limit_new_user_create_topic: 120 rate_limit_new_user_create_post: 30 max_topics_per_day: 20 max_private_messages_per_day: 20 @@ -678,7 +709,7 @@ rate_limits: max_edits_per_day: 30 max_invites_per_day: 10 max_topic_invitations_per_day: 30 - max_topics_in_first_day: 5 + max_topics_in_first_day: 3 max_replies_in_first_day: 10 tl2_additional_likes_per_day_multiplier: 1.5 tl3_additional_likes_per_day_multiplier: 2 @@ -722,27 +753,45 @@ developer: default: 15000 flush_timings_secs: client: true - default: 10 + default: 20 active_user_rate_limit_secs: 60 verbose_localization: default: false client: true + migrate_to_new_scheme: + hidden: true + default: false + max_tracked_new_unread: + default: 500 + client: true + hidden: true embedding: - embeddable_host: - default: '' - regex: "^(?!http).+" # don't allow this to start with http:// or https:// - feed_polling_enabled: false - feed_polling_url: '' + feed_polling_enabled: + default: false + hidden: true + feed_polling_url: + default: '' + hidden: true embed_by_username: default: '' type: username - embed_username_key_from_feed: '' - embed_category: '' - embed_post_limit: 100 - embed_truncate: false - embed_whitelist_selector: '' - embed_blacklist_selector: '' + hidden: true + embed_username_key_from_feed: + default: '' + hidden: true + embed_post_limit: + default: 100 + hidden: true + embed_truncate: + default: false + hidden: true + embed_whitelist_selector: + default: '' + hidden: true + embed_blacklist_selector: + default: '' + hidden: true legal: tos_url: @@ -757,21 +806,26 @@ legal: backups: allow_restore: - client: false default: false maximum_backups: client: true default: 7 - backup_daily: - client: false - default: false + shadowed_by_global: true + automatic_backups_enabled: + default: true + shadowed_by_global: true + backup_frequency: + min: 1 + max: 30 + default: 7 + shadowed_by_global: true enable_s3_backups: - client: false default: false + shadowed_by_global: true s3_backup_bucket: - client: false default: '' regex: "^[^A-Z_.]+$" # can't use '.' when using HTTPS + shadowed_by_global: true uncategorized: version_checks: @@ -788,14 +842,17 @@ uncategorized: default: 'ascii' enum: 'SlugSetting' + permalink_normalizations: + default: '' + type: list + # Search min_search_term_length: client: true default: 3 - max_similar_results: 7 + max_similar_results: 5 minimum_topics_similar: 50 - new_topic_duration_minutes: 2880 previous_visit_timeout_hours: 1 staff_like_weight: 3 topic_view_duration_hours: 8 @@ -856,6 +913,9 @@ uncategorized: sequential_replies_threshold: 2 dominating_topic_minimum_percent: 20 + # Reporting + daily_performance_report: false + global_notice: default: "" client: true @@ -863,6 +923,12 @@ uncategorized: default: false hidden: true + # Nothing past this threshold is ever considered new + # this is calculated dynamically every 15 minutes + min_new_topics_time: + default: 0 + hidden: true + # Category IDs lounge_category_id: default: -1 @@ -873,6 +939,13 @@ uncategorized: staff_category_id: default: -1 hidden: true + uncategorized_category_id: + default: -1 + hidden: true + + performance_report_topic_id: + default: -1 + hidden: true notify_about_flags_after: 48 @@ -888,7 +961,7 @@ uncategorized: disable_edit_notifications: false - vacuum_db_days: 90 + vacuum_db_days: 9000 last_vacuum: default: 0 hidden: true @@ -904,3 +977,38 @@ uncategorized: privacy_topic_id: default: -1 hidden: true + + show_logout_in_header: + default: false + client: true + +user_preferences: + default_email_digest_frequency: + enum: 'DigestEmailSiteSetting' + default: 7 + default_email_private_messages: true + default_email_direct: true + default_email_mailing_list_mode: false + default_email_always: false + + default_other_new_topic_duration_minutes: + enum: 'NewTopicDurationSiteSetting' + default: 2880 + default_other_auto_track_topics_after_msecs: + enum: 'AutoTrackDurationSiteSetting' + default: 240000 + default_other_external_links_in_new_tab: false + default_other_enable_quoting: true + default_other_dynamic_favicon: false + default_other_disable_jump_reply: false + default_other_edit_history_public: false + + default_categories_watching: + type: category_list + default: '' + default_categories_tracking: + type: category_list + default: '' + default_categories_muted: + type: category_list + default: '' diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb index 647b1f1735..1e3752218d 100644 --- a/config/unicorn.conf.rb +++ b/config/unicorn.conf.rb @@ -91,11 +91,25 @@ before_fork do |server, worker| rss * 1024 end + def max_allowed_size + [ENV['UNICORN_SIDEKIQ_MAX_RSS'].to_i, 500].max.megabytes + end + def out_of_memory? - max_allowed_size = [ENV['UNICORN_SIDEKIQ_MAX_RSS'].to_i, 500].max.megabytes; max_rss > max_allowed_size end + def force_kill_rogue_sidekiq + info = `ps -eo pid,rss,args | grep sidekiq | grep -v grep | awk '{print $1,$2}'` + info.split("\n").each do |row| + pid,mem = row.split(" ").map(&:to_i) + if pid > 0 && (mem*1024) > max_allowed_size + Rails.logger.warn "Detected rogue Sidekiq pid #{pid} mem #{mem*1024}, killing" + Process.kill("KILL", pid) rescue nil + end + end + end + def check_sidekiq_heartbeat @sidekiq_heartbeat_interval ||= 30.minutes @sidekiq_next_heartbeat_check ||= Time.new.to_i + @sidekiq_heartbeat_interval @@ -118,7 +132,11 @@ before_fork do |server, worker| end @sidekiq_next_heartbeat_check = Time.new.to_i + @sidekiq_heartbeat_interval - Demon::Sidekiq.restart if restart + if restart + Demon::Sidekiq.restart + sleep 10 + force_kill_rogue_sidekiq + end $redis.client.disconnect end end diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb index e169cfd9dc..c96c0572ee 100644 --- a/db/fixtures/006_badges.rb +++ b/db/fixtures/006_badges.rb @@ -140,11 +140,10 @@ Badge.seed do |b| b.system = true end - [ [Badge::Promoter,"Promoter",BadgeType::Bronze,1,0], - [Badge::Campaigner,"Campaigner",BadgeType::Silver,3,2], - [Badge::Champion,"Champion",BadgeType::Gold,10,2], + [Badge::Campaigner,"Campaigner",BadgeType::Silver,3,1], + [Badge::Champion,"Champion",BadgeType::Gold,5,2], ].each do |id, name, type, count, trust_level| Badge.seed do |b| b.id = id @@ -245,7 +244,6 @@ like_badges = [ {id: Badge::GreatTopic, name: "Great Topic", type: BadgeType::Gold, topic: true} ] - like_badges.each do |spec| Badge.seed do |b| b.id = spec[:id] @@ -273,6 +271,27 @@ Badge.seed do |b| b.system = true end +[ + [Badge::PopularLink, "Popular Link", BadgeType::Bronze, 50], + [Badge::HotLink, "Hot Link", BadgeType::Silver, 300], + [Badge::FamousLink, "Famous Link", BadgeType::Gold, 1000], +].each do |spec| + id, name, level, count = spec + Badge.seed do |b| + b.id = id + b.default_name = name + b.badge_type_id = level + b.multiple_grant = true + b.target_posts = true + b.show_posts = true + b.query = Badge::Queries.linking_badge(count) + b.default_badge_grouping_id = BadgeGrouping::Community + # don't trigger for now, its too expensive + b.trigger = Badge::Trigger::None + b.system = true + end +end + Badge.where("NOT system AND id < 100").each do |badge| new_id = [Badge.maximum(:id) + 1, 100].max old_id = badge.id diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb index 6532a8613a..7effb73775 100644 --- a/db/fixtures/009_users.rb +++ b/db/fixtures/009_users.rb @@ -22,4 +22,30 @@ User.seed do |u| u.trust_level = TrustLevel[4] end -Group.user_trust_level_change!(-1 ,TrustLevel[4]) +Group.user_trust_level_change!(-1, TrustLevel[4]) + +# User for the smoke tests +if ENV["SMOKE"] == "1" + smoke_user = User.seed do |u| + u.id = 0 + u.name = "smoke_user" + u.username = "smoke_user" + u.username_lower = "smoke_user" + u.email = "smoke_user@discourse.org" + u.password = "P4ssw0rd" + u.email_direct = false + u.email_digests = false + u.email_private_messages = false + u.active = true + u.approved = true + u.approved_at = Time.now + u.trust_level = TrustLevel[3] + end.first + + EmailToken.seed do |et| + et.id = 1 + et.user_id = smoke_user.id + et.email = smoke_user.email + et.confirmed = true + end +end diff --git a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb index 569f4b98b2..4e3b18fe73 100644 --- a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb +++ b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb @@ -2,18 +2,25 @@ class MigrateSiteTextToSiteCustomization < ActiveRecord::Migration def up execute <<-SQL - INSERT INTO site_customizations - (name, user_id, enabled, key, created_at, updated_at, head_tag, body_tag) - VALUES ( - 'Migrated from Site Text', - -1, - 't', - '#{SecureRandom.uuid}', - now(), - now(), - (SELECT value FROM site_texts WHERE text_type = 'head' LIMIT 1), - (SELECT value FROM site_texts WHERE text_type = 'bottom' LIMIT 1) - ) + DO + $do$ + BEGIN + IF EXISTS(SELECT 1 FROM site_texts WHERE (text_type = 'head' OR text_type = 'bottom')) THEN + INSERT INTO site_customizations (name, user_id, enabled, key, created_at, updated_at, head_tag, body_tag) + VALUES + ( + 'Migrated from Site Text', + -1, + 't', + '#{SecureRandom.uuid}', + now(), + now(), + (SELECT value FROM site_texts WHERE text_type = 'head' LIMIT 1), + (SELECT value FROM site_texts WHERE text_type = 'bottom' LIMIT 1) + ); + END IF; + END + $do$ SQL end diff --git a/db/migrate/20150609163211_migrate_embeddable_host.rb b/db/migrate/20150609163211_migrate_embeddable_host.rb new file mode 100644 index 0000000000..d3d351a32b --- /dev/null +++ b/db/migrate/20150609163211_migrate_embeddable_host.rb @@ -0,0 +1,5 @@ +class MigrateEmbeddableHost < ActiveRecord::Migration + def change + execute "UPDATE site_settings SET name = 'embeddable_hosts', data_type = 9 WHERE name = 'embeddable_host'" + end +end diff --git a/db/migrate/20150617080349_add_index_on_post_notifications.rb b/db/migrate/20150617080349_add_index_on_post_notifications.rb new file mode 100644 index 0000000000..a8cbccfdc8 --- /dev/null +++ b/db/migrate/20150617080349_add_index_on_post_notifications.rb @@ -0,0 +1,5 @@ +class AddIndexOnPostNotifications < ActiveRecord::Migration + def change + add_index :notifications, [:user_id, :topic_id, :post_number] + end +end diff --git a/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb b/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb new file mode 100644 index 0000000000..973bda76f0 --- /dev/null +++ b/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb @@ -0,0 +1,5 @@ +class AddIndexTargetPostIdOnUserActions < ActiveRecord::Migration + def change + add_index :user_actions, [:target_post_id] + end +end diff --git a/db/migrate/20150617234511_add_staff_index_to_users.rb b/db/migrate/20150617234511_add_staff_index_to_users.rb new file mode 100644 index 0000000000..f060b9b169 --- /dev/null +++ b/db/migrate/20150617234511_add_staff_index_to_users.rb @@ -0,0 +1,6 @@ +class AddStaffIndexToUsers < ActiveRecord::Migration + def change + add_index :users, [:id], name: 'idx_users_admin', where: 'admin' + add_index :users, [:id], name: 'idx_users_moderator', where: 'moderator' + end +end diff --git a/db/migrate/20150702201926_add_topic_template_to_categories.rb b/db/migrate/20150702201926_add_topic_template_to_categories.rb new file mode 100644 index 0000000000..719851cdbc --- /dev/null +++ b/db/migrate/20150702201926_add_topic_template_to_categories.rb @@ -0,0 +1,5 @@ +class AddTopicTemplateToCategories < ActiveRecord::Migration + def change + add_column :categories, :topic_template, :text, null: true + end +end diff --git a/db/migrate/20150706215111_add_mobile_to_user_visits.rb b/db/migrate/20150706215111_add_mobile_to_user_visits.rb new file mode 100644 index 0000000000..f794e1a8ff --- /dev/null +++ b/db/migrate/20150706215111_add_mobile_to_user_visits.rb @@ -0,0 +1,5 @@ +class AddMobileToUserVisits < ActiveRecord::Migration + def change + add_column :user_visits, :mobile, :boolean, default: false + end +end diff --git a/db/migrate/20150707163251_add_reports_index_to_user_visits.rb b/db/migrate/20150707163251_add_reports_index_to_user_visits.rb new file mode 100644 index 0000000000..299bcb250e --- /dev/null +++ b/db/migrate/20150707163251_add_reports_index_to_user_visits.rb @@ -0,0 +1,9 @@ +class AddReportsIndexToUserVisits < ActiveRecord::Migration + def up + add_index :user_visits, [:visited_at, :mobile] + end + + def down + remove_index :user_visits, [:visited_at, :mobile] + end +end diff --git a/db/migrate/20150709021818_add_like_count_to_post_menu.rb b/db/migrate/20150709021818_add_like_count_to_post_menu.rb new file mode 100644 index 0000000000..a12a166f41 --- /dev/null +++ b/db/migrate/20150709021818_add_like_count_to_post_menu.rb @@ -0,0 +1,10 @@ +class AddLikeCountToPostMenu < ActiveRecord::Migration + def up + execute < 0 + category_id = category_row[0]['id'].to_i + end + + if category_id == 0 + category_id = execute("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'")[0]['value'].to_i + end + + embeddable_hosts = execute("SELECT value FROM site_settings WHERE name = 'embeddable_hosts'") + if embeddable_hosts && embeddable_hosts.cmd_tuples > 0 + val = embeddable_hosts[0]['value'] + if val.present? + records = val.split("\n") + if records.present? + records.each do |h| + execute "INSERT INTO embeddable_hosts (host, category_id, created_at, updated_at) VALUES ('#{h}', #{category_id}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)" + end + end + end + end + + execute "DELETE FROM site_settings WHERE name IN ('embeddable_hosts', 'embed_category')" + end +end diff --git a/db/migrate/20150822141540_fix_migrated_hosts.rb b/db/migrate/20150822141540_fix_migrated_hosts.rb new file mode 100644 index 0000000000..d777eddb32 --- /dev/null +++ b/db/migrate/20150822141540_fix_migrated_hosts.rb @@ -0,0 +1,5 @@ +class FixMigratedHosts < ActiveRecord::Migration + def up + execute "UPDATE embeddable_hosts SET host = regexp_replace(host, '^https?:\/\/', '', 'i')" + end +end diff --git a/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb b/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb new file mode 100644 index 0000000000..e706f40f97 --- /dev/null +++ b/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb @@ -0,0 +1,5 @@ +class AddSuppressFromHomepageToCategory < ActiveRecord::Migration + def change + add_column :categories, :suppress_from_homepage, :boolean, default: false + end +end diff --git a/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb b/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb new file mode 100644 index 0000000000..a654369a2e --- /dev/null +++ b/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb @@ -0,0 +1,5 @@ +class AddGrantTrustLevelToGroups < ActiveRecord::Migration + def change + add_column :groups, :grant_trust_level, :integer + end +end diff --git a/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb b/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb new file mode 100644 index 0000000000..bf20583149 --- /dev/null +++ b/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb @@ -0,0 +1,5 @@ +class AddUserIdGroupIdIndexToGroupUsers < ActiveRecord::Migration + def change + add_index :group_users, [:user_id, :group_id], unique: true + end +end diff --git a/discourse.sublime-project b/discourse.sublime-project index 6ce1a8c6ea..20854867ba 100644 --- a/discourse.sublime-project +++ b/discourse.sublime-project @@ -15,6 +15,7 @@ { "path": "plugins" }, { "path": "script" }, { "path": "spec" }, + { "path": "vendor" }, { "path": "test", "folder_exclude_patterns": ["fixtures"] } diff --git a/docs/INSTALL-alternatives.md b/docs/INSTALL-alternatives.md deleted file mode 100644 index cad612d43b..0000000000 --- a/docs/INSTALL-alternatives.md +++ /dev/null @@ -1,85 +0,0 @@ -> # Warning: This Guide is Deprecated -> We only support Docker based installs now. Please see [our **official install guide**](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) for supported install instructions. - -# Alternative Install Options - -Here lie some alternative installation options for Discourse. They're not the -recommended way of doing things, hence they're a bit out of the way. - -Oh, and dragons. Lots of dragons. - -## Web Server Alternative: apache2 - -If you instead want to use apache2 to serve the static pages: - - # Run these commands as your normal login (e.g. "michael") - # If you don't have apache2 yet - sudo apt-get install apache2 - - # Edit your site details in a new apache2 config file - sudo vim /etc/apache2/sites-available/your-domain.com - - # Put these info inside and change accordingly - - - ServerName your-domain.com - ServerAlias www.your-domain.com - - DocumentRoot /srv/www/apps/discourse/public - - - AllowOverride all - Options -MultiViews - - - # Custom log file locations - ErrorLog /srv/www/apps/discourse/log/error.log - CustomLog /srv/www/apps/discourse/access.log combined - - - # Install the Passenger Phusion gem and run the install - gem install passenger - passenger-install-apache2-module - - # Next, we "create" a new apache2 module, passenger - sudo vim /etc/apache2/mods-available/passenger.load - - # Inside paste (change the user accodingly) - LoadModule passenger_module /home/YOUR-USER/.rvm/gems/ruby-2.0.0-p0/gems/passenger-4.0.2/libout/apache2/mod_passenger.so - - # Now the passenger module configuration - sudo vim /etc/apache2/mods-available/passenger.conf - - # Inside, paste (change the user accodingly) - PassengerRoot /home/YOUR-USER/.rvm/gems/ruby-2.0.0-p0/gems/passenger-4.0.2 - PassengerDefaultRuby /home/YOUR-USER/.rvm/wrappers/ruby-2.0.0-p0/ruby - - # Now activate them all - - sudo a2ensite your-domain.com - sudo a2enmod passenger - sudo service apache2 reload - sudo service apache2 restart - -If you get any errors starting or reloading apache, please check the paths above - Ruby 2.0 should be there if you are using RVM, but it could get tricky. - -## RVM Alternative: Systemwide installation - -Taken from http://rvm.io/, the commands below installs RVM and users in the 'rvm' group have access to modify state: - - # Run these commands as your normal login (e.g. "michael") \curl -s -S -L https://get.rvm.io | sudo bash -s stable - sudo adduser $USER rvm - newgrp rvm - . /etc/profile.d/rvm.sh - rvm requirements - - # Build and install ruby - rvm install 2.0.0 - gem install bundler - -When creating the `discourse` user, add him/her/it to the RVM group: - - # Run these commands as your normal login (e.g. "michael") - sudo adduser discourse rvm - -RVM will be located in `/usr/local/rvm` directory instead of `/home/discourse/.rvm`, so update the crontab line respectively. diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 5baa021a17..88306633d2 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -77,7 +77,7 @@ After completing your edits, press CtrlO then Enter 24 hours @@ -151,11 +150,13 @@ Do you want... * Users to log in *only* via your pre-existing website's registration system? [Configure Single-Sign-On](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045). -- Users to log in via Google? (new Oauth2 authentication) [Configure Google logins](https://meta.discourse.org/t/configuring-google-login-for-discourse/15858). +- Users to log in via Google? (new Oauth2 authentication) [Configure Google logins](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858). - Users to log in via Facebook? [Configure Facebook logins](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394). -- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395/last). +- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395). + +- Users to log in via GitHub? [Configure GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745) - Users to post replies via email? [Configure reply via email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003). @@ -171,12 +172,13 @@ Do you want... - A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584) -- To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](http://eviltrout.com/2014/01/22/embedding-discourse.html)? +- To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)? If anything needs to be improved in this guide, feel free to ask on [meta.discourse.org][meta], or even better, submit a pull request. [dd]: https://github.com/discourse/discourse_docker [man]: https://mandrillapp.com + [sp]: https://www.sparkpost.com/ [ssh]: https://help.github.com/articles/generating-ssh-keys [meta]: https://meta.discourse.org [do]: https://www.digitalocean.com/?refcode=5fa48ac82415 diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md deleted file mode 100644 index 58d1202ba6..0000000000 --- a/docs/INSTALL-email.md +++ /dev/null @@ -1,162 +0,0 @@ -> # Warning: This Guide is Deprecated -> We only support Docker based installs now. Please see [our **official install guide**](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) for supported install instructions. - -# Discourse Mail Setup Guide - -After following INSTALL-ubuntu.md your mailer settings should still be set. - -Out-of-the-box Discourse is configured to deliver mail locally via sendmail. -That's great. Leave that there as we're going to try to get the mail to postfix -ASAP so postfix do it's job and process the mail for delivery. - -## Email is IMPORTANT - -Email notifications are core to the Discourse experience. We want your users to receive notifications as soon as possible so they can contribute to the conversation. - -If sending email isn't something to which you want to devote your time, don't -worry about it. There are [companies](http://mandrill.com/) that dedicate -theirs to doing one thing very well - ensuring that mail to your users gets -delivered. - -## Sending Email Through GMail - -Don't do it! GMail is not intended for sending out bulk notifications. Your email setup [will break](http://webapps.stackexchange.com/q/44768/12456). - -## Sending Email Through Mandrill - -### Create an account -We're going to use [Mandrill](http://mandrill.com/) as our email delivery -provider. - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20signup.png) - -1. Create an account at http://mandrill.com/ (click on 'SIGN UP') - -1. I filled out the 'Tell Us A Little About Yourself' survey. They are -providing us a free service, after all! - -### Create an API key -I'm pleased with Mandrill's setup - this is the Right Way to do things. - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20getsmtpcreds.png) - -1. Click 'Get SMTP Credentials' - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20addapikey.png) - -1. Note that you can use 'any valid API key' as your password. Click '+ Add API Key' to create one. - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20editapikey1.png) - -1. Click 'Edit' to document for what we'll be using this key. - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20editapikey2.png) - -1. Since we'll only be using this key for sending email and *nothing else*, check 'Only Allow This Key To Use Certain API Calls' and select only Messages / Send and Messages/ Send-Raw. Send-Raw must be selected or Discourse won't be able to send email. - - -![mandrill email signup](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20editapikey3.png) - -1. Optionally, restrict this key to the public static IP address of your server. - -1. Click 'Save' - -### Configure Postfix for Mandrill - -Thank you Mandrill for providing an excellent [guide on configuring Postfix to use Mandrill](http://help.mandrill.com/entries/23060367-Can-I-configure-Postfix-to-send-through-Mandrill-). - -Additional notes on this document: - -* Ubuntu has an `/etc/postfix/sasl` directory. Create a password file in there. - -* Make sure you put your **API KEY** into this password file, not your **ACCOUNT PASSWORD** - -* You may already have configured a `relayhost` earlier in the installation. If this machine is sending out ANY emails other than Discourse-generated notifications, follow the instructions in 'Relay only certain emails through Mandrill'. - -After configuring postfix as per Mandrill's instructions, reload postfix with `sudo postfix reload`. - -### Send test email - -![discourse admin setting](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20discourse%20admin.png) - -Now we send a test email. Login to your Discourse installation and click on the ≡ (aka congruence/hamburger/etc), then 'Admin'. - -![discourse admin setting](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20discourse%20emailtest.png) - -Click on `Email`, `Settings`, then type your email address into the test box and click `send test email`. - -Within moments, you should have email in your Inbox. - -### OH NOES I DIDN'T GET MY EMAIL TEST! - -Follow the trail. First of all, did the email get to Postfix? Check `/var/log/mail.log`: - - Jun 24 01:24:59 discoursetest postfix/pickup[25387]: 7CBF280294C: uid=1001 from= - Jun 24 01:24:59 discoursetest postfix/cleanup[25829]: 7CBF280294C: message-id=<51c7d82b6f878_8ef3d7802c10139@discoursetest.mail> - Jun 24 01:24:59 discoursetest postfix/qmgr[25386]: 7CBF280294C: from=, size=5884, nrcpt=1 (queue active) - -Looks good! Wait, why is the email coming *from* `info@discourse.org`? That's a -problem we'll fix below. - - Jun 24 01:25:04 discoursetest postfix/smtp[25831]: 7CBF280294C: SASL authentication failed; server smtp.mandrillapp.com[54.235.146.179] said: 435 4.7.8 Error: authentication failed: - Jun 24 01:25:10 discoursetest postfix/smtp[25831]: 7CBF280294C: SASL authentication failed; server smtp.mandrillapp.com[54.234.14.176] said: 435 4.7.8 Error: authentication failed: - Jun 24 01:25:13 discoursetest postfix/smtp[25831]: 7CBF280294C: SASL authentication failed; server smtp.mandrillapp.com[50.16.10.62] said: 435 4.7.8 Error: authentication failed: - Jun 24 01:25:20 discoursetest postfix/smtp[25831]: 7CBF280294C: to=, relay=smtp.mandrillapp.com[54.235.146.152]:25, delay=21, delays=0.07/0.01/21/0, dsn=4.7.8, status=deferred (SASL authentication failed; server smtp.mandrillapp.com[54.235.146.152] said: 435 4.7.8 Error: authentication failed: ) - -The above errors are caused by using an incorrect API key in your sasl passwords file. Fix that (edit `/etc/postfix/sasl/passwd`, run `sudo postmap` on it, then `postqueue -f` to restart the queue). - - Jun 24 01:30:30 discoursetest postfix/smtp[25861]: table hash:/etc/postfix/sasl/passwd(0,lock|fold_fix) has changed -- restarting - Jun 24 01:30:31 discoursetest postfix/smtp[25872]: 7CBF280294C: to=, relay=smtp.mandrillapp.com[54.234.14.176]:25, delay=332, delays=331/0.01/1.2/0.17, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as C515B6380D3) - -That's better! Our test message made it to Mandrill. Let's check Outbound Activity in Mandrill: - - -![mandrill email confirmation](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20emailconfirm.png) - -If you see this, the email was accepted by Mandrill and delivered to the -destination. You need to check your spam filter now. - -If you don't see anything in Mandrill, ensure that the API key is enabled for -'Send-Raw' permission. Mandrill appears to silently drop the email if that's -not set. - -### Configure notification email addresses - -Login to Discourse, go to the Admin page and select 'Settings'. - -Filter with the string 'system'. - -* Ensure that `site_contact_username` is set to an email address for an appropriate "owner" of the site -* Set `notification_email` to 'noreply@', 'nobody@' as appropriate. - -Filter with the string 'contact_email' - -* Ensure `contact_email` is set appropriately. - -### SPF and DKIM records - -Login to Mandrill and click on ⚙ (Settings)-> Sending Domains - -If your domain isn't listed, add it. It'll probably show this: - -![mandrill missing dkim settings](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20missingdkim.png) - -Click 'View DKIM/SPF setup instructions'. - -Follow the instructions there. - -When DNS is properly configured, you should be able to click on 'Test DNS Settings' and Mandrill will confirm they are setup properly: - -![mandrill good dkim settings](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20gooddkim.png) - -### Mandrill Options - -Login to Mandrill and click on ⚙ (Settings)-> Sending Options - -* 'Track Clicks' is enabled by default. This rewrites links in email messages to bounce off the mandrillapp.com domain for click tracking. Disable it here if you don't want that: - -![mandrill rewriting emails](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20rewriting.png) - -* If you do use it, setting up a 'Tracking Domain' is a very good idea to avoid erroneous scam warnings: - -![mandrill tbird warning](https://raw.github.com/discourse/discourse-docimages/master/email/email%20-%20mandrill%20tbirdwarning.png) diff --git a/docs/INSTALL-ubuntu.md b/docs/INSTALL-ubuntu.md deleted file mode 100644 index 24f0fa940b..0000000000 --- a/docs/INSTALL-ubuntu.md +++ /dev/null @@ -1,401 +0,0 @@ -# Warning: This Guide is Deprecated -We only support Docker based installs now. Please see [our **official install guide**](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) for supported install instructions. - -> # Discourse Ubuntu Install Guide - -> ## Recommended Server Hardware - -> - 2 GB of RAM -> - 2 GB of swap -> - 2 processor cores - -> With 2 GB of memory and dual cores, you can run two instances of the thin server (`NUM_WEBS=2`), and easily host anything but the largest of forums. - -> 1 GB of memory, 3 GB of swap and a single core CPU are the minimums for a steady state, running Discourse forum – but it's simpler to just throw a bit more hardware at the problem if you can, particularly during the install. - -> ## Install Ubuntu Server 12.04 LTS (or later) with the package groups: - -> Yes, you can in theory pick the distro of your choice, but to keep this guide sane, we're picking one, and it's Ubuntu. Feel free to substitute the distro of your choice, the steps are mostly the same. - -> ![screenshot of package group selection screen](https://raw.github.com/discourse/discourse-docimages/master/install/ubuntu%20-%20install%20-%20software%20selection.png) - -> * Basic Ubuntu server -> * OpenSSH server -> * Mail server -> * PostgreSQL database (9.1+) - -> You may be working on an already-installed or automatically deployed system, in which case you can install them afterwards: - -> # Run these commands as your normal login (e.g. "michael") -> sudo apt-get update && sudo apt-get -y upgrade -> sudo apt-get install tasksel -> sudo tasksel install openssh-server -> sudo tasksel install mail-server -> sudo tasksel install postgresql-server - -> If the above installation is stuck, please use the following method instead ([detail](https://bugs.launchpad.net/ubuntu/+source/debconf/+bug/141601)): - -> apt-get install postgresql-server^ - -> ### Configure the mail server: - -> ![screenshot of mail server type configuration screen](https://raw.github.com/discourse/discourse-docimages/master/install/ubuntu%20-%20install%20-%20mail_1%20system%20type.png) - -> In our example setup, we're going to configure as a 'Satellite system', forwarding all mail to our egress servers for delivery. You'll probably want to do that unless you're handling mail on the same machine as the Discourse software. - -> ![screenshot of mail name configuration screen](https://raw.github.com/discourse/discourse-docimages/master/install/ubuntu%20-%20install%20-%20mail_2%20mailname.png) - -> You probably want to configure your 'mail name' to be the base name of your domain. Note that this does not affect any email sent out by Discourse itself, just unqualified mail generated by systems programs. - -> ![screenshot of relay host configuration screen](https://raw.github.com/discourse/discourse-docimages/master/install/ubuntu%20-%20install%20-%20mail_3%20relayconfig.png) - -> If you have a mail server responsible for handling the egress of email from your network, enter it here. Otherwise, leave it blank. - -> ## Additional system packages - -> Install necessary packages: - -> # Run these commands as your normal login (e.g. "michael") -> sudo apt-get -y install build-essential libssl-dev libyaml-dev git libtool libxslt-dev libxml2-dev libpq-dev gawk curl pngcrush imagemagick python-software-properties - -> # If you're on Ubuntu >= 12.10, change: -> # python-software-properties to software-properties-common - -> ## Caching: Redis - -> Redis is a networked, in memory key-value store cache. Without the Redis caching layer, we'd have to go to the database a lot more often for common information and the site would be slower as a result. - -> Be sure to install the latest stable Redis, as the package in the distro may be a bit old: - -> sudo apt-add-repository -y ppa:rwky/redis -> sudo apt-get update -> sudo apt-get install redis-server - -> ## Web Server: nginx - -> nginx is used for: - -> * reverse proxy (i.e. load balancer) -> * static asset serving (since you don't want to do that from ruby) -> * anonymous user cache - -> At Discourse, we recommend the latest version of nginx (we like the new and -> shiny). To install on Ubuntu: - -> # Run these commands as your normal login (e.g. "michael") -> # Remove any existing versions of nginx -> sudo apt-get remove '^nginx.*$' - -> # Setup a sources.list.d file for the nginx repository -> cat << 'EOF' | sudo tee /etc/apt/sources.list.d/nginx.list -> deb http://nginx.org/packages/ubuntu/ precise nginx -> deb-src http://nginx.org/packages/ubuntu/ precise nginx -> EOF - -> # Add nginx key -> curl http://nginx.org/keys/nginx_signing.key | sudo apt-key add - - -> # install nginx -> sudo apt-get update && sudo apt-get -y install nginx - -> ## Install Ruby with RVM - -> ### RVM : Single-user installation - -> We recommend installing RVM isolated to a single user's environment. - -> ## Discourse setup - -> Create Discourse user: - -> # Run these commands as your normal login (e.g. "michael") -> sudo adduser --shell /bin/bash --gecos 'Discourse application' discourse -> sudo install -d -m 755 -o discourse -g discourse /var/www/discourse - -> Give Postgres database rights to the `discourse` user: - -> # Run these commands as your normal login (e.g. "michael") -> sudo -u postgres createuser -s discourse -> # If you will be using password authentication on your database, only -> # necessary if the database will be on a remote host -> sudo -u postgres psql -c "alter user discourse password 'todayisagooddaytovi';" - -> Change to the 'discourse' user: - -> # Run this command as your normal login (e.g. "michael"), further commands should be run as 'discourse' -> sudo su - discourse - -> Install RVM - -> # As 'discourse' -> # Install RVM -> \curl -s -S -L https://get.rvm.io | bash -s stable - -> # Refresh your profile -> . ~/.rvm/scripts/rvm - -> Install missing packages - -> # Install necessary packages for building ruby (this will only work if -> # you've given discourse sudo permissions, which is *not* the default) -> # rvm requirements - -> # NOTE: rvm will tell you which packages you (or your sysadmin) need -> # to install during this step. As discourse does not have sudo -> # permissions (likely the case), run: - -> rvm --autolibs=read-fail requirements - -> # For instance, if prompted with `libreadline6-dev libsqlite3-dev sqlite3 autoconf' etc -> # Install the missing packages with this command, run as your user: -> # sudo apt-get install libreadline6-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev libncurses5-dev bison libffi-dev -> # Repeat the autolibs test until you see "Requirements installation successful" - - -> Build and install ruby - -> rvm install 2.0.0 - -> # Use installed ruby as default -> rvm use 2.0.0 --default - -> # Install bundler -> gem install bundler - -> Continue with Discourse installation - -> # Pull down the latest code -> # Now would be a great time to consider [forking](https://help.github.com/articles/fork-a-repo), if want to work from your own copy of discourse -> #If you don't need to customize your installation, and want less hassle upgrading clone from Discourse's repo -> git clone git://github.com/discourse/discourse.git /var/www/discourse -> cd /var/www/discourse - -> # To run on the most recent numbered release instead of bleeding-edge: -> #git checkout latest-release - -> # Install necessary gems -> bundle install --deployment --without test - -> _If you have errors building the native extensions, ensure you have sufficient free system memory. 1GB with no swap isn't enough, we recommend having 2GB as a minimum._ - -> Configure Discourse: - -> # Run these commands as the discourse user -> cd /var/www/discourse/config -> cp discourse_quickstart.conf discourse.conf -> cp discourse.pill.sample discourse.pill - -> Editing /var/www/discourse/config/discourse.conf: - -> Database/Hostname: -> - change database username/password if appropriate -> - change `hostname` to the name you'll use to access the Discourse site, e.g. "forum.example.com" - -> Redis: -> - no changes if this is the only application using redis, but have a look - -> E-mail: -> - browse through all the settings and be sure to add your mail server SMTP settings so outgoing mail can be sent (we recommend [Mandrill](https://mandrillapp.com)) -> - If your users will come from "internal" [private unroutable IPs](https://en.wikipedia.org/wiki/Private_network) like 10.x.x.x or 192.168.x.x please [see this topic](http://meta.discourse.org/t/all-of-my-internal-users-show-as-coming-from-127-0-0-1/6607). - -> Editing: /var/www/discourse/config/discourse.pill -> - change application name from 'discourse' if necessary -> - Ensure appropriate Bluepill.application line is uncommented - -> Initialize the database: - -> # Run these commands as the discourse user -> # The database name here should match the production one in database.yml -> cd /var/www/discourse -> createdb discourse_prod -> RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ENV=production bundle exec rake db:migrate -> RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ENV=production bundle exec rake assets:precompile - -> Not english? Set the default language as appropriate: - -> # Run these commands as the discourse user -> cd /var/www/discourse -> RAILS_ENV=production bundle exec rails c -> SiteSetting.default_locale = 'fr' - -> # Not sure if your locale is supported? Check at the rails console: -> LocaleSiteSetting.values -> => ["cs", "da", "de", "en", "es", "fr", "id", "it", "nb_NO", "nl", "pt", "ru", "sv", "zh_CN", "zh_TW"] - -> ## nginx setup - -> # Run these commands as your normal login (e.g. "michael") -> sudo cp /var/www/discourse/config/nginx.global.conf /etc/nginx/conf.d/local-server.conf -> sudo cp /var/www/discourse/config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf - -> If Discourse will be the only site served by nginx, disable the nginx default -> site: - -> - `sudo mv /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf.disabled` -> - Otherwise, only `server_name`s configured below in `discourse.conf` will be passed to Discourse. - -> Edit /etc/nginx/conf.d/discourse.conf - -> - edit `server_name`. Example: `server_name cain.discourse.org test.cain.discourse.org;` -> - change socket count depending on your NUM_WEB count -> - change socket paths if Discourse is installed to a different location -> - modify root location if Discourse is installed to a different location - -> Reload nginx by running - -> # Run as your normal login (e.g. "michael") -> sudo /etc/init.d/nginx reload - -> ## Bluepill setup - -> Configure Bluepill: - -> # Run these commands as the discourse user -> gem install bluepill -> echo 'alias bluepill="NOEXEC_DISABLE=1 bluepill --no-privileged -c ~/.bluepill"' >> ~/.bash_aliases -> rvm wrapper $(rvm current) bootup bluepill -> rvm wrapper $(rvm current) bootup bundle - -> Start Discourse: - -> # Run these commands as the discourse user -> RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ROOT=/var/www/discourse RAILS_ENV=production NUM_WEBS=2 bluepill --no-privileged -c ~/.bluepill load /var/www/discourse/config/discourse.pill - -> Add the Bluepill startup to crontab. - -> # Run these commands as the discourse user -> crontab -e - -> Add the following lines: - -> @reboot RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ROOT=/var/www/discourse RAILS_ENV=production NUM_WEBS=2 /home/discourse/.rvm/bin/bootup_bluepill --no-privileged -c ~/.bluepill load /var/www/discourse/config/discourse.pill - -> ## Log rotation setup - -> # Disabled for now - log rotation isn't *quite* complete -> #0 0 * * * /usr/sbin/logrotate /var/www/discourse/config/logrotate.conf - -> ## Email setup - -> IMPORTANT: Discourse relies heavily on email. If your email configuration is not correct, you will effectively have a broken forum. -> Please, head over to our [Mail Setup Guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md) to find out more information on how to properly setup emails. - -> Congratulations! You've got Discourse installed and running! - -> ## Administrator account - -> Now make yourself an administrator account. Browse to your Discourse instance -> and create an account by logging in normally, then run the commands: - -> # Run these commands as the discourse user -> cd /var/www/discourse -> RAILS_ENV=production bundle exec rails c - -> # Administratorize yourself: -> # (in rails console) -> > me = User.find_by_username_or_email('myemailaddress@me.com') -> > me.activate # use this in case you haven't configured your mail server and therefore can't receive the activation mail. -> > me.admin = true -> > me.save - -> # Mark yourself as the 'system user': -> # (in rails console) -> > SiteSetting.site_contact_username = me.username - -> At this point we recommend you start going through the various items in the -> [Discourse Admin Quick Start Guide](https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide) -> to further prepare your site for users. - -> ## Site localization - -> Custom assets such as images should be placed somewhere under: - -> /var/www/discourse/public/ - -> For example, create a `local` directory and place it into: - -> /var/www/discourse/public/uploads/local/michael.png - -> The corresponding site setting is: - -> logo_small_url: /uploads/local/michael.png - -> ## Updating Discourse - -> # Run these commands as the discourse user -> bluepill stop -> bluepill quit -> # Back up your install -> DATESTAMP=$(TZ=UTC date +%F-%T) -> pg_dump --no-owner --clean discourse_prod | gzip -c > ~/discourse-db-$DATESTAMP.sql.gz -> tar cfz ~/discourse-dir-$DATESTAMP.tar.gz -C /var/www discourse -> # get the latest Discourse code -> cd /var/www/discourse -> git checkout master -> git pull -> git fetch --tags -> # To run on the latest numbered release instead of bleeding-edge: -> #git checkout latest-release -> # -> # Follow the section below titled: -> # "Check sample configuration files for new settings" -> # -> bundle install --without test --deployment -> RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ENV=production bundle exec rake db:migrate -> RUBY_GC_MALLOC_LIMIT=90000000 RAILS_ENV=production bundle exec rake assets:precompile -> # restart bluepill -> crontab -l -> # Here, run the command to start bluepill. -> # Get it from the crontab output above. - -> ### Check sample configuration files for new settings - -> Check the sample configuration files provided in the repo with the ones being used for additional recommended settings and merge those in: - -> # Run these commands as the discourse user -> cd /var/www/discourse -> diff -u config/discourse_defaults.conf config/discourse.conf - -> #### Example 1 - -> $ diff -u config/discourse.pill.sample config/discourse.pill -> --- config/discourse.pill.sample 2013-07-15 17:38:06.501507001 +0000 -> +++ config/discourse.pill 2013-07-05 06:38:27.133506896 +0000 -> @@ -46,7 +46,7 @@ - -> app.working_dir = rails_root -> sockdir = "#{rails_root}/tmp/sockets" -> - File.directory? sockdir or FileUtils.mkdir_p sockdir -> + File.directory? sockdir or Dir.mkdir sockdir -> num_webs.times do |i| -> app.process("thin-#{i}") do |process| - -> This change reflects us switching to using `FileUtils.mkdir_p` instead of `Dir.mkdir`. - -> #### Example 2 - -> $ diff -u config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf -> --- config/nginx.sample.conf 2013-07-15 17:38:06.521507000 +0000 -> +++ /etc/nginx/conf.d/discourse.conf 2013-07-15 17:52:46.649507024 +0000 -> @@ -12,17 +12,18 @@ -> gzip_min_length 1000; -> gzip_types application/json text/css application/x-javascript; - -> - server_name enter.your.web.hostname.here; -> + server_name webtier.discourse.org; - -> sendfile on; - -> keepalive_timeout 65; -> - client_max_body_size 2m; -> location / { -> root /home/discourse/discourse/public; - -> This change reflects a change in placeholder information plus (importantly) -> adding the `client_max_body_size 2m;` directive to the nginx configuration. -> This change should also be made to your production file. - -> ## Security - -> We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. -> Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse. diff --git a/docs/PLUGINS.md b/docs/PLUGINS.md index 854e855f21..ee874dc157 100644 --- a/docs/PLUGINS.md +++ b/docs/PLUGINS.md @@ -1,8 +1,25 @@ -# List of Discourse Plugins +## List of Discourse Plugins If you just want to get some plugins for your Discourse instance, check out [the plugin category](https://meta.discourse.org/category/extensibility/plugin) at meta. This is the most up to date place for plugin discussion and listing. -# Discourse Plugin Architecture +### Discourse Plugin Tutorials + +* [Part One: Getting Started](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins/30515) + +* [Part Two: Plugin Outlets](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins-part-2-plugin-outlets/31001) + +* [Part Three: Custom Site Settings](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins-part-3-custom-settings/31115) + +* [Part Four: Git Setup](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins-part-4-git-setup/31272) + +* [Part Five: Admin Interfaces](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins-part-5-admin-interfaces/31761) + +* [Part Six: Acceptance Tests](https://meta.discourse.org/t/beginner-s-guide-to-creating-discourse-plugins-part-6-acceptance-tests/32619) + +### Simple Demonstration Plugins + +- [Manipulating text in the composer](https://meta.discourse.org/t/plugin-tutorial-1-how-to-manipulate-the-text-in-the-composer/10925) + +- [Display plugin outlet locations](https://meta.discourse.org/t/plugin-outlet-locations/29589) -**Note: This is a work in progress!** diff --git a/docs/WELCOME-TO-DISCOURSE.md b/docs/WELCOME-TO-DISCOURSE.md index 039bb6e37c..42c2f12fb9 100644 --- a/docs/WELCOME-TO-DISCOURSE.md +++ b/docs/WELCOME-TO-DISCOURSE.md @@ -7,4 +7,6 @@ The first paragraph of this pinned topic will be visible as a welcome message to - Why should they come here? - Where can they read more (links, resources, etc)? -You may want to close this topic via the admin wrench (at the upper right and bottom), so that replies don't pile up on an announcement. \ No newline at end of file + + +You may want to close this topic via the admin :wrench: (at the upper right and bottom), so that replies don't pile up on an announcement. diff --git a/docs/install-HEROKU.md b/docs/install-HEROKU.md deleted file mode 100644 index d7c5c8b42e..0000000000 --- a/docs/install-HEROKU.md +++ /dev/null @@ -1,363 +0,0 @@ -# Warning: This Guide is Deprecated -We only support Docker based installs now. Please see [our **official install guide**](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) for supported install instructions. - ------ - -# Basic Heroku deployment - -This guide takes you through the steps for deploying Discourse to the [Heroku](http://www.heroku.com/) cloud application platform. If you're unfamiliar with Heroku, [read this first](https://devcenter.heroku.com/articles/quickstart). The basic deployment of Discourse requires several services that will cost you money. In addition to the [750 free Dyno hours](https://devcenter.heroku.com/articles/usage-and-billing) provided by Heroku, the application requires one additional process to be running for the Sidekiq queue ($34 monthly), and a Redis database plan that supports a minimum of 2 databases (average $10 monthly). - -For details on how to reduce the monthly cost of your application, see [Advanced Heroku deployment](#advanced-heroku-deployment). - -## Clone Discourse - -If you haven't already, download Discourse and create a new branch for your Heroku configuration. - - git clone git@github.com:discourse/discourse.git - cd discourse - git checkout -b heroku - - -## Deploy to Heroku - -1. Create the heroku app. This automatically creates a git remote called heroku. - - heroku create your-app-name - -1. Add postgres addon (command below adds the free dev version) - - heroku addons:add heroku-postgresql - -1. Add a suitable Redis provider from [Heroku add-ons](https://addons.heroku.com/), (this service will cost you money). - - heroku addons:add openredis:micro - -1. Configure your app to connect to redis - - heroku config:get OPENREDIS_URL - heroku config:set REDIS_PROVIDER_URL= - - heroku config:set DISCOURSE_REDIS_HOST= - heroku config:set DISCOURSE_REDIS_PORT= - heroku config:set DISCOURSE_REDIS_PASSWORD= - heroku config:set DISCOURSE_REDIS_DB= - -1. Run bundler - - bundle install - -1. Generate a secret token in the terminal. - - rake secret - -1. Push the secret to the stored heroku environment variables, this will now be available to your app globally. - - heroku config:add SECRET_TOKEN= - -1. Precompile assets. - - There are two options for precompilation. Either precompile locally, **before each deploy** or enable [Heroku's experimental user-env-compile](https://devcenter.heroku.com/articles/labs-user-env-compile) feature and Heroku will precompile your assets for you. - - 1. **Option 1:** Let Heroku compile your assets - - This is the default for new apps, and seems to work fine. - - 2. **Option 2:** Precompile locally. - - bundle exec rake assets:precompile - - **Notice:** We don't use Foreman to start precompilation, as this would precompile in the development environment. Instead, rake assets:precompile runs in the production environment by default, as it should. - - If Rails complains that the SECRET_TOKEN is not set, you can pass this to the environment by prefixing it to the rake method call. - - SECRET_TOKEN=5310bc16ef6ecfd0... bundle exec rake assets:precompile - - **Tip:** OSX/Linux users can set/unset environment variables in their shell. - - # Set var - export SECRET_TOKEN=5310bc16ef6ecfd0... - # Unset var - unset SECRET_TOKEN - - When precompiling locally make sure to alter the .gitignore file to allow the public/assets folder into version control. - - *.gitignore* - - ```diff - - public/assets - + # public/assets - ``` - - Also, you'll need to add a commit to get the precompiled assets onto Heroku. - - ```bash - git add public/assets - git push heroku heroku:master - ``` - -1. Tell rails to serve your compiled assets - - heroku config:set DISCOURSE_SERVE_STATIC_ASSETS=true - -1. Push your heroku branch to Heroku. - - git push heroku heroku:master - -1. Migrate and seed the database. - - heroku run rake db:migrate db:seed_fu - - You should now be able to visit your app at `http://.herokuapp.com` - -## Configure the deployed application - -1. Log into the app, using your preferred auth provider. - -2. Connect to the Heroku console to make the first user an Admin. - - heroku run console - -3. Enter the following commands. -```ruby - u = User.first - u.admin = true - u.approved = true - u.save -``` - -4. In Discourse admin settings, set `force_hostname` to your applications Heroku domain. - - This step is required for Discourse to properly form links sent with account confirmation emails and password resets. The auto detected application url would point to an Amazon AWS instance. - - Since you can't log in yet, you can set `force_hostname` in the console. -```ruby - SiteSetting.create(:name => 'force_hostname', :data_type =>1, :value=>'yourappnamehere.herokuapp.com') -``` - -5. Start Sidekiq. - - In the [Heroku dashboard](https://dashboard.heroku.com/apps), select your app and you will see the separate processes that have been created for your application under Resources. You will only need to start the sidekiq process for your application to run properly. The worker process has been generated as a Rails default and can be ignored. As you can see **the Sidekiq process costs $34 monthly** to run. If you want to reduce this cost, check out [Advanced Heroku deployment](#advanced-heroku-deployment). - - Click on the check-box next to the Sidekiq process and click Apply Changes - - ##### Your Discourse application should now be functional. However, you will still need to [configure mail](#email) functionality and file storage for uploaded images. For some examples of doing this within Heroku, see [Heroku add-on examples](#heroku-add-on-examples). - -6. [Optional] Increase Garbage collection limit - -When you start up your app, the admin dashboard will complain "Your server is using default ruby garbage collection parameters" - -``` - heroku config:add RUBY_GC_MALLOC_LIMIT=90000000 -``` - -## Running the application locally - -Using Foreman to start the application allows you to mimic the way the application is started on Heroku. It loads environment variables via the .env file and instantiates the application using the Procfile. In the .env sample file, we have set `RAILS_ENV='development'`, this makes the Rails environment variable available globally, and is required when starting this application using Foreman. - -Create a .env file from the sample. - - cp .env.sample .env - -### Foreman commands: - - -##### Create the database - - foreman run rake db:create - -##### Migrate and seed the database - - foreman run rake db:migrate db:seed_fu - -##### Start the application using Foreman - - foreman run rails server - -##### Use Rails console, with pry - - foreman run rails console - -##### Prepare the test database - - foreman run rake db:test:prepare - -##### Run tests - - foreman run rake autospec - - -# Heroku add-on examples - -## Email - -##### Mandrill example - -1. Add the [Mandrill by MailChimp](https://devcenter.heroku.com/articles/mandrill) add-on from the [Heroku add-ons](https://addons.heroku.com/) page, or install from the command line using: - - heroku addons:add mandrill:starter - -2. Configure the smtp settings in the production environment config file. - - *config/environments/production.rb* - - ```ruby - - config.action_mailer.delivery_method = :sendmail - - config.action_mailer.sendmail_settings = {arguments: '-i'} - - + config.action_mailer.delivery_method = :smtp - + config.action_mailer.smtp_settings = { - + :port => '587', - + :address => 'smtp.mandrillapp.com', - + :user_name => ENV['MANDRILL_USERNAME'], - + :password => ENV['MANDRILL_APIKEY'], - + :domain => 'heroku.com', - + :authentication => :plain - + } - ``` - -## S3 (for file uploads) - -You can't upload files to heroku, you need to use a service like S3. - -Here are the [instructions for setting up S3](https://meta.discourse.org/t/setting-up-file-and-image-uploads-to-s3/7229/23) - -You can run this from ```heroku run console``` to test if everything is configured correctly. - -```ruby -bucket_name = Discourse.store.send :s3_bucket -bucket = Discourse.store.send :get_or_create_directory, bucket_name - -f = File.open('README.md') -bucket = Discourse.store.send :upload, f, 'test.txt' -``` - -@adamloving: I think there is still a file size issue. I was testing with a 2MB file that wasn't big enough to trigger the "file too big" Discourse error message, but didn't make it to S3 either. - - -## Load Testing - -##### Blitz example - -1. Add the [Blitz](https://addons.heroku.com/blitz) add-on from the [Heroku add-ons](https://addons.heroku.com/) page, or install from the command line using: - - heroku addons:add blitz:250 - -You can now run basic load tests against your instalation. Here's an example query with the rush of users scaling from 1 to 250 over 60 seconds. The timeout (-T) is set to 30 seconds, as after this Heroku will kill a process and return an error anyway. - - -p 1-250:60 -T 30000 http://YOUR-APP-NAME.herokuapp.com/ - -##### loader.io example - -1. Add the [loader.io](https://addons.heroku.com/loaderio) add-on from the [Heroku add-ons](https://addons.heroku.com/) page, or install from the command line using: - - heroku addons:add loaderio:test - -loader.io is still in beta, so you mileage may vary, but the tests are free for now. -They currently require you verify your domain. A simple way to do this is to add a hard coded static route to `config.routes.rb` using the loaderio verification key. You'll see the key the first time you try to run a load test. - -*config/routes.rb* - -```diff -Discourse::Application.routes.draw do -+ match "/loaderio-xxxxxxxxxxxxxxxxxxxx", :to => proc {|env| [200, {}, ["/loaderio-xxxxxxxxxxxxxxxxxxxx"]] } - ... -end -``` - -# Advanced Heroku deployment - -## Autoscaler - -Adding the [Autoscaler Gem](https://github.com/JustinLove/autoscaler) can help you better manage the running cost of your application by scaling down the Sidekiq worker process when not in use. This could save up to $34 per month depending on your usage levels. - -##### Whilst this Gem has the potential to save you money, it in no way guarantees it. Use of this Gem should be combined with careful monitoring of your applications processes and usage alerts where necessary. - -1. Push your Heroku API key and app name to Heroku. - - heroku config:add HEROKU_API_KEY= HEROKU_APP= - -2. Add the Autoscaler Gem to the Gemfile. - - *Gemfile* - - ```ruby - gem 'autoscaler', require: false - ``` -3. Modify the Sidekiq config file to use the Autoscaler middleware in production. - - - *config/initializers/sidekiq.rb* - - ```ruby - sidekiq_redis = { url: $redis.url, namespace: 'sidekiq' } - - if Rails.env.production? - - require 'autoscaler/sidekiq' - require 'autoscaler/heroku_scaler' - - Sidekiq.configure_server do |config| - config.redis = sidekiq_redis - config.server_middleware do |chain| - chain.add(Autoscaler::Sidekiq::Server, Autoscaler::HerokuScaler.new('sidekiq'), 60) - end - end - - - Sidekiq.configure_client do |config| - config.redis = sidekiq_redis - config.client_middleware do |chain| - chain.add Autoscaler::Sidekiq::Client, 'default' => Autoscaler::HerokuScaler.new('sidekiq') - end - end - - else - - Sidekiq.configure_server { |config| config.redis = sidekiq_redis } - Sidekiq.configure_client { |config| config.redis = sidekiq_redis } - - end - - ``` - -## S3 CDN - -Heroku Cedar stack does not support Nginx as a caching layer, so you may want to host your static assets in a CDN so you're not hitting your rails app for every asset request. - -This can be done simply using the [Asset Sync](https://github.com/rumblelabs/asset_sync) gem. - -You'll need an Amazon S3 account set up with a bucket configured with your app name (appname-assets), and a separate user with write access to that bucket. You can create the new user in Account > Security Credentials. See [AWS best practices](http://docs.aws.amazon.com/IAM/latest/UserGuide/IAMBestPractices.html) for more details. - -**Caveat:** This example relies on the app being deployed using the `heroku labs:enable user-env-compile` method detailed above. For instructions on manual compilation, please refer to the [Asset Sync](https://github.com/rumblelabs/asset_sync) gem readme. - -1. Add the Asset Sync Gem to the Gemfile under assets. - - *Gemfile* - - ```diff - group :assets do - ... - + gem 'asset_sync' - end - ``` - -2. Update production.rb to use the asset host. - - *config/environments/production.rb* - - ```diff - - # config.action_controller.asset_host = "http://YOUR_CDN_HERE" - + config.action_controller.asset_host = "//#{ENV['FOG_DIRECTORY']}.s3.amazonaws.com" - ``` - -3. Get the access keys that were created for the new user and push the S3 configs to Heroku. - - heroku config:set FOG_PROVIDER=AWS AWS_ACCESS_KEY_ID=xxx AWS_SECRET_ACCESS_KEY=yyy FOG_DIRECTORY=appname-assets - -4. Push the Gzip config setting to Heroku. This tells asset sync to upload Gzipped files where available. - - heroku config:add ASSET_SYNC_GZIP_COMPRESSION=true - -Now commit your changes to Git and push to Heroku. - -If you open Chrome's Inspector, click on Network and refresh the page, your assets should now be showing an amazonaws.com url. Please refer to the [Asset Sync](https://github.com/rumblelabs/asset_sync) gem readme for more configuration options, or to use another CDN such as AWS CloudFront for better performance. diff --git a/lib/auth/result.rb b/lib/auth/result.rb index 6bb016c007..461c8f7c9f 100644 --- a/lib/auth/result.rb +++ b/lib/auth/result.rb @@ -3,17 +3,27 @@ class Auth::Result :email_valid, :extra_data, :awaiting_activation, :awaiting_approval, :authenticated, :authenticator_name, :requires_invite, :not_allowed_from_ip_address, - :admin_not_allowed_from_ip_address + :admin_not_allowed_from_ip_address, :omit_username + + attr_accessor :failed, + :failed_reason + + def initialize + @failed = false + end + + def failed? + !!@failed + end def session_data - { - email: email, + { email: email, username: username, email_valid: email_valid, + omit_username: omit_username, name: name, authenticator_name: authenticator_name, - extra_data: extra_data - } + extra_data: extra_data } end def to_client_hash @@ -42,7 +52,8 @@ class Auth::Result username: UserNameSuggester.suggest(username || name || email), # this feels a tad wrong auth_provider: authenticator_name.capitalize, - email_valid: !!email_valid + email_valid: !!email_valid, + omit_username: !!omit_username } end end diff --git a/lib/autospec/reload_css.rb b/lib/autospec/reload_css.rb index 58e31811f6..e6bd00a6fa 100644 --- a/lib/autospec/reload_css.rb +++ b/lib/autospec/reload_css.rb @@ -27,11 +27,13 @@ class Autospec::ReloadCss if paths.any? { |p| p =~ /\.(css|s[ac]ss)/ } # todo connect to dev instead? ActiveRecord::Base.establish_connection - s = DiscourseStylesheets.new(:desktop) # TODO: what about mobile? - s.compile - s.ensure_digestless_file + [:desktop, :mobile].each do |style| + s = DiscourseStylesheets.new(style) + s.compile + s.ensure_digestless_file + paths << "public" + s.stylesheet_relpath_no_digest + end ActiveRecord::Base.clear_active_connections! - paths << "public" + s.stylesheet_relpath_no_digest end paths.map! do |p| hash = nil @@ -41,7 +43,7 @@ class Autospec::ReloadCss p = p.sub(/\.sass/, "") p = p.sub(/\.scss/, "") p = p.sub(/^app\/assets\/stylesheets/, "assets") - { name: p, hash: hash } + { name: p, hash: hash || SecureRandom.hex } end message_bus.publish "/file-change", paths end diff --git a/lib/autospec/run-qunit.js b/lib/autospec/run-qunit.js index 59d1524586..a4a851822e 100644 --- a/lib/autospec/run-qunit.js +++ b/lib/autospec/run-qunit.js @@ -1,14 +1,22 @@ /*jshint devel:true, phantom:true */ -/*global QUnit, ANSI */ +/*globals QUnit ANSI */ + // THIS FILE IS CALLED BY "qunit_runner.rb" IN AUTOSPEC -if (phantom.args.length !== 1) { +var system = require("system"), + args = phantom.args; + +if (args === undefined) { + args = system.args; + args.shift(); +} + +if (args.length !== 1) { console.log("Usage: " + phantom.scriptName + " "); phantom.exit(1); } -var system = require('system'), - fs = require('fs'), +var fs = require('fs'), page = require('webpage').create(), QUNIT_RESULT = "./tmp/qunit_result"; @@ -34,7 +42,7 @@ page.start = new Date(); // -----------------------------------WARNING -------------------------------------- // calling "console.log" BELOW this line will go through the "page.onConsoleMessage" // -----------------------------------WARNING -------------------------------------- -page.open(phantom.args[0], function (status) { +page.open(args[0], function (status) { if (status !== "success") { console.log("\nNO NETWORK :(\n"); phantom.exit(1); diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb index b1fc1c6169..4af184052a 100644 --- a/lib/avatar_lookup.rb +++ b/lib/avatar_lookup.rb @@ -12,10 +12,7 @@ class AvatarLookup private def self.lookup_columns - @lookup_columns ||= [:id, - :email, - :username, - :uploaded_avatar_id] + @lookup_columns ||= %i{id email username uploaded_avatar_id} end def users diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb index c917be31ba..e0f02ecb1b 100644 --- a/lib/backup_restore/backup_restore.rb +++ b/lib/backup_restore/backup_restore.rb @@ -13,8 +13,8 @@ module BackupRestore start! BackupRestore::Backuper.new(user_id, opts) end - def self.restore!(user_id, filename, publish_to_message_bus=false) - start! BackupRestore::Restorer.new(user_id, filename, publish_to_message_bus) + def self.restore!(user_id, opts={}) + start! BackupRestore::Restorer.new(user_id, opts) end def self.rollback! diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb index a1eff02210..0b3b26656d 100644 --- a/lib/backup_restore/backuper.rb +++ b/lib/backup_restore/backuper.rb @@ -6,6 +6,7 @@ module BackupRestore def initialize(user_id, opts={}) @user_id = user_id + @client_id = opts[:client_id] @publish_to_message_bus = opts[:publish_to_message_bus] || false @with_uploads = opts[:with_uploads].nil? ? true : opts[:with_uploads] @@ -46,8 +47,6 @@ module BackupRestore create_archive after_create_hook - - remove_old rescue SystemExit log "Backup process was cancelled!" rescue Exception => ex @@ -58,6 +57,7 @@ module BackupRestore "#{@archive_basename}.tar.gz" ensure notify_user rescue nil + remove_old rescue nil clean_up @success ? log("[SUCCESS]") : log("[FAILED]") end @@ -336,7 +336,7 @@ module BackupRestore def publish_log(message, timestamp) return unless @publish_to_message_bus data = { timestamp: timestamp, operation: "backup", message: message } - MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id]) + MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id], client_ids: [@client_id]) end def save_log(message, timestamp) diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb index bccd2e607d..167c455994 100644 --- a/lib/backup_restore/restorer.rb +++ b/lib/backup_restore/restorer.rb @@ -1,14 +1,17 @@ module BackupRestore - class RestoreDisabledError < RuntimeError; end + class RestoreDisabledError < RuntimeError; end class FilenameMissingError < RuntimeError; end class Restorer attr_reader :success - def initialize(user_id, filename, publish_to_message_bus = false) - @user_id, @filename, @publish_to_message_bus = user_id, filename, publish_to_message_bus + def initialize(user_id, opts={}) + @user_id = user_id + @client_id = opts[:client_id] + @filename = opts[:filename] + @publish_to_message_bus = opts[:publish_to_message_bus] || false ensure_restore_is_enabled ensure_no_operation_is_running @@ -45,8 +48,6 @@ module BackupRestore switch_schema! - # TOFIX: MessageBus is busted... - migrate_database reconnect_database reload_site_settings @@ -74,7 +75,7 @@ module BackupRestore protected def ensure_restore_is_enabled - raise Restore::RestoreDisabledError unless Rails.env.development? || SiteSetting.allow_restore? + raise BackupRestore::RestoreDisabledError unless Rails.env.development? || SiteSetting.allow_restore? end def ensure_no_operation_is_running @@ -89,7 +90,7 @@ module BackupRestore end def ensure_we_have_a_filename - raise Restore::FilenameMissingError if @filename.nil? + raise BackupRestore::FilenameMissingError if @filename.nil? end def initialize_state @@ -354,7 +355,7 @@ module BackupRestore def publish_log(message, timestamp) return unless @publish_to_message_bus data = { timestamp: timestamp, operation: "restore", message: message } - MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id]) + MessageBus.publish(BackupRestore::LOGS_CHANNEL, data, user_ids: [@user_id], client_ids: [@client_id]) end def save_log(message, timestamp) diff --git a/lib/comment_migration.rb b/lib/comment_migration.rb new file mode 100644 index 0000000000..60065d7507 --- /dev/null +++ b/lib/comment_migration.rb @@ -0,0 +1,58 @@ + + +class CommentMigration < ActiveRecord::Migration + def comments_up + raise "Not implemented" + end + + def up + comments_up.each do |table| + table[1].each do |column| + table_name = table[0] + column_name = column[0] + comment = column[1] + + if column_name == :_table + ActiveRecord::Base.exec_sql "COMMENT ON TABLE #{table_name} IS ?", comment + puts " COMMENT ON TABLE #{table_name}" + else + ActiveRecord::Base.exec_sql "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment + puts " COMMENT ON COLUMN #{table_name}.#{column_name}" + end + end + end + end + + def comments_down + {} + end + + def down + replace_nils(comments_up).deep_merge(comments_down).each do |table| + table[1].each do |column| + table_name = table[0] + column_name = column[0] + comment = column[1] + + if column_name == :_table + ActiveRecord::Base.exec_sql "COMMENT ON TABLE #{table_name} IS ?", comment + puts " COMMENT ON TABLE #{table_name}" + else + ActiveRecord::Base.exec_sql "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment + puts " COMMENT ON COLUMN #{table_name}.#{column_name}" + end + end + end + end + + private + def replace_nils(hash) + hash.each do |key, value| + if Hash === value + hash[key] = replace_nils value + else + hash[key] = nil + end + end + end +end diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index c9a53e34a5..13d30c2c97 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -5,7 +5,6 @@ require_dependency 'url_helper' class CookedPostProcessor include ActionView::Helpers::NumberHelper - include UrlHelper def initialize(post, opts={}) @dirty = false @@ -17,11 +16,13 @@ class CookedPostProcessor end def post_process(bypass_bump = false) - keep_reverse_index_up_to_date - post_process_images - post_process_oneboxes - optimize_urls - pull_hotlinked_images(bypass_bump) + DistributedMutex.synchronize("post_process_#{@post.id}") do + keep_reverse_index_up_to_date + post_process_images + post_process_oneboxes + optimize_urls + pull_hotlinked_images(bypass_bump) + end end def keep_reverse_index_up_to_date @@ -67,6 +68,8 @@ class CookedPostProcessor @doc.css("img[src]") - # minus, data images @doc.css("img[src^='data']") - + # minus, emojis + @doc.css("img.emoji") - # minus, image inside oneboxes oneboxed_images - # minus, images inside quotes @@ -91,7 +94,20 @@ class CookedPostProcessor def get_size_from_attributes(img) w, h = img["width"].to_i, img["height"].to_i - return [w, h] if w > 0 && h > 0 + return [w, h] unless w <= 0 || h <= 0 + # if only width or height are specified attempt to scale image + if w > 0 || h > 0 + w = w.to_f + h = h.to_f + original_width, original_height = get_size(img["src"]).map {|integer| integer.to_f} + if w > 0 + ratio = w/original_width + return [w.floor, (original_height*ratio).floor] + else + ratio = h/original_height + return [(original_width*ratio).floor, h.floor] + end + end end def get_size_from_image_sizes(src, image_sizes) @@ -106,13 +122,18 @@ class CookedPostProcessor end def get_size(url) + return @size_cache[url] if @size_cache.has_key?(url) + absolute_url = url absolute_url = Discourse.base_url_no_prefix + absolute_url if absolute_url =~ /^\/[^\/]/ # FastImage fails when there's no scheme absolute_url = SiteSetting.scheme + ":" + absolute_url if absolute_url.start_with?("//") + return unless is_valid_image_url?(absolute_url) + # we can *always* crawl our own images return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url) + @size_cache[url] ||= FastImage.size(absolute_url) rescue Zlib::BufError # FastImage.size raises BufError for some gifs end @@ -130,6 +151,12 @@ class CookedPostProcessor width, height = img["width"].to_i, img["height"].to_i original_width, original_height = get_size(src) + # can't reach the image... + if original_width.nil? || original_height.nil? + Rails.logger.info "Can't reach '#{src}' to get its dimension." + return + end + return if original_width.to_i <= width && original_height.to_i <= height return if original_width.to_i <= SiteSetting.max_image_width && original_height.to_i <= SiteSetting.max_image_height @@ -207,7 +234,7 @@ class CookedPostProcessor def update_topic_image(images) if @post.is_first_post? img = images.first - @post.topic.update_column(:image_url, img["src"]) if img["src"].present? + @post.topic.update_column(:image_url, img["src"][0...255]) if img["src"].present? end end @@ -228,13 +255,13 @@ class CookedPostProcessor %w{href data-download-href}.each do |selector| @doc.css("a[#{selector}]").each do |a| href = a["#{selector}"].to_s - a["#{selector}"] = schemaless absolute(href) if is_local(href) + a["#{selector}"] = UrlHelper.schemaless UrlHelper.absolute(href) if UrlHelper.is_local(href) end end @doc.css("img[src]").each do |img| src = img["src"].to_s - img["src"] = schemaless absolute(src) if is_local(src) + img["src"] = UrlHelper.schemaless UrlHelper.absolute(src) if UrlHelper.is_local(src) end end @@ -260,12 +287,17 @@ class CookedPostProcessor reason = I18n.t("disable_remote_images_download_reason") staff_action_logger = StaffActionLogger.new(Discourse.system_user) staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, { details: reason }) + # also send a private message to the site contact user - SystemMessage.create_from_system_user(Discourse.site_contact_user, :download_remote_images_disabled) + notify_about_low_disk_space true end + def notify_about_low_disk_space + SystemMessage.create_from_system_user(Discourse.site_contact_user, :download_remote_images_disabled) + end + def available_disk_space 100 - `df -P #{Rails.root}/public/uploads | tail -1 | tr -s ' ' | cut -d ' ' -f 5`.to_i end diff --git a/lib/db_helper.rb b/lib/db_helper.rb new file mode 100644 index 0000000000..7059c592bb --- /dev/null +++ b/lib/db_helper.rb @@ -0,0 +1,23 @@ +class DbHelper + + REMAP_SQL ||= " + SELECT table_name, column_name + FROM information_schema.columns + WHERE table_schema = 'public' + AND is_updatable = 'YES' + AND (data_type LIKE 'char%' OR data_type LIKE 'text%') + ORDER BY table_name, column_name" + + def self.remap(from, to) + connection = ActiveRecord::Base.connection.raw_connection + remappable_columns = connection.async_exec(REMAP_SQL).to_a + args = [from, to, "%#{from}%"] + + remappable_columns.each do |rc| + table_name = rc["table_name"] + column_name = rc["column_name"] + connection.async_exec("UPDATE #{table_name} SET #{column_name} = REPLACE(#{column_name}, $1, $2) WHERE #{column_name} LIKE $3", args) rescue nil + end + end + +end diff --git a/lib/demon/base.rb b/lib/demon/base.rb index e7cffd419b..6fb162faad 100644 --- a/lib/demon/base.rb +++ b/lib/demon/base.rb @@ -3,6 +3,10 @@ module Demon; end # intelligent fork based demonizer class Demon::Base + def self.demons + @demons + end + def self.start(count=1) @demons ||= {} count.times do |i| @@ -31,21 +35,58 @@ class Demon::Base end end + attr_reader :pid, :parent_pid, :started, :index + attr_accessor :stop_timeout + def initialize(index) @index = index @pid = nil @parent_pid = Process.pid @started = false + @stop_timeout = 10 end def pid_file "#{Rails.root}/tmp/pids/#{self.class.prefix}_#{@index}.pid" end + def alive?(pid=nil) + pid ||= @pid + if pid + Demon::Base.alive?(pid) + else + false + end + end + def stop @started = false if @pid + # TODO configurable stop signal Process.kill("HUP",@pid) + + wait_for_stop = lambda { + timeout = @stop_timeout + + while alive? && timeout > 0 + timeout -= (@stop_timeout/10.0) + sleep(@stop_timeout/10.0) + Process.waitpid(@pid, Process::WNOHANG) rescue -1 + end + + Process.waitpid(@pid, Process::WNOHANG) rescue -1 + } + + wait_for_stop.call + + if alive? + STDERR.puts "Process would not terminate cleanly, force quitting. pid: #{@pid}" + Process.kill("KILL", @pid) + end + + wait_for_stop.call + + @pid = nil @started = false end @@ -96,7 +137,7 @@ class Demon::Base def already_running? if File.exists? pid_file pid = File.read(pid_file).to_i - if alive?(pid) + if Demon::Base.alive?(pid) return pid end end @@ -104,6 +145,13 @@ class Demon::Base nil end + def self.alive?(pid) + Process.kill(0, pid) + true + rescue + false + end + private def write_pid_file @@ -120,24 +168,20 @@ class Demon::Base def monitor_parent Thread.new do while true - unless alive?(@parent_pid) - Process.kill "TERM", Process.pid - sleep 10 - Process.kill "KILL", Process.pid + begin + unless alive?(@parent_pid) + Process.kill "TERM", Process.pid + sleep 10 + Process.kill "KILL", Process.pid + end + rescue => e + STDERR.puts "URGENT monitoring thread had an exception #{e}" end sleep 1 end end end - def alive?(pid) - begin - Process.kill(0, pid) - true - rescue - false - end - end def suppress_stdout true diff --git a/lib/discourse.rb b/lib/discourse.rb index 5c97377533..a087120ee7 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -3,6 +3,12 @@ require_dependency 'plugin/instance' require_dependency 'auth/default_current_user_provider' require_dependency 'version' +# Prevents errors with reloading dev with conditional includes +if Rails.env.development? + require_dependency 'file_store/s3_store' + require_dependency 'file_store/local_store' +end + module Discourse require 'sidekiq/exception_handler' @@ -37,7 +43,13 @@ module Discourse class InvalidParameters < StandardError; end # When they don't have permission to do something - class InvalidAccess < StandardError; end + class InvalidAccess < StandardError + attr_reader :obj + def initialize(msg=nil, obj=nil) + super(msg) + @obj = obj + end + end # When something they want is not found class NotFound < StandardError; end @@ -55,19 +67,11 @@ module Discourse class CSRF < StandardError; end def self.filters - @filters ||= [:latest, :unread, :new, :read, :posted, :bookmarks, :search] - end - - def self.feed_filters - @feed_filters ||= [:latest] + @filters ||= [:latest, :unread, :new, :read, :posted, :bookmarks] end def self.anonymous_filters - @anonymous_filters ||= [:latest, :top, :categories, :search] - end - - def self.logged_in_filters - @logged_in_filters ||= Discourse.filters - Discourse.anonymous_filters + @anonymous_filters ||= [:latest, :top, :categories] end def self.top_menu_items @@ -203,7 +207,7 @@ module Discourse end def self.base_url - return base_url_no_prefix + base_uri + base_url_no_prefix + base_uri end def self.enable_readonly_mode @@ -354,7 +358,9 @@ module Discourse end def self.sidekiq_redis_config - { url: $redis.url, namespace: 'sidekiq' } + conf = GlobalSetting.redis_config.dup + conf[:namespace] = 'sidekiq' + conf end def self.static_doc_topic_ids diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb index fa80aa43fd..d966539bab 100644 --- a/lib/discourse_iife.rb +++ b/lib/discourse_iife.rb @@ -24,17 +24,7 @@ class DiscourseIIFE < Sprockets::Processor return data if path =~ /\.hbrs/ return data if path =~ /\.hbs/ - res = "(function () {\n\nvar $ = window.jQuery;\n// IIFE Wrapped Content Begins:\n\n#{data}\n\n// IIFE Wrapped Content Ends\n\n })(this);" - - # Include JS code for JSHint - unless Rails.env.production? - req_path = path.sub(Rails.root.to_s, '') - .sub("/app/assets/javascripts", "") - .sub("/test/javascripts", "") - res << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['/assets#{req_path}'] = #{data.to_json};\n" - end - - res + "(function () {\n\nvar $ = window.jQuery;\n// IIFE Wrapped Content Begins:\n\n#{data}\n\n// IIFE Wrapped Content Ends\n\n })(this);" end end diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb index 8875807f5a..4585836215 100644 --- a/lib/discourse_plugin_registry.rb +++ b/lib/discourse_plugin_registry.rb @@ -77,8 +77,26 @@ class DiscoursePluginRegistry Archetype.register(name, options) end - def self.register_glob(root, extension) - self.asset_globs << [root, extension] + def self.register_glob(root, extension, options=nil) + self.asset_globs << [root, extension, options || {}] + end + + def self.each_globbed_asset(each_options=nil) + each_options ||= {} + + self.asset_globs.each do |g| + root, ext, options = *g + + if options[:admin] + next unless each_options[:admin] + else + next if each_options[:admin] + end + + Dir.glob("#{root}/**/*") do |f| + yield f, ext + end + end end def self.register_asset(asset, opts=nil) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 8cf03960f3..b4943fde9e 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -6,18 +6,11 @@ class DiscourseRedis def self.raw_connection(config = nil) config ||= self.config - redis_opts = {host: config['host'], port: config['port'], db: config['db']} - redis_opts[:password] = config['password'] if config['password'] - Redis.new(redis_opts) + Redis.new(config) end def self.config - @config ||= YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env] - end - - def self.url(config=nil) - config ||= self.config - "redis://#{(':' + config['password'] + '@') if config['password']}#{config['host']}:#{config['port']}/#{config['db']}" + GlobalSetting.redis_config end def initialize(config=nil) @@ -30,10 +23,6 @@ class DiscourseRedis @redis end - def url - self.class.url(@config) - end - def self.ignore_readonly yield rescue Redis::CommandError => ex diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb index 777c9b780e..58974b77ad 100644 --- a/lib/distributed_cache.rb +++ b/lib/distributed_cache.rb @@ -31,7 +31,7 @@ class DistributedCache hash = current.hash(message.site_id) case payload["op"] - when "set" then hash[payload["key"]] = payload["value"] + when "set" then hash[payload["key"]] = payload["marshalled"] ? Marshal.load(payload["value"]) : payload["value"] when "delete" then hash.delete(payload["key"]) when "clear" then hash.clear end @@ -69,7 +69,10 @@ class DistributedCache end def self.set(hash, key, value) - publish(hash, { op: :set, key: key, value: value }) + # special support for set + marshal = Set === value + value = Marshal.dump(value) if marshal + publish(hash, { op: :set, key: key, value: value, marshalled: marshal }) end def self.delete(hash, key) diff --git a/lib/distributed_memoizer.rb b/lib/distributed_memoizer.rb index ead419caa3..c5e7031d37 100644 --- a/lib/distributed_memoizer.rb +++ b/lib/distributed_memoizer.rb @@ -30,8 +30,7 @@ class DistributedMemoizer end ensure - # NOTE: delete regardless so next one in does not need to wait MAX_WAIT - # again + # NOTE: delete regardless so next one in does not need to wait MAX_WAIT again redis.del(redis_lock_key) end end @@ -49,6 +48,7 @@ class DistributedMemoizer end protected + def self.get_lock(redis, redis_lock_key) redis.watch(redis_lock_key) current = redis.get(redis_lock_key) @@ -61,6 +61,6 @@ class DistributedMemoizer end redis.unwatch - return result == ["OK"] + result == ["OK"] end end diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb index 5e1428d969..bacc5f1cf1 100644 --- a/lib/email/message_builder.rb +++ b/lib/email/message_builder.rb @@ -21,20 +21,21 @@ module Email @to = to @opts = opts || {} - @template_args = {site_name: SiteSetting.email_prefix.presence || SiteSetting.title, - base_url: Discourse.base_url, - user_preferences_url: "#{Discourse.base_url}/my/preferences" }.merge!(@opts) + @template_args = { + site_name: SiteSetting.email_prefix.presence || SiteSetting.title, + base_url: Discourse.base_url, + user_preferences_url: "#{Discourse.base_url}/my/preferences", + }.merge!(@opts) if @template_args[:url].present? if @opts[:include_respond_instructions] == false @template_args[:respond_instructions] = '' else - @template_args[:respond_instructions] = - if allow_reply_by_email? - I18n.t('user_notifications.reply_by_email', @template_args) - else - I18n.t('user_notifications.visit_link_to_respond', @template_args) - end + @template_args[:respond_instructions] = if allow_reply_by_email? + I18n.t('user_notifications.reply_by_email', @template_args) + else + I18n.t('user_notifications.visit_link_to_respond', @template_args) + end end end end @@ -56,15 +57,15 @@ module Email def html_part return unless html_override = @opts[:html_override] - if @opts[:add_unsubscribe_link] + if @opts[:add_unsubscribe_link] if response_instructions = @template_args[:respond_instructions] respond_instructions = PrettyText.cook(response_instructions).html_safe html_override.gsub!("%{respond_instructions}", respond_instructions) end unsubscribe_link = PrettyText.cook(I18n.t('unsubscribe_link', template_args)).html_safe - html_override.gsub!("%{unsubscribe_link}",unsubscribe_link) + html_override.gsub!("%{unsubscribe_link}", unsubscribe_link) end styled = Email::Styles.new(html_override) diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 4c1b5760bc..f8fb71f5bd 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -155,6 +155,8 @@ module Email else object.body.to_s end + rescue + nil end REPLYING_HEADER_LABELS = ['From', 'Sent', 'To', 'Subject', 'Reply To', 'Cc', 'Bcc', 'Date'] diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 426c03d670..22f9ffe1e8 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -159,13 +159,16 @@ module Email end def strip_avatars_and_emojis - @fragment.css('img').each do |img| + @fragment.search('img').each do |img| if img['src'] =~ /_avatar/ img.parent['style'] = "vertical-align: top;" if img.parent.name == 'td' img.remove end - img.replace(img['title']) if (img['src'] =~ /images\/emoji/ || img['src'] =~ /uploads\/default\/_emoji/) + if img['title'] && (img['src'] =~ /images\/emoji/ || img['src'] =~ /uploads\/default\/_emoji/) + img.add_previous_sibling(img['title'] || "emoji") + img.remove + end end @fragment.to_s diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index 6b5658963e..30f575f423 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -83,8 +83,6 @@ module Tilt @output = klass.v8.eval(generate_source(scope)) end - source = @output.dup - # For backwards compatibility with plugins, for now export the Global format too. # We should eventually have an upgrade system for plugins to use ES6 or some other # resolve based API. @@ -108,27 +106,16 @@ module Tilt result = "Controller" if result == "ControllerController" result = "Route" if result == "DiscourseRoute" result = "View" if result == "ViewView" + result.gsub!(/Mixin$/, '') result.gsub!(/Model$/, '') - @output << "\n\nDiscourse.#{result} = require('#{require_name}').default;\n" + if result != "PostMenuView" + @output << "\n\nDiscourse.#{result} = require('#{require_name}').default;\n" + end end end - # Include JS code for JSHint - unless Rails.env.production? - if scope.pathname.to_s =~ /js\.es6/ - extension = "js.es6" - elsif scope.pathname.to_s =~ /\.es6/ - extension = "es6" - else - extension = "js" - end - req_path = "/assets/#{scope.logical_path}.#{extension}" - - @output << "\nwindow.__jshintSrc = window.__jshintSrc || {}; window.__jshintSrc['#{req_path}'] = #{data.to_json};\n" - end - @output end @@ -136,7 +123,7 @@ module Tilt def generate_source(scope) js_source = ::JSON.generate(data, quirks_mode: true) - js_source = "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring']})['code']" + js_source = "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators']})['code']" "new module.exports.Compiler(#{js_source}, '#{module_name(scope.root_path, scope.logical_path)}', #{compiler_options}).#{compiler_method}()" end diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb index f36fd01505..95e9cf1de7 100644 --- a/lib/excerpt_parser.rb +++ b/lib/excerpt_parser.rb @@ -13,6 +13,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document @text_entities = options[:text_entities] == true @markdown_images = options[:markdown_images] == true @keep_newlines = options[:keep_newlines] == true + @keep_emojis = options[:keep_emojis] == true @start_excerpt = false end @@ -48,10 +49,15 @@ class ExcerptParser < Nokogiri::XML::SAX::Document case name when "img" + attributes = Hash[*attributes.flatten] + + if @keep_emojis && attributes["class"] == 'emoji' + return include_tag(name, attributes) + end + # If include_images is set, include the image in markdown characters("!") if @markdown_images - attributes = Hash[*attributes.flatten] if attributes["alt"] characters("[#{attributes["alt"]}]") elsif attributes["title"] diff --git a/lib/file_helper.rb b/lib/file_helper.rb index 008dc55216..30f9895a71 100644 --- a/lib/file_helper.rb +++ b/lib/file_helper.rb @@ -14,7 +14,7 @@ class FileHelper tmp = Tempfile.new([tmp_file_name, extension]) File.open(tmp.path, "wb") do |f| - downloaded = uri.open("rb", read_timeout: 5, redirect: follow_redirect) + downloaded = uri.open("rb", read_timeout: 5, redirect: follow_redirect, allow_redirections: :all) while f.size <= max_file_size && data = downloaded.read(512.kilobytes) f.write(data) end diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb index b5c172eeeb..53a20df389 100644 --- a/lib/file_store/local_store.rb +++ b/lib/file_store/local_store.rb @@ -14,7 +14,7 @@ module FileStore path = public_dir + url tombstone = public_dir + url.sub("/uploads/", "/tombstone/") FileUtils.mkdir_p(Pathname.new(tombstone).dirname) - FileUtils.move(path, tombstone) + FileUtils.move(path, tombstone, :force => true) rescue Errno::ENOENT # don't care if the file isn't there end diff --git a/lib/freedom_patches/active_record_base.rb b/lib/freedom_patches/active_record_base.rb index eafb7f7219..4f62d40647 100644 --- a/lib/freedom_patches/active_record_base.rb +++ b/lib/freedom_patches/active_record_base.rb @@ -4,7 +4,7 @@ class ActiveRecord::Base def self.exec_sql(*args) conn = ActiveRecord::Base.connection sql = ActiveRecord::Base.send(:sanitize_sql_array, args) - conn.execute(sql) + conn.raw_connection.exec(sql) end def self.exec_sql_row_count(*args) diff --git a/lib/freedom_patches/i18n_fallbacks.rb b/lib/freedom_patches/i18n_fallbacks.rb new file mode 100644 index 0000000000..b8aa691835 --- /dev/null +++ b/lib/freedom_patches/i18n_fallbacks.rb @@ -0,0 +1,17 @@ +module I18n + module Backend + module Fallbacks + def exists?(locale, key) + I18n.fallbacks[locale].each do |fallback| + begin + return true if super(fallback, key) + rescue I18n::InvalidLocale + # we do nothing when the locale is invalid, as this is a fallback anyways. + end + end + + false + end + end + end +end diff --git a/lib/freedom_patches/open_uri_redirections.rb b/lib/freedom_patches/open_uri_redirections.rb new file mode 100644 index 0000000000..78bb47b1f3 --- /dev/null +++ b/lib/freedom_patches/open_uri_redirections.rb @@ -0,0 +1,98 @@ +##### +# Patch to allow open-uri to follow safe (http to https) +# and unsafe redirections (https to http). +# +# Original gist URL: +# https://gist.github.com/1271420 +# +# Relevant issue: +# http://redmine.ruby-lang.org/issues/3719 +# +# Source here: +# https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb +# +# Thread-safe implementation adapted from: +# https://github.com/obfusk/open_uri_w_redirect_to_https +# +# Copy and pasted from: +# https://github.com/open-uri-redirections/open_uri_redirections +# + +require "open-uri" + +module OpenURI + class < HTTPS redirections. + # * :all will allow HTTP => HTTPS and HTTPS => HTTP redirections. + # + # OpenURI::open can receive different kinds of arguments, like a string for + # the mode or an integer for the permissions, and then a hash with options + # like UserAgent, etc. + # + # To find the :allow_redirections option, we look for this options hash. + # + def self.open_uri(name, *rest, &block) + Thread.current[:__open_uri_redirections__] = allow_redirections(rest) + + block2 = lambda do |io| + Thread.current[:__open_uri_redirections__] = nil + block[io] + end + + begin + open_uri_original name, *rest, &(block ? block2 : nil) + ensure + Thread.current[:__open_uri_redirections__] = nil + end + end + + private + + def self.allow_redirections(args) + options = first_hash_argument(args) + options.delete :allow_redirections if options + end + + def self.first_hash_argument(arguments) + arguments.select { |arg| arg.is_a? Hash }.first + end + + def self.http_to_https?(uri1, uri2) + schemes_from([uri1, uri2]) == %w(http https) + end + + def self.https_to_http?(uri1, uri2) + schemes_from([uri1, uri2]) == %w(https http) + end + + def self.schemes_from(uris) + uris.map { |u| u.scheme.downcase } + end +end diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb index 95f9f9d0b1..7b3fc986a6 100644 --- a/lib/freedom_patches/translate_accelerator.rb +++ b/lib/freedom_patches/translate_accelerator.rb @@ -59,6 +59,11 @@ module I18n end end + def ensure_loaded!(locale) + @loaded_locales ||= [] + load_locale locale unless @loaded_locales.include?(locale) + end + def translate(key, *args) load_locale(config.locale) unless @loaded_locales.include?(config.locale) return translate_no_cache(key, *args) if args.length > 0 diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index e3f1a030b8..d668803ab5 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -144,10 +144,13 @@ module PostGuardian end def can_see_post?(post) - post.present? && - (is_admin? || - ((is_moderator? || !post.deleted_at.present?) && - can_see_topic?(post.topic))) + return false if post.blank? + return true if is_admin? + return false unless can_see_topic?(post.topic) + return false unless post.user == @user || Topic.visible_post_types(@user).include?(post.post_type) + return false if !is_moderator? && post.deleted_at.present? + + true end def can_view_edit_history?(post) diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb index 6543208b53..cb5cc6d723 100644 --- a/lib/guardian/topic_guardian.rb +++ b/lib/guardian/topic_guardian.rb @@ -15,7 +15,7 @@ module TopicGuardian def can_create_topic_on_category?(category) can_create_topic?(nil) && - (!category || Category.topic_create_allowed(self).where(:id => category.id).count == 1) + (!category || Category.topic_create_allowed(self).where(id: category.id).count == 1) end def can_create_post_on_topic?(topic) @@ -72,6 +72,22 @@ module TopicGuardian !topic.read_restricted_category? || can_see_category?(topic.category) end + def can_see_topic_if_not_deleted?(topic) + return false unless topic + # Admins can see everything + return true if is_admin? + # Deleted topics + # return false if topic.deleted_at && !can_see_deleted_topics? + + if topic.private_message? + return authenticated? && + topic.all_allowed_users.where(id: @user.id).exists? + end + + # not secure, or I can see it + !topic.read_restricted_category? || can_see_category?(topic.category) + end + def filter_allowed_categories(records) unless is_admin? allowed_ids = allowed_category_ids diff --git a/lib/image_sizer.rb b/lib/image_sizer.rb index 3fa0160047..cc4ee8a6b5 100644 --- a/lib/image_sizer.rb +++ b/lib/image_sizer.rb @@ -1,18 +1,18 @@ module ImageSizer # Resize an image to the aspect ratio we want - def self.resize(width, height) + def self.resize(width, height, opts = {}) return if width.blank? || height.blank? - max_width = SiteSetting.max_image_width.to_f - max_height = SiteSetting.max_image_height.to_f + max_width = (opts[:max_width] || SiteSetting.max_image_width).to_f + max_height = (opts[:max_height] || SiteSetting.max_image_height).to_f w = width.to_f h = height.to_f return [w.floor, h.floor] if w <= max_width && h <= max_height - ratio = [max_width / w, max_height / h].min; + ratio = [max_width / w, max_height / h].min [(w * ratio).floor, (h * ratio).floor] end diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index 2211015300..af06c33409 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -1,30 +1,98 @@ module JsLocaleHelper - def self.output_locale(locale, translations = nil) - current_locale = I18n.locale - I18n.locale = locale.to_sym + def self.load_translations(locale, opts=nil) + opts ||= {} + @loaded_translations = nil if opts[:force] + + @loaded_translations ||= HashWithIndifferentAccess.new + @loaded_translations[locale] ||= begin + locale_str = locale.to_s + + # load default translations + translations = YAML::load(File.open("#{Rails.root}/config/locales/client.#{locale_str}.yml")) + # load plugins translations + plugin_translations = {} + Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file| + plugin_translations.deep_merge! YAML::load(File.open(file)) + end + + # merge translations (plugin translations overwrite default translations) + translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['js'] + + # We used to split the admin versus the client side, but it's much simpler to just + # include both for now due to the small size of the admin section. + # + # For now, let's leave it split out in the translation file in case we want to split + # it again later, so we'll merge the JSON ourselves. + admin_contents = translations[locale_str].delete('admin_js') + translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present? + translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js'] + + translations + end + end + + # purpose-built recursive algorithm ahoy! + def self.deep_delete_matches(deleting_from, *checking_hashes) + checking_hashes.compact! + + new_hash = deleting_from.dup + deleting_from.each do |key, value| + if value.is_a? Hash + # Recurse + new_at_key = deep_delete_matches(deleting_from[key], *(checking_hashes.map {|h| h[key]})) + if new_at_key.empty? + new_hash.delete key + else + new_hash[key] = new_at_key + end + else + if checking_hashes.any? {|h| h.include? key} + new_hash.delete key + end + end + end + new_hash + end + + def self.load_translations_merged(*locales) + @loaded_merges ||= {} + @loaded_merges[locales.join('-')] ||= begin + all_translations = {} + merged_translations = {} + loaded_locales = [] + + locales.map(&:to_s).each do |locale| + all_translations[locale] = JsLocaleHelper.load_translations locale + merged_translations[locale] = deep_delete_matches(all_translations[locale][locale], *loaded_locales.map { |l| merged_translations[l] }) + loaded_locales << locale + end + merged_translations + end + end + + def self.output_locale(locale) + locale_sym = locale.to_sym locale_str = locale.to_s - # load default translations - translations ||= YAML::load(File.open("#{Rails.root}/config/locales/client.#{locale_str}.yml")) - # load plugins translations - plugin_translations = {} - Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file| - plugin_translations.deep_merge! YAML::load(File.open(file)) + current_locale = I18n.locale + I18n.locale = locale_sym + + site_locale = SiteSetting.default_locale.to_sym + + if Rails.env.development? + translations = load_translations(locale_sym, force: true) + else + if locale_sym == :en + translations = load_translations(locale_sym) + elsif locale_sym == site_locale || site_locale == :en + translations = load_translations_merged(locale_sym, :en) + else + translations = load_translations_merged(locale_sym, site_locale, :en) + end end - # merge translations (plugin translations overwrite default translations) - translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['js'] - - # We used to split the admin versus the client side, but it's much simpler to just - # include both for now due to the small size of the admin section. - # - # For now, let's leave it split out in the translation file in case we want to split - # it again later, so we'll merge the JSON ourselves. - admin_contents = translations[locale_str].delete('admin_js') - translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present? - translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js'] message_formats = strip_out_message_formats!(translations[locale_str]['js']) result = generate_message_format(message_formats, locale_str) @@ -51,7 +119,7 @@ module JsLocaleHelper def self.moment_format_function(name) format = I18n.t("dates.#{name}") - result = "moment.fn.#{name.camelize(:lower)} = function(){ return this.format('#{format}'); };\n" + "moment.fn.#{name.camelize(:lower)} = function(){ return this.format('#{format}'); };\n" end def self.moment_locale(locale_str) diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb index 5105fa2a5f..abde76ec08 100644 --- a/lib/letter_avatar.rb +++ b/lib/letter_avatar.rb @@ -31,7 +31,7 @@ class LetterAvatar end def generate(username, size, opts = nil) - DistributedMutex.synchronize("letter_avatar_#{version}_#{username}_#{size}") do + DistributedMutex.synchronize("letter_avatar_#{version}_#{username}") do identity = Identity.from_username(username) cache = true @@ -45,6 +45,9 @@ class LetterAvatar fullsize = fullsize_path(identity) generate_fullsize(identity) if !cache || !File.exists?(fullsize) + # Optimizing here is dubious, it can save up to 2x for large images (eg 359px) + # BUT... we are talking 2400 bytes down to 1200 bytes, both fit in one packet + # The cost of this is huge, its a 40% perf hit OptimizedImage.resize(fullsize, filename, size, size) filename @@ -81,8 +84,7 @@ class LetterAvatar `convert #{instructions.join(" ")}` - ImageOptim.new.optimize_image!(filename) rescue nil - + ## do not optimize image, it will end up larger than original filename end diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb index d315c53a50..a65eb2df1a 100644 --- a/lib/middleware/anonymous_cache.rb +++ b/lib/middleware/anonymous_cache.rb @@ -89,6 +89,7 @@ module Middleware if status == 200 && cache_duration headers_stripped = headers.dup.delete_if{|k, _| ["Set-Cookie","X-MiniProfiler-Ids"].include? k} + headers_stripped["X-Discourse-Cached"] = "true" parts = [] response.each do |part| parts << part diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb index ee8c25f962..4a1bcb0803 100644 --- a/lib/middleware/request_tracker.rb +++ b/lib/middleware/request_tracker.rb @@ -21,8 +21,10 @@ class Middleware::RequestTracker ApplicationRequest.increment!(:page_view_crawler) elsif data[:has_auth_cookie] ApplicationRequest.increment!(:page_view_logged_in) + ApplicationRequest.increment!(:page_view_logged_in_mobile) if data[:is_mobile] else ApplicationRequest.increment!(:page_view_anon) + ApplicationRequest.increment!(:page_view_anon_mobile) if data[:is_mobile] end end @@ -45,7 +47,6 @@ class Middleware::RequestTracker TRACK_VIEW = "HTTP_DISCOURSE_TRACK_VIEW".freeze CONTENT_TYPE = "Content-Type".freeze def self.get_data(env,result) - status,headers = result status = status.to_i @@ -56,12 +57,14 @@ class Middleware::RequestTracker track_view = status == 200 track_view &&= env_track_view != "0".freeze && env_track_view != "false".freeze track_view &&= env_track_view || (request.get? && !request.xhr? && headers[CONTENT_TYPE] =~ /text\/html/) + track_view = !!track_view { status: status, is_crawler: helper.is_crawler?, has_auth_cookie: helper.has_auth_cookie?, is_background: request.path =~ /^\/message-bus\// || request.path == /\/topics\/timings/, + is_mobile: helper.is_mobile?, track_view: track_view } end @@ -75,11 +78,15 @@ class Middleware::RequestTracker host = RailsMultisite::ConnectionManagement.host(env) if data - Scheduler::Defer.later("Track view", _db=nil) do - self.class.log_request_on_site(data,host) - end + log_later(data,host) end end + def log_later(data,host) + Scheduler::Defer.later("Track view", _db=nil) do + self.class.log_request_on_site(data,host) + end + end + end diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index 7c17135d02..901e7417e6 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -28,15 +28,69 @@ class NewPostManager @sorted_handlers.sort_by! {|h| -h[:priority]} end - def self.user_needs_approval?(user) + def self.is_first_post?(manager) + user = manager.user + args = manager.args + + !!( + args[:first_post_checks] && + user.post_count == 0 + ) + end + + def self.is_fast_typer?(manager) + args = manager.args + + is_first_post?(manager) && + args[:typing_duration_msecs].to_i < SiteSetting.min_first_post_typing_time && + SiteSetting.auto_block_fast_typers_on_first_post && + manager.user.trust_level <= SiteSetting.auto_block_fast_typers_max_trust_level + end + + def self.matches_auto_block_regex?(manager) + args = manager.args + + pattern = SiteSetting.auto_block_first_post_regex + + return false unless pattern.present? + return false unless is_first_post?(manager) + + begin + regex = Regexp.new(pattern, Regexp::IGNORECASE) + rescue => e + Rails.logger.warn "Invalid regex in auto_block_first_post_regex #{e}" + return false + end + + "#{args[:title]} #{args[:raw]}" =~ regex + + end + + def self.user_needs_approval?(manager) + user = manager.user + return false if user.staff? (user.post_count < SiteSetting.approve_post_count) || - (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) + (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) || + is_fast_typer?(manager) || + matches_auto_block_regex?(manager) end def self.default_handler(manager) - manager.enqueue('default') if user_needs_approval?(manager.user) + if user_needs_approval?(manager) + + result = manager.enqueue('default') + + block = is_fast_typer?(manager) + + block ||= matches_auto_block_regex?(manager) + + manager.user.update_columns(blocked: true) if block + + result + + end end def self.queue_enabled? diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index 79227ac1f3..50aa8bc7b0 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -82,13 +82,14 @@ module Oneboxer changed = false Oneboxer.each_onebox_link(doc) do |url, element| - onebox, preview = yield(url,element) + onebox, _preview = yield(url,element) if onebox parsed_onebox = Nokogiri::HTML::fragment(onebox) next unless parsed_onebox.children.count > 0 # special logic to strip empty p elements if element.parent && + element.parent.node_name && element.parent.node_name.downcase == "p" && element.parent.children.count == 1 element = element.parent @@ -128,7 +129,10 @@ module Oneboxer } } rescue => e - Discourse.handle_job_exception(e, message: "While trying to onebox a URL", url: url) + # no point warning here, just cause we have an issue oneboxing a url + # we can later hunt for failed oneboxes by searching logs if needed + Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}") + # return a blank hash, so rest of the code works {preview: "", onebox: ""} end diff --git a/lib/permalink_constraint.rb b/lib/permalink_constraint.rb index 0abf395e28..8fc9520290 100644 --- a/lib/permalink_constraint.rb +++ b/lib/permalink_constraint.rb @@ -1,7 +1,7 @@ class PermalinkConstraint def matches?(request) - Permalink.where(url: request.fullpath[1..-1]).exists? + Permalink.where(url: Permalink.normalize_url(request.fullpath)).exists? end end diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index 99e978f9b9..d51adc4f13 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -35,6 +35,7 @@ class Plugin::Instance def initialize(metadata=nil, path=nil) @metadata = metadata @path = path + @idx = 0 end def add_admin_route(label, location) @@ -62,6 +63,7 @@ class Plugin::Instance end # Extend a class but check that the plugin is enabled + # for class methods use `add_class_method` def add_to_class(klass, attr, &block) klass = klass.to_s.classify.constantize @@ -74,6 +76,35 @@ class Plugin::Instance end end + # Adds a class method to a class, respecting if plugin is enabled + def add_class_method(klass, attr, &block) + klass = klass.to_s.classify.constantize rescue klass.to_s.constantize + + hidden_method_name = :"#{attr}_without_enable_check" + klass.send(:define_singleton_method, hidden_method_name, &block) + + plugin = self + klass.send(:define_singleton_method, attr) do |*args| + send(hidden_method_name, *args) if plugin.enabled? + end + end + + def add_model_callback(klass, callback, &block) + klass = klass.to_s.classify.constantize rescue klass.to_s.constantize + plugin = self + + # generate a unique method name + method_name = "#{plugin.name}_#{klass.name}_#{callback}#{@idx}".underscore + @idx += 1 + hidden_method_name = :"#{method_name}_without_enable_check" + klass.send(:define_method, hidden_method_name, &block) + + klass.send(callback) do |*args| + send(hidden_method_name, *args) if plugin.enabled? + end + + end + # Add validation method but check that the plugin is enabled def validate(klass, name, &block) klass = klass.to_s.classify.constantize @@ -141,7 +172,13 @@ class Plugin::Instance end initializers.each do |callback| - callback.call(self) + begin + callback.call(self) + rescue ActiveRecord::StatementInvalid => e + # When running db:migrate for the first time on a new database, plugin initializers might + # try to use models. Tolerate it. + raise e unless e.message.try(:include?, "PG::UndefinedTable") + end end end @@ -223,6 +260,10 @@ class Plugin::Instance root_path = "#{File.dirname(@path)}/assets/javascripts" DiscoursePluginRegistry.register_glob(root_path, 'js.es6') DiscoursePluginRegistry.register_glob(root_path, 'hbs') + + admin_path = "#{File.dirname(@path)}/admin/assets/javascripts" + DiscoursePluginRegistry.register_glob(admin_path, 'js.es6', admin: true) + DiscoursePluginRegistry.register_glob(admin_path, 'hbs', admin: true) end self.instance_eval File.read(path), path @@ -241,6 +282,8 @@ class Plugin::Instance # Automatically include assets Rails.configuration.assets.paths << auto_generated_path Rails.configuration.assets.paths << File.dirname(path) + "/assets" + Rails.configuration.assets.paths << File.dirname(path) + "/admin/assets" + Rails.configuration.assets.paths << File.dirname(path) + "/test/javascripts" # Automatically include rake tasks Rake.add_rakelib(File.dirname(path) + "/lib/tasks") @@ -299,8 +342,12 @@ class Plugin::Instance end end - def enabled_site_setting(setting) - @enabled_site_setting = setting + def enabled_site_setting(setting=nil) + if setting + @enabled_site_setting = setting + else + @enabled_site_setting + end end protected diff --git a/lib/post_creator.rb b/lib/post_creator.rb index bb9723a959..182cb0a366 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -31,6 +31,7 @@ class PostCreator # :raw_email - Imported from an email # via_email - Mark this post as arriving via email # raw_email - Full text of arriving email (to store) + # action_code - Describes a small_action post (optional) # # When replying to a topic: # topic_id - topic we're replying to @@ -53,9 +54,17 @@ class PostCreator # If we don't do this we introduce a rather risky dependency @user = user @opts = opts || {} + opts[:title] = pg_clean_up(opts[:title]) if opts[:title] && opts[:title].include?("\u0000") + opts[:raw] = pg_clean_up(opts[:raw]) if opts[:raw] && opts[:raw].include?("\u0000") + opts.delete(:reply_to_post_number) unless opts[:topic_id] + @spam = false end + def pg_clean_up(str) + str.gsub("\u0000", "") + end + # True if the post was considered spam def spam? @spam @@ -112,6 +121,7 @@ class PostCreator def create if valid? transaction do + build_post_stats create_topic save_post extract_links @@ -145,6 +155,14 @@ class PostCreator @post end + def self.track_post_stats + Rails.env != "test".freeze || @track_post_stats + end + + def self.track_post_stats=(val) + @track_post_stats = val + end + def self.create(user, opts) PostCreator.new(user, opts).create end @@ -171,6 +189,23 @@ class PostCreator protected + def build_post_stats + if PostCreator.track_post_stats + draft_key = @topic ? "topic_#{@topic.id}" : "new_topic" + + sequence = DraftSequence.current(@user, draft_key) + revisions = Draft.where(sequence: sequence, + user_id: @user.id, + draft_key: draft_key).pluck(:revisions).first || 0 + + @post.build_post_stat( + drafts_saved: revisions, + typing_duration_msecs: @opts[:typing_duration_msecs] || 0, + composer_open_duration_msecs: @opts[:composer_open_duration_msecs] || 0 + ) + end + end + def trigger_after_events(post) DiscourseEvent.trigger(:topic_created, post.topic, @opts, @user) unless @opts[:topic_id] DiscourseEvent.trigger(:post_created, post, @opts, @user) @@ -193,7 +228,8 @@ class PostCreator # discourse post. def create_embedded_topic return unless @opts[:embed_url].present? - TopicEmbed.create!(topic_id: @post.topic_id, post_id: @post.id, embed_url: @opts[:embed_url]) + embed = TopicEmbed.new(topic_id: @post.topic_id, post_id: @post.id, embed_url: @opts[:embed_url]) + rollback_from_errors!(embed) unless embed.save end def handle_spam @@ -239,11 +275,15 @@ class PostCreator end def update_topic_stats - # Update attributes on the topic - featured users and last posted. - attrs = {last_posted_at: @post.created_at, last_post_user_id: @post.user_id} - attrs[:bumped_at] = @post.created_at unless @post.no_bump - attrs[:word_count] = (@topic.word_count || 0) + @post.word_count + return if @post.post_type == Post.types[:whisper] + + attrs = { + last_posted_at: @post.created_at, + last_post_user_id: @post.user_id, + word_count: (@topic.word_count || 0) + @post.word_count, + } attrs[:excerpt] = @post.excerpt(220, strip_links: true) if new_topic? + attrs[:bumped_at] = @post.created_at unless @post.no_bump @topic.update_attributes(attrs) end @@ -254,7 +294,7 @@ class PostCreator end def setup_post - @opts[:raw] = TextCleaner.normalize_whitespaces(@opts[:raw]).gsub(/\s+\z/, "") + @opts[:raw] = TextCleaner.normalize_whitespaces(@opts[:raw] || '').gsub(/\s+\z/, "") post = Post.new(raw: @opts[:raw], topic_id: @topic.try(:id), @@ -262,7 +302,7 @@ class PostCreator reply_to_post_number: @opts[:reply_to_post_number]) # Attributes we pass through to the post instance if present - [:post_type, :no_bump, :cooking_options, :image_sizes, :acting_user, :invalidate_oneboxes, :cook_method, :via_email, :raw_email].each do |a| + [:post_type, :no_bump, :cooking_options, :image_sizes, :acting_user, :invalidate_oneboxes, :cook_method, :via_email, :raw_email, :action_code].each do |a| post.send("#{a}=", @opts[a]) if @opts[a].present? end @@ -303,8 +343,7 @@ class PostCreator @user.user_stat.save! - @user.last_posted_at = @post.created_at - @user.save! + @user.update_attributes(last_posted_at: @post.created_at) end def publish diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb index fb6bd9079c..394b6ccc43 100644 --- a/lib/post_destroyer.rb +++ b/lib/post_destroyer.rb @@ -58,6 +58,7 @@ class PostDestroyer topic = Topic.with_deleted.find @post.topic_id topic.recover! if @post.is_first_post? topic.update_statistics + recover_user_actions DiscourseEvent.trigger(:post_recovered, @post, @opts, @user) end @@ -90,7 +91,7 @@ class PostDestroyer end update_associated_category_latest_topic update_user_counts - TopicUser.update_post_action_cache(topic_id: @post.topic_id) + TopicUser.update_post_action_cache(post_id: @post.id) end feature_users_in_the_topic if @post.topic @@ -166,6 +167,11 @@ class PostDestroyer end end + def recover_user_actions + # TODO: Use a trash concept for `user_actions` to avoid churn and simplify this? + UserActionObserver.log_post(@post) + end + def remove_associated_replies post_ids = PostReply.where(reply_id: @post.id).pluck(:post_id) diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb index 3d17c8c66c..d4e1354aaa 100644 --- a/lib/post_jobs_enqueuer.rb +++ b/lib/post_jobs_enqueuer.rb @@ -56,6 +56,9 @@ class PostJobsEnqueuer end def skip_after_create? - @opts[:import_mode] || @topic.private_message? || @post.post_type == Post.types[:moderator_action] + @opts[:import_mode] || + @topic.private_message? || + @post.post_type == Post.types[:moderator_action] || + @post.post_type == Post.types[:small_action] end end diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index 48f9c97143..6a97b16655 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -136,6 +136,9 @@ class PostRevisor publish_changes grant_badge + TopicLink.extract_from(@post) + QuotedPost.extract_from(@post) + successfully_saved_post_and_topic end @@ -202,7 +205,7 @@ class PostRevisor USER_ACTIONS_TO_REMOVE ||= [UserAction::REPLY, UserAction::RESPONSE] def update_post - if @fields.has_key?("user_id") && @fields["user_id"] != @post.user_id + if @fields.has_key?("user_id") && @fields["user_id"] != @post.user_id && @post.user_id != nil prev_owner = User.find(@post.user_id) new_owner = User.find(@fields["user_id"]) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 2f6417f894..1b43959482 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -7,8 +7,6 @@ require_dependency 'post' module PrettyText class Helpers - include UrlHelper - def t(key, opts) key = "js." + key unless opts @@ -27,20 +25,13 @@ module PrettyText return "" unless user.present? # TODO: Add support for ES6 and call `avatar-template` directly - if !user.uploaded_avatar_id && SiteSetting.default_avatars.present? - split_avatars = SiteSetting.default_avatars.split("\n") - if split_avatars.present? - hash = username.each_char.reduce(0) do |result, char| - [((result << 5) - result) + char.ord].pack('L').unpack('l').first - end - - avatar_template = split_avatars[hash.abs % split_avatars.size] - end + if !user.uploaded_avatar_id + avatar_template = User.default_template(username) else avatar_template = user.avatar_template end - schemaless absolute avatar_template + UrlHelper.schemaless UrlHelper.absolute avatar_template end def is_username_valid(username) @@ -88,8 +79,8 @@ module PrettyText "vendor/assets/javascripts/better_markdown.js", "app/assets/javascripts/defer/html-sanitizer-bundle.js", "app/assets/javascripts/discourse/dialects/dialect.js", + "app/assets/javascripts/discourse/lib/censored-words.js", "app/assets/javascripts/discourse/lib/utilities.js", - "app/assets/javascripts/discourse/lib/html.js", "app/assets/javascripts/discourse/lib/markdown.js", ) @@ -136,17 +127,38 @@ module PrettyText end def self.decorate_context(context) - context.eval("Discourse.SiteSettings = #{SiteSetting.client_settings_json};") context.eval("Discourse.CDN = '#{Rails.configuration.action_controller.asset_host}';") - context.eval("Discourse.BaseUrl = 'http://#{RailsMultisite::ConnectionManagement.current_hostname}';") - context.eval("Discourse.getURL = function(url) { return '#{Discourse::base_uri}' + url };") - context.eval("Discourse.getURLWithCDN = function(url) { url = Discourse.getURL(url); if (Discourse.CDN) { url = Discourse.CDN + url; } return url; };") + context.eval("Discourse.BaseUrl = '#{RailsMultisite::ConnectionManagement.current_hostname}'.replace(/:[\d]*$/,'');") + context.eval("Discourse.BaseUri = '#{Discourse::base_uri("/")}';") + context.eval("Discourse.SiteSettings = #{SiteSetting.client_settings_json};") + + context.eval("Discourse.getURL = function(url) { + if (!url) return url; + if (!/^\\/[^\\/]/.test(url)) return url; + + var u = (Discourse.BaseUri === undefined ? '/' : Discourse.BaseUri); + + if (u[u.length-1] === '/') u = u.substring(0, u.length-1); + if (url.indexOf(u) !== -1) return url; + if (u.length > 0 && url[0] !== '/') url = '/' + url; + + return u + url; + };") + + context.eval("Discourse.getURLWithCDN = function(url) { + url = this.getURL(url); + if (Discourse.CDN && /^\\/[^\\/]/.test(url)) { + url = Discourse.CDN + url; + } else if (Discourse.S3CDN) { + url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN); + } + return url; + };") end def self.markdown(text, opts=nil) # we use the exact same markdown converter as the client # TODO: use the same extensions on both client and server (in particular the template for mentions) - baked = nil protect do @@ -224,6 +236,7 @@ module PrettyText def self.add_s3_cdn(doc) doc.css("img").each do |img| + next unless img["src"] img["src"] = img["src"].sub(Discourse.store.absolute_base_url, SiteSetting.s3_cdn_url) end end diff --git a/lib/sass/discourse_sass_compiler.rb b/lib/sass/discourse_sass_compiler.rb index c8f1908245..fb0c2a66c3 100644 --- a/lib/sass/discourse_sass_compiler.rb +++ b/lib/sass/discourse_sass_compiler.rb @@ -1,6 +1,12 @@ require_dependency 'sass/discourse_sass_importer' require 'pathname' +module Sass::Script::Functions + def _error(message) + raise Sass::SyntaxError, mesage + end +end + class DiscourseSassCompiler def self.compile(scss, target, opts={}) diff --git a/lib/sass/discourse_sass_importer.rb b/lib/sass/discourse_sass_importer.rb index b9ad83da3e..a7558c9747 100644 --- a/lib/sass/discourse_sass_importer.rb +++ b/lib/sass/discourse_sass_importer.rb @@ -44,13 +44,17 @@ class DiscourseSassImporter < Sass::Importers::Filesystem end end + def apply_cdn(url) + "#{GlobalSetting.cdn_url}#{url}" + end + def find(name, options) if name == "category_backgrounds" contents = "" Category.where('background_url IS NOT NULL').each do |c| if c.background_url.present? - contents << "body.category-#{c.full_slug} { background-image: url(#{c.background_url}) }\n" + contents << "body.category-#{c.full_slug} { background-image: url(#{apply_cdn(c.background_url)}) }\n" end end return Sass::Engine.new(contents, options.merge( @@ -64,9 +68,9 @@ class DiscourseSassImporter < Sass::Importers::Filesystem if name == "theme_variables" contents = "" if color_scheme = ColorScheme.enabled - ColorScheme.base_colors.each do |name, base_hex| - override = color_scheme.colors_by_name[name] - contents << "$#{name}: ##{override ? override.hex : base_hex} !default;\n" + ColorScheme.base_colors.each do |n, base_hex| + override = color_scheme.colors_by_name[n] + contents << "$#{n}: ##{override ? override.hex : base_hex} !default;\n" end else special_imports[name].each do |css_file| @@ -144,7 +148,7 @@ class DiscourseSassImporter < Sass::Importers::Filesystem end def engine_from_path(name, dir, options) - full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options)) + full_filename, _ = Sass::Util.destructure(find_real_file(dir, name, options)) return unless full_filename && File.readable?(full_filename) depend_on(full_filename) diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb index fda3c300e6..2f2b42d4a9 100644 --- a/lib/scheduler/manager.rb +++ b/lib/scheduler/manager.rb @@ -118,16 +118,18 @@ module Scheduler end def self.without_runner(redis=nil) - self.new(redis, true) + self.new(redis, skip_runner: true) end - def initialize(redis = nil, skip_runner = false) + def initialize(redis = nil, options=nil) @redis = $redis || redis @random_ratio = 0.1 - unless skip_runner + unless options && options[:skip_runner] @runner = Runner.new(self) self.class.current = self end + + @hostname = options && options[:hostname] @manager_id = SecureRandom.hex end @@ -139,6 +141,10 @@ module Scheduler @current = manager end + def hostname + @hostname ||= `hostname`.strip + end + def schedule_info(klass) ScheduleInfo.new(klass, self) end @@ -162,17 +168,22 @@ module Scheduler def reschedule_orphans! lock do - redis.zrange(Manager.queue_key, 0, -1).each do |key| - klass = get_klass(key) - next unless klass - info = schedule_info(klass) + reschedule_orphans_on! + reschedule_orphans_on!(hostname) + end + end - if ['QUEUED', 'RUNNING'].include?(info.prev_result) && - (info.current_owner.blank? || !redis.get(info.current_owner)) - info.prev_result = 'ORPHAN' - info.next_run = Time.now.to_i - info.write! - end + def reschedule_orphans_on!(hostname=nil) + redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key| + klass = get_klass(key) + next unless klass + info = schedule_info(klass) + + if ['QUEUED', 'RUNNING'].include?(info.prev_result) && + (info.current_owner.blank? || !redis.get(info.current_owner)) + info.prev_result = 'ORPHAN' + info.next_run = Time.now.to_i + info.write! end end end @@ -185,24 +196,30 @@ module Scheduler def tick lock do - (key, due), _ = redis.zrange Manager.queue_key, 0, 0, withscores: true - return unless key - if due.to_i <= Time.now.to_i - klass = get_klass(key) - unless klass - # corrupt key, nuke it (renamed job or something) - redis.zrem Manager.queue_key, key - return - end - info = schedule_info(klass) - info.prev_run = Time.now.to_i - info.prev_result = "QUEUED" - info.prev_duration = -1 - info.next_run = nil - info.current_owner = identity_key - info.schedule! - @runner.enq(klass) + schedule_next_job + schedule_next_job(hostname) + end + end + + def schedule_next_job(hostname=nil) + (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true + + return unless key + if due.to_i <= Time.now.to_i + klass = get_klass(key) + unless klass + # corrupt key, nuke it (renamed job or something) + redis.zrem Manager.queue_key(hostname), key + return end + info = schedule_info(klass) + info.prev_run = Time.now.to_i + info.prev_result = "QUEUED" + info.prev_duration = -1 + info.next_run = nil + info.current_owner = identity_key + info.schedule! + @runner.enq(klass) end end @@ -256,19 +273,27 @@ module Scheduler end def identity_key - @identity_key ||= "_scheduler_#{`hostname`}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}" + @identity_key ||= "_scheduler_#{hostname}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}" end def self.lock_key "_scheduler_lock_" end - def self.queue_key - "_scheduler_queue_" + def self.queue_key(hostname=nil) + if hostname + "_scheduler_queue_#{hostname}_" + else + "_scheduler_queue_" + end end - def self.schedule_key(klass) - "_scheduler_#{klass}" + def self.schedule_key(klass,hostname=nil) + if hostname + "_scheduler_#{klass}_#{hostname}" + else + "_scheduler_#{klass}" + end end end end diff --git a/lib/scheduler/schedule.rb b/lib/scheduler/schedule.rb index 822e06fa37..a00fe1330f 100644 --- a/lib/scheduler/schedule.rb +++ b/lib/scheduler/schedule.rb @@ -17,6 +17,15 @@ module Scheduler::Schedule @every end + # schedule job indepndently on each host (looking at hostname) + def per_host + @per_host = true + end + + def is_per_host + @per_host + end + def schedule_info manager = Scheduler::Manager.without_runner manager.schedule_info self diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb index 9416ffa3bd..755bc621a9 100644 --- a/lib/scheduler/schedule_info.rb +++ b/lib/scheduler/schedule_info.rb @@ -86,6 +86,7 @@ module Scheduler end def write! + clear! redis.set key, { next_run: @next_run, @@ -95,7 +96,7 @@ module Scheduler current_owner: @current_owner }.to_json - redis.zadd Manager.queue_key, @next_run , @klass + redis.zadd queue_key, @next_run , @klass end def del! @@ -104,7 +105,19 @@ module Scheduler end def key - Manager.schedule_key(@klass) + if @klass.is_per_host + Manager.schedule_key(@klass, @manager.hostname) + else + Manager.schedule_key(@klass) + end + end + + def queue_key + if @klass.is_per_host + Manager.queue_key(@manager.hostname) + else + Manager.queue_key + end end def redis @@ -114,7 +127,7 @@ module Scheduler private def clear! redis.del key - redis.zrem Manager.queue_key, @klass + redis.zrem queue_key, @klass end end diff --git a/lib/scheduler/views/scheduler.erb b/lib/scheduler/views/scheduler.erb index 3e7933bc38..9d07083b03 100644 --- a/lib/scheduler/views/scheduler.erb +++ b/lib/scheduler/views/scheduler.erb @@ -58,6 +58,7 @@
    " method="post"> + <%= csrf_tag if respond_to?(:csrf_tag) %>
    diff --git a/lib/search.rb b/lib/search.rb index 97779db687..6811a98be5 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -95,18 +95,20 @@ class Search end def initialize(term, opts=nil) - term = process_advanced_search!(term) - if term.present? - @term = Search.prepare_data(term.to_s) - @original_term = PG::Connection.escape_string(@term) - end - @opts = opts || {} @guardian = @opts[:guardian] || Guardian.new @search_context = @opts[:search_context] @include_blurbs = @opts[:include_blurbs] || false + @blurb_length = @opts[:blurb_length] @limit = Search.per_facet + term = process_advanced_search!(term) + + if term.present? + @term = Search.prepare_data(term.to_s) + @original_term = PG::Connection.escape_string(@term) + end + if @search_pms && @guardian.user @opts[:type_filter] = "private_messages" @search_context = @guardian.user @@ -116,7 +118,7 @@ class Search @limit = Search.per_filter end - @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs) + @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs, @blurb_length) end def self.execute(term, opts=nil) @@ -125,7 +127,9 @@ class Search # Query a term def execute - return nil if @term.blank? || @term.length < (@opts[:min_search_term_length] || SiteSetting.min_search_term_length) + if @term.blank? || @term.length < (@opts[:min_search_term_length] || SiteSetting.min_search_term_length) + return nil unless @filters.present? + end # If the term is a number or url to a topic, just include that topic if @opts[:search_for_id] && @results.type_filter == 'topic' @@ -145,58 +149,159 @@ class Search @results end + def self.advanced_filter(trigger,&block) + (@advanced_filters ||= {})[trigger] = block + end + + def self.advanced_filters + @advanced_filters + end + + advanced_filter(/status:open/) do |posts| + posts.where('NOT topics.closed AND NOT topics.archived') + end + + advanced_filter(/status:closed/) do |posts| + posts.where('topics.closed') + end + + advanced_filter(/status:archived/) do |posts| + posts.where('topics.archived') + end + + advanced_filter(/status:noreplies/) do |posts| + posts.where("topics.posts_count = 1") + end + + advanced_filter(/status:single_user/) do |posts| + posts.where("topics.participant_count = 1") + end + + advanced_filter(/posts_count:(\d+)/) do |posts, match| + posts.where("topics.posts_count = ?", match.to_i) + end + + advanced_filter(/in:first/) do |posts| + posts.where("posts.post_number = 1") + end + + advanced_filter(/badge:(.*)/) do |posts,match| + badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first + if badge_id + posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id) + else + posts.where("1 = 0") + end + end + + advanced_filter(/in:(likes|bookmarks)/) do |posts, match| + if @guardian.user + post_action_type = PostActionType.types[:like] if match == "likes" + post_action_type = PostActionType.types[:bookmark] if match == "bookmarks" + + posts.where("posts.id IN ( + SELECT pa.post_id FROM post_actions pa + WHERE pa.user_id = #{@guardian.user.id} AND + pa.post_action_type_id = #{post_action_type} AND + deleted_at IS NULL + )") + end + end + + advanced_filter(/in:posted/) do |posts| + posts.where("posts.user_id = #{@guardian.user.id}") if @guardian.user + end + + advanced_filter(/in:(watching|tracking)/) do |posts,match| + if @guardian.user + level = TopicUser.notification_levels[match.to_sym] + posts.where("posts.topic_id IN ( + SELECT tu.topic_id FROM topic_users tu + WHERE tu.user_id = #{@guardian.user.id} AND + tu.notification_level >= #{level} + )") + + end + end + + advanced_filter(/category:(.+)/) do |posts,match| + category_id = Category.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first + if category_id + posts.where("topics.category_id = ?", category_id) + else + posts.where("1 = 0") + end + end + + advanced_filter(/group:(.+)/) do |posts,match| + group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck(:id).first + if group_id + posts.where("posts.user_id IN (select gu.user_id from group_users gu where gu.group_id = ?)", group_id) + else + posts.where("1 = 0") + end + end + + advanced_filter(/user:(.+)/) do |posts,match| + user_id = User.where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck(:id).first + if user_id + posts.where("posts.user_id = #{user_id}") + else + posts.where("1 = 0") + end + end + + advanced_filter(/min_age:(\d+)/) do |posts,match| + n = match.to_i + posts.where("topics.created_at > ?", n.days.ago) + end + + advanced_filter(/max_age:(\d+)/) do |posts,match| + n = match.to_i + posts.where("topics.created_at < ?", n.days.ago) + end + private + def process_advanced_search!(term) - term.to_s.split(/\s+/).map do |word| - if word == 'status:open' - @status = :open - nil - elsif word == 'status:closed' - @status = :closed - nil - elsif word == 'status:archived' - @status = :archived - nil - elsif word == 'status:noreplies' - @posts_count = 1 - nil - elsif word == 'status:singleuser' - @single_user = true - nil - elsif word == 'order:latest' + term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word,_)| + next if word.blank? + + found = false + + Search.advanced_filters.each do |matcher, block| + cleaned = word.gsub(/["']/,"") + if cleaned =~ matcher + (@filters ||= []) << [block, $1] + found = true + end + end + + if word == 'order:latest' @order = :latest nil + elsif word =~ /topic:(\d+)/ + topic_id = $1.to_i + if topic_id > 1 + topic = Topic.find_by(id: topic_id) + if @guardian.can_see?(topic) + @search_context = topic + end + end + nil elsif word == 'order:views' @order = :views nil - elsif word =~ /category:(.+)/ - @category_id = Category.find_by('name ilike ?', $1).try(:id) - nil - elsif word =~ /user:(.+)/ - @user_id = User.find_by('username_lower = ?', $1.downcase).try(:id) - nil - elsif word == 'in:likes' - @liked_only = true - nil - elsif word == 'in:posted' - @posted_only = true - nil - elsif word == 'in:watching' - @notification_level = TopicUser.notification_levels[:watching] - nil - elsif word == 'in:tracking' - @notification_level = TopicUser.notification_levels[:tracking] + elsif word == 'order:likes' + @order = :likes nil elsif word == 'in:private' @search_pms = true nil - elsif word == 'in:bookmarks' - @bookmarked_only = true - nil else - word + found ? nil : word end end.compact.join(' ') end @@ -210,8 +315,8 @@ class Search else @limit = Search.per_facet + 1 unless @search_context - user_search - category_search + user_search if @term.present? + category_search if @term.present? end topic_search end @@ -288,7 +393,7 @@ class Search def posts_query(limit, opts=nil) opts ||= {} - posts = Post + posts = Post.where(post_type: Post.types[:regular]) .joins(:post_search_data, :topic) .joins("LEFT JOIN categories ON categories.id = topics.category_id") .where("topics.deleted_at" => nil) @@ -306,60 +411,27 @@ class Search posts = posts.where("topics.archetype <> ?", Archetype.private_message) end - if is_topic_search - posts = posts.joins('JOIN users u ON u.id = posts.user_id') - posts = posts.where("posts.raw || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%") - else - posts = posts.where("post_search_data.search_data @@ #{ts_query}") - end - - if @status == :open - posts = posts.where('NOT topics.closed AND NOT topics.archived') - elsif @status == :archived - posts = posts.where('topics.archived') - elsif @status == :closed - posts = posts.where('topics.closed') - end - - if @single_user - posts = posts.where("topics.featured_user1_id IS NULL AND topics.last_post_user_id = topics.user_id") - end - - if @posts_count - posts = posts.where("topics.posts_count = #{@posts_count}") - end - - if @user_id - posts = posts.where("posts.user_id = #{@user_id}") - end - - if @guardian.user - if @liked_only || @bookmarked_only - - post_action_type = PostActionType.types[:like] if @liked_only - post_action_type = PostActionType.types[:bookmark] if @bookmarked_only - - posts = posts.where("posts.id IN ( - SELECT pa.post_id FROM post_actions pa - WHERE pa.user_id = #{@guardian.user.id} AND - pa.post_action_type_id = #{post_action_type} - )") + if @term.present? + if is_topic_search + posts = posts.joins('JOIN users u ON u.id = posts.user_id') + posts = posts.where("posts.raw || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%") + else + posts = posts.where("post_search_data.search_data @@ #{ts_query}") + exact_terms = @term.scan(/"([^"]+)"/).flatten + exact_terms.each do |exact| + posts = posts.where("posts.raw ilike ?", "%#{exact}%") + end end - - if @posted_only - posts = posts.where("posts.user_id = #{@guardian.user.id}") - end - - if @notification_level - posts = posts.where("posts.topic_id IN ( - SELECT tu.topic_id FROM topic_users tu - WHERE tu.user_id = #{@guardian.user.id} AND - tu.notification_level >= #{@notification_level} - )") - end - end + @filters.each do |block, match| + if block.arity == 1 + posts = instance_exec(posts, &block) || posts + else + posts = instance_exec(posts, match, &block) || posts + end + end if @filters + # If we have a search context, prioritize those posts first if @search_context.present? @@ -380,11 +452,7 @@ class Search end - if @category_id - posts = posts.where("topics.category_id = ?", @category_id) - end - - if @order == :latest + if @order == :latest || (@term.blank? && !@order) if opts[:aggregate_search] posts = posts.order("MAX(posts.created_at) DESC") else @@ -396,6 +464,12 @@ class Search else posts = posts.order("topics.views DESC") end + elsif @order == :likes + if opts[:aggregate_search] + posts = posts.order("MAX(posts.like_count) DESC") + else + posts = posts.order("posts.like_count DESC") + end else posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC") @@ -425,37 +499,48 @@ class Search end def self.ts_query(term, locale = nil, joiner = "&") + + data = Post.exec_sql("SELECT to_tsvector(:locale, :term)", + locale: locale || long_locale, + term: term + ).values[0][0] + locale = Post.sanitize(locale) if locale - all_terms = term.gsub(/[\p{P}\p{S}]+/, ' ').squish.split - query = Post.sanitize(all_terms.map {|t| "#{PG::Connection.escape_string(t)}:*"}.join(" #{joiner} ")) + all_terms = data.scan(/'([^']+)'\:\d+/).flatten + all_terms.map! do |t| + t.split(/[\)\(&']/)[0] + end.compact! + + query = Post.sanitize(all_terms.map {|t| "'#{PG::Connection.escape_string(t)}':*"}.join(" #{joiner} ")) "TO_TSQUERY(#{locale || query_locale}, #{query})" end def ts_query(locale=nil) - if !locale - @ts_query ||= begin - Search.ts_query(@term, locale) - end - else - Search.ts_query(@term, locale) - end + @ts_query_cache ||= {} + @ts_query_cache[(locale || query_locale) + " " + @term] ||= Search.ts_query(@term, locale) end def aggregate_search(opts = {}) - post_sql = posts_query(@limit, aggregate_search: true, + min_or_max = @order == :latest ? "max" : "min" + + post_sql = + if @order == :likes + # likes are a pain to aggregate so skip + posts_query(@limit, private_messages: opts[:private_messages]) + .select('topics.id', "post_number") + .to_sql + else + posts_query(@limit, aggregate_search: true, private_messages: opts[:private_messages]) - .select('topics.id', 'min(post_number) post_number') - .group('topics.id') - .to_sql + .select('topics.id', "#{min_or_max}(post_number) post_number") + .group('topics.id') + .to_sql + end # double wrapping so we get correct row numbers post_sql = "SELECT *, row_number() over() row_number FROM (#{post_sql}) xxx" - # p Topic.exec_sql(post_sql).to_a - # puts post_sql - # p Topic.exec_sql("SELECT topic_id FROM topic_allowed_users WHERE user_id = 2").to_a - posts = Post.includes(:topic => :category) .joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number") .order('row_number') diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb index 742b1493b6..387696c300 100644 --- a/lib/search/grouped_search_results.rb +++ b/lib/search/grouped_search_results.rb @@ -3,7 +3,6 @@ require 'sanitize' class Search class GroupedSearchResults - include ActiveModel::Serialization class TextHelper @@ -15,22 +14,19 @@ class Search :more_posts, :more_categories, :more_users, :term, :search_context, :include_blurbs - def initialize(type_filter, term, search_context, include_blurbs) + def initialize(type_filter, term, search_context, include_blurbs, blurb_length) @type_filter = type_filter @term = term @search_context = search_context @include_blurbs = include_blurbs + @blurb_length = blurb_length || 200 @posts = [] @categories = [] @users = [] end def blurb(post) - cooked = SearchObserver::HtmlScrubber.scrub(post.cooked).squish - terms = @term.split(/\s+/) - blurb = TextHelper.excerpt(cooked, terms.first, radius: 100) - blurb = TextHelper.truncate(cooked, length: 200) if blurb.blank? - Sanitize.clean(blurb) + GroupedSearchResults.blurb_for(post.cooked, @term, @blurb_length) end def add(object) @@ -43,6 +39,18 @@ class Search end end + + def self.blurb_for(cooked, term=nil, blurb_length=200) + cooked = SearchObserver::HtmlScrubber.scrub(cooked).squish + + blurb = nil + if term + terms = term.split(/\s+/) + blurb = TextHelper.excerpt(cooked, terms.first, radius: blurb_length / 2, seperator: " ") + end + blurb = TextHelper.truncate(cooked, length: blurb_length, seperator: " ") if blurb.blank? + Sanitize.clean(blurb) + end end end diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 456f94d336..90be6860fc 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -1,7 +1,14 @@ require_dependency 'enum' require_dependency 'site_settings/db_provider' +require 'site_setting_validations' module SiteSettingExtension + include SiteSettingValidations + + # For plugins, so they can tell if a feature is supported + def supported_types + [:email, :username, :list, :enum] + end # part 1 of refactor, centralizing the dependency here def provider=(val) @@ -14,7 +21,18 @@ module SiteSettingExtension end def types - @types ||= Enum.new(:string, :time, :fixnum, :float, :bool, :null, :enum, :list, :url_list) + @types ||= Enum.new(:string, + :time, + :fixnum, + :float, + :bool, + :null, + :enum, + :list, + :url_list, + :host_list, + :category_list, + :value_list) end def mutex @@ -58,6 +76,10 @@ module SiteSettingExtension @refresh_settings ||= [] end + def client_settings + @client_settings ||= [] + end + def previews @previews ||= {} end @@ -80,9 +102,7 @@ module SiteSettingExtension if new_choices = opts[:choices] - if String === new_choices - new_choices = eval(new_choices) - end + new_choices = eval(new_choices) if new_choices.is_a?(String) choices.has_key?(name) ? choices[name].concat(new_choices) : @@ -129,12 +149,7 @@ module SiteSettingExtension # just like a setting, except that it is available in javascript via DiscourseSession def client_setting(name, default = nil, opts = {}) setting(name, default, opts) - @client_settings ||= [] - @client_settings << name - end - - def client_settings - @client_settings ||= [] + client_settings << name end def settings_hash @@ -171,7 +186,13 @@ module SiteSettingExtension category: categories[s], preview: previews[s] } - opts.merge!({valid_values: enum_class(s).values, translate_names: enum_class(s).translate_names?}) if type == :enum + + if type == :enum && enum_class(s) + opts.merge!({valid_values: enum_class(s).values, translate_names: enum_class(s).translate_names?}) + elsif type == :enum + opts.merge!({valid_values: choices[s].map{|c| {name: c, value: c}}, translate_names: false}) + end + opts[:choices] = choices[s] if choices.has_key? s opts end @@ -194,26 +215,20 @@ module SiteSettingExtension ensure_listen_for_changes old = current - new_hash = Hash[*(provider.all.map{ |s| - [s.name.intern, convert(s.value,s.data_type)] + new_hash = Hash[*(provider.all.map { |s| + [s.name.intern, convert(s.value, s.data_type, s.name)] }.to_a.flatten)] # add defaults, cause they are cached new_hash = defaults.merge(new_hash) # add shadowed - shadowed_settings.each do |ss| - new_hash[ss] = GlobalSetting.send(ss) - end + shadowed_settings.each { |ss| new_hash[ss] = GlobalSetting.send(ss) } changes, deletions = diff_hash(new_hash, old) - changes.each do |name, val| - current[name] = val - end - deletions.each do |name, val| - current[name] = defaults[name] - end + changes.each { |name, val| current[name] = val } + deletions.each { |name, val| current[name] = defaults[name] } clear_cache! end @@ -263,7 +278,7 @@ module SiteSettingExtension end def add_override!(name, val) - type = get_data_type(name, defaults[name]) + type = get_data_type(name, defaults[name.to_sym]) if type == types[:bool] && val != true && val != false val = (val == "t" || val == "true") ? 't' : 'f' @@ -278,7 +293,12 @@ module SiteSettingExtension end if type == types[:enum] - raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val) + val = val.to_i if defaults[name.to_sym].is_a?(Fixnum) + if enum_class(name) + raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val) + else + raise Discourse::InvalidParameters.new(:value) unless choices[name].include?(val) + end end if v = validators[name] @@ -288,8 +308,13 @@ module SiteSettingExtension end end + if self.respond_to? "validate_#{name}" + send("validate_#{name}", val) + end + provider.save(name, val, type) - current[name] = convert(val, type) + current[name] = convert(val, type, name) + notify_clients!(name) if client_settings.include? name clear_cache! end @@ -297,6 +322,10 @@ module SiteSettingExtension MessageBus.publish('/site_settings', {process: process_id}) end + def notify_clients!(name) + MessageBus.publish('/client_settings', {name: name, value: self.send(name)}) + end + def has_setting?(name) defaults.has_key?(name.to_sym) || defaults.has_key?("#{name}?".to_sym) end @@ -314,7 +343,7 @@ module SiteSettingExtension valid = false unless value.to_i.is_a?(Fixnum) end - return valid + valid end def filter_value(name, value) @@ -364,8 +393,8 @@ module SiteSettingExtension def get_data_type(name, val) return types[:null] if val.nil? - # Some types are just for validations like email. Only consider - # it valid if includes in `types` + # Some types are just for validations like email. + # Only consider it valid if includes in `types` if static_type = static_types[name.to_sym] return types[static_type] if types.keys.include?(static_type) end @@ -384,7 +413,7 @@ module SiteSettingExtension end end - def convert(value, type) + def convert(value, type, name) case type when types[:float] value.to_f @@ -394,9 +423,10 @@ module SiteSettingExtension value == true || value == "t" || value == "true" when types[:null] nil + when types[:enum] + defaults[name.to_sym].is_a?(Fixnum) ? value.to_i : value else return value if types[type] - # Otherwise it's a type error raise ArgumentError.new :type end @@ -408,7 +438,8 @@ module SiteSettingExtension 'username' => UsernameSettingValidator, types[:fixnum] => IntegerSettingValidator, types[:string] => StringSettingValidator, - 'list' => StringSettingValidator + 'list' => StringSettingValidator, + 'enum' => StringSettingValidator } @validator_mapping[type_name] end diff --git a/lib/site_setting_validations.rb b/lib/site_setting_validations.rb new file mode 100644 index 0000000000..e69bfc2f95 --- /dev/null +++ b/lib/site_setting_validations.rb @@ -0,0 +1,53 @@ + +module SiteSettingValidations + + def validate_error(key) + raise Discourse::InvalidParameters.new(I18n.t("errors.site_settings.#{key}")) + end + + def validate_min_username_length(new_val) + validate_error :min_username_length_range if new_val > SiteSetting.max_username_length + validate_error :min_username_length_exists if User.where('length(username) < ?', new_val).exists? + end + + def validate_max_username_length(new_val) + validate_error :min_username_length_range if new_val < SiteSetting.min_username_length + validate_error :max_username_length_exists if User.where('length(username) > ?', new_val).exists? + end + + def validate_default_categories(new_val, default_categories_selected) + validate_error :default_categories_already_selected if (new_val.split("|").to_set & default_categories_selected).size > 0 + end + + def validate_default_categories_watching(new_val) + default_categories_selected = [ + SiteSetting.default_categories_tracking.split("|"), + SiteSetting.default_categories_muted.split("|"), + ].flatten.to_set + + validate_default_categories(new_val, default_categories_selected) + end + + def validate_default_categories_tracking(new_val) + default_categories_selected = [ + SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_muted.split("|"), + ].flatten.to_set + + validate_default_categories(new_val, default_categories_selected) + end + + def validate_default_categories_muted(new_val) + default_categories_selected = [ + SiteSetting.default_categories_watching.split("|"), + SiteSetting.default_categories_tracking.split("|"), + ].flatten.to_set + + validate_default_categories(new_val, default_categories_selected) + end + + def validate_enable_s3_uploads(new_val) + validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank? + end + +end diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb index 5b4d79e124..7757299fbd 100644 --- a/lib/site_settings/db_provider.rb +++ b/lib/site_settings/db_provider.rb @@ -13,29 +13,23 @@ class SiteSettings::DbProvider def all return [] unless table_exists? - # note, not leaking out AR records, cause I want all editing to happen - # via this API - SqlBuilder.new("select name, data_type, value from #{@model.table_name}").map_exec(OpenStruct) + # Not leaking out AR records, cause I want all editing to happen via this API + SqlBuilder.new("SELECT name, data_type, value FROM #{@model.table_name}").map_exec(OpenStruct) end def find(name) return nil unless table_exists? - # note, not leaking out AR records, cause I want all editing to happen - # via this API - SqlBuilder.new("select name, data_type, value from #{@model.table_name} where name = :name") + # Not leaking out AR records, cause I want all editing to happen via this API + SqlBuilder.new("SELECT name, data_type, value FROM #{@model.table_name} WHERE name = :name") .map_exec(OpenStruct, name: name) .first end def save(name, value, data_type) - return unless table_exists? - model = @model.find_by({ - name: name - }) - + model = @model.find_by(name: name) model ||= @model.new model.name = name diff --git a/lib/site_settings/local_process_provider.rb b/lib/site_settings/local_process_provider.rb index 1e3fa609a2..a945150545 100644 --- a/lib/site_settings/local_process_provider.rb +++ b/lib/site_settings/local_process_provider.rb @@ -24,7 +24,10 @@ class SiteSettings::LocalProcessProvider end def save(name, value, data_type) - settings[name] = Setting.new(name,value, data_type) + # NOTE: convert to string to simulate the conversion that is happening + # when using DbProvider + value = value.to_s + settings[name] = Setting.new(name, value, data_type) end def destroy(name) diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index c5542307e1..a6fc5d09ff 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -24,6 +24,9 @@ task 'assets:precompile:before' do require 'sprockets' require 'digest/sha1' + # Needed for proper source maps with a CDN + load "#{Rails.root}/lib/global_path.rb" + include GlobalPath if $node_uglify # monkey patch asset pipeline not to gzip, compress: false is broken @@ -94,13 +97,18 @@ def compress_node(from,to) to_path = "#{assets_path}/#{to}" source_map_root = (d=File.dirname(from)) == "." ? "/assets" : "/assets/#{d}" + source_map_url = cdn_path "/assets/#{to}.map" - cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '/assets/#{to}.map'" - + cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '#{source_map_url}'" STDERR.puts cmd - `#{cmd} 2>&1` + result = `#{cmd} 2>&1` + unless $?.success? + STDERR.puts result + exit 1 + end + result end def compress_ruby(from,to) @@ -114,7 +122,7 @@ def compress_ruby(from,to) .compile_with_map(data) dest = "#{assets_path}/#{to}" - File.write(dest, uglified << "\n//# sourceMappingURL=/assets/#{to}.map") + File.write(dest, uglified << "\n//# sourceMappingURL=#{cdn_path "/assets/#{to}.map"}") File.write(dest + ".map", map) end diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake index 4980a49c90..fb1be240b3 100644 --- a/lib/tasks/auto_annotate_models.rake +++ b/lib/tasks/auto_annotate_models.rake @@ -19,6 +19,7 @@ if(Rails.env.development?) 'exclude_tests' => "true", 'exclude_fixtures' => "true", 'exclude_factories' => "true", + 'exclude_serializers' => "true", 'ignore_model_sub_dir' => "false", 'skip_on_db_migrate' => "true", 'format_bare' => "true", diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 430d9d768c..0045fcee42 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -34,6 +34,10 @@ task 'docker:test' do @good &&= run_or_fail("bundle exec rspec") end unless ENV["RUBY_ONLY"] + @good &&= run_or_fail("eslint app/assets/javascripts") + @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts") + @good &&= run_or_fail("eslint --ext .es6 test/javascripts") + @good &&= run_or_fail("eslint test/javascripts") @good &&= run_or_fail("bundle exec rake qunit:test") end diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake index a35b41a8e9..061ae69ffb 100644 --- a/lib/tasks/qunit.rake +++ b/lib/tasks/qunit.rake @@ -35,7 +35,7 @@ task "qunit:test" => :environment do begin success = true test_path = "#{Rails.root}/vendor/assets/javascripts" - cmd = "phantomjs #{test_path}/run-qunit.js \"http://localhost:#{port}/qunit\"" + cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit" # wait for server to respond, will exception out on failure tries = 0 diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake index 91ac3ffe78..890eb128ad 100644 --- a/lib/tasks/smoke_test.rake +++ b/lib/tasks/smoke_test.rake @@ -1,6 +1,5 @@ desc "run phantomjs based smoke tests on current build" task "smoke:test" do - phantom_path = File.expand_path('~/phantomjs/bin/phantomjs') phantom_path = nil unless File.exists?(phantom_path) phantom_path = phantom_path || 'phantomjs' diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake index 8ff0c70e0c..dbbf890829 100644 --- a/lib/tasks/uploads.rake +++ b/lib/tasks/uploads.rake @@ -6,21 +6,19 @@ require "digest/sha1" task "uploads:backfill_shas" => :environment do RailsMultisite::ConnectionManagement.each_connection do |db| - puts "Backfilling #{db}" - Upload.select([:id, :sha, :url]).find_each do |u| - if u.sha.nil? + puts "Backfilling #{db}..." + Upload.where(sha1: nil).find_each do |u| + begin + path = Discourse.store.path_for(u) + u.sha1 = Digest::SHA1.file(path).hexdigest + u.save! putc "." - path = "#{Rails.root}/public/#{u.url}" - sha = Digest::SHA1.file(path).hexdigest - begin - Upload.update_all ["sha = ?", sha], ["id = ?", u.id] - rescue ActiveRecord::RecordNotUnique - # not a big deal if we've got a few duplicates - end + rescue Errno::ENOENT + putc "X" end end end - puts "done" + puts "", "Done" end ################################################################################ @@ -98,6 +96,7 @@ end task "uploads:migrate_to_s3" => :environment do require "file_store/s3_store" require "file_store/local_store" + require "db_helper" ENV["RAILS_DB"] ? migrate_to_s3 : migrate_to_s3_all_sites end @@ -152,7 +151,7 @@ def migrate_to_s3 end # remap the URL - remap(from, to) + DbHelper.remap(from, to) putc "." end @@ -365,171 +364,15 @@ def regenerate_missing_optimized end ################################################################################ -# migrate_to_new_pattern # +# migrate_to_new_scheme # ################################################################################ -task "uploads:migrate_to_new_pattern" => :environment do - require "file_helper" - require "file_store/local_store" - - ENV["RAILS_DB"] ? migrate_to_new_pattern : migrate_to_new_pattern_all_sites +task "uploads:start_migration" => :environment do + SiteSetting.migrate_to_new_scheme = true + puts "Migration started!" end -def migrate_to_new_pattern_all_sites - RailsMultisite::ConnectionManagement.each_connection { migrate_to_new_pattern } -end - -def migrate_to_new_pattern - db = RailsMultisite::ConnectionManagement.current_db - - puts "Migrating uploads to new pattern for '#{db}'..." - migrate_uploads_to_new_pattern - - puts "Migrating optimized images to new pattern for '#{db}'..." - migrate_optimized_images_to_new_pattern - - puts "Done!" -end - -def migrate_uploads_to_new_pattern - puts "Moving uploads to new location..." - - max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes - local_store = FileStore::LocalStore.new - - Upload.where("LENGTH(COALESCE(url, '')) = 0").destroy_all - - Upload.where("url NOT LIKE '%/original/_X/%'").find_each do |upload| - begin - successful = false - # keep track of the url - previous_url = upload.url.dup - # where is the file currently stored? - external = previous_url =~ /^\/\// - # download if external - if external - url = SiteSetting.scheme + ":" + previous_url - file = FileHelper.download(url, max_file_size_kb, "discourse", true) rescue nil - next unless file - path = file.path - else - path = local_store.path_for(upload) - next unless File.exists?(path) - end - # compute SHA if missing - if upload.sha1.blank? - upload.sha1 = Digest::SHA1.file(path).hexdigest - end - # optimize if image - if FileHelper.is_image?(File.basename(path)) - ImageOptim.new.optimize_image!(path) - end - # store to new location & update the filesize - File.open(path) do |f| - upload.url = Discourse.store.store_upload(f, upload) - upload.filesize = f.size - upload.save - end - # remap the URLs - remap(previous_url, upload.url) - # remove the old file (when local) - unless external - FileUtils.rm(path, force: true) rescue nil - end - # succesfully migrated - successful = true - rescue => e - puts e.message - puts e.backtrace.join("\n") - ensure - putc successful ? '.' : 'X' - file.try(:unlink) rescue nil - file.try(:close) rescue nil - end - end - - puts -end - -def migrate_optimized_images_to_new_pattern - max_file_size_kb = SiteSetting.max_image_size_kb.kilobytes - local_store = FileStore::LocalStore.new - - OptimizedImage.where("LENGTH(COALESCE(url, '')) = 0").destroy_all - - OptimizedImage.where("url NOT LIKE '%/original/_X/%'").find_each do |optimized_image| - begin - successful = false - # keep track of the url - previous_url = optimized_image.url.dup - # where is the file currently stored? - external = previous_url =~ /^\/\// - # download if external - if external - url = SiteSetting.scheme + ":" + previous_url - file = FileHelper.download(url, max_file_size_kb, "discourse", true) rescue nil - next unless file - path = file.path - else - path = local_store.path_for(optimized_image) - next unless File.exists?(path) - file = File.open(path) - end - # compute SHA if missing - if optimized_image.sha1.blank? - optimized_image.sha1 = Digest::SHA1.file(path).hexdigest - end - # optimize if image - ImageOptim.new.optimize_image!(path) - # store to new location & update the filesize - File.open(path) do |f| - optimized_image.url = Discourse.store.store_optimized_image(f, optimized_image) - optimized_image.save - end - # remap the URLs - remap(previous_url, optimized_image.url) - # remove the old file (when local) - unless external - FileUtils.rm(path, force: true) rescue nil - end - # succesfully migrated - successful = true - rescue => e - puts e.message - puts e.backtrace.join("\n") - ensure - putc successful ? '.' : 'X' - file.try(:unlink) rescue nil - file.try(:close) rescue nil - end - end - - puts -end - -REMAP_SQL ||= " - SELECT table_name, column_name - FROM information_schema.columns - WHERE table_schema = 'public' - AND is_updatable = 'YES' - AND (data_type LIKE 'char%' OR data_type LIKE 'text%') -ORDER BY table_name, column_name -" - -def remap(from, to) - connection ||= ActiveRecord::Base.connection.raw_connection - remappable_columns ||= connection.async_exec(REMAP_SQL).to_a - - remappable_columns.each do |rc| - table_name = rc["table_name"] - column_name = rc["column_name"] - begin - connection.async_exec(" - UPDATE #{table_name} - SET #{column_name} = REPLACE(#{column_name}, $1, $2) - WHERE #{column_name} IS NOT NULL - AND #{column_name} <> REPLACE(#{column_name}, $1, $2)", [from, to]) - rescue - end - end +task "uploads:stop_migration" => :environment do + SiteSetting.migrate_to_new_scheme = false + puts "Migration stoped!" end diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index 8213bbeb8d..cff51e7c89 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -1,6 +1,9 @@ require_dependency 'has_errors' class TopicCreator + + attr_reader :user, :guardian, :opts + include HasErrors def self.create(user, guardian, opts) @@ -16,11 +19,21 @@ class TopicCreator def valid? topic = Topic.new(setup_topic_params) - validate_child(topic) + # validate? will clear the error hash + # so we fire the validation event after + # this allows us to add errors + valid = topic.valid? + DiscourseEvent.trigger(:after_validate_topic, topic, self) + valid &&= topic.errors.empty? + + add_errors_from(topic) unless valid + + valid end def create topic = Topic.new(setup_topic_params) + DiscourseEvent.trigger(:before_create_topic, topic, self) setup_auto_close_time(topic) process_private_message(topic) @@ -73,6 +86,10 @@ class TopicCreator topic_params[key] = @opts[key] if @opts[key].present? end + if topic_params[:import_mode] && @opts[:views].to_i > 0 + topic_params[:views] = @opts[:views].to_i + end + # Automatically give it a moderator warning subtype if specified topic_params[:subtype] = TopicSubtype.moderator_warning if @opts[:is_warning] diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 15af3dd515..73d47fd4ad 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -1,15 +1,16 @@ # -# Helps us find topics. Returns a TopicList object containing the topics -# found. +# Helps us find topics. +# Returns a TopicList object containing the topics found. # + require_dependency 'topic_list' require_dependency 'suggested_topics_builder' require_dependency 'topic_query_sql' class TopicQuery # Could be rewritten to %i if Ruby 1.9 is no longer supported - VALID_OPTIONS = %w(except_topic_ids - exclude_category + VALID_OPTIONS = %i(except_topic_ids + exclude_category_ids limit page per_page @@ -27,7 +28,7 @@ class TopicQuery search slow_platform filter - ).map(&:to_sym) + q) # Maps `order` to a columns in `topics` SORTABLE_MAPPING = { @@ -43,7 +44,7 @@ class TopicQuery def initialize(user=nil, options={}) options.assert_valid_keys(VALID_OPTIONS) - @options = options + @options = options.dup @user = user end @@ -70,10 +71,6 @@ class TopicQuery create_list(:latest, {}, latest_results) end - def list_search - create_list(:latest, {}, latest_results) - end - def list_read create_list(:read, unordered: true) do |topics| topics.order('COALESCE(tu.last_visited_at, topics.bumped_at) DESC') @@ -135,9 +132,10 @@ class TopicQuery def list_category_topic_ids(category) query = default_results(category: category.id) pinned_ids = query.where('pinned_at IS NOT NULL AND category_id = ?', category.id) + .limit(nil) .order('pinned_at DESC').pluck(:id) non_pinned_ids = query.where('pinned_at IS NULL OR category_id <> ?', category.id).pluck(:id) - (pinned_ids + non_pinned_ids)[0...@options[:per_page]] + (pinned_ids + non_pinned_ids) end def list_new_in_category(category) @@ -166,7 +164,7 @@ class TopicQuery end unpinned_topics = topics.where("NOT ( #{pinned_clause} )") - pinned_topics = topics.where(pinned_clause) + pinned_topics = topics.dup.offset(nil).where(pinned_clause) per_page = options[:per_page] || per_page_setting limit = per_page unless options[:limit] == false @@ -175,7 +173,7 @@ class TopicQuery if page == 0 (pinned_topics + unpinned_topics)[0...limit] if limit else - offset = (page * per_page - pinned_topics.count) - 1 + offset = (page * per_page) - pinned_topics.count - 1 offset = 0 unless offset > 0 unpinned_topics.offset(offset).to_a end @@ -303,14 +301,17 @@ class TopicQuery if options[:no_subcategories] result = result.where('categories.id = ?', category_id) else - result = result.where('categories.id = ? or (categories.parent_category_id = ? AND categories.topic_id <> topics.id)', category_id, category_id) + result = result.where('categories.id = :category_id OR (categories.parent_category_id = :category_id AND categories.topic_id <> topics.id)', category_id: category_id) end result = result.references(:categories) end result = apply_ordering(result, options) result = result.listable_topics.includes(:category) - result = result.where('categories.name is null or categories.name <> ?', options[:exclude_category]).references(:categories) if options[:exclude_category] + + if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0 + result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids]).references(:categories) + end # Don't include the category topics if excluded if options[:no_definitions] @@ -395,19 +396,20 @@ class TopicQuery def remove_muted_categories(list, user, opts=nil) category_id = get_category_id(opts[:exclude]) if opts + if user - list = list.where("NOT EXISTS( - SELECT 1 FROM category_users cu - WHERE cu.user_id = ? AND - cu.category_id = topics.category_id AND - cu.notification_level = ? AND - cu.category_id <> ? - )", - user.id, - CategoryUser.notification_levels[:muted], - category_id || -1 - ) - .references('cu') + list = list.references("cu") + .where(" + NOT EXISTS ( + SELECT 1 + FROM category_users cu + WHERE cu.user_id = :user_id + AND cu.category_id = topics.category_id + AND cu.notification_level = :muted + AND cu.category_id <> :category_id + )", user_id: user.id, + muted: CategoryUser.notification_levels[:muted], + category_id: category_id || -1) end list diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb index 161f362be4..2af8401afb 100644 --- a/lib/topic_retriever.rb +++ b/lib/topic_retriever.rb @@ -13,10 +13,7 @@ class TopicRetriever private def invalid_host? - SiteSetting.normalized_embeddable_host != URI(@embed_url).host - rescue URI::InvalidURIError - # An invalid URI is an invalid host - true + !EmbeddableHost.host_allowed?(@embed_url) end def retrieved_recently? diff --git a/lib/topic_view.rb b/lib/topic_view.rb index c4e23aef6b..24a49d24cf 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -131,6 +131,14 @@ class TopicView @topic.relative_url end + def page_title + title = @topic.title + if @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id && @topic.category + title += " - #{topic.category.name}" + end + title + end + def title @topic.title end @@ -183,11 +191,9 @@ class TopicView # Find the sort order for a post in the topic def sort_order_for_post_number(post_number) - Post.where(topic_id: @topic.id, post_number: post_number) - .with_deleted - .select(:sort_order) - .first - .try(:sort_order) + posts = Post.where(topic_id: @topic.id, post_number: post_number).with_deleted + posts = filter_post_types(posts) + posts.select(:sort_order).first.try(:sort_order) end # Filter to all posts near a particular post number @@ -324,11 +330,22 @@ class TopicView private + def filter_post_types(posts) + visible_types = Topic.visible_post_types(@user) + + if @user.present? + posts.where("user_id = ? OR post_type IN (?)", @user.id, visible_types) + else + posts.where(post_type: visible_types) + end + end + def filter_posts_by_ids(post_ids) # TODO: Sort might be off @posts = Post.where(id: post_ids, topic_id: @topic.id) .includes(:user, :reply_to_user) .order('sort_order') + @posts = filter_post_types(@posts) @posts = @posts.with_deleted if @guardian.can_see_deleted_posts? @posts end @@ -347,13 +364,13 @@ class TopicView end def find_topic(topic_id) - finder = Topic.where(id: topic_id).includes(:category) - finder = finder.with_deleted if @guardian.can_see_deleted_topics? + # with_deleted covered in #check_and_raise_exceptions + finder = Topic.with_deleted.where(id: topic_id).includes(:category) finder.first end def unfiltered_posts - result = @topic.posts + result = filter_post_types(@topic.posts) result = result.with_deleted if @guardian.can_see_deleted_posts? result = @topic.posts.where("user_id IS NOT NULL") if @exclude_deleted_users result @@ -371,7 +388,7 @@ class TopicView end if @best.present? - @filtered_posts = @filtered_posts.where('posts.post_type <> ?', Post.types[:moderator_action]) + @filtered_posts = @filtered_posts.where('posts.post_type = ?', Post.types[:regular]) @contains_gaps = true end @@ -400,7 +417,7 @@ class TopicView if @topic.present? && @topic.private_message? && @user.blank? raise Discourse::NotLoggedIn.new end - guardian.ensure_can_see!(@topic) + raise Discourse::InvalidAccess.new("can't see #{@topic}", @topic) unless guardian.can_see?(@topic) end diff --git a/lib/url_helper.rb b/lib/url_helper.rb index f34753100b..24f6192ac7 100644 --- a/lib/url_helper.rb +++ b/lib/url_helper.rb @@ -1,6 +1,6 @@ -module UrlHelper +class UrlHelper - def is_local(url) + def self.is_local(url) url.present? && ( Discourse.store.has_been_uploaded?(url) || !!(url =~ /^\/assets\//) || @@ -9,16 +9,16 @@ module UrlHelper ) end - def absolute(url, cdn = Discourse.asset_host) + def self.absolute(url, cdn = Discourse.asset_host) url =~ /^\/[^\/]/ ? (cdn || Discourse.base_url_no_prefix) + url : url end - def absolute_without_cdn(url) - absolute(url, nil) + def self.absolute_without_cdn(url) + self.absolute(url, nil) end - def schemaless(url) - url.sub(/^https?:/, "") + def self.schemaless(url) + url.sub(/^http:/, "") end end diff --git a/lib/user_name_suggester.rb b/lib/user_name_suggester.rb index 09e4db698b..4819a3f879 100644 --- a/lib/user_name_suggester.rb +++ b/lib/user_name_suggester.rb @@ -38,6 +38,7 @@ module UserNameSuggester name = name.gsub(/^[^[:alnum:]]+|\W+$/, "") .gsub(/\W+/, "_") .gsub(/^\_+/, '') + .gsub(/[\-_\.]{2,}/, "_") name end diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb index c9f5889762..b686379571 100644 --- a/lib/validators/email_validator.rb +++ b/lib/validators/email_validator.rb @@ -17,7 +17,7 @@ class EmailValidator < ActiveModel::EachValidator def email_in_restriction_setting?(setting, value) domains = setting.gsub('.', '\.') - regexp = Regexp.new("@(.+\.)?(#{domains})", true) + regexp = Regexp.new("@(.+\\.)?(#{domains})", true) value =~ regexp end diff --git a/lib/version.rb b/lib/version.rb index 12601999f7..cf7da889b6 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -3,9 +3,9 @@ module Discourse unless defined? ::Discourse::VERSION module VERSION #:nodoc: MAJOR = 1 - MINOR = 3 - TINY = 5 - PRE = nil + MINOR = 4 + TINY = 0 + PRE = 'beta12' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/plugins/lazyYT/plugin.rb b/plugins/lazyYT/plugin.rb index 866765e7e6..3ba1206531 100644 --- a/plugins/lazyYT/plugin.rb +++ b/plugins/lazyYT/plugin.rb @@ -14,16 +14,17 @@ register_asset "stylesheets/lazyYT_mobile.scss", :mobile # freedom patch YouTube Onebox class Onebox::Engine::YoutubeOnebox include Onebox::Engine + alias_method :yt_onebox_to_html, :to_html def to_html if video_id video_width = (params['width'] && params['width'].to_i <= 695) ? params['width'] : 480 # embed width video_height = (params['height'] && params['height'].to_i <= 500) ? params['height'] : 270 # embed height - + # Put in the LazyYT div instead of the iframe "
    " else - super + yt_onebox_to_html end end diff --git a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 index da48d4abbf..42087e2933 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 @@ -1,4 +1,4 @@ -import round from "discourse/plugins/poll/lib/round"; +import round from "discourse/lib/round"; export default Em.Component.extend({ tagName: "span", diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index ef3ebce95f..1a9c3943d3 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -1,8 +1,10 @@ -export default Em.Controller.extend({ - isMultiple: Em.computed.equal("poll.type", "multiple"), - isNumber: Em.computed.equal("poll.type", "number"), - isRandom : Em.computed.equal("poll.order", "random"), - isClosed: Em.computed.equal("poll.status", "closed"), +import computed from "ember-addons/ember-computed-decorators"; + +export default Ember.Controller.extend({ + isMultiple: Ember.computed.equal("poll.type", "multiple"), + isNumber: Ember.computed.equal("poll.type", "number"), + isRandom : Ember.computed.equal("poll.order", "random"), + isClosed: Ember.computed.equal("poll.status", "closed"), // shows the results when // - poll is closed @@ -11,12 +13,10 @@ export default Em.Controller.extend({ showingResults: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived", "showResults"), showResultsDisabled: Em.computed.equal("poll.voters", 0), - hideResultsDisabled: Em.computed.alias("isClosed"), - - poll: function() { - const poll = this.get("model"), - vote = this.get("vote"); + hideResultsDisabled: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived"), + @computed("model", "vote") + poll(poll, vote) { if (poll) { const options = _.map(poll.get("options"), o => Em.Object.create(o)); @@ -28,44 +28,46 @@ export default Em.Controller.extend({ } return poll; - }.property("model"), + }, - selectedOptions: function() { + @computed("poll.options.@each.selected") + selectedOptions() { return _.map(this.get("poll.options").filterBy("selected"), o => o.get("id")); - }.property("poll.options.@each.selected"), + }, - min: function() { - let min = parseInt(this.get("poll.min"), 10); + @computed("poll.min") + min(min) { + min = parseInt(min, 10); if (isNaN(min) || min < 1) { min = 1; } return min; - }.property("poll.min"), + }, - max: function() { - let options = this.get("poll.options.length"), - max = parseInt(this.get("poll.max"), 10); + @computed("poll.max", "poll.options.length") + max(max, options) { + max = parseInt(max, 10); if (isNaN(max) || max > options) { max = options; } return max; - }.property("poll.max", "poll.options.length"), + }, - votersText: function() { - return I18n.t("poll.voters", { count: this.get("poll.voters") }); - }.property("poll.voters"), + @computed("poll.voters") + votersText(count) { + return I18n.t("poll.voters", { count }); + }, - totalVotes: function() { + @computed("poll.options.@each.votes") + totalVotes() { return _.reduce(this.get("poll.options"), function(total, o) { return total + parseInt(o.get("votes"), 10); }, 0); - }.property("poll.options.@each.votes"), + }, - totalVotesText: function() { - return I18n.t("poll.total_votes", { count: this.get("totalVotes") }); - }.property("totalVotes"), - - multipleHelpText: function() { - const options = this.get("poll.options.length"), - min = this.get("min"), - max = this.get("max"); + @computed("totalVotes") + totalVotesText(count) { + return I18n.t("poll.total_votes", { count }); + }, + @computed("min", "max", "poll.options.length") + multipleHelpText(min, max, options) { if (max > 0) { if (min === max) { if (min > 1) { @@ -73,7 +75,7 @@ export default Em.Controller.extend({ } } else if (min > 1) { if (max < options) { - return I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max }); + return I18n.t("poll.multiple.help.between_min_and_max_options", { min, max }); } else { return I18n.t("poll.multiple.help.at_least_min_options", { count: min }); } @@ -81,33 +83,31 @@ export default Em.Controller.extend({ return I18n.t("poll.multiple.help.up_to_max_options", { count: max }); } } - }.property("min", "max", "poll.options.length"), + }, - canCastVotes: function() { - if (this.get("isClosed") || this.get("showingResults") || this.get("loading")) { + @computed("isClosed", "showResults", "loading", "isMultiple", "selectedOptions.length", "min", "max") + canCastVotes(isClosed, showResults, loading, isMultiple, selectedOptionCount, min, max) { + if (isClosed || showResults || loading) { return false; } - const selectedOptionCount = this.get("selectedOptions.length"); - - if (this.get("isMultiple")) { - return selectedOptionCount >= this.get("min") && selectedOptionCount <= this.get("max"); + if (isMultiple) { + return selectedOptionCount >= min && selectedOptionCount <= max; } else { return selectedOptionCount > 0; } - }.property("isClosed", "showingResults", "loading", - "selectedOptions.length", - "isMultiple", "min", "max"), + }, castVotesDisabled: Em.computed.not("canCastVotes"), - canToggleStatus: function() { + @computed("loading", "post.user_id", "post.topic.closed", "post.topic.archived") + canToggleStatus(loading, userId, topicClosed, topicArchived) { return this.currentUser && - (this.currentUser.get("id") === this.get("post.user_id") || this.currentUser.get("staff")) && - !this.get("loading") && - !this.get("post.topic.closed") && - !this.get("post.topic.archived"); - }.property("loading", "post.user_id", "post.topic.{closed,archived}"), + (this.currentUser.get("id") === userId || this.currentUser.get("staff")) && + !loading && + !topicClosed && + !topicArchived; + }, actions: { @@ -130,8 +130,6 @@ export default Em.Controller.extend({ if (!this.get("canCastVotes")) { return; } if (!this.currentUser) { return this.send("showLogin"); } - const self = this; - this.set("loading", true); Discourse.ajax("/polls/vote", { @@ -141,13 +139,13 @@ export default Em.Controller.extend({ poll_name: this.get("poll.name"), options: this.get("selectedOptions"), } - }).then(function(results) { - self.setProperties({ vote: results.vote, showResults: true }); - self.set("model", Em.Object.create(results.poll)); - }).catch(function() { + }).then(results => { + this.setProperties({ vote: results.vote, showResults: true }); + this.set("model", Em.Object.create(results.poll)); + }).catch(() => { bootbox.alert(I18n.t("poll.error_while_casting_votes")); - }).finally(function() { - self.set("loading", false); + }).finally(() => { + this.set("loading", false); }); }, @@ -176,11 +174,11 @@ export default Em.Controller.extend({ poll_name: self.get("poll.name"), status: self.get("isClosed") ? "open" : "closed", } - }).then(function(results) { + }).then(results => { self.set("model", Em.Object.create(results.poll)); - }).catch(function() { + }).catch(() => { bootbox.alert(I18n.t("poll.error_while_toggling_status")); - }).finally(function() { + }).finally(() => { self.set("loading", false); }); } diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs index e9c89f8d35..f2ce5ff56f 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs @@ -34,7 +34,9 @@
    {{#if isMultiple}} - {{d-button class="cast-votes" title="poll.cast-votes.title" label="poll.cast-votes.label" disabled=castVotesDisabled action="castVotes"}} + {{#unless hideResultsDisabled}} + {{d-button class="cast-votes" title="poll.cast-votes.title" label="poll.cast-votes.label" disabled=castVotesDisabled action="castVotes"}} + {{/unless}} {{/if}} {{#if showingResults}} diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 index 5cbb4152bb..2e086fbc5e 100644 --- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 +++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 @@ -1,4 +1,5 @@ import PostView from "discourse/views/post"; +import { on } from "ember-addons/ember-computed-decorators"; function createPollView(container, post, poll, vote) { const controller = container.lookup("controller:poll", { singleton: false }), @@ -20,14 +21,16 @@ export default { // listen for back-end to tell us when a post has a poll messageBus.subscribe("/polls", data => { - const post = container.lookup("controller:topic").get('modee.postStream').findLoadedPost(data.post_id); + const post = container.lookup("controller:topic").get('model.postStream').findLoadedPost(data.post_id); // HACK to trigger the "postViewUpdated" event - Em.run.next(_ => post.set("cooked", post.get("cooked") + " ")); + Em.run.next(() => post.set("cooked", post.get("cooked") + " ")); }); // overwrite polls PostView.reopen({ - _createPollViews: function($post) { + + @on("postViewInserted", "postViewUpdated") + _createPollViews($post) { const post = this.get("post"), polls = post.get("polls"), votes = post.get("polls_votes") || {}; @@ -48,11 +51,11 @@ export default { pollView = createPollView(container, post, polls[pollName], votes[pollName]); $poll.replaceWith($div); - Em.run.next(_ => pollView.renderer.replaceIn(pollView, $div[0])); + Em.run.next(() => pollView.renderer.replaceIn(pollView, $div[0])); pollViews[pollName] = pollView; }); - messageBus.subscribe("/polls/" + this.get("post.id"), results => { + messageBus.subscribe(`/polls/${this.get("post.id")}`, results => { if (results && results.polls) { _.forEach(results.polls, poll => { if (pollViews[poll.name]) { @@ -63,15 +66,16 @@ export default { }); this.set("pollViews", pollViews); - }.on("postViewInserted", "postViewUpdated"), + }, - _cleanUpPollViews: function() { - messageBus.unsubscribe("/polls/" + this.get("post.id")); + @on("willClearRender") + _cleanUpPollViews() { + messageBus.unsubscribe(`/polls/${this.get("post.id")}`); if (this.get("pollViews")) { _.forEach(this.get("pollViews"), v => v.destroy()); } - }.on("willClearRender") + } }); } }; diff --git a/plugins/poll/assets/javascripts/poll_dialect.js b/plugins/poll/assets/javascripts/poll_dialect.js index 70771e4156..bc9b6585ed 100644 --- a/plugins/poll/assets/javascripts/poll_dialect.js +++ b/plugins/poll/assets/javascripts/poll_dialect.js @@ -36,6 +36,9 @@ } } + // Disable dialect when poll plugin is disabled + if (!Discourse.SiteSettings.poll_enabled) { return ["div"].concat(contents); } + // default poll attributes var attributes = { "class": "poll" }; attributes[DATA_PREFIX + "status"] = "open"; diff --git a/plugins/poll/assets/javascripts/views/poll.js.es6 b/plugins/poll/assets/javascripts/views/poll.js.es6 index 5ee730eaf3..bad40cfebf 100644 --- a/plugins/poll/assets/javascripts/views/poll.js.es6 +++ b/plugins/poll/assets/javascripts/views/poll.js.es6 @@ -1,3 +1,5 @@ +import { on } from "ember-addons/ember-computed-decorators"; + export default Em.View.extend({ templateName: "poll", classNames: ["poll"], @@ -9,8 +11,9 @@ export default Em.View.extend({ "data-poll-name": Em.computed.alias("poll.name"), "data-poll-status": Em.computed.alias("poll.status"), - _fixPollContainerHeight: function() { + @on("didInsertElement") + _fixPollContainerHeight() { const pollContainer = this.$(".poll-container"); pollContainer.height(pollContainer.height()); - }.on("didInsertElement") + } }); diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss index 8730ef44c5..b15a657400 100644 --- a/plugins/poll/assets/stylesheets/common/poll.scss +++ b/plugins/poll/assets/stylesheets/common/poll.scss @@ -10,6 +10,8 @@ div.poll { border: 1px solid $border-color; + @include unselectable; + ul, ol { margin: 0; padding: 0; diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml index 1d803323f4..4c3a9ec5e4 100644 --- a/plugins/poll/config/locales/client.ar.yml +++ b/plugins/poll/config/locales/client.ar.yml @@ -9,11 +9,42 @@ ar: js: poll: voters: - zero: "المصوتون" - one: "المصوت" - other: "المصوتون" + zero: "لا يوجد مصوتون" + one: "مصوت" + two: "مصوتان" + few: "مصوتون قليلون" + many: "مصوتون كثيرون" + other: "المصوتين" total_votes: - zero: "مجموع الأصوات" + zero: "مجموع عدم التصويت" one: "مجموع التصويت" + two: "مجموع التصويتان" + few: "مجموع الأصوات القليلة" + many: "مجموع الأصوات الكثيرة" other: "مجموع الأصوات" average_rating: "متوسط التصنيف: %{average} " + multiple: + help: + at_least_min_options: "من المفترض أن تختار على الأقل %{count} خيارات ." + up_to_max_options: "يجب عليك إختيار على الأكثر %{count} خيارات ." + x_options: "يجب عليك إختيار %{count} خيارات ." + between_min_and_max_options: "يجب عليك إختيار بين %{min} و %{max} خيارات ." + cast-votes: + title: "إدراج تصويتك ." + label: "صوت اﻵن!" + show-results: + title: "عرض نتائج التصويت" + label: "عرض النتائج" + hide-results: + title: "العودة إلى تصويتاتك" + label: "إخفاء النتائج" + open: + title: "فتح التصويت " + label: "فتح" + confirm: "هل بالفعل تاريد فتح هذا التصويت ؟" + close: + title: "إغلاق التصويت" + label: "إغلاق" + confirm: "هل أنت متأكد من إنك تريد إغلاق هذا التصويت ؟" + error_while_toggling_status: "هناك خطاء عند محاولة تبديل حالة التصويت ." + error_while_casting_votes: "هناك خطاء عن محاولة إدراج صوتك ." diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml index 6fc39b211b..d6a32ba183 100644 --- a/plugins/poll/config/locales/client.cs.yml +++ b/plugins/poll/config/locales/client.cs.yml @@ -9,14 +9,17 @@ cs: js: poll: voters: - zero: "hlasů" one: "hlasující" - other: "hlasů" + few: "hlasujících" + other: "hlasující" total_votes: - zero: "hlasů" - one: "hlas" + one: "hlas celkem" + few: "hlasy celkem" other: "hlasů celkem" average_rating: "Průměrné hodnocení: %{average}." + multiple: + help: + at_least_min_options: "Musíte zvolit alespoň %{count} možností." cast-votes: title: "Hlasujte" label: "Hlasovat!" diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml index d16eb468f0..7f31c2d0f9 100644 --- a/plugins/poll/config/locales/client.da.yml +++ b/plugins/poll/config/locales/client.da.yml @@ -9,17 +9,17 @@ da: js: poll: voters: - zero: "vælgere" one: "vælger" other: "vælgere" total_votes: - zero: "afgivne stemmer" one: "afgiven stemme" other: "afgivne stemmer" average_rating: "Gennemsnitlig rating: %{average}." multiple: help: + at_least_min_options: "Du skal mindst vælge %{count} muligheder." up_to_max_options: "Du kan vælge op til %{count} muligheder." + x_options: "Du skal vælge %{count} muligheder." between_min_and_max_options: "Du kan vælge mellem %{min} og %{max} muligheder." cast-votes: title: "Afgiv dine stemmer" diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml index 336b4b845c..7833ece385 100644 --- a/plugins/poll/config/locales/client.de.yml +++ b/plugins/poll/config/locales/client.de.yml @@ -9,11 +9,9 @@ de: js: poll: voters: - zero: "Teilnehmer" one: "Teilnehmer" other: "Teilnehmer" total_votes: - zero: "abgegebene Stimmen" one: "abgegebene Stimme" other: "abgegebene Stimmen" average_rating: "Durchschnittliche Bewertung: %{average}" diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml index ffafed3c9e..586a8dfaf5 100644 --- a/plugins/poll/config/locales/client.en.yml +++ b/plugins/poll/config/locales/client.en.yml @@ -1,19 +1,27 @@ # encoding: utf-8 +# This file contains content for the client portion of the poll plugin, sent out +# to the Javascript app. # -# Never edit this file. It will be overwritten when translations are pulled from Transifex. -# -# To work with us on translations, join this project: +# To work with us on translations, see: # https://www.transifex.com/projects/p/discourse-org/ +# +# This is a "source" file, which is used by Transifex to get translations for other languages. +# After this file is changed, it needs to be pushed by a maintainer to Transifex: +# +# tx push -s +# +# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882 +# +# To validate this YAML file after you change it, please paste it into +# http://yamllint.com/ en: js: poll: voters: - zero: "voters" one: "voter" other: "voters" total_votes: - zero: "total votes" one: "total vote" other: "total votes" diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml index 28bb00188c..828b06f07c 100644 --- a/plugins/poll/config/locales/client.es.yml +++ b/plugins/poll/config/locales/client.es.yml @@ -9,13 +9,11 @@ es: js: poll: voters: - zero: "votantes" one: "votante" other: "votantes" total_votes: - zero: "total votos" - one: "total voto" - other: "total votos" + one: "voto total" + other: "votos totales" average_rating: "Puntuación media: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml index 556a39b692..e3f743f115 100644 --- a/plugins/poll/config/locales/client.fa_IR.yml +++ b/plugins/poll/config/locales/client.fa_IR.yml @@ -9,18 +9,16 @@ fa_IR: js: poll: voters: - zero: "voters" - one: "voter" - other: "voters" + other: "رأی دهندگان" total_votes: - zero: "total votes" - one: "total vote" - other: "total votes" + other: "مجموع آرا" average_rating: "میانگین امتیاز: %{average}." multiple: help: - up_to_max_options: "You may choose up to %{count} options." - between_min_and_max_options: "You may choose between %{min} and %{max} options." + at_least_min_options: "حداقل %{count} گزینه باید انتخاب شود." + up_to_max_options: "می‌توانید تا %{count} گزینه را انتخاب کنید." + x_options: "%{count} گزینه باید انتخاب شود" + between_min_and_max_options: "می‌توانید بین %{min} تا %{max} گزینه را انتخاب کنید." cast-votes: title: "انداختن رأی شما" label: "رای بدهید!" diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml index 51d879df93..1b31427f79 100644 --- a/plugins/poll/config/locales/client.fi.yml +++ b/plugins/poll/config/locales/client.fi.yml @@ -9,17 +9,17 @@ fi: js: poll: voters: - zero: "äänestäjät" one: "äänestäjä" other: "äänestäjät" total_votes: - zero: "ääntä" one: "ääni" other: "ääntä" average_rating: "Keskivertoarvio: %{average}." multiple: help: - up_to_max_options: "Voit valita enintään %{count} vaihtoehtoa." + at_least_min_options: "Sinun täytyy valita vähintään %{count} vaihtoehtoa." + up_to_max_options: "Voit valita enintään %{count} vaihtoehtoa." + x_options: "Sinun täytyy valita %{count} vaihtoehtoa." between_min_and_max_options: "Voit valita %{min}-%{max}%{average}" multiple: help: diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml index f30b67a847..8c84678581 100644 --- a/plugins/poll/config/locales/client.he.yml +++ b/plugins/poll/config/locales/client.he.yml @@ -9,17 +9,17 @@ he: js: poll: voters: - zero: "מצביעים" - one: "מצביע/ה" + one: "מצביע" other: "מצביעים" total_votes: - zero: "סך הכל הצבעות" - one: "הצבעה אחת סך הכל" - other: "סך הכל הצבעות" + one: "מספר הצבעות כולל" + other: "מספר הצבעות כולל" average_rating: "דירוג ממוצע: %{average}." multiple: help: + at_least_min_options: "עליך לבחור לפחות %{count} אפשרויות" up_to_max_options: "באפשרותך לבחור עד %{count} אפשרויות." + x_options: "עליך לבחור %{count} אפשרויות. " between_min_and_max_options: "באפשרותך לבחור בין %{min} עד %{max} אפשרויות." cast-votes: title: "שליחת הצבעות" diff --git a/plugins/poll/config/locales/client.id.yml b/plugins/poll/config/locales/client.id.yml index 2112cad6a2..9d940ae970 100644 --- a/plugins/poll/config/locales/client.id.yml +++ b/plugins/poll/config/locales/client.id.yml @@ -5,4 +5,22 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -id: {} +id: + js: + poll: + average_rating: "Rata-rata rating: %{average}." + multiple: + help: + at_least_min_options: "Kamu wajib memilih setidaknya %{count} pilihan." + up_to_max_options: "Kamu boleh memilih maksimum %{count} pilihan." + x_options: "Kamu harus memilih %{count} pilihan." + between_min_and_max_options: "Kamu hanya bisa memilih minimum %{min} pilihan dan maximum %{max} pilihan." + cast-votes: + title: "Gunakan suaramu" + label: "Pilih sekarang!" + show-results: + title: "Lihat hasil polling" + label: "Lihat hasil" + hide-results: + title: "Kembali ke suaramu" + label: "Sembunyikan hasil" diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml index dcdcd892c1..e5ab646bd3 100644 --- a/plugins/poll/config/locales/client.it.yml +++ b/plugins/poll/config/locales/client.it.yml @@ -9,17 +9,17 @@ it: js: poll: voters: - zero: "votanti" one: "votante" other: "votanti" total_votes: - zero: "voti totali" one: "voto totale" other: "voti totali" average_rating: "Voto medio: %{average}." multiple: help: + at_least_min_options: "Devi scegliere almeno %{count} opzioni." up_to_max_options: "Puoi scegliere fino a %{count} opzioni." + x_options: "Devi scegliere %{count} opzioni." between_min_and_max_options: "Puoi scegliere tra %{min} e %{max} opzioni." cast-votes: title: "Vota" diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml index 8c2dc00904..2d01b7c38e 100644 --- a/plugins/poll/config/locales/client.ja.yml +++ b/plugins/poll/config/locales/client.ja.yml @@ -5,4 +5,36 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -ja: {} +ja: + js: + poll: + voters: + other: "投票者数" + total_votes: + other: "合計得票数" + average_rating: "平均評価: %{average}." + multiple: + help: + at_least_min_options: "少なくとも %{count} 個のオプションを選んでください。" + up_to_max_options: "%{count} 個のオプションまで選択することができます。" + x_options: "%{count} 個のオプションを選択してください。" + between_min_and_max_options: "%{min} と %{max} のオプションから選択することができます。" + cast-votes: + title: "投票する" + label: "すぐ投票！" + show-results: + title: "投票結果を表示" + label: "結果を表示" + hide-results: + title: "あなたの投票に戻る" + label: "結果を非表示にする" + open: + title: "投票を開く" + label: "開く" + confirm: "この投票をオープンにしてもよろしいですか？" + close: + title: "投票を終了" + label: "閉じる" + confirm: "この投票を終了してもよろしいですか？" + error_while_toggling_status: "投票の状態を切り替え中にエラーが発生しました。" + error_while_casting_votes: "投票中にエラーが発生しました。" diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml index 1f014fb7f7..ad715c3ee4 100644 --- a/plugins/poll/config/locales/client.ko.yml +++ b/plugins/poll/config/locales/client.ko.yml @@ -9,27 +9,25 @@ ko: js: poll: voters: - zero: "투표자" - one: "투표자" other: "투표자" total_votes: - zero: "전체 투표" - one: "전체 투표" other: "전체 투표" - average_rating: "평균 Rating: %{average}." + average_rating: "평균: %{average}." multiple: help: - up_to_max_options: "최대 %{count}개의 옵션을 선택가능합니다." - between_min_and_max_options: "최소 %{min}개에서 최대 %{max}까지 선택가능합니다." + at_least_min_options: "적어도 %{count}개는 선택해야 합니다." + up_to_max_options: "%{count}개까지만 선택할 수 있습니다." + x_options: "정확히 %{count}개를 선택해야 합니다." + between_min_and_max_options: "%{min}개에서 %{max}개까지 선택할 수 있습니다." cast-votes: - title: "Cast your votes" + title: "표 던지기" label: "지금 투표!" show-results: title: "투표 결과 표시" label: "결과 보기" hide-results: title: "투표로 돌아가기" - label: "겨로가 숨기기" + label: "결과 숨기기" open: title: "투표 열기" label: "열기" @@ -38,5 +36,5 @@ ko: title: "투표 닫기" label: "닫기" confirm: "정말 이 투표를 닫으시겠어요?" - error_while_toggling_status: "투표의 상태를 변경하는데 에러가 발생했습니다." - error_while_casting_votes: "There was an error while casting your votes." + error_while_toggling_status: "투표의 상태를 변경하는데 오류가 발생했습니다." + error_while_casting_votes: "투표 중에 오류가 발생했습니다." diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml index 69adb71246..0039a0d65b 100644 --- a/plugins/poll/config/locales/client.nb_NO.yml +++ b/plugins/poll/config/locales/client.nb_NO.yml @@ -9,17 +9,17 @@ nb_NO: js: poll: voters: - zero: "stemmer" - one: "har stemt" - other: "har stemt" + one: "stemmegiver" + other: "stemmegivere" total_votes: - zero: "stemmer totalt" - one: "stemmer totalt" - other: "stemmer totalt" + one: "antall stemmer" + other: "antall stemmer" average_rating: "Gjennomsnitt: %{average}." multiple: help: + at_least_min_options: "Du må velge minst %{count} alternativer." up_to_max_options: "Du kan velge opptil %{count} alternativer." + x_options: "Du må velge %{count} alternativer." between_min_and_max_options: "Du kan velge mellom %{min} og %{max} alternativer." cast-votes: title: "Stem nå" diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml index c12df6b29b..de778280c0 100644 --- a/plugins/poll/config/locales/client.nl.yml +++ b/plugins/poll/config/locales/client.nl.yml @@ -9,17 +9,17 @@ nl: js: poll: voters: - zero: "kiezers" - one: "kiezer" - other: "kiezers" + one: "keer gestemd" + other: "keer gestemd" total_votes: - zero: "totaal aantal stemmen" - one: "totaal aantal stemmen" - other: "totaal aantal stemmen" + one: "stem" + other: "stemmen" average_rating: "Gemiddeld cijfer: %{average}." multiple: help: + at_least_min_options: "Kies tenminste %{count} opties." up_to_max_options: "Je kunt maximaal %{count} opties kiezen." + x_options: "Kies %{count} opties." between_min_and_max_options: "Je kan tussen %{min} en %{max} opties kiezen." cast-votes: title: "Geef je stem" diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml index c85bd13061..b344003fdd 100644 --- a/plugins/poll/config/locales/client.pl_PL.yml +++ b/plugins/poll/config/locales/client.pl_PL.yml @@ -9,12 +9,12 @@ pl_PL: js: poll: voters: - zero: "głosujących" one: "głosujący" + few: "głosujących" other: "głosujących" total_votes: - zero: "oddanych głosów" - one: "oddany głos" + one: "oddanych głosów" + few: "oddanych głosów" other: "oddanych głosów" average_rating: "Średnia ocena: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml index eaafdd4978..9d7df2719f 100644 --- a/plugins/poll/config/locales/client.pt.yml +++ b/plugins/poll/config/locales/client.pt.yml @@ -5,4 +5,38 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -pt_PT: {} +pt: + js: + poll: + voters: + one: "eleitor" + other: "eleitores" + total_votes: + one: "total da votação" + other: "total de votos" + average_rating: "Classificação média: %{average}." + multiple: + help: + at_least_min_options: "Deve escolher pelo menos %{count} opções." + up_to_max_options: "Pode escolher até %{count} opções." + x_options: "Deve escolher %{count} opções." + between_min_and_max_options: "Pode escolher entre %{min} e %{max} opções." + cast-votes: + title: "Votar" + label: "Vote agora!" + show-results: + title: "Exibir resultados da votação" + label: "Mostrar resultados" + hide-results: + title: "Voltar aos meus votos" + label: "Ocultar resultados" + open: + title: "Abrir a votação" + label: "Abrir" + confirm: "Tem a certeza que quer abrir esta votação?" + close: + title: "Fechar a votação" + label: "Fechar" + confirm: "Tem a certeza que quer fechar esta votação?" + error_while_toggling_status: "Ocorreu um erro ao alternar o estado desta votação." + error_while_casting_votes: "Ocorreu um erro enquanto os seus votos eram enviados." diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml index 345ecb3677..7fec94ebd8 100644 --- a/plugins/poll/config/locales/client.pt_BR.yml +++ b/plugins/poll/config/locales/client.pt_BR.yml @@ -8,18 +8,12 @@ pt_BR: js: poll: - voters: - zero: "votantes" - one: "votante" - other: "votantes" - total_votes: - zero: "total de votos" - one: "total de voto" - other: "total de votos" average_rating: "Resultado médio: %{average}." multiple: help: + at_least_min_options: "Você precisa escolher ao menos %{count} opções." up_to_max_options: "Você pode escolher %{count} opções." + x_options: "Você precisa escolher %{count} opções." between_min_and_max_options: "Você pode escolher entre %{min} e %{max} opções." cast-votes: title: "Seus votos" diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml index 6ce3f2116f..e1e2ff3241 100644 --- a/plugins/poll/config/locales/client.ro.yml +++ b/plugins/poll/config/locales/client.ro.yml @@ -8,18 +8,12 @@ ro: js: poll: - voters: - zero: "alegători" - one: "alegător" - other: "alegători" - total_votes: - zero: "numar total de voturi" - one: "vot total" - other: "numar total de voturi" average_rating: "Media: %{average}." multiple: help: + at_least_min_options: "Trebuie să alegeți cel puțin %{count} opțiuni." up_to_max_options: "Puteţi alege cel mult %{count} opţiuni." + x_options: "Trebuie să alegeți %{count} opțiuni." between_min_and_max_options: "Puteţi alege între %{min} şi %{max} opţiuni." cast-votes: title: "Exprimaţi-vă votul" diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml index 8151860a4b..8f73a0a443 100644 --- a/plugins/poll/config/locales/client.ru.yml +++ b/plugins/poll/config/locales/client.ru.yml @@ -8,18 +8,12 @@ ru: js: poll: - voters: - zero: "голосов" - one: "голос" - other: "голосов" - total_votes: - zero: "всего голосов" - one: "всего проголосовало" - other: "всего голосов" average_rating: "Примерный рейтинг: %{average}." multiple: help: + at_least_min_options: "Вы должны выбрать как минимум %{count} ответов." up_to_max_options: "Вы можете выбрать не более %{count} вариантов ответов." + x_options: "Вы должны выбрать %{count} варианта ответа." between_min_and_max_options: "Вы можете выбрать от %{min} до %{max} ответов." cast-votes: title: "Проголосуйте" diff --git a/plugins/poll/config/locales/client.sq.yml b/plugins/poll/config/locales/client.sq.yml index 163b5e78a6..5efd604a25 100644 --- a/plugins/poll/config/locales/client.sq.yml +++ b/plugins/poll/config/locales/client.sq.yml @@ -8,7 +8,19 @@ sq: js: poll: - average_rating: "Average rating: %{average}." + voters: + one: "votues" + other: "votuesit" + total_votes: + one: "total vote" + other: "total votes" + average_rating: "Vlerësimi mesatar: %{average}." + multiple: + help: + at_least_min_options: "Ju duhet të zgjidhni të paktën %{count} opsionet." + up_to_max_options: "You may choose up to %{count} options." + x_options: "You must choose %{count} options." + between_min_and_max_options: "You may choose between %{min} and %{max} options." cast-votes: title: "Cast your votes" label: "Voto Tani" @@ -19,8 +31,8 @@ sq: title: "Back to your votes" label: "Hide results" open: - title: "Open the poll" - label: "Hap" + title: "Fillo një Sondazh" + label: "Fillo" confirm: "Are you sure you want to open this poll?" close: title: "Mbyll sondazhin" diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml index fd54901f75..421ff6218f 100644 --- a/plugins/poll/config/locales/client.sv.yml +++ b/plugins/poll/config/locales/client.sv.yml @@ -5,4 +5,32 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -sv: {} +sv: + js: + poll: + average_rating: "Medelbetyg: %{average}." + multiple: + help: + at_least_min_options: "Du måste välja minst %{count} alternativ." + up_to_max_options: "Du kan välja upp till %{count} alternativ." + x_options: "Du måste välja %{count} alternativ." + between_min_and_max_options: "Du kan välja mellan %{min} och %{max} alternativ." + cast-votes: + title: "Lägg dina röster" + label: "Rösta nu!" + show-results: + title: "Visa omröstningsresultatet" + label: "Visa resultat" + hide-results: + title: "Tillbaka till dina röster" + label: "Göm resultat" + open: + title: "Öppna omröstningen" + label: "Öppna" + confirm: "Är du säker på att du vill öppna denna omröstning?" + close: + title: "Stäng omröstningen" + label: "Stäng" + confirm: "Är du säker på att du vill stänga denna omröstning?" + error_while_toggling_status: "Ett fel uppstod vid ändring av status för denna omröstning." + error_while_casting_votes: "Ett fel uppstod vid röstningen." diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml index 716c9bf235..2e6792746d 100644 --- a/plugins/poll/config/locales/client.tr_TR.yml +++ b/plugins/poll/config/locales/client.tr_TR.yml @@ -9,27 +9,25 @@ tr_TR: js: poll: voters: - zero: "oy verenler" - one: "oy veren" - other: "oy verenler" + other: "oylayan" total_votes: - zero: "tüm oylar" - one: "toplam oy" - other: "tüm oylar" + other: "toplam oy" average_rating: "Ortalama oran: %{average}." multiple: help: + at_least_min_options: "En az %{count} seçim yapmalısınız." up_to_max_options: "En fazla %{count} seçim yapabilirsiniz." + x_options: "%{count} seçim yapmalısınız." between_min_and_max_options: "%{min} ve %{max} seçenekleri arasında seçim yapabilirsiniz." cast-votes: - title: "Oyunuzu verin" + title: "Oyunuzu kullanın" label: "Şimdi oylayın!" show-results: title: "Anket sonuçlarını göster" label: "Sonuçları göster" hide-results: title: "Oylarınıza dönün" - label: "Sonuçları sakla" + label: "Sonuçları gizle" open: title: "Anketi başlat" label: "Başlat" diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml index f654b80e8c..3acfff74e8 100644 --- a/plugins/poll/config/locales/client.uk.yml +++ b/plugins/poll/config/locales/client.uk.yml @@ -5,12 +5,4 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -uk: - js: - poll: - voters: - zero: "проголосувало" - one: "проголосував" - other: "проголосувало" - total_votes: - zero: "кількість голосів" +uk: {} diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml index c34b128a23..cd3958a6a3 100644 --- a/plugins/poll/config/locales/client.zh_CN.yml +++ b/plugins/poll/config/locales/client.zh_CN.yml @@ -9,13 +9,9 @@ zh_CN: js: poll: voters: - zero: "投票者" - one: "投票者" other: "投票者" total_votes: - zero: "总投票数" - one: "总投票数" - other: "总投票数" + other: "总票数" average_rating: "平均排名：%{average}。" multiple: help: diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml index 79ea4de815..7fcef197a3 100644 --- a/plugins/poll/config/locales/server.ar.yml +++ b/plugins/poll/config/locales/server.ar.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -ar: {} +ar: + site_settings: + poll_enabled: "المستخدمين المسموح لهم إنشاء استطلاع رأي" + poll_maximum_options: "أقصى عدد من الخيارات المسموحة في استطلاع الرأي." + poll: + multiple_polls_without_name: "هناك عدة استطلاعات رأي بدون اسم. استخدم خاصية 'name' لتحديد استطلاعاتك الفريدة." + multiple_polls_with_same_name: "هناك عدة استطلاعات رأي متشابهة بالاسم : %{name}. استخدم خاصية 'name' لتحدي استطلاعك الفريد." + default_poll_must_have_at_least_2_options: "استطلاع الرأي يجب أن يكون على الأقل 2 من الخيارات." + named_poll_must_have_at_least_2_options: "استطلاع الرأي المسمى %{name} يجب أن يكون على الأقل 2 من الخيارات." + default_poll_must_have_less_options: "استطلاع الرأي يجب أن يكون أقل من %{max} الخيارات." + named_poll_must_have_less_options: "استطلاع الرأي المسمى %{name} يجب أقل من %{max} الخيارات." + default_poll_must_have_different_options: "استطلاع الرأي يجب أن يكون مختلف الخيارات." + named_poll_must_have_different_options: "استطلاع الرأي المسمى %{name} يجب أن يكون مختلف الخيارات." + default_poll_with_multiple_choices_has_invalid_parameters: "معلمات استطلاع الرأي ذات الخيار المتعدد غير صالحة." + named_poll_with_multiple_choices_has_invalid_parameters: "معلمات استطلاع الرأي المسمى %{name} ذات الخيار المتعدد غير صالحة." + requires_at_least_1_valid_option: "يجب أن تختار أختيار 1 صحيح على الأقل." + cannot_change_polls_after_5_minutes: "لا يمكنك إضافة أو حذف أو إعادة تسمية استطلاعات الرأي بعد الـ5 دقائق اﻷولى." + op_cannot_edit_options_after_5_minutes: "لا تستطيع إضافة أو حذف خيارات استطلاع الرأي بعد أول 5 دقائق. أرجو أن تتصل بالمسؤول إذا احتجت لتحرير خيارات الرأي." + staff_cannot_add_or_remove_options_after_5_minutes: "لا تستطيع إضافة أو حذف خيارات استطلاع الرأي بعد أول 5 دقائق. يجب عليك إغلاق هذا الموضوع وإنشاء جديد بدلا عنه." + no_polls_associated_with_this_post: "لا استطلاعات رأي مرتبطة مع هذا الاستطلاع." + no_poll_with_this_name: "استطلاع الرأي المسمى %{name} غير مرتبط مع هذا الاستطلاع." + post_is_deleted: "لا يمكنك عمل حذف مشاركة." + topic_must_be_open_to_vote: "الموضوع يجب أن يكون مفتوح للتصويت." + poll_must_be_open_to_vote: "يجب أن تكون الاستطلاعات مفتوحة للتصويت." + topic_must_be_open_to_toggle_status: "الموضوع يجب أن يكون مفتوح لتبديل الحالة." + only_staff_or_op_can_toggle_status: "فقط الأعضاء العاملين أو المعلنين الأصليين يمكنهم تبديل حالة الاستطلاع." diff --git a/plugins/poll/config/locales/server.da.yml b/plugins/poll/config/locales/server.da.yml index 02f8b25b78..ba7e89bf41 100644 --- a/plugins/poll/config/locales/server.da.yml +++ b/plugins/poll/config/locales/server.da.yml @@ -18,12 +18,15 @@ da: named_poll_must_have_less_options: "Afstemningen %{name} skal have mindre end %{max} valgmuligheder." default_poll_must_have_different_options: "Afstemningen skal have forskellige muligheder." named_poll_must_have_different_options: "Afstemningen %{name} skal have forskellige valgmuligheder." + default_poll_with_multiple_choices_has_invalid_parameters: "Afstemning med flere valgmuligheder har ugyldige parametre." + named_poll_with_multiple_choices_has_invalid_parameters: "Afstemningen %{name} med flere valgmuligheder har ugyldige parametre." requires_at_least_1_valid_option: "Du skal vælge mindst 1 gyldig mulighed." cannot_change_polls_after_5_minutes: "Du kan ikke tilføje, fjerne eller omdøbe afstemninger efter de første 5 minutter." op_cannot_edit_options_after_5_minutes: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første 5 minutter. Kontakt venligst en moderator hvis du har brug for at rette en mulighed." staff_cannot_add_or_remove_options_after_5_minutes: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første 5 minutter. Du kan lukke emnet og oprette et nyt istedet." no_polls_associated_with_this_post: "Ingen afstemninger er associeret med dette indlæg." no_poll_with_this_name: "Ingen afstemning med navnet %{name} er associeret med dette indlæg." + post_is_deleted: "Kan ikke gøres på et slettet indlæg." topic_must_be_open_to_vote: "Emnet skal være åbent for at kunne stemme." poll_must_be_open_to_vote: "Afstemning skal være åben for at kunne stemme." topic_must_be_open_to_toggle_status: "Emnet skal være åbent for at ændre status." diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml index f78da1322b..dd1e4a5da9 100644 --- a/plugins/poll/config/locales/server.en.yml +++ b/plugins/poll/config/locales/server.en.yml @@ -1,9 +1,18 @@ # encoding: utf-8 +# This file contains content for the server portion of the poll plugin used by Ruby # -# Never edit this file. It will be overwritten when translations are pulled from Transifex. -# -# To work with us on translations, join this project: +# To work with us on translations, see: # https://www.transifex.com/projects/p/discourse-org/ +# +# This is a "source" file, which is used by Transifex to get translations for other languages. +# After this file is changed, it needs to be pushed by a maintainer to Transifex: +# +# tx push -s +# +# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882 +# +# To validate this YAML file after you change it, please paste it into +# http://yamllint.com/ en: site_settings: diff --git a/plugins/poll/config/locales/server.fa_IR.yml b/plugins/poll/config/locales/server.fa_IR.yml index df4e6bc980..1bb4e1cf57 100644 --- a/plugins/poll/config/locales/server.fa_IR.yml +++ b/plugins/poll/config/locales/server.fa_IR.yml @@ -18,12 +18,15 @@ fa_IR: named_poll_must_have_less_options: "Poll named %{name} must have less than %{max} options." default_poll_must_have_different_options: "نظرسنجی باید گزینه های متفاوت داشته باشد. " named_poll_must_have_different_options: "Poll named %{name} must have different options." + default_poll_with_multiple_choices_has_invalid_parameters: "در نظرسنجی چند گزینه‌ای پارامترهای نامعتبری وجود دارد." + named_poll_with_multiple_choices_has_invalid_parameters: "در نظرسنجی چند گزینه‌ای با نام %{name} پارامترهای نامعتبری وجود دارد." requires_at_least_1_valid_option: "You must select at least 1 valid option." cannot_change_polls_after_5_minutes: "You cannot add, remove or rename polls after the first 5 minutes." op_cannot_edit_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. Please contact a moderator if you need to edit a poll option." staff_cannot_add_or_remove_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. You should close this topic and create a new one instead." no_polls_associated_with_this_post: "هیچ نظرسنجی با این نوشته در تماس نیستند. " no_poll_with_this_name: "هیچ نظرسنجی اسم گزاری نشده %{name} در تماس به این نوشته نیست. " + post_is_deleted: "این کار را نمی‌توان روی یک نوشته حذف شده انجام داد." topic_must_be_open_to_vote: "جستار باید برای رای گزاری باز باشد. " poll_must_be_open_to_vote: "نظرسنجی باید باز باشد برای رای گیری." topic_must_be_open_to_toggle_status: "جستار باید برای تغییر وضیعت باز باشد. " diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml index ecfd1c3729..c70cc428f5 100644 --- a/plugins/poll/config/locales/server.fi.yml +++ b/plugins/poll/config/locales/server.fi.yml @@ -18,12 +18,15 @@ fi: named_poll_must_have_less_options: "Äänestyksen nimeltä %{name} pitää sisältää vähemmän, kuin %{max} vaihtoehtoa." default_poll_must_have_different_options: "Äänestysvaihtoehtojen on erottava toisistaan." named_poll_must_have_different_options: "Äänestyksen nimeltä %{name} vaihtoehtojen on erottava toisistaan." + default_poll_with_multiple_choices_has_invalid_parameters: "Kysely, jossa on useita vaihtoehtoja sisältää epäkelpoja parametreja." + named_poll_with_multiple_choices_has_invalid_parameters: "Kysely nimeltä %{name}, jossa on useampia vaihtoehtoja sisältää epäkelpoja parametreja" requires_at_least_1_valid_option: "Sinun täytyy valita vähintään 1 vaihtoehto." cannot_change_polls_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen." op_cannot_edit_options_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen. Ota yhteyttä valvojaan, jos sinun täytyy muokata kyselyn vaihtoehtoja." staff_cannot_add_or_remove_options_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen. Sinun tulee poistaa tämä ketju ja avata uusi sen sijaan." no_polls_associated_with_this_post: "Tämä viesti ei sisällä äänestyskyselyä." no_poll_with_this_name: "Tämä viesti ei sisällä äänestyskyselyä nimeltä %{name}." + post_is_deleted: "Ei voi tehdä poistetulle viestille" topic_must_be_open_to_vote: "Vain avoimessa ketjussa voi äänestää." poll_must_be_open_to_vote: "Vain avoimessa kyselyssä voi äänestää." topic_must_be_open_to_toggle_status: "Vain avoimessa ketjussa voi muuttaa äänestyksen tilaa." diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml index 96b15d6088..9711891cc5 100644 --- a/plugins/poll/config/locales/server.he.yml +++ b/plugins/poll/config/locales/server.he.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -he: {} +he: + site_settings: + poll_enabled: "אפשר למשתמשים ליצור סקרים?" + poll_maximum_options: "מספר אפשרויות מירבי המותר בסקר" + poll: + multiple_polls_without_name: "יש מספר סקרים ללא שם. השתמש במאפיין 'name' לזהות באופן יחודי את הסקרים שלך. " + multiple_polls_with_same_name: "יש מספר סקרים עם אותו שם %{name}. השתמש במאפיין 'name' לזהות באופן יחודי את הסקרים שלך. " + default_poll_must_have_at_least_2_options: "לסקר צריך להיות לפחות שתי אפשרויות." + named_poll_must_have_at_least_2_options: "לסקר בשם %{name} צריך שיהיה לפחות שתי אפשרויות." + default_poll_must_have_less_options: "לסקר צריך שיהיו פחות מ %{max} אפשרויות. " + named_poll_must_have_less_options: "לסקר בשם %{name} צריך שיהיו פחות מ %{max} אפשרויות. " + default_poll_must_have_different_options: "לסקר צריך שיהיה אפשרויות שונות. " + named_poll_must_have_different_options: "לסקר בשם %{name} צריך שיהיו אפשרויות שונות. " + default_poll_with_multiple_choices_has_invalid_parameters: "לסקר עם בחירה מרובה יש פרמטרים לא תקינים. " + named_poll_with_multiple_choices_has_invalid_parameters: "לסקר בשם %{name} עם בחירה מרובה יש פרמטרים לא תקינים. " + requires_at_least_1_valid_option: "עליך לבחור לפחות אפשרות אחת תקינה. " + cannot_change_polls_after_5_minutes: "אינך יכול להוסיף, להסיר או לשנות שם לסקרים לאחר 5 דקות מפרסומם." + op_cannot_edit_options_after_5_minutes: "לא ניתן להוסיך או להסיר אפשרויות מהסקר לאחר 5 דקות מפרסומו. צרו קשר עם מנהל אם אתם צריכים לערוך אפשרות בסקר." + staff_cannot_add_or_remove_options_after_5_minutes: "לא ניתן להוסיף או להסיר אפשרויות מסקרים לאחר 5 דקות מפרסום הסקר. ניתן לסגור את הנושא הזה ולפתוח אחד חדש במקומו." + no_polls_associated_with_this_post: "אין סקרים שמקושרים לפרסום הזה." + no_poll_with_this_name: "אין סקר בשם %{name} שמקושר לפרסום הזה. " + post_is_deleted: "לא ניתן לפעול על הודעה שנמחקה." + topic_must_be_open_to_vote: "הנושא צריך להיות פתוח להצבעות." + poll_must_be_open_to_vote: "הסקר צריך להיות פתוח להזמנות." + topic_must_be_open_to_toggle_status: "הנושא צריך להיות פתוח לשינויים בסטטוס." + only_staff_or_op_can_toggle_status: "רק חבר צוות או המפרסם המקורי יכול לשנות סטטוס של סקר. " diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml index 1f096450b5..2ece567bf8 100644 --- a/plugins/poll/config/locales/server.it.yml +++ b/plugins/poll/config/locales/server.it.yml @@ -18,10 +18,15 @@ it: named_poll_must_have_less_options: "Il sondaggio dal nome %{name} deve avere meno di %{max} opzioni." default_poll_must_have_different_options: "Il sondaggio deve avere opzioni diverse." named_poll_must_have_different_options: "Il sondaggio dal nome %{name} deve avere opzioni diverse." + default_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla ha parametri non validi." + named_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla dal nome %{name} ha parametri non validi." requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida." cannot_change_polls_after_5_minutes: "Non puoi aggiungere, cancellare o rinominare i sondaggi dopo i primi 5 minuti." + op_cannot_edit_options_after_5_minutes: "Non puoi aggiungere o rimuovere opzioni ad un sondaggio dopo i primi 5 minuti. Per favore contatta un moderatore se devi modificare un'opzione del sondaggio." + staff_cannot_add_or_remove_options_after_5_minutes: "Non puoi aggiungere o rimuovere opzioni ad un sondaggio dopo i primi 5 minuti. Dovresti chiudere questo argomento e crearne un altro." no_polls_associated_with_this_post: "Non ci sono sondaggi associati con questo messaggio." no_poll_with_this_name: "Nessun sondaggio avente nome %{name} è associato a questo messaggio." + post_is_deleted: "Non è possibile operare su un messaggio cancellato." topic_must_be_open_to_vote: "L'argomento deve essere aperto per poter votare." poll_must_be_open_to_vote: "Il sondaggio deve essere aperto per poter votare." topic_must_be_open_to_toggle_status: "L'argomento deve essere aperto per commutare lo stato." diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml index 8c2dc00904..2caae93362 100644 --- a/plugins/poll/config/locales/server.ja.yml +++ b/plugins/poll/config/locales/server.ja.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -ja: {} +ja: + site_settings: + poll_enabled: "ユーザによる投票の作成を許可しますか？" + poll_maximum_options: "投票で許可されるオプションの最大数。" + poll: + multiple_polls_without_name: "名前のない複数の投票があります。一意に投票結果を識別するために、属性'name'を使用します。" + multiple_polls_with_same_name: "同じ名前: %{name} の複数の投票があります。一意に投票結果を識別するために、属性'name'を使用します。" + default_poll_must_have_at_least_2_options: "投票は少なくとも2つのオプションが必要です。" + named_poll_must_have_at_least_2_options: "投票 %{name} は少なくとも2つのオプションが必要です。" + default_poll_must_have_less_options: "投票オプションは %{max} 未満です。" + named_poll_must_have_less_options: "投票 %{name} のオプションは %{max} 未満です。" + default_poll_must_have_different_options: "投票は異なるオプションが必要です。" + named_poll_must_have_different_options: "投票 %{name} は異なるオプションが必要です。" + default_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票に無効なパラメータがあります。" + named_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票 %{name} に無効なパラメータがあります。" + requires_at_least_1_valid_option: "少なくとも1つの有効なオプションを選択する必要があります。" + cannot_change_polls_after_5_minutes: "最初の5分を経過すると、投票の追加、削除や名前変更はできません。" + op_cannot_edit_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。投票オプションの編集が必要であれば、モデレータに連絡してください。" + staff_cannot_add_or_remove_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。このトピックを閉じて新しいトピックを作成してください。" + no_polls_associated_with_this_post: "このポストに関連付けられた投票はありません。" + no_poll_with_this_name: "このポストに関連付けられた投票 %{name} はありません。" + post_is_deleted: "削除されたポストに作用することはできません。" + topic_must_be_open_to_vote: "投票するトピックはオープンになっている必要があります。" + poll_must_be_open_to_vote: "投票するにはオープンになっている必要があります。" + topic_must_be_open_to_toggle_status: "状態を切り替えるには、トピックがオープンになっている必要があります。" + only_staff_or_op_can_toggle_status: "スタッフやオリジナル投稿者のみが投票状態を切り替えることができます。" diff --git a/plugins/poll/config/locales/server.ko.yml b/plugins/poll/config/locales/server.ko.yml index ecf6fffaf1..c8066f3a2c 100644 --- a/plugins/poll/config/locales/server.ko.yml +++ b/plugins/poll/config/locales/server.ko.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -ko_KR: {} +ko: + site_settings: + poll_enabled: "유저에게 설문조사 작성 허용" + poll_maximum_options: "최대 설문조사 항목이 허용됨." + poll: + multiple_polls_without_name: "이름없는 설문조사가 여러개 있습니다. 'name' 속성을 사용하여 설문조사를 개별적으로 구분해 보세요." + multiple_polls_with_same_name: "같은 이름 %{name} 의 설문조사가 여러개 있습니다. 'name' 속성을 사용하여 설문조사를 개별적으로 구분해 보세요." + default_poll_must_have_at_least_2_options: "설문조사에 적어도 2개의 항목은 있어야합니다." + named_poll_must_have_at_least_2_options: "%{name} 설문조사에 적어도 2개의 항목이 있어야 합니다." + default_poll_must_have_less_options: "설문조사 항목은 %{max}개보다 적어야합니다." + named_poll_must_have_less_options: "%{name} 설문조사의 항목이 %{max}개보다 적어야 합니다." + default_poll_must_have_different_options: "한 설문조사 안에 항목 내용들이 각각 달라야 합니다." + named_poll_must_have_different_options: "%{name} 설문조사의 항목 내용들이 달라야 합니다." + default_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 설문조사가 잘못된 매개변수를 가지고 있습니다." + named_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 %{name} 설문조사가 잘못된 매개변수를 가지고 있습니다." + requires_at_least_1_valid_option: "적어도 올바른 항목 1개를 선택해야 합니다." + cannot_change_polls_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제, 이름변경을 할 수 없습니다." + op_cannot_edit_options_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제를 할 수 없습니다. 설문 항목을 바꾸고 싶다면 관리자에게 문의하세요." + staff_cannot_add_or_remove_options_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제를 할 수 없습니다. 대신에 이 토픽을 닫고 새 설문조사를 만들어야 합니다." + no_polls_associated_with_this_post: "이 게시글과 연결된 설문조사가 없습니다." + no_poll_with_this_name: "이 게시글과 연결된 %{name} 설문조사가 없습니다." + post_is_deleted: "지워진 글에는 불가능합니다." + topic_must_be_open_to_vote: "토픽이 열려야 투표를 할 수 있습니다." + poll_must_be_open_to_vote: "설문조사가 열려야 투표를 할 수 있습니다." + topic_must_be_open_to_toggle_status: "토픽이 열려야 상태 변경을 할 수 있습니다." + only_staff_or_op_can_toggle_status: "관리자나 작성자만이 설문조사 상태를 변경할 수 있습니다." diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml index 2231ad9749..8d5c7e686d 100644 --- a/plugins/poll/config/locales/server.nb_NO.yml +++ b/plugins/poll/config/locales/server.nb_NO.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -nb_NO: {} +nb_NO: + site_settings: + poll_enabled: "Tillat brukere å opprette spørreundersøkelser" + poll_maximum_options: "Maksimalt antall alternativer i en spørreundersøkelse som tillates." + poll: + multiple_polls_without_name: "Det er flere spørreundersøkelser uten et navn. Bruk 'navn' attributten til å identifisere spørreundersøkelsene dine." + multiple_polls_with_same_name: "Det er flere spørreundersøkelser med samme navn: %{name}. Bruk 'name' attributten til å identifisere spørreundersøkelsene dine." + default_poll_must_have_at_least_2_options: "Spørrsundersøkelser må inneholde minst 2 alternativer." + named_poll_must_have_at_least_2_options: "Spørresundersøkelsen %{name} må ha minst 2 svaralternativer." + default_poll_must_have_less_options: "Spørreundersøkelsen må ha mindre enn %{max} svaralternativer." + named_poll_must_have_less_options: "Spørresundersøkelsen %{name} må ha mindre enn %{max} svaralternativer." + default_poll_must_have_different_options: "Spørreundersøkelsen må ha ulike alternativer." + named_poll_must_have_different_options: "Spørresundersøkelsen %{name} må ha ulike svaralternativer." + default_poll_with_multiple_choices_has_invalid_parameters: "Spørreundersøkelsen med flere svaralternativer har ugyldige parametere." + named_poll_with_multiple_choices_has_invalid_parameters: "Spørresundersøkelsen %{name} med flere svaralternativer har ugyldige parametere." + requires_at_least_1_valid_option: "Du må velge minst 1 gyldig alternativ." + cannot_change_polls_after_5_minutes: "Du kan ikke legge til, fjerne eller omdøpe spørreundersøkelser etter de første 5 minuttene." + op_cannot_edit_options_after_5_minutes: "Du kan ikke legge til eller fjerne svaralternativer i løpet av de første 5 minuttene. Venligst kontakt en moderator hvis du har behov for å redigere et svaralternativ." + staff_cannot_add_or_remove_options_after_5_minutes: "Du kan ikke legge til eller fjerne svaralternativer etter de første 5 minuttene. Du bør stenge dette emnet og opprette en ny istedet." + no_polls_associated_with_this_post: "Ingen spørreunderøkelser er assosiert med dette innlegget." + no_poll_with_this_name: "Ingen undersøkelse med navnet %{name} er assosiert med dette innlegget." + post_is_deleted: "Kan ikke agere på et slettet innlegg." + topic_must_be_open_to_vote: "Emnet må være åpent for å kunne avgi stemme." + poll_must_be_open_to_vote: "Spørreundersøkelsen må være åpen for å kunne avigi stemme." + topic_must_be_open_to_toggle_status: "Emnet må være åpent for å redigere status." + only_staff_or_op_can_toggle_status: "Kun forumpersonalet eller den forfatteren av emnet kan redigere status på spørreundersøkelsen." diff --git a/plugins/poll/config/locales/server.nl.yml b/plugins/poll/config/locales/server.nl.yml index ba7488529e..232d915004 100644 --- a/plugins/poll/config/locales/server.nl.yml +++ b/plugins/poll/config/locales/server.nl.yml @@ -18,13 +18,16 @@ nl: named_poll_must_have_less_options: "De poll genaamd %{name} moet minder dan %{max} opties hebben." default_poll_must_have_different_options: "Polls moeten verschillende opties hebben." named_poll_must_have_different_options: "De poll genaamd %{name} moet verschillende opties hebben." - requires_at_least_1_valid_option: "Je moet minimaal 1 geldige optie kiezen." + default_poll_with_multiple_choices_has_invalid_parameters: "De poll met meerdere keuzes heeft ongeldige parameters." + named_poll_with_multiple_choices_has_invalid_parameters: "De poll met de naam %{name} met meerdere keuzes heeft ongeldige parameters." + requires_at_least_1_valid_option: "Kies ten minste 1 geldige optie." cannot_change_polls_after_5_minutes: "Je kunt polls niet toevoegen, verwijderen of hernoemen na de eerste 5 minuten." op_cannot_edit_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. Neem a.u.b. contact op met een moderator als u een poll optie moet wijzigen." staff_cannot_add_or_remove_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. In plaats daarvan kun je dit topic sluiten en een nieuwe maken." - no_polls_associated_with_this_post: "Er zijn geen polls geassocieerd met deze post." - no_poll_with_this_name: "Er is geen poll genaamd %{name} geassocieerd met deze post." + no_polls_associated_with_this_post: "Er bestaan geen polls voor dit bericht." + no_poll_with_this_name: "Er bestaat geen poll met de naam %{name} voor dit bericht." + post_is_deleted: "Dit kan niet bij een verwijderd bericht." topic_must_be_open_to_vote: "Het topic moet geopend zijn om te kunnen stemmen." poll_must_be_open_to_vote: "De poll moet geopend zijn om te kunnen stemmen." topic_must_be_open_to_toggle_status: "Het topic moet geopend zijn om de status te kunnen veranderen." - only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke poster kan een poll status veranderen." + only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke plaatser van een bericht kan de status van een poll veranderen." diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml index eaafdd4978..ed455c1b50 100644 --- a/plugins/poll/config/locales/server.pt.yml +++ b/plugins/poll/config/locales/server.pt.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -pt_PT: {} +pt: + site_settings: + poll_enabled: "Permitir que os utilizadores criem votações?" + poll_maximum_options: "Número máximo de opções permitidas numa votação." + poll: + multiple_polls_without_name: "Há múltiplas votações sem nome. Utilize o atributo 'nome' para identificar as suas votações de maneira única." + multiple_polls_with_same_name: "Há múltiplas votações com o mesmo nome: %{name}. Utilize o atributo 'nome' para identificar as suas votações de maneira única." + default_poll_must_have_at_least_2_options: "Votação deve ter pelo menos 2 opções." + named_poll_must_have_at_least_2_options: "Votação com o nome %{name} deve ter pelo menos 2 opções." + default_poll_must_have_less_options: "Votação deve ter menos que %{max} opções." + named_poll_must_have_less_options: "Votação com o nome %{name} deve ter menos que %{max} opções." + default_poll_must_have_different_options: "Votação deve ter opções diferentes." + named_poll_must_have_different_options: "Votação com o nome %{name} deve ter opções diferentes." + default_poll_with_multiple_choices_has_invalid_parameters: "Votação com escolha múltipla tem parâmetros inválidos." + named_poll_with_multiple_choices_has_invalid_parameters: "Votação com o nome %{name} com escolha múltipla tem parâmetros inválidos." + requires_at_least_1_valid_option: "Deve selecionar pelo menos 1 opção válida." + cannot_change_polls_after_5_minutes: "Não pode adicionar, remover ou renomear votações após os primeiros 5 minutos." + op_cannot_edit_options_after_5_minutes: "Não pode adicionar ou remover opções da votação após os primeiros 5 minutos. Por favor contacte um moderador se necessitar de editar opções da votação." + staff_cannot_add_or_remove_options_after_5_minutes: "Não pode adicionar ou remover opções da votação após os primeiros 5 minutos. Deve fechar este tópico e criar um novo." + no_polls_associated_with_this_post: "Nenhuma votação está associada a esta mensagem." + no_poll_with_this_name: "Nenhuma votação com o nome %{name} está associada a esta mensagem." + post_is_deleted: "Não é possível realizar ações em mensagens eliminadas." + topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar." + poll_must_be_open_to_vote: "Votação tem que estar aberta para votar." + topic_must_be_open_to_toggle_status: "O tópico tem que estar aberto para alternar o estado." + only_staff_or_op_can_toggle_status: "Apenas um membro do pessoal ou o autor original pode alternar o estado da votação." diff --git a/plugins/poll/config/locales/server.ru.yml b/plugins/poll/config/locales/server.ru.yml index e72af1b4c7..8f1059c64e 100644 --- a/plugins/poll/config/locales/server.ru.yml +++ b/plugins/poll/config/locales/server.ru.yml @@ -18,12 +18,15 @@ ru: named_poll_must_have_less_options: "Голосование %{name} может содержать максимум %{max} ответов." default_poll_must_have_different_options: "Ответы в голосовании должны быть разными." named_poll_must_have_different_options: "Ответы в голосовании %{name} должны быть разными." + default_poll_with_multiple_choices_has_invalid_parameters: "Опрос c мультивыбором имеет неверные параметры." + named_poll_with_multiple_choices_has_invalid_parameters: "Опрос с мультивыбором %{name} имеет неверные параметры." requires_at_least_1_valid_option: "Вы должны выбрать как минимум 1 правильный ответ." cannot_change_polls_after_5_minutes: "Вы не можете удалить или переименовать опрос в течении первых 5 минут." op_cannot_edit_options_after_5_minutes: "Вы не можете добавлять и удалять ответы голосования по истечению 5 минут после создания. Свяжитесь с модератором если вам необходимо отредактировать ответы в данном голосовании." staff_cannot_add_or_remove_options_after_5_minutes: "Вы не можете добавлять и удалять ответы голосования по истечению 5 минут после создания. Вы можете закрыть данную тему и создать новую. " no_polls_associated_with_this_post: "Нет голосований прикрепленных к данному посту" no_poll_with_this_name: "Нет голосований %{name} прикрепленных к данному посту." + post_is_deleted: "Невозможно совершить действие над удаленным сообщением." topic_must_be_open_to_vote: "Тема должна быть открыта для голосования." poll_must_be_open_to_vote: "Опрос должен быть открыт для голосования." topic_must_be_open_to_toggle_status: "Тема должна быть открыта для изменения статуса." diff --git a/plugins/poll/config/locales/server.sq.yml b/plugins/poll/config/locales/server.sq.yml index 8640d0c933..c2c613bcc9 100644 --- a/plugins/poll/config/locales/server.sq.yml +++ b/plugins/poll/config/locales/server.sq.yml @@ -8,15 +8,25 @@ sq: site_settings: poll_enabled: "Allow users to create polls?" + poll_maximum_options: "Numri maksimal i opsioneve të lejuara në një sondazh." poll: multiple_polls_without_name: "There are multiple polls without a name. Use the 'name' attribute to uniquely identify your polls." multiple_polls_with_same_name: "There are multiple polls with the same name: %{name}. Use the 'name' attribute to uniquely identify your polls." - default_poll_must_have_at_least_2_options: "Poll must have at least 2 options." + default_poll_must_have_at_least_2_options: "Sondazhi duhet të ketë të paktën 2 opsione. " named_poll_must_have_at_least_2_options: "Poll named %{name} must have at least 2 options." - default_poll_must_have_different_options: "Poll must have different options." + default_poll_must_have_less_options: "Sondazhi duhet të ketë më pak se %{max} opsione." + named_poll_must_have_less_options: "Poll named %{name} must have less than %{max} options." + default_poll_must_have_different_options: "Sondazh duhet të ketë opsione të ndryshme." + named_poll_must_have_different_options: "Poll named %{name} must have different options." + default_poll_with_multiple_choices_has_invalid_parameters: "Poll with multiple choices has invalid parameters." + named_poll_with_multiple_choices_has_invalid_parameters: "Poll named %{name} with multiple choice has invalid parameters." + requires_at_least_1_valid_option: "You must select at least 1 valid option." + cannot_change_polls_after_5_minutes: "You cannot add, remove or rename polls after the first 5 minutes." + op_cannot_edit_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. Please contact a moderator if you need to edit a poll option." + staff_cannot_add_or_remove_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. You should close this topic and create a new one instead." no_polls_associated_with_this_post: "No polls are associated with this post." no_poll_with_this_name: "No poll named %{name} associated with this post." + post_is_deleted: "Cannot act on a deleted post." topic_must_be_open_to_vote: "The topic must be open to vote." poll_must_be_open_to_vote: "Poll must be open to vote." topic_must_be_open_to_toggle_status: "The topic must be open to toggle status." - only_staff_or_op_can_toggle_status: "Only a staff member or the original poster can toggle a poll status." diff --git a/plugins/poll/config/locales/server.sv.yml b/plugins/poll/config/locales/server.sv.yml index fd54901f75..d13c1eee1d 100644 --- a/plugins/poll/config/locales/server.sv.yml +++ b/plugins/poll/config/locales/server.sv.yml @@ -5,4 +5,29 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -sv: {} +sv: + site_settings: + poll_enabled: "Tillåt användare att skapa omröstningar?" + poll_maximum_options: "Maximalt antal alternativ tillåtna i en omröstning." + poll: + multiple_polls_without_name: "Det finns flera omröstningar utan ett namn. Använd attributet 'namn' för att unikt identifiera dina omröstningar." + multiple_polls_with_same_name: "Det finns flera omröstningar med samma namn: %{name}. Använd attributet 'namn' för att unikt identifiera din omröstningar." + default_poll_must_have_at_least_2_options: "Omröstningen måste ha minst 2 alternativ." + named_poll_must_have_at_least_2_options: "Omröstningen med namnet %{name} måste ha minst 2 alternativ." + default_poll_must_have_less_options: "Omröstningen måste ha mindre än %{max} alternativ." + named_poll_must_have_less_options: "Omröstningen med namnet %{name} måste ha mindre än %{max} alternativ." + default_poll_must_have_different_options: "Omröstningen måste ha olika alternativ." + named_poll_must_have_different_options: "Omröstning med namnet %{name} måste ha olika alternativ." + default_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med flera val har ogiltiga parametrar." + named_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med namnet %{name} med flera val har ogiltiga parametrar." + requires_at_least_1_valid_option: "Du måste välja minst 1 giltigt alternativ." + cannot_change_polls_after_5_minutes: "Du kan inte lägga till, ta bort eller byta namn på omröstningar efter de första 5 minutrarna." + op_cannot_edit_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter det första 5 minutrarna. Vänligen kontakta en moderator om du behöver redigera ett omröstningsalternativ." + staff_cannot_add_or_remove_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter de första 5 minutrarna. Du får stänga detta ämne och skapa ett nytt i sådana fall." + no_polls_associated_with_this_post: "Inga omröstningar är knutet till detta inlägg." + no_poll_with_this_name: "Ingen omröstning med namnet %{name} är knuten till detta inlägg." + post_is_deleted: "Kan inte göra något med ett raderat inlägg." + topic_must_be_open_to_vote: "Detta ämne måste vara öppet för att kunna rösta." + poll_must_be_open_to_vote: "Omröstning måste vara öppen för att kunna rösta." + topic_must_be_open_to_toggle_status: "Ämnet måste vara öppet för att kunna växla status." + only_staff_or_op_can_toggle_status: "Endast personal eller ursprungsskribenten kan växla status på en omröstning." diff --git a/plugins/poll/config/locales/server.tr_TR.yml b/plugins/poll/config/locales/server.tr_TR.yml index c0587899ed..9018c91244 100644 --- a/plugins/poll/config/locales/server.tr_TR.yml +++ b/plugins/poll/config/locales/server.tr_TR.yml @@ -7,7 +7,7 @@ tr_TR: site_settings: - poll_enabled: "Kullanıcıların anket oluşturmasına izin ver?" + poll_enabled: "Kullanıcılar anket oluşturabilirler mi?" poll_maximum_options: "Bir ankette izin verilen en fazla seçenek sayısı." poll: multiple_polls_without_name: "İsimsiz birden fazla anket var. 'name' atıfını kullanarak anketlerinizi özebir tanımlayabilirsiniz." @@ -18,12 +18,15 @@ tr_TR: named_poll_must_have_less_options: "%{name} isimli anket en fazla %{max} seçeneğe sahip olabilir." default_poll_must_have_different_options: "Anketin farklı seçenekleri olmalı." named_poll_must_have_different_options: "%{name} isimli anketin farklı seçenekleri olmalı." + default_poll_with_multiple_choices_has_invalid_parameters: "Çoklu seçim seçeneği içeren anketinizde hatalar belirlendi." + named_poll_with_multiple_choices_has_invalid_parameters: "%{name} ile adlandırılmış ve çoklu seçim seçeneği içeren anketinizde hatalar belirlendi." requires_at_least_1_valid_option: "En az 1 geçerli seçim yapmalısınız." cannot_change_polls_after_5_minutes: "Anketler, ilk 5 dakikadan sonra eklenemez, çıkartılamaz ya da yeniden isimlendirilemez." op_cannot_edit_options_after_5_minutes: "Anketler ilk 5 dakikadan sonra eklenemez ya da çıkartılamaz. Eğer bir anket seçeneğini değiştirmeniz gerekiyorsa herhangi bir moderatör ile iletişime geçin." staff_cannot_add_or_remove_options_after_5_minutes: "Anketler ilk 5 dakikadan sonra eklenemez ya da çıkartılamaz. Bu konuyu kapatıp, yerine yeni bir konu oluşturmalısınız." no_polls_associated_with_this_post: "Bu gönderiyle alakalı bir anket yok." no_poll_with_this_name: "Bu gönderiyle alakalı %{name} isimli bir anket yok." + post_is_deleted: "Silinmiş konu üzerinde işlem yapamazsınız." topic_must_be_open_to_vote: "Konu oylanabilmesi için açık olmalı." poll_must_be_open_to_vote: "Anket oylanabilmesi için açık olmalı." topic_must_be_open_to_toggle_status: "Statüsün düzenlenebilmesi için konu açık olmalı." diff --git a/plugins/poll/config/locales/server.uk.yml b/plugins/poll/config/locales/server.uk.yml index 7e72e9bbe6..026536d754 100644 --- a/plugins/poll/config/locales/server.uk.yml +++ b/plugins/poll/config/locales/server.uk.yml @@ -9,3 +9,14 @@ uk: site_settings: poll_enabled: "Дозволити користувачам створювати опитування?" poll_maximum_options: "Максимальна кількість варіантів в опитуванні" + poll: + default_poll_must_have_at_least_2_options: "Голосування повинно мати щонайменше 2 варіанти." + named_poll_must_have_at_least_2_options: "Голосування під назвою %{name} повинно мати щонайменше 2 варіанти." + default_poll_must_have_different_options: "Голосування повинно мати різні варіанти." + named_poll_must_have_different_options: "Голосування під назвою %{name} повинно мати різні варіанти." + requires_at_least_1_valid_option: "Ви маєте обрати щонайменше 1 валідний варіант." + cannot_change_polls_after_5_minutes: "Ви не можете додавати, видаляти або перейменовувати голосування протягом перших 5 хвилин." + no_polls_associated_with_this_post: "Для цього допису голосування відсутні." + no_poll_with_this_name: "Для цього допису відсутнє голосування під назвою %{name}." + topic_must_be_open_to_vote: "Тема має бути відкрита для голосування." + poll_must_be_open_to_vote: "Опитування має бути відкритим для голосування." diff --git a/plugins/poll/config/settings.yml b/plugins/poll/config/settings.yml index bdeb59954c..2d01ba6b88 100644 --- a/plugins/poll/config/settings.yml +++ b/plugins/poll/config/settings.yml @@ -1,5 +1,7 @@ plugins: poll_enabled: default: true + client: true poll_maximum_options: default: 20 + client: true diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 5147e7f072..0f061e5b5f 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -4,6 +4,8 @@ # authors: Vikhyat Korrapati (vikhyat), Régis Hanol (zogstrip) # url: https://github.com/discourse/discourse/tree/master/plugins/poll +enabled_site_setting :poll_enabled + register_asset "stylesheets/common/poll.scss" register_asset "stylesheets/desktop/poll.scss", :desktop register_asset "stylesheets/mobile/poll.scss", :mobile @@ -15,6 +17,9 @@ PLUGIN_NAME ||= "discourse_poll".freeze POLLS_CUSTOM_FIELD ||= "polls".freeze VOTES_CUSTOM_FIELD ||= "polls-votes".freeze +DATA_PREFIX ||= "data-poll-".freeze +DEFAULT_POLL_NAME ||= "poll".freeze + after_initialize do # remove "Vote Now!" & "Show Results" links in emails @@ -155,6 +160,7 @@ after_initialize do end require_dependency "application_controller" + class DiscoursePoll::PollsController < ::ApplicationController requires_plugin PLUGIN_NAME @@ -215,9 +221,6 @@ after_initialize do end end - DATA_PREFIX ||= "data-poll-".freeze - DEFAULT_POLL_NAME ||= "poll".freeze - validate(:post, :validate_polls) do # only care when raw has changed! return unless self.raw_changed? @@ -283,9 +286,12 @@ after_initialize do # load previous polls previous_polls = post.custom_fields[POLLS_CUSTOM_FIELD] || {} + # extract options + current_options = polls.values.map { |p| p["options"].map { |o| o["id"] } }.flatten.sort + previous_options = previous_polls.values.map { |p| p["options"].map { |o| o["id"] } }.flatten.sort + # are the polls different? - if polls.keys != previous_polls.keys || - polls.values.map { |p| p["options"] } != previous_polls.values.map { |p| p["options"] } + if polls.keys != previous_polls.keys || current_options != previous_options # outside of the 5-minute edit window? if post.created_at < 5.minutes.ago diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb index dd4699345c..a47d7def26 100644 --- a/plugins/poll/spec/controllers/posts_controller_spec.rb +++ b/plugins/poll/spec/controllers/posts_controller_spec.rb @@ -4,6 +4,10 @@ describe PostsController do let!(:user) { log_in } let!(:title) { "Testing Poll Plugin" } + before do + SiteSetting.min_first_post_typing_time = 0 + end + describe "polls" do it "works" do @@ -86,7 +90,7 @@ describe PostsController do describe "within the first 5 minutes" do let(:post_id) do - Timecop.freeze(3.minutes.ago) do + Timecop.freeze(4.minutes.ago) do xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" } ::JSON.parse(response.body)["id"] end @@ -111,30 +115,54 @@ describe PostsController do describe "after the first 5 minutes" do + let(:poll) { "[poll]\n- A\n- B[/poll]" } + let(:new_option) { "[poll]\n- A\n- C[/poll]" } + let(:updated) { "before\n\n[poll]\n- A\n- B[/poll]\n\nafter" } + let(:post_id) do Timecop.freeze(6.minutes.ago) do - xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" } + xhr :post, :create, { title: title, raw: poll } ::JSON.parse(response.body)["id"] end end - let(:new_raw) { "[poll]\n- A\n- C[/poll]" } - - it "cannot be changed by OP" do - xhr :put, :update, { id: post_id, post: { raw: new_raw } } + it "OP cannot change the options" do + xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).not_to be_success json = ::JSON.parse(response.body) expect(json["errors"][0]).to eq(I18n.t("poll.op_cannot_edit_options_after_5_minutes")) end - it "can be edited by staff" do + it "staff can change the options" do log_in_user(Fabricate(:moderator)) - xhr :put, :update, { id: post_id, post: { raw: new_raw } } + xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).to be_success json = ::JSON.parse(response.body) expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") end + it "support changes on the post" do + xhr :put, :update, { id: post_id, post: { raw: updated } } + expect(response).to be_success + json = ::JSON.parse(response.body) + expect(json["post"]["cooked"]).to match("before") + end + + describe "with at least one vote" do + + before do + DiscoursePoll::Poll.vote(post_id, "poll", ["5c24fc1df56d764b550ceae1b9319125"], user.id) + end + + it "support changes on the post" do + xhr :put, :update, { id: post_id, post: { raw: updated } } + expect(response).to be_success + json = ::JSON.parse(response.body) + expect(json["post"]["cooked"]).to match("before") + end + + end + end end diff --git a/public/403.ar.html b/public/403.ar.html index 1e2006dd1a..12d30120a4 100644 --- a/public/403.ar.html +++ b/public/403.ar.html @@ -1,6 +1,6 @@ -لا يمكنك عمل ذلك (403) +لا يمكنك فعل ذلك (403)