From fad64bf1f090fd22227daeb9f0a66fb207c45a64 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 26 Aug 2017 09:23:18 +0000 Subject: [PATCH 01/25] Latest translations and fallbacks --- public/language/ja/admin/extend/plugins.json | 6 +++--- public/language/ja/admin/general/navigation.json | 2 +- public/language/ja/admin/manage/categories.json | 2 +- public/language/ja/admin/manage/groups.json | 2 +- public/language/ja/admin/menu.json | 2 +- public/language/ja/admin/settings/general.json | 4 ++-- public/language/ja/admin/settings/post.json | 8 ++++---- public/language/ja/admin/settings/user.json | 12 ++++++------ public/language/ja/error.json | 8 ++++---- public/language/ja/global.json | 4 ++-- public/language/ja/modules.json | 2 +- public/language/ja/notifications.json | 2 +- public/language/ja/pages.json | 2 +- public/language/ja/success.json | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/public/language/ja/admin/extend/plugins.json b/public/language/ja/admin/extend/plugins.json index 95302c87c1..37c6cf37ab 100644 --- a/public/language/ja/admin/extend/plugins.json +++ b/public/language/ja/admin/extend/plugins.json @@ -45,7 +45,7 @@ "alert.incompatible": "

NodeBBのバージョン(v%1)を v%2 にアップデートする必要があります。このプラグインの新しいバージョンをインストールするにはNodeBBをアップデートしてください。

", "alert.possibly-incompatible": "

No Compatibility Information Found

このプラグインはインストールに必要なNodeBBのバージョンの指定がされていませんでした。完全な互換性は保証されず、NodeBBが正常に起動しなくなる可能性があります。

NodeBBが正常に起動できない場合:

$ ./nodebb reset plugin=\"%1\"

このプラグインの最新バージョンのインストールを続行しますか？

", - "license.title": "Plugin License Information", - "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", - "license.cta": "Do you wish to continue with activating this plugin?" + "license.title": "プラグインライセンス情報", + "license.intro": "%1のプラグインは%2の下でライセンスされています。このプラグインを有効にする前にライセンス条項を熟読してください。", + "license.cta": "このプラグインを有効にし続けますか？" } diff --git a/public/language/ja/admin/general/navigation.json b/public/language/ja/admin/general/navigation.json index 386ff8311f..411bcb7367 100644 --- a/public/language/ja/admin/general/navigation.json +++ b/public/language/ja/admin/general/navigation.json @@ -11,7 +11,7 @@ "only-admins": "管理者にのみ表示する", "only-global-mods-and-admins": "グローバルモデレーターおよび管理者のみに表示", "only-logged-in": "ログインしたユーザーのみに表示", - "only-guest": "Only display to guests", + "only-guest": "ゲストにのみ表示する", "open-new-window": "新しいウィンドウで開く", "installed-plugins-required": "インストール済みのプラグインが必要です:", diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json index 2d4f6ddab1..0147d1a656 100644 --- a/public/language/ja/admin/manage/categories.json +++ b/public/language/ja/admin/manage/categories.json @@ -10,7 +10,7 @@ "custom-class": "カスタムClass", "num-recent-replies": "# 最近の返信数", "ext-link": "外部リンク", - "is-section": "Treat this category as a section", + "is-section": "このカテゴリをセクションとして扱う", "upload-image": "画像をアップロード", "delete-image": "削除", "category-image": "カテゴリ画像", diff --git a/public/language/ja/admin/manage/groups.json b/public/language/ja/admin/manage/groups.json index c0f55920fd..bcb96b0326 100644 --- a/public/language/ja/admin/manage/groups.json +++ b/public/language/ja/admin/manage/groups.json @@ -1,7 +1,7 @@ { "name": "グループ名", "description": "グループの説明", - "member-count": "Member Count", + "member-count": "メンバー数", "system": "システムグループ", "edit": "編集", "search-placeholder": "検索", diff --git a/public/language/ja/admin/menu.json b/public/language/ja/admin/menu.json index 12b0907c0b..7b15649258 100644 --- a/public/language/ja/admin/menu.json +++ b/public/language/ja/admin/menu.json @@ -12,7 +12,7 @@ "manage/tags": "タグ", "manage/users": "ユーザー", "manage/registration": "登録キュー", - "manage/post-queue": "Post Queue", + "manage/post-queue": "投稿キュー", "manage/groups": "グループ", "manage/ip-blacklist": "IPブラックリスト", diff --git a/public/language/ja/admin/settings/general.json b/public/language/ja/admin/settings/general.json index 943b8620fc..f7c9e8dca7 100644 --- a/public/language/ja/admin/settings/general.json +++ b/public/language/ja/admin/settings/general.json @@ -2,8 +2,8 @@ "site-settings": "サイト設定", "title": "サイトタイトル", "title.url": "URL", - "title.url-placeholder": "The URL of the site title", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", + "title.url-placeholder": "サイトタイトルのURL", + "title.url-help": "タイトルをクリックすると、ユーザーをこのアドレスに送信します。空白のままにすると、ユーザーはフォーラムのインデックスに送信されます。", "title.name": "あなたのコミュニティ名", "title.show-in-header": "ヘッダーにサイトタイトルを表示する", "browser-title": "ブラウザ", diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json index e99206a882..556fe7efc0 100644 --- a/public/language/ja/admin/settings/post.json +++ b/public/language/ja/admin/settings/post.json @@ -6,8 +6,8 @@ "sorting.most-votes": "最も多い評価", "sorting.topic-default": "デフォルトのスレッドの並び順", "restrictions": "転記の制限", - "restrictions.post-queue": "Enable post queue", - "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", + "restrictions.post-queue": "投稿キューを有効にする", + "restrictions.post-queue-help": "投稿キューを有効にすると、新しいユーザーの投稿が承認待ちの状態になります。", "restrictions.seconds-between": "投稿間の秒数", "restrictions.seconds-between-new": "新規ユーザーの投稿間の秒数", "restrictions.rep-threshold": "この制限が解除される前の評判しきい値", @@ -31,8 +31,8 @@ "unread": "未読の設定", "unread.cutoff": "未読のカットオフ日", "unread.min-track-last": "最後に読み込みを行う前に追跡するスレッドの最小投稿数", - "recent": "Recent Settings", - "recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page", + "recent": "最近の設定", + "recent.categoryFilter.disable": "/最近のページで無視されたカテゴリのトピックのフィルタリングを無効にする", "signature": "署名の設定", "signature.disable": "署名を無効にする", "signature.no-links": "署名内のリンクを無効にする", diff --git a/public/language/ja/admin/settings/user.json b/public/language/ja/admin/settings/user.json index 15d50a459a..648809c1f9 100644 --- a/public/language/ja/admin/settings/user.json +++ b/public/language/ja/admin/settings/user.json @@ -13,9 +13,9 @@ "disable-email-changes": "Eメールの変更を無効にする", "disable-password-changes": "パスワードの変更を無効にする", "allow-account-deletion": "アカウントが解除されました", - "user-info-private": "Hide user list and data from guests", - "hide-fullname": "Hide fullname from users", - "hide-email": "Hide email from users", + "user-info-private": "ゲストから、ユーザーリストとデータが見えないようにする。", + "hide-fullname": "ユーザーから、フルネームが見えないようにする。", + "hide-email": "ユーザーから、Emailが見えないようにする。", "themes": "テーマ", "disable-user-skins": "ユーザーがカスタムスキンを選択できないようにする", "account-protection": "アカウント保護", @@ -36,12 +36,12 @@ "registration.max-invites": "ユーザーごとの最大招待数", "max-invites": "ユーザーごとの最大招待数", "max-invites-help": "無制限の場合は0です。管理者は無限の招待を受ける
「招待のみ」にのみ適用されます", - "invite-expiration": "Invite expiration", - "invite-expiration-help": "# of days invitations expire in.", + "invite-expiration": "招待の有効期限", + "invite-expiration-help": "＃日の招待状は期限切れです。", "min-username-length": "ユーザー名の最小文字数", "max-username-length": "ユーザー名の最大文字数", "min-password-length": "パスワードの最小文字数", - "min-password-strength": "Minimum Password Strength", + "min-password-strength": "最低限のパスワード強度", "max-about-me-length": "概要の最大文字数", "terms-of-use": "フォーラム利用規約(空白のままにしておくと無効になります)", "user-search": "ユーザーを検索", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index f450eed636..5beac4a421 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -1,6 +1,6 @@ { "invalid-data": "無効なデータ", - "invalid-json": "Invalid JSON", + "invalid-json": "無効なJSON", "not-logged-in": "ログインしていません。", "account-locked": "あなたのアカウントは一時的にロックされています", "search-requires-login": "検索するにはアカウントが必要です - ログインするかアカウントを作成してください。", @@ -13,7 +13,7 @@ "invalid-title": "無効なタイトル!", "invalid-user-data": "無効なユーザーデータ", "invalid-password": "無効なパスワード", - "invalid-login-credentials": "Invalid login credentials", + "invalid-login-credentials": "ログイン資格情報が無効です", "invalid-username-or-password": "ユーザー名とパスワードの両方を指定してください", "invalid-search-term": "無効な検索ワード", "csrf-invalid": "セッションの期限切れと思われるため、私達はあなたのログイン状態を確認できませんでした。もう一度お試しください。", @@ -32,7 +32,7 @@ "password-too-long": "パスワードが長すぎます", "user-banned": "ユーザーは停止されています", "user-banned-reason": "申し訳ありませんが、このアカウントは停止されています。 (理由: %1)", - "user-banned-reason-until": "Sorry, this account has been banned until %1 (Reason: %2)", + "user-banned-reason-until": "申し訳ありませんが、このアカウントは％1(理由：％2)まで禁止されています。", "user-too-new": "申し訳ありません。登録後に投稿を行うには%1秒お待ち下さい。", "blacklisted-ip": "申し訳ありませんがあなたのIPアドレスは当コミュニティで停止されています。もし誤ったエラーだと思われる場合は管理者にお問い合わせください。", "ban-expiry-missing": "この停止の終了日を入力してください。", @@ -107,7 +107,7 @@ "chat-disabled": "Chat system disabled", "too-many-messages": "You have sent too many messages, please wait awhile.", "invalid-chat-message": "Invalid chat message", - "chat-message-too-long": "Chat messages can not be longer than %1 characters.", + "chat-message-too-long": "チャットメッセージは％1文字より長くすることはできません。", "cant-edit-chat-message": "You are not allowed to edit this message", "cant-remove-last-user": "You can't remove the last user", "cant-delete-chat-message": "あなたはこのメッセージを削除する権限を持っていません。", diff --git a/public/language/ja/global.json b/public/language/ja/global.json index 89b71b1856..eb93d17b41 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -104,6 +104,6 @@ "cookies.accept": "了解!", "cookies.learn_more": "もっと詳しく", "edited": "編集されました", - "disabled": "Disabled", - "select": "Select" + "disabled": "無効", + "select": "選択" } \ No newline at end of file diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json index 64678bf638..80da09030e 100644 --- a/public/language/ja/modules.json +++ b/public/language/ja/modules.json @@ -20,7 +20,7 @@ "chat.three_months": "3ヶ月", "chat.delete_message_confirm": "本当にこのメッセージを削除しますか？", "chat.add-users-to-room": "部屋にユーザーを追加", - "chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?", + "chat.confirm-chat-with-dnd-user": "このユーザーのステータスはDnD(Do not disturb：取り込み中)に設定されています。あなたはまだチャットしたいですか？", "composer.compose": "構成", "composer.show_preview": "プレビュー表示", "composer.hide_preview": "プレビュー非表示", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index a0f2027535..384e1d0342 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1が登録リクエストを送りました。", "new_register_multiple": "%1の登録リクエストがレビュー待ちです。", "flag_assigned_to_you": "フラグ %1はあなたに割当てられました", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "レビュー待ちの投稿", "email-confirmed": "Eメールが確認されました", "email-confirmed-message": "メールアドレス検証をして頂き、ありがとうございます。あなたのアカウントは完全にアクティブになりました。", "email-confirm-error-message": "あなたのEメールアドレス検証に問題があります。コードが無効か、期限切れです。", diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index d4d8c9e52e..28d615dda9 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "モデレーターツール", "flagged-content": "フラグ付きコンテンツ", "ip-blacklist": "IPブラックリスト", - "post-queue": "Post Queue", + "post-queue": "投稿キュー", "users/online": "オンラインのユーザー", "users/latest": "最近のユーザー", "users/sort-posts": "ほとんどの投稿を持つユーザー", diff --git a/public/language/ja/success.json b/public/language/ja/success.json index a651610569..44a88b9bd1 100644 --- a/public/language/ja/success.json +++ b/public/language/ja/success.json @@ -1,7 +1,7 @@ { "success": "成功しました", "topic-post": "投稿に成功しました", - "post-queued": "Your post is queued for approval.", + "post-queued": "あなたの投稿は承認待ちです。", "authentication-successful": "認証に成功しました", "settings-saved": "設定を保存しました。" } \ No newline at end of file From b2c16b2ba0aa0e91b55692fb59a809d8d6c551f9 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 27 Aug 2017 09:23:16 +0000 Subject: [PATCH 02/25] Latest translations and fallbacks --- public/language/zh-CN/admin/extend/plugins.json | 4 ++-- public/language/zh-CN/admin/general/navigation.json | 2 +- public/language/zh-CN/admin/menu.json | 2 +- public/language/zh-CN/admin/settings/general.json | 6 +++--- public/language/zh-CN/notifications.json | 2 +- public/language/zh-CN/pages.json | 2 +- public/language/zh-CN/success.json | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/zh-CN/admin/extend/plugins.json b/public/language/zh-CN/admin/extend/plugins.json index afddba66e5..3a86470581 100644 --- a/public/language/zh-CN/admin/extend/plugins.json +++ b/public/language/zh-CN/admin/extend/plugins.json @@ -45,7 +45,7 @@ "alert.incompatible": "

NodeBB 版本(v%1) 只支持到此插件的v%2版本。如需要此插件更加新的版本请先升级 NodeBB。

", "alert.possibly-incompatible": "

未找到兼容性信息

此插件未注明对应的 NodeBB 版本。可能会产生兼容问题，导致 NodeBB 无法正常启动。

NodeBB 无法正常启动时请运行以下命令：

$ ./nodebb reset plugin=\"%1\"

是否继续安装此插件的最新版本？

", - "license.title": "Plugin License Information", + "license.title": "插件许可证信息", "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", - "license.cta": "Do you wish to continue with activating this plugin?" + "license.cta": "你希望继续使用这个插件吗？" } diff --git a/public/language/zh-CN/admin/general/navigation.json b/public/language/zh-CN/admin/general/navigation.json index 6e5c00cc43..0be0b9ddb5 100644 --- a/public/language/zh-CN/admin/general/navigation.json +++ b/public/language/zh-CN/admin/general/navigation.json @@ -11,7 +11,7 @@ "only-admins": "仅向管理员展示", "only-global-mods-and-admins": "仅向全局版主及管理员展示", "only-logged-in": "仅向已登录用户展示", - "only-guest": "Only display to guests", + "only-guest": "仅对游客展示", "open-new-window": "在新窗口中打开", "installed-plugins-required": "需要已安装的插件：", diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index a2acd7b6b8..2c48cc7e79 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -12,7 +12,7 @@ "manage/tags": "话题", "manage/users": "用户", "manage/registration": "注册申请", - "manage/post-queue": "Post Queue", + "manage/post-queue": "提交列表", "manage/groups": "群组", "manage/ip-blacklist": "IP 黑名单", diff --git a/public/language/zh-CN/admin/settings/general.json b/public/language/zh-CN/admin/settings/general.json index daa6ee3cf7..6683a0b76b 100644 --- a/public/language/zh-CN/admin/settings/general.json +++ b/public/language/zh-CN/admin/settings/general.json @@ -1,9 +1,9 @@ { "site-settings": "站点设置", "title": "站点标题", - "title.url": "URL", - "title.url-placeholder": "The URL of the site title", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", + "title.url": "网址", + "title.url-placeholder": "网站标题链接", + "title.url-help": "当标题被点击，用户将跳转到该地址。如果留空，用户将跳转到论坛首页。", "title.name": "您的社区名称", "title.show-in-header": "在顶部显示站点标题", "browser-title": "浏览器标题", diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 02090c39af..85366895e9 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1 发出了注册请求", "new_register_multiple": "有 %1 条注册申请等待批准。", "flag_assigned_to_you": "举报 %1 已经被指派给你", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "请求查验帖子", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已完全激活。", "email-confirm-error-message": "验证的您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index cca14a93aa..6577c0326a 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "版主工具", "flagged-content": "已举报的内容", "ip-blacklist": "IP 黑名单", - "post-queue": "Post Queue", + "post-queue": "提交列表", "users/online": "在线会员", "users/latest": "最新会员", "users/sort-posts": "发帖最多的会员", diff --git a/public/language/zh-CN/success.json b/public/language/zh-CN/success.json index 660c7fe1bc..8ff8d2a4d1 100644 --- a/public/language/zh-CN/success.json +++ b/public/language/zh-CN/success.json @@ -1,7 +1,7 @@ { "success": "成功", "topic-post": "您已成功发布。", - "post-queued": "Your post is queued for approval.", + "post-queued": "你的帖子正在等待审核。", "authentication-successful": "验证成功", "settings-saved": "设置已保存！" } \ No newline at end of file From bc6edba6df12adfee3171b215168ad2b1bea9410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 27 Aug 2017 19:13:19 -0400 Subject: [PATCH 03/25] change post queue test --- test/posts.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/test/posts.js b/test/posts.js index 14e5241b63..7b67b3ee8c 100644 --- a/test/posts.js +++ b/test/posts.js @@ -3,6 +3,8 @@ var assert = require('assert'); var async = require('async'); +var request = require('request'); +var nconf = require('nconf'); var db = require('./mocks/databasemock'); var topics = require('../src/topics'); @@ -14,6 +16,7 @@ var groups = require('../src/groups'); var socketPosts = require('../src/socket.io/posts'); var socketTopics = require('../src/socket.io/topics'); var meta = require('../src/meta'); +var helpers = require('./helpers'); describe('Post\'s', function () { var voterUid; @@ -33,7 +36,7 @@ describe('Post\'s', function () { user.create({ username: 'upvotee' }, next); }, globalModUid: function (next) { - user.create({ username: 'globalmod' }, next); + user.create({ username: 'globalmod', password: 'globalmodpwd' }, next); }, category: function (next) { categories.create({ @@ -784,7 +787,21 @@ describe('Post\'s', function () { }); }); - it('should get queued posts and submit', function (done) { + it('should load queued posts', function (done) { + helpers.loginUser('globalmod', 'globalmodpwd', function (err, jar) { + assert.ifError(err); + request(nconf.get('url') + '/api/post-queue', { jar: jar, json: true }, function (err, res, body) { + assert.ifError(err); + assert.equal(body.posts[0].type, 'topic'); + assert.equal(body.posts[0].data.content, 'queued topic content'); + assert.equal(body.posts[1].type, 'reply'); + assert.equal(body.posts[1].data.content, 'this is a queued reply'); + done(); + }); + }); + }); + + it('should accept queued posts submit', function (done) { var ids; async.waterfall([ function (next) { @@ -792,20 +809,6 @@ describe('Post\'s', function () { }, function (_ids, next) { ids = _ids; - var keys = ids.map(function (id) { - return 'post:queue:' + id; - }); - db.getObjects(keys, next); - }, - function (data, next) { - data.forEach(function (data) { - data.data = JSON.parse(data.data); - }); - assert.equal(data[0].type, 'topic'); - assert.equal(data[0].data.content, 'queued topic content'); - assert.equal(data[1].type, 'reply'); - assert.equal(data[1].data.content, 'this is a queued reply'); - socketPosts.accept({ uid: globalModUid }, { id: ids[0] }, next); }, function (next) { From 9cb098bb0bd3fbece865466b76dfb347b7971665 Mon Sep 17 00:00:00 2001 From: manolino Date: Mon, 28 Aug 2017 14:34:42 -0400 Subject: [PATCH 04/25] Implements Jimp exitRotate() new method (jimp 0.2.28) to sove incoherent rotations when scaling images. --- src/image.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/image.js b/src/image.js index 9377757cf3..4d3be47e6f 100644 --- a/src/image.js +++ b/src/image.js @@ -37,6 +37,10 @@ image.resizeImage = function (data, callback) { var y = 0; var crop; + if (image._exif && image._exif.tags && image._exif.tags.Orientation) { + image.exifRotate(); + } + if (origRatio !== desiredRatio) { if (desiredRatio > origRatio) { desiredRatio = 1 / desiredRatio; From a176582282ffc501cbd81393ef23f8d57dfa8de6 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 29 Aug 2017 09:23:29 +0000 Subject: [PATCH 05/25] Latest translations and fallbacks --- public/language/cs/admin/extend/plugins.json | 6 +-- .../language/cs/admin/general/navigation.json | 2 +- public/language/cs/admin/manage/tags.json | 30 +++++------ public/language/cs/admin/settings/chat.json | 14 ++--- .../language/cs/admin/settings/cookies.json | 18 +++---- public/language/cs/admin/settings/group.json | 20 +++---- public/language/cs/admin/settings/guest.json | 12 ++--- .../cs/admin/settings/notifications.json | 6 +-- .../cs/admin/settings/pagination.json | 14 ++--- .../cs/admin/settings/reputation.json | 14 ++--- .../language/cs/admin/settings/sockets.json | 8 +-- public/language/cs/admin/settings/tags.json | 20 +++---- .../language/cs/admin/settings/uploads.json | 52 +++++++++---------- public/language/cs/admin/settings/user.json | 10 ++-- public/language/cs/notifications.json | 2 +- public/language/cs/pages.json | 2 +- public/language/cs/success.json | 4 +- 17 files changed, 117 insertions(+), 117 deletions(-) diff --git a/public/language/cs/admin/extend/plugins.json b/public/language/cs/admin/extend/plugins.json index 3c1ff9bc29..328d73d245 100644 --- a/public/language/cs/admin/extend/plugins.json +++ b/public/language/cs/admin/extend/plugins.json @@ -45,7 +45,7 @@ "alert.incompatible": "

Vaše verze NodeBB (v%1) umožňuje jen aktualizovat toto rozšíření na v%2. Aktualizujte prosím NodeBB, chcete-li nainstalovat nejnovější verzi tohoto rozšíření.

", "alert.possibly-incompatible": "

Nebyla nalezena žádná informace o kompatibilitě

Toto rozšíření nemá nastavenou požadovanou verzi NodeBB. Plná kompatibilita nemůže být garantována a může způsobit, že se vám již NodeBB nespustí.

Nespustí-li se správně NodeBB:

$ ./nodebb reset plugin=\"%1\"

Pokračovat v instalaci této aktuální verze rozšíření?

", - "license.title": "Plugin License Information", - "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", - "license.cta": "Do you wish to continue with activating this plugin?" + "license.title": "Licenční informace o rozšíření", + "license.intro": "Rozšíření %1 je licencováno pod %2. Pro aktivování tohoto rozšíření si přečtěte licenční podmínky.", + "license.cta": "Přejete si pokračovat v aktivování tohoto rozšíření?" } diff --git a/public/language/cs/admin/general/navigation.json b/public/language/cs/admin/general/navigation.json index 7ec2b67612..c8e001b955 100644 --- a/public/language/cs/admin/general/navigation.json +++ b/public/language/cs/admin/general/navigation.json @@ -11,7 +11,7 @@ "only-admins": "Zobrazuje se jen správci", "only-global-mods-and-admins": "Zobrazuje se jen hlavním moderátorům a správcům", "only-logged-in": "Zobrazuje se jen přihlášeným uživatelům", - "only-guest": "Only display to guests", + "only-guest": "Zobrazit jen hostům", "open-new-window": "Otevřít v novém okně", "installed-plugins-required": "Vyžadovaná nainstalovaná rozšíření:", diff --git a/public/language/cs/admin/manage/tags.json b/public/language/cs/admin/manage/tags.json index c65a88f38f..910febd31e 100644 --- a/public/language/cs/admin/manage/tags.json +++ b/public/language/cs/admin/manage/tags.json @@ -1,18 +1,18 @@ { - "none": "Your forum does not have any topics with tags yet.", - "bg-color": "Background Colour", - "text-color": "Text Colour", - "create-modify": "Create & Modify Tags", - "description": "Select tags via clicking and/or dragging, use shift to select multiple.", - "create": "Create Tag", - "modify": "Modify Tags", - "delete": "Delete Selected Tags", - "search": "Hledat tagy…", - "settings": "Click here to visit the tag settings page.", - "name": "Tag Name", + "none": "Vaše fórum neobsahuje žádné témata se značkami.", + "bg-color": "Barva pozadí", + "text-color": "Barva textu", + "create-modify": "Vytvořit a upravit značky", + "description": "Vyberte značky pomocí kliknutí a/nebo přetažením, pro vícenásobný výběr, použijte klávesu Shift.", + "create": "Vytvořit značku", + "modify": "Upravit značky", + "delete": "Odstranit vybrané značky", + "search": "Hledat značky...", + "settings": "Pro přejití na stránku s nastavením značek, klikněte zde.", + "name": "Název značky", - "alerts.editing-multiple": "Editing multiple tags", - "alerts.editing-x": "Editing \"%1\" tag", - "alerts.confirm-delete": "Do you want to delete the selected tags?", - "alerts.update-success": "Tag Updated!" + "alerts.editing-multiple": "Upravení víceznaček", + "alerts.editing-x": "Upravení značky \"%1\"", + "alerts.confirm-delete": "Chcete odstranit vybranou značku?", + "alerts.update-success": "Značka aktualizována." } \ No newline at end of file diff --git a/public/language/cs/admin/settings/chat.json b/public/language/cs/admin/settings/chat.json index 0b22127341..602f7fb71a 100644 --- a/public/language/cs/admin/settings/chat.json +++ b/public/language/cs/admin/settings/chat.json @@ -1,9 +1,9 @@ { - "chat-settings": "Chat Settings", - "disable": "Disable chat", - "disable-editing": "Disable chat message editing/deletion", - "disable-editing-help": "Administrators and global moderators are exempt from this restriction", - "max-length": "Maximum length of chat messages", - "max-room-size": "Maximum number of users in chat rooms", - "delay": "Time between chat messages in milliseconds" + "chat-settings": "Nastavení konverzace", + "disable": "Zakázat konverzaci", + "disable-editing": "Zakázat upravení/odstranění konverzační zprávy", + "disable-editing-help": "Správci a globální moderátoři jsou vyjmuti z tohoto omezení", + "max-length": "Maximální délka konverzační zprávy", + "max-room-size": "Maximální počet uživatelů v konverzační místnosti", + "delay": "Čas mezi konverzačními zprávami v milisekundách" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/cookies.json b/public/language/cs/admin/settings/cookies.json index f8b0f0538b..652ba3a23b 100644 --- a/public/language/cs/admin/settings/cookies.json +++ b/public/language/cs/admin/settings/cookies.json @@ -1,11 +1,11 @@ { - "eu-consent": "EU Consent", - "consent.enabled": "Enabled", - "consent.message": "Notification message", - "consent.acceptance": "Acceptance message", - "consent.link-text": "Policy Link Text", - "consent.blank-localised-default": "Leave blank to use NodeBB localised defaults", - "settings": "Settings", - "cookie-domain": "Session cookie domain", - "blank-default": "Leave blank for default" + "eu-consent": "Souhlas EU", + "consent.enabled": "Povolit", + "consent.message": "Potvrzovací zpráva", + "consent.acceptance": "Zpráva o příjmutí", + "consent.link-text": "Odkaz na text", + "consent.blank-localised-default": "Pro použití výchozího textu NodeBB, zanechte prázdné", + "settings": "Nastavení", + "cookie-domain": "Doména relace cookies", + "blank-default": "Pro výchozí, zanechte prázdné" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/group.json b/public/language/cs/admin/settings/group.json index 1ae88c9cf5..d74f9a8db2 100644 --- a/public/language/cs/admin/settings/group.json +++ b/public/language/cs/admin/settings/group.json @@ -1,12 +1,12 @@ { - "general": "General", - "private-groups": "Private Groups", - "private-groups.help": "If enabled, joining of groups requires the approval of the group owner (Default: enabled)", - "private-groups.warning": "Beware! If this option is disabled and you have private groups, they automatically become public.", - "allow-creation": "Allow Group Creation", - "allow-creation-help": "If enabled, users can create groups (Default: disabled)", - "max-name-length": "Maximum Group Name Length", - "cover-image": "Group Cover Image", - "default-cover": "Default Cover Images", - "default-cover-help": "Add comma-separated default cover images for groups that don't have an uploaded cover image" + "general": "Všeobecné", + "private-groups": "Soukromé skupiny", + "private-groups.help": "Je-li povoleno, připojení ke skupině vyžaduje schválení zakladatele skupiny (výchozí: povoleno)", + "private-groups.warning": "Ale pozor, je-li tato možnost zakázána a vy máte soukromé skupiny, stanou se automaticky veřejnými.", + "allow-creation": "Povolit vytvoření skupin", + "allow-creation-help": "Je-li povoleno, uživatelé mohou vytvořit skupiny (výchozí: zakázáno)", + "max-name-length": "Maximální délka názvu skupiny", + "cover-image": "Obrázek skupiny", + "default-cover": "Výchozí obrázek", + "default-cover-help": "Pro skupiny, které nemají nahraný obrázek, přidejte výchozí obrázky oddělené čárkami" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/guest.json b/public/language/cs/admin/settings/guest.json index 6b2ac2c8b2..4b42e8530c 100644 --- a/public/language/cs/admin/settings/guest.json +++ b/public/language/cs/admin/settings/guest.json @@ -1,8 +1,8 @@ { - "handles": "Guest Handles", - "handles.enabled": "Allow guest handles", - "handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"", - "privileges": "Guest Privileges", - "privileges.can-search": "Allow guests to search without logging in", - "privileges.can-search-users": "Allow guests to search users without logging in" + "handles": "Zacházení s hosty", + "handles.enabled": "Povolit upravení zacházení s hosty", + "handles.enabled-help": "Tato možnost odkryje nové pole, které umožňuje hostům vybrat jméno, které se připojí ke každému příspěvku, který vytvoří. Bude-li zakázáno, budou jednoduše nazýváni \"Host\"", + "privileges": "Oprávnění hostů", + "privileges.can-search": "Povolit hostům bez přihlášení používat hledání", + "privileges.can-search-users": "Povolit hostům bez přihlášení hledat uživatele" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/notifications.json b/public/language/cs/admin/settings/notifications.json index 4eff7f341a..15a5c2415b 100644 --- a/public/language/cs/admin/settings/notifications.json +++ b/public/language/cs/admin/settings/notifications.json @@ -1,5 +1,5 @@ { - "notifications": "Notifications", - "welcome-notification": "Welcome Notification", - "welcome-notification-link": "Welcome Notification Link" + "notifications": "Oznámení", + "welcome-notification": "Uvítání", + "welcome-notification-link": "Odkaz na uvítání" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/pagination.json b/public/language/cs/admin/settings/pagination.json index 27d71b4de5..c14a17e694 100644 --- a/public/language/cs/admin/settings/pagination.json +++ b/public/language/cs/admin/settings/pagination.json @@ -1,9 +1,9 @@ { - "pagination": "Pagination Settings", - "enable": "Paginate topics and posts instead of using infinite scroll.", - "topics": "Topic Pagination", - "posts-per-page": "Posts per Page", - "categories": "Category Pagination", - "topics-per-page": "Topics per Page", - "initial-num-load": "Initial Number of Topics to Load on Unread, Recent, and Popular" + "pagination": "Nastavení stránkování", + "enable": "Stránkovat témata a příspěvky namísto nekonečného posouvání", + "topics": "Stránkování témat", + "posts-per-page": "Příspěvků na stránku", + "categories": "Stránkování kategorii", + "topics-per-page": "Témat na stránku", + "initial-num-load": "Počáteční počet témat pro načtení u nepřečtených, posledních a polulárních" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/reputation.json b/public/language/cs/admin/settings/reputation.json index f0e59e8db9..db452a9345 100644 --- a/public/language/cs/admin/settings/reputation.json +++ b/public/language/cs/admin/settings/reputation.json @@ -1,9 +1,9 @@ { - "reputation": "Reputation Settings", - "disable": "Disable Reputation System", - "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", - "thresholds": "Activity Thresholds", - "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "reputation": "Nastavení reputace", + "disable": "Zakázat systém reputace", + "disable-down-voting": "Zakázat hlasování", + "votes-are-public": "Všechna hlasování jsou veřejná", + "thresholds": "Omezení aktivity", + "min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem", + "min-rep-flag": "Minimální reputace pro označení příspěvků" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/sockets.json b/public/language/cs/admin/settings/sockets.json index d04ee42fcf..1250237416 100644 --- a/public/language/cs/admin/settings/sockets.json +++ b/public/language/cs/admin/settings/sockets.json @@ -1,6 +1,6 @@ { - "reconnection": "Reconnection Settings", - "max-attempts": "Max Reconnection Attempts", - "default-placeholder": "Default: %1", - "delay": "Reconnection Delay" + "reconnection": "Nastavení znovu připojení", + "max-attempts": "Maximální počet pokusů o znovu připojení", + "default-placeholder": "Výchozí: %1", + "delay": "Časové zpoždění pro znovu připojení" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/tags.json b/public/language/cs/admin/settings/tags.json index 6f31f60ba0..3932e65eef 100644 --- a/public/language/cs/admin/settings/tags.json +++ b/public/language/cs/admin/settings/tags.json @@ -1,12 +1,12 @@ { - "tag": "Tag Settings", - "min-per-topic": "Minimum Tags per Topic", - "max-per-topic": "Maximum Tags per Topic", - "min-length": "Minimum Tag Length", - "max-length": "Maximum Tag Length", - "goto-manage": "Click here to visit the tag management page.", - "privacy": "Privacy", - "list-private": "Make the tags list private", - "related-topics": "Related Topics", - "max-related-topics": "Maximum related topics to display (if supported by theme)" + "tag": "Nastavení značky", + "min-per-topic": "Minimální počet značek/téma", + "max-per-topic": "maximální počet značek/téma", + "min-length": "Minimální délka značky", + "max-length": "Maximální délka značky", + "goto-manage": "Pro přejití na stránku správy značek, klikněte zde.", + "privacy": "Soukromí", + "list-private": "Seznam značek je soukromí", + "related-topics": "Související témata", + "max-related-topics": "Maximální počet zobrazených souvisejících témat (je-li podporováno motivem)" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/uploads.json b/public/language/cs/admin/settings/uploads.json index a458870354..688fdf4920 100644 --- a/public/language/cs/admin/settings/uploads.json +++ b/public/language/cs/admin/settings/uploads.json @@ -1,28 +1,28 @@ { - "posts": "Posts", - "allow-files": "Allow users to upload regular files", - "private": "Make uploaded files private", - "max-image-width": "Resize images down to specified width (in pixels)", - "max-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)", - "max-file-size": "Maximum File Size (in KiB)", - "max-file-size-help": "(in kibibytes, default: 2048 KiB)", - "allow-topic-thumbnails": "Allow users to upload topic thumbnails", - "topic-thumb-size": "Topic Thumb Size", - "allowed-file-extensions": "Allowed File Extensions", - "allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. pdf,xls,doc). An empty list means all extensions are allowed.", - "profile-avatars": "Profile Avatars", - "allow-profile-image-uploads": "Allow users to upload profile images", - "convert-profile-image-png": "Convert profile image uploads to PNG", - "default-avatar": "Custom Default Avatar", - "upload": "Upload", - "profile-image-dimension": "Profile Image Dimension", - "profile-image-dimension-help": "(in pixels, default: 128 pixels)", - "max-profile-image-size": "Maximum Profile Image File Size", - "max-profile-image-size-help": "(in kibibytes, default: 256 KiB)", - "max-cover-image-size": "Maximum Cover Image File Size", - "max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)", - "keep-all-user-images": "Keep old versions of avatars and profile covers on the server", - "profile-covers": "Profile Covers", - "default-covers": "Default Cover Images", - "default-covers-help": "Add comma-separated default cover images for accounts that don't have an uploaded cover image" + "posts": "Příspěvky", + "allow-files": "Povolit uživatelům nahrávat normální soubory", + "private": "Nahrané soubory jsou sokromé", + "max-image-width": "Zmenšit velikost obrázků na potřebné rozlišení (v pixelech)", + "max-image-width-help": "(v pixelech, výchozí: 760 pixelů, pro zákaz nastavte 0)", + "max-file-size": "Maximální velikost souboru (v KiB)", + "max-file-size-help": "(v kilobajtech, výchozí 2048 KiB)", + "allow-topic-thumbnails": "Povolit uživatelům nahrát miniatury témat", + "topic-thumb-size": "Velikost miniatury tématu", + "allowed-file-extensions": "Povolené přípony souborů", + "allowed-file-extensions-help": "Zadejte seznam přípon souborů oddělených čárkou (např.: pdf, xls, doc). Prázdný seznam znamená, že všechny přípony jsou povoleny.", + "profile-avatars": "Profilové obrázky", + "allow-profile-image-uploads": "Povolit uživatelům nahrát profilové obrázky", + "convert-profile-image-png": "Převést profilové obrázky do *.png", + "default-avatar": "Výchozí uživatelský obrázek", + "upload": "Nahrát", + "profile-image-dimension": "Rozlišení profilového obrázku", + "profile-image-dimension-help": "(v pixelech, výchozí: 128 pixelů)", + "max-profile-image-size": "Maximální velikost profilového obrázku", + "max-profile-image-size-help": "(v kilobajtech, výchozí: 256 KiB)", + "max-cover-image-size": "Maximální velikost obrázku", + "max-cover-image-size-help": "(v kilobajtech, výchozí: 2048 KiB)", + "keep-all-user-images": "Ponechat starou verzi obrázků a profilových obrázků na serveru", + "profile-covers": "Profilové obrázky", + "default-covers": "Výchozí obrázek", + "default-covers-help": "Přidat výchozí obrázky oddělené čárkou pro účty, které nemají nahraný obrázek" } diff --git a/public/language/cs/admin/settings/user.json b/public/language/cs/admin/settings/user.json index c91c6cfbec..199703513a 100644 --- a/public/language/cs/admin/settings/user.json +++ b/public/language/cs/admin/settings/user.json @@ -13,10 +13,10 @@ "disable-email-changes": "Zakázat změnu e-mailu", "disable-password-changes": "Zakázat změnu hesla", "allow-account-deletion": "Povolit smazání účtu", - "user-info-private": "Hide user list and data from guests", - "hide-fullname": "Hide fullname from users", - "hide-email": "Hide email from users", - "themes": "Témata", + "user-info-private": "Skrýt seznam uživatelů a data před hosty", + "hide-fullname": "Skrýt jméno před uživateli", + "hide-email": "Skrýt e-mail před uživateli", + "themes": "Motivy", "disable-user-skins": "Zabránit uživateli ve výběru vlastního vzhledu", "account-protection": "Ochrana účtu", "login-attempts": "Počet pokusů o přihlášení za hodinu", @@ -32,7 +32,7 @@ "registration-type.invite-only": "Jen na pozvání", "registration-type.admin-invite-only": "Jen na pozvání správce", "registration-type.disabled": "Bez registrace", - "registration-type.help": "Normal - Users can register from the /register page.
\nAdmin Approval - User registrations are placed in an approval queue for administrators.
\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.
\nInvite Only - Users can invite others from the users page.
\nAdmin Invite Only - Only administrators can invite others from users and admin/manage/users pages.
\nNo registration - No user registration.
", + "registration-type.help": "Normální - uživatelé se mohou registrovat ze stránky registrace.
☺\nSchválení správce - uživatelské registrace jsou přesunuty do fronty na schváleníu správce.
\nSchválení správce pro IP - normální pro nové uživatele, schválení správce pro adresy IP, které mají stejné IP jako jiné účty.
\nJen pro zvané - uživatelé mohou pozvat jiné uživatele na stránce uživatelé.
\nJen pro zvané správcem - jen správce může pozvat jiné uživatele na stránce uživatelé a admin/manage/users.
\nBez registrace - žádná registrace uživatelů.
", "registration.max-invites": "Maximální počet pozvání na uživatele", "max-invites": "Maximální počet pozvání na uživatele", "max-invites-help": "0 pro neomezené. Správci mají neomezeně pozvánek
Použitelné jen pro \"Jen pozvané\"", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index c33de798fd..9c6a90153d 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1 odeslal registrační požadavek.", "new_register_multiple": "Je zde %1 registračních požadavků čeká na vyřízení.", "flag_assigned_to_you": "Označení %1 vám bylo přiřazeno", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "Příspěvek na schválení", "email-confirmed": "E-mail potvrzen", "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.", "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.", diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json index 3ce7e08157..a8eda5a6b7 100644 --- a/public/language/cs/pages.json +++ b/public/language/cs/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "Nástroje moderátora", "flagged-content": "Nahlášený obsah", "ip-blacklist": "Černá listina IP adres", - "post-queue": "Post Queue", + "post-queue": "Fronta příspěvků", "users/online": "Připojení uživatelé", "users/latest": "Nejnovější uživatelé", "users/sort-posts": "Uživatelé s nejvíce příspěvky", diff --git a/public/language/cs/success.json b/public/language/cs/success.json index 8b218b567c..656ed305ef 100644 --- a/public/language/cs/success.json +++ b/public/language/cs/success.json @@ -1,7 +1,7 @@ { "success": "Úspěšné", - "topic-post": "Úspěšně umístěno.", - "post-queued": "Your post is queued for approval.", + "topic-post": "Příspěvek úspěšně přidán.", + "post-queued": "Váš příspěvek byl přidán do fronty na schválení.", "authentication-successful": "Úspěšné přihlášení", "settings-saved": "Nastavení byla uložena." } \ No newline at end of file From cd60d79a1307ce35857839e9e1460d169afcf1a3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 29 Aug 2017 09:28:18 -0400 Subject: [PATCH 06/25] closes #5904 --- public/src/admin/manage/ip-blacklist.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/public/src/admin/manage/ip-blacklist.js b/public/src/admin/manage/ip-blacklist.js index 4b5b37ce11..1a6760b14f 100644 --- a/public/src/admin/manage/ip-blacklist.js +++ b/public/src/admin/manage/ip-blacklist.js @@ -47,13 +47,10 @@ define('admin/manage/ip-blacklist', ['Chart'], function (Chart) { var hourlyLabels = utils.getHoursArray().map(function (text, idx) { return idx % 3 ? '' : text; }); - var dailyLabels = utils.getDaysArray().map(function (text, idx) { + var dailyLabels = utils.getDaysArray().slice(-7).map(function (text, idx) { return idx % 3 ? '' : text; }); - // Only 7 days displayed in this chart - dailyLabels.length = 7; - if (utils.isMobile()) { Chart.defaults.global.tooltips.enabled = false; } From 643ae05d68d5530d7a10546cb4b78136b323bed7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 29 Aug 2017 11:41:43 -0400 Subject: [PATCH 07/25] closes #5868 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0c263ec61a..7fdf88ef44 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,9 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.32", + "nodebb-theme-persona": "5.0.33", "nodebb-theme-slick": "1.1.1", - "nodebb-theme-vanilla": "6.0.26", + "nodebb-theme-vanilla": "6.0.27", "nodebb-widget-essentials": "3.0.4", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", From b3438bc695a71c7021c6d17c60e91c6b34cb160f Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 30 Aug 2017 09:23:54 +0000 Subject: [PATCH 08/25] Latest translations and fallbacks --- .../language/cs/admin/settings/advanced.json | 28 +++++------ public/language/cs/admin/settings/email.json | 46 +++++++++---------- public/language/cs/admin/settings/post.json | 46 +++++++++---------- .../cs/admin/settings/web-crawler.json | 16 +++---- public/language/pl/admin/extend/plugins.json | 6 +-- public/language/pl/admin/extend/widgets.json | 4 +- .../language/pl/admin/general/dashboard.json | 22 ++++----- .../language/pl/admin/general/languages.json | 2 +- .../language/pl/admin/general/navigation.json | 6 +-- public/language/pl/language.json | 2 +- public/language/pl/topic.json | 8 ++-- public/language/pl/user.json | 10 ++-- 12 files changed, 98 insertions(+), 98 deletions(-) diff --git a/public/language/cs/admin/settings/advanced.json b/public/language/cs/admin/settings/advanced.json index 05a1929cf0..569536e81f 100644 --- a/public/language/cs/admin/settings/advanced.json +++ b/public/language/cs/admin/settings/advanced.json @@ -1,19 +1,19 @@ { - "maintenance-mode": "Maintenance Mode", - "maintenance-mode.help": "When the forum is in maintenance mode, all requests will be redirected to a static holding page. Administrators are exempt from this redirection, and are able to access the site normally.", - "maintenance-mode.message": "Maintenance Message", - "headers": "Headers", - "headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame", - "headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB", + "maintenance-mode": "Režim údržby", + "maintenance-mode.help": "Je-li fórum v režimu údržby, všechny požadavky budou přesměrovány na statickou stránku. Správci jsou vyloučeni z tohoto přesměrování a budou mít normálně zobrazené stránky.", + "maintenance-mode.message": "Zpráva údržby", + "headers": "Hlavičky", + "headers.allow-from": "Nastavte ALLOW-FROM pro umístění NodeBB do iFrame", + "headers.powered-by": "Upravte si hlavičku \"Powered by\" odesílanou NodeBB", "headers.acao": "Access-Control-Allow-Origin", - "headers.acao-help": "To deny access to all sites, leave empty", + "headers.acao-help": "Pro zakázání přístupu na všechny stránky, zanechte prázdné", "headers.acam": "Access-Control-Allow-Methods", "headers.acah": "Access-Control-Allow-Headers", - "traffic-management": "Traffic Management", - "traffic.help": "NodeBB deploys equipped with a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", - "traffic.enable": "Enable Traffic Management", - "traffic.event-lag": "Event Loop Lag Threshold (in milliseconds)", - "traffic.event-lag-help": "Lowering this value decreases wait times for page loads, but will also show the \"excessive load\" message to more users. (Restart required)", - "traffic.lag-check-interval": "Check Interval (in milliseconds)", - "traffic.lag-check-interval-help": "Lowering this value causes NodeBB to become more sensitive to spikes in load, but may also cause the check to become too sensitive. (Restart required)" + "traffic-management": "Správa provozu", + "traffic.help": "NodeBB obsahuje modul, který automaticky zamítá požadavky při vysokém vytížení. Toto nastavení můžete zde upravit, ačkoliv výchozí hodnoty jsou zaručením úspěchu.", + "traffic.enable": "Povolit správu provozu", + "traffic.event-lag": "Hranice prodlevy smyčky události (v milisekundách)", + "traffic.event-lag-help": "Snížení této hodnoty sníží čas pro načtení stránky, ale taky zobrazí více uživatelům zprávu o \"přetížení stránek\". (je vyžadován restart)", + "traffic.lag-check-interval": "Kontrola intervalů (v milisekundách)", + "traffic.lag-check-interval-help": "Snížení této hodnoty způsobí, že NodeBB bude citlivější na zatížení načítání stránek a na kontrolu tohoto zatížení. (je vyžadován restart)" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json index 1e92c88490..7c6b3eea24 100644 --- a/public/language/cs/admin/settings/email.json +++ b/public/language/cs/admin/settings/email.json @@ -1,25 +1,25 @@ { - "email-settings": "Email Settings", - "address": "Email Address", - "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", - "from": "From Name", - "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", - "template": "Edit Email Template", - "template.select": "Select Email Template", - "template.revert": "Revert to Original", - "testing": "Email Testing", - "testing.select": "Select Email Template", - "testing.send": "Send Test Email", - "testing.send-help": "The test email will be sent to the currently logged in user's email address.", - "subscriptions": "Email Subscriptions", - "subscriptions.disable": "Disable subscriber notification emails", - "subscriptions.hour": "Digest Hour", - "subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. 0 for midnight, 17 for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.
The approximate server time is:
The next daily digest is scheduled to be sent " + "email-settings": "Nastavení e-mailu", + "address": "E-mailové adresy", + "address-help": "Následující e-mailové adresy budou zobrazeny příjemci v políčkách \"Od\" a \"Odpovědět\".", + "from": "Jméno - od", + "from-help": "Zobrazené jméno v e-mailu v - Od", + "gmail-routing": "Směrování služby Gmail", + "gmail-routing-help1": "Směrování Gmailu někdy nefunguje s účty s nejvyšším zabezpečením. V tomto případě budete muset upravit váš účet na Gmailu a povolit nižší zabezpečení aplikací.", + "gmail-routing-help2": "Pro více informací o tomto způsobu řešení si přečtěte článek na NodeMailer.. Alternativně se dá ještě upravit rozšíření třetích stran pro e-maily jako SendGrid, MailGun, atd. Dostupné rozšíření zde.", + "gmail-transport": "Směrovat e-maily přes účet Gmail/Google Apps", + "gmail-transport.username": "Uživatelské jméno", + "gmail-transport.username-help": "zadejte plnou e-mailovou adresu, zvláště používáte-li spravovanou doménu Google Apps.", + "gmail-transport.password": "Heslo", + "template": "Upravit šablonu e-mailu", + "template.select": "Vybrat šablonu e-mailu", + "template.revert": "Zpět k původnímu", + "testing": "Test e-mailu", + "testing.select": "Vyberte šablonu e-mailu", + "testing.send": "Odeslat testovací e-mail", + "testing.send-help": "Testovací e-mail bude odeslán aktuálně přihlášenému uživateli na jeho e-mailovou adresu z registrace.", + "subscriptions": "Přihlášení e-mailu k odběru", + "subscriptions.disable": "Zakázat oznamovací e-maily přihlášeným k odběru", + "subscriptions.hour": "Hodina přehledu", + "subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. 0 pro půlnoc, 17 pro 5:00pm). Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami.
Přibližný čas serveru je: .
Další odeslání přehledů je plánováno na ." } \ No newline at end of file diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index a789025597..79d041e4a8 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -1,28 +1,28 @@ { - "sorting": "Post Sorting", - "sorting.post-default": "Default Post Sorting", - "sorting.oldest-to-newest": "Oldest to Newest", - "sorting.newest-to-oldest": "Newest to Oldest", - "sorting.most-votes": "Most Votes", - "sorting.topic-default": "Default Topic Sorting", - "restrictions": "Posting Restrictions", - "restrictions.post-queue": "Enable post queue", - "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", - "restrictions.seconds-between": "Seconds between Posts", - "restrictions.seconds-between-new": "Seconds between Posts for New Users", - "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", - "restrictions.seconds-defore-new": "Seconds before new user can post", - "restrictions.seconds-edit-after": "Number of seconds users are allowed to edit posts after posting. (0 disabled)", - "restrictions.seconds-delete-after": "Number of seconds users are allowed to delete posts after posting. (0 disabled)", - "restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics. (0 disabled)", - "restrictions.min-title-length": "Minimum Title Length", - "restrictions.max-title-length": "Maximum Title Length", - "restrictions.min-post-length": "Minimum Post Length", - "restrictions.max-post-length": "Maximum Post Length", - "restrictions.days-until-stale": "Days until Topic is considered stale", + "sorting": "Třídění přísvěvků", + "sorting.post-default": "Výchozí třídění příspěvků", + "sorting.oldest-to-newest": "Od nejstarších po nejnovější", + "sorting.newest-to-oldest": "Od nejnovějších po nejstarší", + "sorting.most-votes": "Dle hlasování", + "sorting.topic-default": "Výchozí třídění tématu", + "restrictions": "Omezení příspěvků", + "restrictions.post-queue": "Povolit frontu pro příspěvky", + "restrictions.post-queue-help": "Povolení fronty příspěvků bude přidávat příspěvky nových uživatelů do fronty na schválení.", + "restrictions.seconds-between": "Sekundy mezi příspěvky", + "restrictions.seconds-between-new": "Sekundy mezi příspěvky pro nové uživatele", + "restrictions.rep-threshold": "Hranice reputace před zavedením omezení", + "restrictions.seconds-defore-new": "Sekundy předtím, než uživatel může přidat příspěvek", + "restrictions.seconds-edit-after": "Počet sekund, kdy uživatelé mohou upravit příspěvky po jejich napsání. (0 zakázáno)", + "restrictions.seconds-delete-after": "Počet sekund, kdy uživatelé mohou odstranit příspěvky po jeho napsání. (0 zakázáno)", + "restrictions.replies-no-delete": "Počet odpovědí, kdy je uživatelům zakázáno odstranit jejich vlastní příspěvek. (0 zakázáno)", + "restrictions.min-title-length": "Minimální délka názvu", + "restrictions.max-title-length": "Maximální délka názvu", + "restrictions.min-post-length": "Minimální délka příspěvku", + "restrictions.max-post-length": "Maximální délka příspěvku", + "restrictions.days-until-stale": "Počet dnů, kdy je téma považováno za staré", "restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.", - "timestamp": "Timestamp", - "timestamp.cut-off": "Date cut-off (in days)", + "timestamp": "Časový otisk", + "timestamp.cut-off": "Datum ukončení (ve dnech)", "timestamp.cut-off-help": "Dates & times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).
(Default: 30, or one month). Set to 0 to always display dates, leave blank to always display relative times.", "teaser": "Teaser Post", "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", diff --git a/public/language/cs/admin/settings/web-crawler.json b/public/language/cs/admin/settings/web-crawler.json index 2e0d31d12b..a10912b938 100644 --- a/public/language/cs/admin/settings/web-crawler.json +++ b/public/language/cs/admin/settings/web-crawler.json @@ -1,10 +1,10 @@ { - "crawlability-settings": "Crawlability Settings", - "robots-txt": "Custom Robots.txt Leave blank for default", - "sitemap-feed-settings": "Sitemap & Feed Settings", - "disable-rss-feeds": "Disable RSS Feeds", - "disable-sitemap-xml": "Disable Sitemap.xml", - "sitemap-topics": "Number of Topics to display in the Sitemap", - "clear-sitemap-cache": "Clear Sitemap Cache", - "view-sitemap": "View Sitemap" + "crawlability-settings": "Nastavit prohledávatelnost", + "robots-txt": "Upravit Robots.txt Pro výchozí zanechte prázdné", + "sitemap-feed-settings": "Nastavit zdroj a mapu stránky", + "disable-rss-feeds": "Zakázat zdroje RSS", + "disable-sitemap-xml": "Zakázat Sitemap.xml", + "sitemap-topics": "Počet témat zobrazených na mapě stránky", + "clear-sitemap-cache": "Smazat mezipaměť mapy stránky", + "view-sitemap": "Zobrazit mapu stránky" } \ No newline at end of file diff --git a/public/language/pl/admin/extend/plugins.json b/public/language/pl/admin/extend/plugins.json index a0a181fd40..f9396c05a8 100644 --- a/public/language/pl/admin/extend/plugins.json +++ b/public/language/pl/admin/extend/plugins.json @@ -18,8 +18,8 @@ "order.explanation": "Pluginy ładują się tutaj w określonej kolejności, od góry do dołu.", "plugin-item.themes": "Style", - "plugin-item.deactivate": "Dezaktywować", - "plugin-item.activate": "Aktywne", + "plugin-item.deactivate": "Dezaktywuj", + "plugin-item.activate": "Aktywuj", "plugin-item.install": "Zainstaluj", "plugin-item.uninstall": "Odinstaluj", "plugin-item.settings": "Ustawienia", @@ -45,7 +45,7 @@ "alert.incompatible": "

Twoja wersja NodeBB (v%1) jest usuwana w celu uaktualnienia do v%2 tego pluginu. Proszę zaktualizuj twoje NodeBB jeżeli chcesz zainstalować nowszą wersję tego pluginu.

", "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", - "license.title": "Plugin License Information", + "license.title": "Informacje o licencji pluginu", "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/pl/admin/extend/widgets.json b/public/language/pl/admin/extend/widgets.json index 379b1df398..8e6e04a594 100644 --- a/public/language/pl/admin/extend/widgets.json +++ b/public/language/pl/admin/extend/widgets.json @@ -13,7 +13,7 @@ "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", - "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.updated": "Widżety zaktualizowane", + "alert.update-success": "Pomyślnie widżety zostały zaktualizowane" } \ No newline at end of file diff --git a/public/language/pl/admin/general/dashboard.json b/public/language/pl/admin/general/dashboard.json index b30b0ee607..637d2a4932 100644 --- a/public/language/pl/admin/general/dashboard.json +++ b/public/language/pl/admin/general/dashboard.json @@ -2,12 +2,12 @@ "forum-traffic": "Ruch na forum", "page-views": "Wyświetlenia strony", "unique-visitors": "Unikalni goście", - "users": "Users", - "posts": "Posts", - "topics": "Topics", - "page-views-seven": "Last 7 Days", - "page-views-thirty": "Last 30 Days", - "page-views-last-day": "Last 24 hours", + "users": "Użytkownicy", + "posts": "Posty", + "topics": "Tematy", + "page-views-seven": "Ostatnie 7 dni", + "page-views-thirty": "Ostatnie 30 dni", + "page-views-last-day": "Ostatnie 24 godziny", "page-views-custom": "Custom Date Range", "page-views-custom-start": "Range Start", "page-views-custom-end": "Range End", @@ -29,10 +29,10 @@ "running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.", "notices": "Powiadomienia", - "restart-not-required": "Restart not required", - "restart-required": "Restart required", - "search-plugin-installed": "Search Plugin installed", - "search-plugin-not-installed": "Search Plugin not installed", + "restart-not-required": "Restart nie jest potrzebny", + "restart-required": "Wymagany restart", + "search-plugin-installed": "Wyszukiwarka jest zainstalowana", + "search-plugin-not-installed": "Wyszukiwarka nie jest zainstalowana", "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "Zarządzanie systemem", @@ -57,7 +57,7 @@ "on-categories": "On categories list", "reading-posts": "Reading posts", "browsing-topics": "Browsing topics", - "recent": "Recent", + "recent": "Ostatnie", "unread": "Nieprzeczytane", "high-presence-topics": "High Presence Topics", diff --git a/public/language/pl/admin/general/languages.json b/public/language/pl/admin/general/languages.json index 5f90036f0a..1b7d377fcc 100644 --- a/public/language/pl/admin/general/languages.json +++ b/public/language/pl/admin/general/languages.json @@ -2,5 +2,5 @@ "language-settings": "Ustawienia Językowe", "description": "Domyślnym językiem określa ustawienia języka dla wszystkich użytkowników, którzy odwiedzają forum.
Użytkownicy mogą zmienić domyślny język, w ustawieniach konta.", "default-language": "Domyślny Język", - "auto-detect": "Auto Detect Language Setting for Guests" + "auto-detect": "Automatycznie wykrywaj język gości" } \ No newline at end of file diff --git a/public/language/pl/admin/general/navigation.json b/public/language/pl/admin/general/navigation.json index 9068f97491..757403edf3 100644 --- a/public/language/pl/admin/general/navigation.json +++ b/public/language/pl/admin/general/navigation.json @@ -7,15 +7,15 @@ "text-class": "Text Class: optional", "id": "ID: optional", - "properties": "Properties:", + "properties": "Ustawienia:", "only-admins": "Pokaż tylko dla administracji", "only-global-mods-and-admins": "Pokaż tylko dla globalnych moderatorów oraz administracji", "only-logged-in": "Pokaż tylko dla zalogowanych użytkowników", - "only-guest": "Only display to guests", + "only-guest": "Pokazuj tylko gościom", "open-new-window": "Otwórz w nowym oknie", "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", + "search-plugin": "Wyszukiwarka", "btn.delete": "Usunąć", "btn.disable": "Wyłącz", diff --git a/public/language/pl/language.json b/public/language/pl/language.json index 5d4c3d60cf..69c0648ff7 100644 --- a/public/language/pl/language.json +++ b/public/language/pl/language.json @@ -1,5 +1,5 @@ { "name": "polski", "code": "pl", - "dir": "ltr" + "dir": "od lewej do prawej" } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 515231700d..2848c928b6 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -13,9 +13,9 @@ "notify_me": "Powiadamiaj mnie o nowych odpowiedziach w tym temacie", "quote": "Cytuj", "reply": "Odpowiedz", - "replies_to_this_post": "%1 Replies", - "one_reply_to_this_post": "1 Reply", - "last_reply_time": "Last reply", + "replies_to_this_post": "%1 Odpowiedzi", + "one_reply_to_this_post": "1 Odpowiedź", + "last_reply_time": "Ostatnia odpowiedź", "reply-as-topic": "Odpowiedz na temat", "guest-login-reply": "Zaloguj się, aby odpowiedzieć.", "edit": "Edytuj", @@ -59,7 +59,7 @@ "thread_tools.unlock": "Odblokuj Temat", "thread_tools.move": "Przenieś Temat", "thread_tools.move_all": "Przenieś wszystko", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "Wybierz kategorię", "thread_tools.fork": "Skopiuj Temat", "thread_tools.delete": "Usuń Temat", "thread_tools.delete-posts": "Usuń posty", diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 795470daa5..6eee599fba 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -33,7 +33,7 @@ "chat": "Rozmawiaj", "chat_with": "Kontynuuj rozmowę z %1", "new_chat_with": "Rozpocznij rozmowę z %1", - "flag-profile": "Flag Profile", + "flag-profile": "Zgłoś profil", "follow": "Śledź", "unfollow": "Przestań śledzić", "more": "Więcej", @@ -60,14 +60,14 @@ "username_taken_workaround": "Wybrany login jest już zajęty, więc zmieniliśmy go trochę. Proponujemy %1", "password_same_as_username": "Twoje hasło jest takie samo jak nazwa użytkownika, prosimy wybrać inne hasło.", "password_same_as_email": "Twoje hasło jest takie samo jak adres e-mail, prosimy wybrać inne hasło.", - "weak_password": "Weak password.", + "weak_password": "Słabe hasło.", "upload_picture": "Prześlij zdjęcie", "upload_a_picture": "Prześlij zdjęcie", "remove_uploaded_picture": "Usuń Przesłane Zdjęcie", "upload_cover_picture": "Prześlij zdjęcie tła", "remove_cover_picture_confirm": "Czy jesteś pewny, że chcesz usunąć zdjęcie okładki?", - "crop_picture": "Crop picture", - "upload_cropped_picture": "Crop and upload", + "crop_picture": "Przytnij obrazek", + "upload_cropped_picture": "Przytnij i wrzuć", "settings": "Ustawienia", "show_email": "Wyświetlaj mój adres e-mail", "show_fullname": "Wyświetlaj moją pełną nazwę", @@ -132,5 +132,5 @@ "info.email-history": "Historia adresu e-mail", "info.moderation-note": "Notka moderatora", "info.moderation-note.success": "Notka nie została zapisana", - "info.moderation-note.add": "Add note" + "info.moderation-note.add": "Dodaj notatkę" } \ No newline at end of file From 412f844885ac4ea1da6111924a52fd3ee04b46a9 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 1 Sep 2017 09:23:19 +0000 Subject: [PATCH 09/25] Latest translations and fallbacks --- .../ar/admin/manage/ip-blacklist.json | 5 +- .../bg/admin/manage/ip-blacklist.json | 5 +- .../bn/admin/manage/ip-blacklist.json | 5 +- .../language/cs/admin/general/dashboard.json | 114 ++++++++--------- .../language/cs/admin/manage/categories.json | 102 +++++++-------- .../cs/admin/manage/ip-blacklist.json | 5 +- public/language/cs/admin/menu.json | 116 +++++++++--------- .../language/cs/admin/settings/general.json | 62 +++++----- public/language/cs/admin/settings/post.json | 48 ++++---- .../da/admin/manage/ip-blacklist.json | 5 +- .../de/admin/manage/ip-blacklist.json | 5 +- .../el/admin/manage/ip-blacklist.json | 5 +- .../en-US/admin/manage/ip-blacklist.json | 5 +- .../admin/manage/ip-blacklist.json | 5 +- .../es/admin/manage/ip-blacklist.json | 5 +- .../et/admin/manage/ip-blacklist.json | 5 +- .../fa-IR/admin/manage/ip-blacklist.json | 5 +- .../fi/admin/manage/ip-blacklist.json | 5 +- .../fr/admin/manage/ip-blacklist.json | 5 +- .../gl/admin/manage/ip-blacklist.json | 5 +- .../he/admin/manage/ip-blacklist.json | 5 +- .../hr/admin/manage/ip-blacklist.json | 5 +- .../hu/admin/manage/ip-blacklist.json | 5 +- .../id/admin/manage/ip-blacklist.json | 5 +- .../it/admin/manage/ip-blacklist.json | 5 +- .../ja/admin/manage/ip-blacklist.json | 5 +- .../ko/admin/manage/ip-blacklist.json | 5 +- .../lt/admin/manage/ip-blacklist.json | 5 +- .../ms/admin/manage/ip-blacklist.json | 5 +- .../nb/admin/manage/ip-blacklist.json | 5 +- .../nl/admin/manage/ip-blacklist.json | 5 +- .../pl/admin/manage/ip-blacklist.json | 5 +- .../pt-BR/admin/manage/ip-blacklist.json | 5 +- .../pt-PT/admin/manage/ip-blacklist.json | 5 +- .../ro/admin/manage/ip-blacklist.json | 5 +- .../ru/admin/manage/ip-blacklist.json | 5 +- .../rw/admin/manage/ip-blacklist.json | 5 +- .../sc/admin/manage/ip-blacklist.json | 5 +- .../sk/admin/manage/ip-blacklist.json | 5 +- .../sl/admin/manage/ip-blacklist.json | 5 +- .../sr/admin/manage/ip-blacklist.json | 5 +- public/language/sr/notifications.json | 2 +- public/language/sr/pages.json | 2 +- public/language/sr/success.json | 2 +- .../sv/admin/manage/ip-blacklist.json | 5 +- .../th/admin/manage/ip-blacklist.json | 5 +- .../tr/admin/manage/ip-blacklist.json | 5 +- .../uk/admin/manage/ip-blacklist.json | 5 +- .../vi/admin/manage/ip-blacklist.json | 5 +- .../zh-CN/admin/manage/ip-blacklist.json | 5 +- .../zh-TW/admin/manage/ip-blacklist.json | 5 +- 51 files changed, 396 insertions(+), 267 deletions(-) diff --git a/public/language/ar/admin/manage/ip-blacklist.json b/public/language/ar/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/ar/admin/manage/ip-blacklist.json +++ b/public/language/ar/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/bg/admin/manage/ip-blacklist.json b/public/language/bg/admin/manage/ip-blacklist.json index c49791d2d3..532fe66493 100644 --- a/public/language/bg/admin/manage/ip-blacklist.json +++ b/public/language/bg/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "Правилни правила: %1 от %2.", "validate.x-invalid": "Следните %1 правила са грешни:", - "alerts.applied-success": "Черният списък е приложен" + "alerts.applied-success": "Черният списък е приложен", + + "analytics.blacklist-hourly": "Фигура 1 – Попадения в черния списък за час", + "analytics.blacklist-daily": "Фигура 2 – Попадения в черния списък за ден" } \ No newline at end of file diff --git a/public/language/bn/admin/manage/ip-blacklist.json b/public/language/bn/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/bn/admin/manage/ip-blacklist.json +++ b/public/language/bn/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/cs/admin/general/dashboard.json b/public/language/cs/admin/general/dashboard.json index 0e918ade44..04c1199ae7 100644 --- a/public/language/cs/admin/general/dashboard.json +++ b/public/language/cs/admin/general/dashboard.json @@ -1,69 +1,69 @@ { - "forum-traffic": "Forum Traffic", - "page-views": "Page Views", - "unique-visitors": "Unique Visitors", - "users": "Users", - "posts": "Posts", - "topics": "Topics", - "page-views-seven": "Last 7 Days", - "page-views-thirty": "Last 30 Days", - "page-views-last-day": "Last 24 hours", - "page-views-custom": "Custom Date Range", - "page-views-custom-start": "Range Start", - "page-views-custom-end": "Range End", - "page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is YYYY-MM-DD", - "page-views-custom-error": "Please enter a valid date range in the format YYYY-MM-DD", + "forum-traffic": "Provoz fóra", + "page-views": "Zobrazení stránky", + "unique-visitors": "Jedineční návštěvníci", + "users": "Uživatelé", + "posts": "Příspěvky", + "topics": "Témata", + "page-views-seven": "Posledních 7 dnů", + "page-views-thirty": "Posledních 30 dní", + "page-views-last-day": "Posledních 24 hodin", + "page-views-custom": "Dle rozsahu data", + "page-views-custom-start": "Začátek rozsahu", + "page-views-custom-end": "Konec rozsahu", + "page-views-custom-help": "Zadejte rozsah data zobrazení stránek, které chcete vidět. Není-li datum nastaveno, výchozí formát je YYYY-MM-DD", + "page-views-custom-error": "Zadejte správný rozsah ve formátu YYYY-MM-DD", - "stats.day": "Day", - "stats.week": "Week", - "stats.month": "Month", - "stats.all": "All Time", + "stats.day": "Den", + "stats.week": "Týden", + "stats.month": "Měsíc", + "stats.all": "Všechny časy", - "updates": "Updates", - "running-version": "You are running NodeBB v%1.", - "keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.", - "up-to-date": "

You are up-to-date

", - "upgrade-available": "

A new version (v%1) has been released. Consider upgrading your NodeBB.

", - "prerelease-upgrade-available": "

This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.

", - "prerelease-warning": "

This is a pre-release version of NodeBB. Unintended bugs may occur.

", - "running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator.", + "updates": "Aktualizace", + "running-version": "Fungujete na NodeBB v%1.", + "keep-updated": "Vždy udržujte NodeBB aktuální kvůli bezpečnostním záplatám a opravám.", + "up-to-date": "

Máte aktuální verzi

", + "upgrade-available": "

Byla uvolněna nová verze (v%1). Zvažte aktualizaci vašeho NodeBB.

", + "prerelease-upgrade-available": "

Toto je zastaralá zkušební verze NodeBB. Nová verze (v%1) byla uvolněna. Zvažte aktualizaci NodeBB.

", + "prerelease-warning": "

Toto je zkušební verze NodeBB. Mohou se vyskytnout různé chyby.

", + "running-in-development": "Fórum běží ve vývojářském režimu a může být potencionálně zranitelné . Kontaktujte správce systému.", - "notices": "Notices", - "restart-not-required": "Restart not required", - "restart-required": "Restart required", - "search-plugin-installed": "Search Plugin installed", - "search-plugin-not-installed": "Search Plugin not installed", - "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", + "notices": "Oznámení", + "restart-not-required": "Restart není potřeba", + "restart-required": "Je potřeba restartovat", + "search-plugin-installed": "Rozšíření pro hledání je nainstalováno", + "search-plugin-not-installed": "Rozšíření pro hledání není nainstalováno", + "search-plugin-tooltip": "Pro aktivování funkce vyhledávání, nainstalujte rozšíření pro hledání ze stránky rozšíření.", - "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", - "maintenance-mode": "Maintenance Mode", - "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", - "realtime-chart-updates": "Realtime Chart Updates", + "control-panel": "Ovládání systému", + "reload": "Znovu načíst", + "restart": "Restartovat", + "restart-warning": "Znovu načtení nebo restartování NodeBB odpojí na pár vteřin všechna stávající připojení.", + "maintenance-mode": "Režim údržby", + "maintenance-mode-title": "Pro nastavení režimu údržby NodeBB, klikněte zde", + "realtime-chart-updates": "Aktualizace grafů v reálném čase", - "active-users": "Active Users", - "active-users.users": "Users", - "active-users.guests": "Guests", - "active-users.total": "Total", - "active-users.connections": "Connections", + "active-users": "Aktivní uživatelé", + "active-users.users": "Uživatelé", + "active-users.guests": "Hosté", + "active-users.total": "Celkově", + "active-users.connections": "Připojení", - "anonymous-registered-users": "Anonymous vs Registered Users", - "anonymous": "Anonymous", - "registered": "Registered", + "anonymous-registered-users": "Anonymní × registrovaní uživatelé", + "anonymous": "Anonymní", + "registered": "Registrovaní", - "user-presence": "User Presence", - "on-categories": "On categories list", - "reading-posts": "Reading posts", + "user-presence": "Výskyt uživatele", + "on-categories": "V seznamu kategorii", + "reading-posts": "Čtení příspěvku", "browsing-topics": "Prohlížení témat", - "recent": "Recent", - "unread": "Unread", + "recent": "Poslední", + "unread": "Nepřečtené", - "high-presence-topics": "High Presence Topics", + "high-presence-topics": "Témata s vysokou účastí", - "graphs.page-views": "Page Views", - "graphs.unique-visitors": "Unique Visitors", - "graphs.registered-users": "Registered Users", - "graphs.anonymous-users": "Anonymous Users" + "graphs.page-views": "Zobrazení stránky", + "graphs.unique-visitors": "Jedineční návštěvníci", + "graphs.registered-users": "Registrovaní uživatelé", + "graphs.anonymous-users": "Anonymní uživatelé" } diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index 6d9b9f161b..66a6c75100 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -1,69 +1,69 @@ { - "settings": "Category Settings", - "privileges": "Privileges", + "settings": "Nastavení kategorie", + "privileges": "Oprávnění", - "name": "Category Name", - "description": "Category Description", - "bg-color": "Background Colour", - "text-color": "Text Colour", - "bg-image-size": "Background Image Size", - "custom-class": "Custom Class", - "num-recent-replies": "# nedávných odpovědí", - "ext-link": "External Link", - "is-section": "Treat this category as a section", - "upload-image": "Upload Image", - "delete-image": "Remove", - "category-image": "Category Image", - "parent-category": "Parent Category", - "optional-parent-category": "(Optional) Parent Category", - "parent-category-none": "(None)", - "copy-settings": "Copy Settings From", - "optional-clone-settings": "(Optional) Clone Settings From Category", - "purge": "Purge Category", + "name": "Název kategorie", + "description": "Popis kategorie", + "bg-color": "Barva pozadí", + "text-color": "Barva textu", + "bg-image-size": "Velikost obrázku pozadí", + "custom-class": "Upravit třídu", + "num-recent-replies": "# posledních odpovědí", + "ext-link": "Externí odkaz", + "is-section": "Zacházet s kategorii jako se sekcí", + "upload-image": "Nahrát obrázek", + "delete-image": "Vyjmout", + "category-image": "Obrázek kategorie", + "parent-category": "Nadřazená kategorie", + "optional-parent-category": "Nadřazená kategorie (doporučeno)", + "parent-category-none": "(nic)", + "copy-settings": "Kopírovat nastavení z", + "optional-clone-settings": "Klonovat nastavení z kategorie (doporučeno)", + "purge": "Vyčistit kategorii", - "enable": "Enable", - "disable": "Disable", - "edit": "Edit", + "enable": "Povolit", + "disable": "Zakázat", + "edit": "Upravit", - "select-category": "Select Category", - "set-parent-category": "Set Parent Category", + "select-category": "Vyberte kategorii", + "set-parent-category": "Nastavit nadřazenou kategorii", "privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.", "privileges.warning": "Note: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.", - "privileges.section-viewing": "Viewing Privileges", - "privileges.section-posting": "Posting Privileges", - "privileges.section-moderation": "Moderation Privileges", - "privileges.section-user": "User", - "privileges.search-user": "Add User", - "privileges.no-users": "No user-specific privileges in this category.", - "privileges.section-group": "Group", - "privileges.group-private": "This group is private", - "privileges.search-group": "Add Group", - "privileges.copy-to-children": "Copy to Children", - "privileges.copy-from-category": "Copy from Category", + "privileges.section-viewing": "Oprávnění prohlížení", + "privileges.section-posting": "Oprávnění příspěvků", + "privileges.section-moderation": "Oprávnění moderování", + "privileges.section-user": "Uživatel", + "privileges.search-user": "Přidat uživatele", + "privileges.no-users": "V této kategorii není nastaveno žádné oprávnění uživatele.", + "privileges.section-group": "Skupina", + "privileges.group-private": "Tato skupina je soukromá", + "privileges.search-group": "Přidat skupinu", + "privileges.copy-to-children": "Kopírovat do podřazené", + "privileges.copy-from-category": "Kopírovat z kategorie", "privileges.inherit": "If the registered-users group is granted a specific privilege, all other groups receive an implicit privilege, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the registered-users user group, and so, privileges for additional groups need not be explicitly granted.", - "analytics.back": "Back to Categories List", - "analytics.title": "Analytics for \"%1\" category", + "analytics.back": "Zpět do seznamu kategorii", + "analytics.title": "Analýza pro kategorii \"%1\"", "analytics.pageviews-hourly": "Figure 1 – Hourly page views for this category", "analytics.pageviews-daily": "Figure 2 – Daily page views for this category", "analytics.topics-daily": "Figure 3 – Daily topics created in this category", "analytics.posts-daily": "Figure 4 – Daily posts made in this category", - "alert.created": "Created", - "alert.create-success": "Category successfully created!", - "alert.none-active": "You have no active categories.", - "alert.create": "Create a Category", - "alert.confirm-moderate": "Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.", + "alert.created": "Vytvořeno", + "alert.create-success": "Kategorie byla úspěšně vytvořena.", + "alert.none-active": "Nemáte žádné aktivní kategorie.", + "alert.create": "Vytvořit kategorii", + "alert.confirm-moderate": "Jste si jist/a, že chcete umožnit oprávnění moderovat této skupině uživatelů? Tato skupina je veřejná a uživatelé se k ní mohou připojit dle libosti.", "alert.confirm-purge": "

Do you really want to purge this category \"%1\"?

Warning! All topics and posts in this category will be purged!

Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you'll want to \"disable\" the category instead.

", - "alert.purge-success": "Category purged!", - "alert.copy-success": "Settings Copied!", - "alert.set-parent-category": "Set Parent Category", - "alert.updated": "Updated Categories", - "alert.updated-success": "Category IDs %1 successfully updated.", - "alert.upload-image": "Upload category image", - "alert.find-user": "Find a User", + "alert.purge-success": "Kategorie byla vyčištěna.", + "alert.copy-success": "Nastavení bylo zkopírováno.", + "alert.set-parent-category": "Nastavit nadřazenou kategorii", + "alert.updated": "Kategorie byly aktualizovány", + "alert.updated-success": "ID kategorie %1 bylo aktualizováno.", + "alert.upload-image": "Nahrát obrázek kategorie", + "alert.find-user": "Najít uživatele", "alert.user-search": "Najít uživatele…", - "alert.find-group": "Find a Group", + "alert.find-group": "Najít skupinu", "alert.group-search": "Hledat skupinu…" } \ No newline at end of file diff --git a/public/language/cs/admin/manage/ip-blacklist.json b/public/language/cs/admin/manage/ip-blacklist.json index ebeceeeff4..993e3e41c4 100644 --- a/public/language/cs/admin/manage/ip-blacklist.json +++ b/public/language/cs/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 z %2 pravidel je platných.", "validate.x-invalid": "Následujících %1 pravidel není platných:", - "alerts.applied-success": "Černá listina byla použita" + "alerts.applied-success": "Černá listina byla použita", + + "analytics.blacklist-hourly": "Postava 1 - záznamů v černé listině/hodinu", + "analytics.blacklist-daily": "Postava 2 - záznamů v černé listině/den" } \ No newline at end of file diff --git a/public/language/cs/admin/menu.json b/public/language/cs/admin/menu.json index c18d35a96a..f0ff8082bf 100644 --- a/public/language/cs/admin/menu.json +++ b/public/language/cs/admin/menu.json @@ -1,75 +1,75 @@ { - "section-general": "General", - "general/dashboard": "Dashboard", - "general/homepage": "Home Page", - "general/navigation": "Navigation", - "general/languages": "Languages", - "general/sounds": "Sounds", - "general/social": "Social", + "section-general": "Všeobecné", + "general/dashboard": "Nástěnka", + "general/homepage": "Domovská stránka", + "general/navigation": "Navigace", + "general/languages": "Jazyky", + "general/sounds": "Zvuky", + "general/social": "Sociální", - "section-manage": "Manage", - "manage/categories": "Categories", - "manage/tags": "Tags", - "manage/users": "Users", - "manage/registration": "Registration Queue", - "manage/post-queue": "Post Queue", - "manage/groups": "Groups", - "manage/ip-blacklist": "IP Blacklist", + "section-manage": "Spravovat", + "manage/categories": "Kategorie", + "manage/tags": "Značky", + "manage/users": "Uživatelé", + "manage/registration": "Registrační fronta", + "manage/post-queue": "Fronta příspěvků", + "manage/groups": "Skupiny", + "manage/ip-blacklist": "Černá listina IP", - "section-settings": "Settings", - "settings/general": "General", - "settings/reputation": "Reputation", - "settings/email": "Email", - "settings/user": "User", - "settings/group": "Group", - "settings/guest": "Guests", - "settings/uploads": "Uploads", - "settings/post": "Post", - "settings/chat": "Chat", - "settings/pagination": "Pagination", - "settings/tags": "Tags", - "settings/notifications": "Notifications", + "section-settings": "Nastavení", + "settings/general": "Všeobecné", + "settings/reputation": "Reputace", + "settings/email": "E-mail", + "settings/user": "Uživatel", + "settings/group": "Skupina", + "settings/guest": "Hosté", + "settings/uploads": "Nahrané", + "settings/post": "Příspěvěk", + "settings/chat": "Konverzace", + "settings/pagination": "Stránkování", + "settings/tags": "Značky", + "settings/notifications": "Oznámení", "settings/cookies": "Cookies", - "settings/web-crawler": "Web Crawler", - "settings/sockets": "Sockets", - "settings/advanced": "Advanced", + "settings/web-crawler": "Webový prohledávač", + "settings/sockets": "Sockety", + "settings/advanced": "Pokročilé", - "settings.page-title": "%1 Settings", + "settings.page-title": "Nastavení %1", - "section-appearance": "Appearance", - "appearance/themes": "Themes", - "appearance/skins": "Skins", - "appearance/customise": "Custom HTML & CSS", + "section-appearance": "Vzhled", + "appearance/themes": "Motivy", + "appearance/skins": "Vzhledy", + "appearance/customise": "Uživatelské HTML a CSS", - "section-extend": "Extend", - "extend/plugins": "Plugins", - "extend/widgets": "Widgets", - "extend/rewards": "Rewards", + "section-extend": "Rozšířit", + "extend/plugins": "Rozšíření", + "extend/widgets": "Miniaplikace", + "extend/rewards": "Odměny", - "section-social-auth": "Social Authentication", + "section-social-auth": "Sociální autentifikace", - "section-plugins": "Plugins", - "extend/plugins.install": "Install Plugins", + "section-plugins": "Rozšíření", + "extend/plugins.install": "Nainstalovat rozšíření", - "section-advanced": "Advanced", - "advanced/database": "Database", - "advanced/events": "Events", - "advanced/logs": "Logs", - "advanced/errors": "Errors", - "advanced/cache": "Cache", - "development/logger": "Logger", - "development/info": "Info", + "section-advanced": "Pokročilé", + "advanced/database": "Databáze", + "advanced/events": "Události", + "advanced/logs": "Protokoly", + "advanced/errors": "Chyby", + "advanced/cache": "Mezipamě", + "development/logger": "Protokolář", + "development/info": "Informace", - "reload-forum": "Reload Forum", - "restart-forum": "Restart Forum", - "logout": "Log out", - "view-forum": "View Forum", + "reload-forum": "Znovu načíst fórum", + "restart-forum": "Restartovat fórum", + "logout": "Odhlásit", + "view-forum": "Zobrazit fórum", - "search.placeholder": "Hledat", + "search.placeholder": "Hledat...", "search.no-results": "Žádné výsledky…", - "search.search-forum": "Search the forum for ", + "search.search-forum": "Prohledat fórum pro ", "search.keep-typing": "Pište dále pro zobrazení výsledků…", "search.start-typing": "Začněte psát pro zobrazení výsledků…", - "connection-lost": "Připojení k %1 bylo ztraceno. Snaha o opětovné připojení…" + "connection-lost": "Připojení k %1 bylo ztraceno, snaha o opětovné připojení…" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/general.json b/public/language/cs/admin/settings/general.json index 948123f7cb..a57ec12acb 100644 --- a/public/language/cs/admin/settings/general.json +++ b/public/language/cs/admin/settings/general.json @@ -1,35 +1,35 @@ { - "site-settings": "Site Settings", - "title": "Site Title", + "site-settings": "Nastavení stránky", + "title": "Název stránky", "title.url": "URL", - "title.url-placeholder": "The URL of the site title", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", - "title.name": "Your Community Name", - "title.show-in-header": "Show Site Title in Header", - "browser-title": "Browser Title", - "browser-title-help": "If no browser title is specified, the site title will be used", - "title-layout": "Title Layout", - "title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}", - "description.placeholder": "A short description about your community", - "description": "Site Description", - "keywords": "Site Keywords", - "keywords-placeholder": "Keywords describing your community, comma-separated", - "logo": "Site Logo", - "logo.image": "Image", - "logo.image-placeholder": "Path to a logo to display on forum header", - "logo.upload": "Upload", + "title.url-placeholder": "URL názvu stránky", + "title.url-help": "Bude-li kliknuto na název, uživatel bude přesměrován na tuto adresu. Zůstane-li prázdné, uživatel bude odeslán na index fóra", + "title.name": "Název vaší komunity", + "title.show-in-header": "Zobrazit název stránky v hlavičce", + "browser-title": "Název prohlížeče", + "browser-title-help": "Nebude-li název prohlížeče určen, bude použit název stránky", + "title-layout": "Vzhled názvu", + "title-layout-help": "Určete jak název prohlížeče má být sestaven, tj. {pageTitle} | {browserTitle}", + "description.placeholder": "Zkrácený popis vaší komunity", + "description": "Popis stránky", + "keywords": "Klíčová slova pro stránky", + "keywords-placeholder": "Klíčová slova popisující vaši komunitu, odděleno čárkou", + "logo": "Logo stránky", + "logo.image": "Obrázek", + "logo.image-placeholder": "Cesta k logu, aby mohlo být zobrazeno v hlavičce fóra", + "logo.upload": "Nahrát", "logo.url": "URL", - "logo.url-placeholder": "The URL of the site logo", - "logo.url-help": "When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.", - "logo.alt-text": "Alt Text", - "log.alt-text-placeholder": "Alternative text for accessibility", - "favicon": "Favicon", - "favicon.upload": "Upload", - "touch-icon": "Homescreen/Touch Icon", - "touch-icon.upload": "Upload", - "touch-icon.help": "Recommended size and format: 192x192, PNG format only. If no touch icon is specified, NodeBB will fall back to using the favicon.", - "outgoing-links": "Outgoing Links", - "outgoing-links.warning-page": "Use Outgoing Links Warning Page", - "search-default-sort-by": "Search default sort by", - "outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page" + "logo.url-placeholder": "URL loga stránky", + "logo.url-help": "Bude-li kliknuto na logo, uživatel bude přesměrován na tuto adresu. Zůstane-li prázdné, uživatel bude přesměrován na index fóra.", + "logo.alt-text": "Popisující text (alt)", + "log.alt-text-placeholder": "Alternativní text pro přístupnost", + "favicon": "Ikonka (favicon)", + "favicon.upload": "Nahrát", + "touch-icon": "Ikonka domovské obrazovky/dotyková", + "touch-icon.upload": "Nahrát", + "touch-icon.help": "Doporučená velikost a formát je: jen v *.png 192x192. Nebude-li určena dotyková ikona, NodeBB nepoužije žádnou z ikon (favicon).", + "outgoing-links": "Odchozí odkazy", + "outgoing-links.warning-page": "Použít stránku s upozorněním při odchozích odkazech", + "search-default-sort-by": "Výchozí třídění při hledání", + "outgoing-links.whitelist": "Domény u kterých bude přeskočena upozorňovací stránka" } \ No newline at end of file diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index 79d041e4a8..877ac90f51 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -1,5 +1,5 @@ { - "sorting": "Třídění přísvěvků", + "sorting": "Třídění příspěvků", "sorting.post-default": "Výchozí třídění příspěvků", "sorting.oldest-to-newest": "Od nejstarších po nejnovější", "sorting.newest-to-oldest": "Od nejnovějších po nejstarší", @@ -20,29 +20,29 @@ "restrictions.min-post-length": "Minimální délka příspěvku", "restrictions.max-post-length": "Maximální délka příspěvku", "restrictions.days-until-stale": "Počet dnů, kdy je téma považováno za staré", - "restrictions.stale-help": "If a topic is considered \"stale\", then a warning will be shown to users who attempt to reply to that topic.", + "restrictions.stale-help": "Je-li téma považováno za \"staré\", uživateli se zobrazí oznámení při pokusu o přidání odpovědi.", "timestamp": "Časový otisk", "timestamp.cut-off": "Datum ukončení (ve dnech)", - "timestamp.cut-off-help": "Dates & times will be shown in a relative manner (e.g. \"3 hours ago\" / \"5 days ago\"), and localised into various\n\t\t\t\t\tlanguages. After a certain point, this text can be switched to display the localised date itself\n\t\t\t\t\t(e.g. 5 Nov 2016 15:30).
(Default: 30, or one month). Set to 0 to always display dates, leave blank to always display relative times.", - "teaser": "Teaser Post", - "teaser.last-post": "Last – Show the latest post, including the original post, if no replies", - "teaser.last-reply": "Last – Show the latest reply, or a \"No replies\" placeholder if no replies", - "teaser.first": "First", - "unread": "Unread Settings", - "unread.cutoff": "Unread cutoff days", - "unread.min-track-last": "Minimum posts in topic before tracking last read", - "recent": "Recent Settings", - "recent.categoryFilter.disable": "Disable filtering of topics in ignored categories on the /recent page", - "signature": "Signature Settings", - "signature.disable": "Disable signatures", - "signature.no-links": "Disable links in signatures", - "signature.no-images": "Disable images in signatures", - "signature.max-length": "Maximum Signature Length", - "composer": "Composer Settings", - "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", - "composer.show-help": "Show \"Help\" tab", - "composer.enable-plugin-help": "Allow plugins to add content to the help tab", - "composer.custom-help": "Custom Help Text", - "ip-tracking": "IP Tracking", - "ip-tracking.each-post": "Track IP Address for each post" + "timestamp.cut-off-help": "Datum a čas bude zobrazen relativně (tj. \"před 3 hodinami\" / \"před 5 dny\"), a dle toho lokalizován do různých\n\t\t\t\t\tjazyků. Za určitých okolností, může tento text být přepnut na lokalizované datum\n\t\t\t\t\t(tj. 5 Led 2017 15:30)
(výchozí: 30,nebo měsíc). Nastavte na 0, pro zobrazení datumů, zanecháte-li prázdné, bude vždy zobrazen relativní čas", + "teaser": "Ukázka příspěvku", + "teaser.last-post": "Poslední - zobrazení posledního příspěvku, včetně hlavního příspěvku, nejsou-li odpovědi", + "teaser.last-reply": "Poslední - zobrazení poslední odpovědi, nebo nejsou-li žádné odpovědi textu \"Bez odpovědi\"", + "teaser.first": "První", + "unread": "Nastavení nepřečtených", + "unread.cutoff": "Dny ukončení nepřečtených", + "unread.min-track-last": "Minimální počet příspěvků v tématu před posledním čtením", + "recent": "Nastavení pro poslední", + "recent.categoryFilter.disable": "Zakázat filtrování témat v ignorovaných kategoriích na poslední stránce", + "signature": "Nastavení podpisu", + "signature.disable": "Zakázat podpisy", + "signature.no-links": "Zakázat odkazy v podpisech", + "signature.no-images": "Zakázat obrázky v podpisech", + "signature.max-length": "Maximální délka podpisu", + "composer": "Nastavení kompozice", + "composer-help": "Následující nastavení kontroluje funkčnost a/nebo vzhled zobrazených příspěvků\n\t\t\t\tpro uživatele, kteří vytvoří nové téma nebo odpovídají na existující téma.", + "composer.show-help": "Zobrazit záložku \"Nápověda\"", + "composer.enable-plugin-help": "Povolit rozšíření přidat obsah do záložky nápovědy", + "composer.custom-help": "Uživatelský text nápovědy", + "ip-tracking": "Sledování IP", + "ip-tracking.each-post": "Sledovat adresu IP u každého příspěvku" } \ No newline at end of file diff --git a/public/language/da/admin/manage/ip-blacklist.json b/public/language/da/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/da/admin/manage/ip-blacklist.json +++ b/public/language/da/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/de/admin/manage/ip-blacklist.json b/public/language/de/admin/manage/ip-blacklist.json index a6d4f1cff9..92456bd30e 100644 --- a/public/language/de/admin/manage/ip-blacklist.json +++ b/public/language/de/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 von %2 Regel(n) zulässig.", "validate.x-invalid": "Die folgenden %1 Regeln sind unzulässig:", - "alerts.applied-success": "Blacklist angewandt" + "alerts.applied-success": "Blacklist angewandt", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/el/admin/manage/ip-blacklist.json b/public/language/el/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/el/admin/manage/ip-blacklist.json +++ b/public/language/el/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/en-US/admin/manage/ip-blacklist.json b/public/language/en-US/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/en-US/admin/manage/ip-blacklist.json +++ b/public/language/en-US/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/manage/ip-blacklist.json b/public/language/en-x-pirate/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/en-x-pirate/admin/manage/ip-blacklist.json +++ b/public/language/en-x-pirate/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/es/admin/manage/ip-blacklist.json b/public/language/es/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/es/admin/manage/ip-blacklist.json +++ b/public/language/es/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/et/admin/manage/ip-blacklist.json b/public/language/et/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/et/admin/manage/ip-blacklist.json +++ b/public/language/et/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/manage/ip-blacklist.json b/public/language/fa-IR/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/fa-IR/admin/manage/ip-blacklist.json +++ b/public/language/fa-IR/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/fi/admin/manage/ip-blacklist.json b/public/language/fi/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/fi/admin/manage/ip-blacklist.json +++ b/public/language/fi/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/fr/admin/manage/ip-blacklist.json b/public/language/fr/admin/manage/ip-blacklist.json index b4a6efd3c6..16f930d438 100644 --- a/public/language/fr/admin/manage/ip-blacklist.json +++ b/public/language/fr/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 sur %2 règle(s) valide(s).", "validate.x-invalid": "Les règles suivantes %1 sont invalides:", - "alerts.applied-success": "Liste noire appliquée" + "alerts.applied-success": "Liste noire appliquée", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/gl/admin/manage/ip-blacklist.json b/public/language/gl/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/gl/admin/manage/ip-blacklist.json +++ b/public/language/gl/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/he/admin/manage/ip-blacklist.json b/public/language/he/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/he/admin/manage/ip-blacklist.json +++ b/public/language/he/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/hr/admin/manage/ip-blacklist.json b/public/language/hr/admin/manage/ip-blacklist.json index 374b5029d5..47d58a64d2 100644 --- a/public/language/hr/admin/manage/ip-blacklist.json +++ b/public/language/hr/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 od %2 pravila valjano.", "validate.x-invalid": "Sljedeća %1 pravila su nevažeća:", - "alerts.applied-success": "Blokiranje omogućeno" + "alerts.applied-success": "Blokiranje omogućeno", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/hu/admin/manage/ip-blacklist.json b/public/language/hu/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/hu/admin/manage/ip-blacklist.json +++ b/public/language/hu/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/id/admin/manage/ip-blacklist.json b/public/language/id/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/id/admin/manage/ip-blacklist.json +++ b/public/language/id/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/it/admin/manage/ip-blacklist.json b/public/language/it/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/it/admin/manage/ip-blacklist.json +++ b/public/language/it/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/ja/admin/manage/ip-blacklist.json b/public/language/ja/admin/manage/ip-blacklist.json index 2068aaa7d0..754d32e1ed 100644 --- a/public/language/ja/admin/manage/ip-blacklist.json +++ b/public/language/ja/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "％2のルールのうち％1 のルール(s) が有効です。", "validate.x-invalid": "次の％1 ルールは無効:", - "alerts.applied-success": "ブラックリストに適用されました" + "alerts.applied-success": "ブラックリストに適用されました", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/ko/admin/manage/ip-blacklist.json b/public/language/ko/admin/manage/ip-blacklist.json index 7a137dc9ad..12582231c7 100644 --- a/public/language/ko/admin/manage/ip-blacklist.json +++ b/public/language/ko/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%2 룰(들) 중 %1 유효함.", "validate.x-invalid": "다음 %1 규칙들은 유효하지 않습니다:", - "alerts.applied-success": "블랙리스트 적용됨" + "alerts.applied-success": "블랙리스트 적용됨", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/lt/admin/manage/ip-blacklist.json b/public/language/lt/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/lt/admin/manage/ip-blacklist.json +++ b/public/language/lt/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/ms/admin/manage/ip-blacklist.json b/public/language/ms/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/ms/admin/manage/ip-blacklist.json +++ b/public/language/ms/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/ip-blacklist.json b/public/language/nb/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/nb/admin/manage/ip-blacklist.json +++ b/public/language/nb/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/nl/admin/manage/ip-blacklist.json b/public/language/nl/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/nl/admin/manage/ip-blacklist.json +++ b/public/language/nl/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/pl/admin/manage/ip-blacklist.json b/public/language/pl/admin/manage/ip-blacklist.json index 4e96a6103a..4b9c733170 100644 --- a/public/language/pl/admin/manage/ip-blacklist.json +++ b/public/language/pl/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/manage/ip-blacklist.json b/public/language/pt-BR/admin/manage/ip-blacklist.json index 9746b23a24..454dc645de 100644 --- a/public/language/pt-BR/admin/manage/ip-blacklist.json +++ b/public/language/pt-BR/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 de %2 regras(s) validá(s).", "validate.x-invalid": "As seguintes %1 regras são inválidas:", - "alerts.applied-success": "Lista Negra Aplicada" + "alerts.applied-success": "Lista Negra Aplicada", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/manage/ip-blacklist.json b/public/language/pt-PT/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/pt-PT/admin/manage/ip-blacklist.json +++ b/public/language/pt-PT/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/ro/admin/manage/ip-blacklist.json b/public/language/ro/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/ro/admin/manage/ip-blacklist.json +++ b/public/language/ro/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/ru/admin/manage/ip-blacklist.json b/public/language/ru/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/ru/admin/manage/ip-blacklist.json +++ b/public/language/ru/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/rw/admin/manage/ip-blacklist.json b/public/language/rw/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/rw/admin/manage/ip-blacklist.json +++ b/public/language/rw/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/sc/admin/manage/ip-blacklist.json b/public/language/sc/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/sc/admin/manage/ip-blacklist.json +++ b/public/language/sc/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/sk/admin/manage/ip-blacklist.json b/public/language/sk/admin/manage/ip-blacklist.json index e7aadd2d5e..ba8ddea2ae 100644 --- a/public/language/sk/admin/manage/ip-blacklist.json +++ b/public/language/sk/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/sl/admin/manage/ip-blacklist.json b/public/language/sl/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/sl/admin/manage/ip-blacklist.json +++ b/public/language/sl/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/sr/admin/manage/ip-blacklist.json b/public/language/sr/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/sr/admin/manage/ip-blacklist.json +++ b/public/language/sr/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index 5d7cc50a0b..18421b0857 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1 вам је послао захтев за регистрацију.", "new_register_multiple": "Постоје %1 захтева за регистрацију који чекају преглед.", "flag_assigned_to_you": "Заставица %1 је додељена вама", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "Порука на чекању за преглед", "email-confirmed": "Е-пошта је потврђена.", "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.", "email-confirm-error-message": "Дошло је до проблема са овером ваше е-поште. Можда је код неисправан или је истекао.", diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json index 8a075fd622..44f39483ea 100644 --- a/public/language/sr/pages.json +++ b/public/language/sr/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "Алати модератора", "flagged-content": "Садржај означен заставицом", "ip-blacklist": "Црна листа IP адреса", - "post-queue": "Post Queue", + "post-queue": "Порука на чекању", "users/online": "Корисници на мрежи", "users/latest": "Најновији корисници", "users/sort-posts": "Корисници са највише порука", diff --git a/public/language/sr/success.json b/public/language/sr/success.json index 1d4596c6da..bbf415b6ac 100644 --- a/public/language/sr/success.json +++ b/public/language/sr/success.json @@ -1,7 +1,7 @@ { "success": "Успешно", "topic-post": "Успешно сте послали поруку.", - "post-queued": "Your post is queued for approval.", + "post-queued": "Ваша порука је стављена у ред за одобрење.", "authentication-successful": "Успешна аутентификација", "settings-saved": "Подешавања су сачувана!" } \ No newline at end of file diff --git a/public/language/sv/admin/manage/ip-blacklist.json b/public/language/sv/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/sv/admin/manage/ip-blacklist.json +++ b/public/language/sv/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/th/admin/manage/ip-blacklist.json b/public/language/th/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/th/admin/manage/ip-blacklist.json +++ b/public/language/th/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/ip-blacklist.json b/public/language/tr/admin/manage/ip-blacklist.json index 9ba7b9f06d..a2ae108c72 100644 --- a/public/language/tr/admin/manage/ip-blacklist.json +++ b/public/language/tr/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/uk/admin/manage/ip-blacklist.json b/public/language/uk/admin/manage/ip-blacklist.json index 062a21b4dd..0088dfecff 100644 --- a/public/language/uk/admin/manage/ip-blacklist.json +++ b/public/language/uk/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 із %2 правил вірні.", "validate.x-invalid": "Наступні %1 правил невірні:", - "alerts.applied-success": "Чорний список примінено" + "alerts.applied-success": "Чорний список примінено", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/vi/admin/manage/ip-blacklist.json b/public/language/vi/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/vi/admin/manage/ip-blacklist.json +++ b/public/language/vi/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/manage/ip-blacklist.json b/public/language/zh-CN/admin/manage/ip-blacklist.json index b4938f974b..7cce4570a7 100644 --- a/public/language/zh-CN/admin/manage/ip-blacklist.json +++ b/public/language/zh-CN/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 / %2的规则有效。", "validate.x-invalid": "下列 %0 个规则无效：", - "alerts.applied-success": "黑名单生效" + "alerts.applied-success": "黑名单生效", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/manage/ip-blacklist.json b/public/language/zh-TW/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/zh-TW/admin/manage/ip-blacklist.json +++ b/public/language/zh-TW/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file From 1829aa139d56709abf04c2c19b7a8036b8d096ef Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 1 Sep 2017 16:07:00 -0400 Subject: [PATCH 10/25] up themes --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7fdf88ef44..f9ece674ea 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,9 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.33", + "nodebb-theme-persona": "6.0.0", "nodebb-theme-slick": "1.1.1", - "nodebb-theme-vanilla": "6.0.27", + "nodebb-theme-vanilla": "7.0.0", "nodebb-widget-essentials": "3.0.4", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", From 8e89eb80b7330bc60e171bb520ba738e4ab53a17 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 1 Sep 2017 16:14:49 -0400 Subject: [PATCH 11/25] up composer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db23296aa1..f3eee792d3 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "morgan": "^1.8.2", "mousetrap": "^1.6.1", "nconf": "^0.8.4", - "nodebb-plugin-composer-default": "5.0.7", + "nodebb-plugin-composer-default": "5.0.8", "nodebb-plugin-dbsearch": "2.0.6", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.2.1", From bf79857b7d5262f380726105a93d6c4187c20e28 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 1 Sep 2017 17:42:55 -0400 Subject: [PATCH 12/25] closes #5908 --- package.json | 4 ++-- public/src/admin/manage/group.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f3eee792d3..06731e89e0 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "6.0.0", + "nodebb-theme-persona": "6.0.1", "nodebb-theme-slick": "1.1.1", - "nodebb-theme-vanilla": "7.0.0", + "nodebb-theme-vanilla": "7.0.1", "nodebb-widget-essentials": "3.0.4", "nodemailer": "4.1.0", "passport": "^0.3.0", diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js index 910db07af7..14846f18a7 100644 --- a/public/src/admin/manage/group.js +++ b/public/src/admin/manage/group.js @@ -104,7 +104,7 @@ define('admin/manage/group', [ 'icon:text': userLabel.attr('data-usericon-text'), }; - Benchpress.parse('admin/partials/groups/memberlist', 'members', { + Benchpress.parse('admin/partials/groups/memberlist', 'group.members', { group: { isOwner: ajaxify.data.group.isOwner, members: [member], From 1358a8930577eaf0b166c0f96d8d3fad431bf171 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 1 Sep 2017 18:40:34 -0400 Subject: [PATCH 13/25] closes #5907 --- src/controllers/authentication.js | 2 +- test/authentication.js | 57 +++++++++++++++++++++++++++++++ test/helpers/index.js | 4 +-- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js index f0f64f42fd..e8ea4ff5b5 100644 --- a/src/controllers/authentication.js +++ b/src/controllers/authentication.js @@ -42,7 +42,7 @@ authenticationController.register = function (req, res) { return next(new Error('[[error:invalid-email]]')); } - if (!userData.username || userData.username.length < meta.config.minimumUsernameLength) { + if (!userData.username || userData.username.length < meta.config.minimumUsernameLength || utils.slugify(userData.username).length < meta.config.minimumUsernameLength) { return next(new Error('[[error:username-too-short]]')); } diff --git a/test/authentication.js b/test/authentication.js index 55602777a2..6dd781710c 100644 --- a/test/authentication.js +++ b/test/authentication.js @@ -78,6 +78,63 @@ describe('authentication', function () { }); }); + it('should fail to create user if username is too short', function (done) { + helpers.registerUser({ + username: 'a', + password: '123456', + 'password-confirm': '123456', + email: 'should@error1.com', + }, function (err, jar, response, body) { + assert.ifError(err); + assert.equal(response.statusCode, 400); + assert.equal(body, '[[error:username-too-short]]'); + done(); + }); + }); + + it('should fail to create user if userslug is too short', function (done) { + helpers.registerUser({ + username: '----a-----', + password: '123456', + 'password-confirm': '123456', + email: 'should@error2.com', + }, function (err, jar, response, body) { + assert.ifError(err); + assert.equal(response.statusCode, 400); + assert.equal(body, '[[error:username-too-short]]'); + done(); + }); + }); + + it('should fail to create user if userslug is too short', function (done) { + helpers.registerUser({ + username: ' a', + password: '123456', + 'password-confirm': '123456', + email: 'should@error3.com', + }, function (err, jar, response, body) { + assert.ifError(err); + assert.equal(response.statusCode, 400); + assert.equal(body, '[[error:username-too-short]]'); + done(); + }); + }); + + it('should fail to create user if userslug is too short', function (done) { + helpers.registerUser({ + username: 'a ', + password: '123456', + 'password-confirm': '123456', + email: 'should@error4.com', + }, function (err, jar, response, body) { + assert.ifError(err); + assert.equal(response.statusCode, 400); + assert.equal(body, '[[error:username-too-short]]'); + done(); + }); + }); + + it('should register and login a user', function (done) { request({ url: nconf.get('url') + '/api/config', diff --git a/test/helpers/index.js b/test/helpers/index.js index 29a66e00dd..79c510c88b 100644 --- a/test/helpers/index.js +++ b/test/helpers/index.js @@ -137,8 +137,8 @@ helpers.registerUser = function (data, callback) { headers: { 'x-csrf-token': body.csrf_token, }, - }, function (err) { - callback(err, jar); + }, function (err, response, body) { + callback(err, jar, response, body); }); }); }; From 0587b98eca291346ebbdf66d1f2a7e6468d364b2 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 1 Sep 2017 23:20:36 +0000 Subject: [PATCH 14/25] Latest translations and fallbacks --- public/language/ar/admin/settings/email.json | 22 +++++++++++++------ public/language/bg/admin/settings/email.json | 22 +++++++++++++------ public/language/bn/admin/settings/email.json | 22 +++++++++++++------ .../language/cs/admin/manage/categories.json | 4 ++-- public/language/cs/admin/settings/email.json | 22 +++++++++++++------ public/language/da/admin/settings/email.json | 22 +++++++++++++------ public/language/de/admin/settings/email.json | 22 +++++++++++++------ public/language/el/admin/settings/email.json | 22 +++++++++++++------ .../language/en-US/admin/settings/email.json | 22 +++++++++++++------ .../en-x-pirate/admin/settings/email.json | 22 +++++++++++++------ public/language/es/admin/settings/email.json | 22 +++++++++++++------ public/language/et/admin/settings/email.json | 22 +++++++++++++------ .../language/fa-IR/admin/settings/email.json | 22 +++++++++++++------ public/language/fi/admin/settings/email.json | 22 +++++++++++++------ public/language/fr/admin/settings/email.json | 22 +++++++++++++------ public/language/gl/admin/settings/email.json | 22 +++++++++++++------ public/language/he/admin/settings/email.json | 22 +++++++++++++------ public/language/hr/admin/settings/email.json | 22 +++++++++++++------ public/language/hu/admin/settings/email.json | 22 +++++++++++++------ public/language/id/admin/settings/email.json | 22 +++++++++++++------ public/language/it/admin/settings/email.json | 22 +++++++++++++------ public/language/ja/admin/settings/email.json | 22 +++++++++++++------ public/language/ko/admin/settings/email.json | 22 +++++++++++++------ public/language/lt/admin/settings/email.json | 22 +++++++++++++------ public/language/ms/admin/settings/email.json | 22 +++++++++++++------ public/language/nb/admin/settings/email.json | 22 +++++++++++++------ public/language/nl/admin/settings/email.json | 22 +++++++++++++------ public/language/pl/admin/settings/email.json | 22 +++++++++++++------ .../language/pt-BR/admin/settings/email.json | 22 +++++++++++++------ .../language/pt-PT/admin/settings/email.json | 22 +++++++++++++------ public/language/ro/admin/settings/email.json | 22 +++++++++++++------ public/language/ru/admin/manage/users.json | 10 ++++----- public/language/ru/admin/settings/email.json | 22 +++++++++++++------ public/language/ru/success.json | 2 +- public/language/ru/topic.json | 8 +++---- public/language/ru/user.json | 2 +- public/language/rw/admin/settings/email.json | 22 +++++++++++++------ public/language/sc/admin/settings/email.json | 22 +++++++++++++------ public/language/sk/admin/settings/email.json | 22 +++++++++++++------ public/language/sl/admin/settings/email.json | 22 +++++++++++++------ public/language/sr/admin/settings/email.json | 22 +++++++++++++------ public/language/sv/admin/settings/email.json | 22 +++++++++++++------ public/language/th/admin/settings/email.json | 22 +++++++++++++------ public/language/tr/admin/settings/email.json | 22 +++++++++++++------ public/language/uk/admin/settings/email.json | 22 +++++++++++++------ public/language/vi/admin/settings/email.json | 22 +++++++++++++------ .../language/zh-CN/admin/settings/email.json | 22 +++++++++++++------ .../language/zh-TW/admin/settings/email.json | 22 +++++++++++++------ 48 files changed, 658 insertions(+), 314 deletions(-) diff --git a/public/language/ar/admin/settings/email.json b/public/language/ar/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/ar/admin/settings/email.json +++ b/public/language/ar/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index 5f0af650d0..b519703e08 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Следният адрес на е-поща е този, който получателят ще види в полетата „От“ и “Отговор до“.", "from": "Име за полето „От“", "from-help": "Името на изпращача, което да бъде показано в е-писмото.", - "gmail-routing": "Препращане на Gmail", - "gmail-routing-help1": "Има доклади, че препращането на Gmail не работи за акаунти с подсилена защита. В тези случаи ще трябва да настроите своя акаунт в GMail така, че да позволява използването на по-малко защитени приложения.", - "gmail-routing-help2": "За повече информация относно това обиколно решение, моля, прегледайте тази статия за проблема в „NodeMailer“. Друго решение би било използването на добавка за е-поща от трета страна, като например „SendGrid“, „Mailgun“ и т.н. Вижте наличните добавки тук.", - "gmail-transport": "Препращане на е-писмата през акаунта в Gmail/Google Apps", - "gmail-transport.username": "Потребителско име", - "gmail-transport.username-help": "Въведете пълния адрес на е-пощата тук, особено ако използвате управляван домейн на „Google Apps“.", - "gmail-transport.password": "Парола", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Редактирана не шаблона за е-писма", "template.select": "Изберете шаблон за е-писма", "template.revert": "Връщане на оригинала", diff --git a/public/language/bn/admin/settings/email.json b/public/language/bn/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/bn/admin/settings/email.json +++ b/public/language/bn/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index 66a6c75100..64102ac8dd 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -28,8 +28,8 @@ "select-category": "Vyberte kategorii", "set-parent-category": "Nastavit nadřazenou kategorii", - "privileges.description": "You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or a per-group basis. You can add a new user to this table by searching for them in the form below.", - "privileges.warning": "Note: Privilege settings take effect immediately. It is not necessary to save the category after adjusting these settings.", + "privileges.description": "Můžete nastavit oprávnění ovládání přístupu ke kategorii v této sekci. Oprávnění mohou být přidělena na uživatele nebo na celou skupinu. Uživatele můžete přidat jeho vyhledáním ze spodního formuláře.", + "privileges.warning": "Poznámka: nastavení oprávnění má okamžitý vliv. Není tedy nutné uložit kategorii pro upravení těchto nastavení", "privileges.section-viewing": "Oprávnění prohlížení", "privileges.section-posting": "Oprávnění příspěvků", "privileges.section-moderation": "Oprávnění moderování", diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json index 7c6b3eea24..84de6d44a5 100644 --- a/public/language/cs/admin/settings/email.json +++ b/public/language/cs/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Následující e-mailové adresy budou zobrazeny příjemci v políčkách \"Od\" a \"Odpovědět\".", "from": "Jméno - od", "from-help": "Zobrazené jméno v e-mailu v - Od", - "gmail-routing": "Směrování služby Gmail", - "gmail-routing-help1": "Směrování Gmailu někdy nefunguje s účty s nejvyšším zabezpečením. V tomto případě budete muset upravit váš účet na Gmailu a povolit nižší zabezpečení aplikací.", - "gmail-routing-help2": "Pro více informací o tomto způsobu řešení si přečtěte článek na NodeMailer.. Alternativně se dá ještě upravit rozšíření třetích stran pro e-maily jako SendGrid, MailGun, atd. Dostupné rozšíření zde.", - "gmail-transport": "Směrovat e-maily přes účet Gmail/Google Apps", - "gmail-transport.username": "Uživatelské jméno", - "gmail-transport.username-help": "zadejte plnou e-mailovou adresu, zvláště používáte-li spravovanou doménu Google Apps.", - "gmail-transport.password": "Heslo", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Upravit šablonu e-mailu", "template.select": "Vybrat šablonu e-mailu", "template.revert": "Zpět k původnímu", diff --git a/public/language/da/admin/settings/email.json b/public/language/da/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/da/admin/settings/email.json +++ b/public/language/da/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index da2109f9df..56d72f72fb 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Die folgende E-Mail Adresse ist die E-Mail Adresse, welche dem Empfänger im \"Von\" und \"Antworten\" Bereich sehen wird.", "from": "Name des Absenders", "from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "Es gab Berichte bezüglich des \"Gmail Routing\", welches nicht auf Accounts mit erhöhten Sicherheitseinstellungen funktionierte (Standardeinstellung). In diesem Fall müssen sie ihren Gmail Account konfigurieren weniger sichere Apps zu erlauben.", - "gmail-routing-help2": "Für mehr informationen zu diesem Workaround, konsultieren Sie bitte diesen NodeMailer Artikel über dieses Problem. Eine alternative wäre ein Plugin von Drittherstellern wie SendGrid, mailgun etc. zu verwenden. Verfügbare Plugins durchsuchen.", - "gmail-transport": "E-Mails über einen Gmail/Google Apps Account verschicken", - "gmail-transport.username": "Benutzername", - "gmail-transport.username-help": "Gib die vollständige E-Mail Adresse hier ein, insbesondere wenn Du eine Google-Apps verwaltete Domain verwendest.", - "gmail-transport.password": "Passwort", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "E-Mail Vorlage bearbeiten", "template.select": "E-Mail Vorlage auswählen", "template.revert": "Original wiederherstellen", diff --git a/public/language/el/admin/settings/email.json b/public/language/el/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/el/admin/settings/email.json +++ b/public/language/el/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/en-US/admin/settings/email.json b/public/language/en-US/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/en-US/admin/settings/email.json +++ b/public/language/en-US/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/en-x-pirate/admin/settings/email.json b/public/language/en-x-pirate/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/en-x-pirate/admin/settings/email.json +++ b/public/language/en-x-pirate/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/es/admin/settings/email.json b/public/language/es/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/es/admin/settings/email.json +++ b/public/language/es/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/et/admin/settings/email.json b/public/language/et/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/et/admin/settings/email.json +++ b/public/language/et/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/fa-IR/admin/settings/email.json b/public/language/fa-IR/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/fa-IR/admin/settings/email.json +++ b/public/language/fa-IR/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/fi/admin/settings/email.json b/public/language/fi/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/fi/admin/settings/email.json +++ b/public/language/fi/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index 493427ed8c..c737ec5265 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "L'adresse e-mail suivante fait référence à l'adresse que le destinataire verra dans les champs \"De :\" et \"Répondre à :\". ", "from": "Nom de l’expéditeur", "from-help": "Le nom de l’expéditeur à afficher dans l'e-mail", - "gmail-routing": "Routing Gmail", - "gmail-routing-help1": "Il y a eu des rapports selon lesquels le routage Gmail ne fonctionne pas avec les comptes ayant une sécurité plus élevée. Dans ce cas vous devezconfiguer votre compte Gmail pour qu'il autorise les applications moins sécurisées.", - "gmail-routing-help2": "Pour plus d'information sur cette astuce, merci de consulter l'article de NodeMailer sur ce sujet. Une alternative serait d'utiliser un service tiers d'envoi d'email tel que SendGrid, Mailgun, etc. Afficher les plugins disponibles ici.", - "gmail-transport": "Router les e-mails via un compte Gmail/Google Apps", - "gmail-transport.username": "Nom d'utilisateur", - "gmail-transport.username-help": "Entrer l'adresse e-mail complète ici, surtout si vous utilisez un domaine géré par Google Apps.", - "gmail-transport.password": "Mot de passe", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Modifier le modèle d'e-mail", "template.select": "Sélectionner un modèle d'e-mail ", "template.revert": "Retourner à l'original", diff --git a/public/language/gl/admin/settings/email.json b/public/language/gl/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/gl/admin/settings/email.json +++ b/public/language/gl/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/hr/admin/settings/email.json b/public/language/hr/admin/settings/email.json index 67ef2941c5..072e8508ba 100644 --- a/public/language/hr/admin/settings/email.json +++ b/public/language/hr/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Sljedeća email adresa je adresa koju će primatelj vidjeti u \"Od\" i \"Odgovori na\" poljima.", "from": "Od imena", "from-help": "Ime prikazano u dolaznom emailu.", - "gmail-routing": "Gmail putanja", - "gmail-routing-help1": "Postoje prijave da je Gmail Routing onemogućen na računima sa povišenom sigurnosti. U tom slučaju morati ćete konfigurirati vaš GMail račun da dozvoljava manje sigurne aplikacije.", - "gmail-routing-help2": "Za više informacija o ovom rješenju href=\"https://nodemailer.com/using-gmail/\"> molimo pročitajte NodeMailer članak o tom problemu .Alternativa je korištenje email dodatak treće strane poput SendGrid,MailGun itd. Pretražite moguće email dodatke ovdje.", - "gmail-transport": "Prosljedite email kroz Gmail/Google Apps račun", - "gmail-transport.username": "Korisničko ime", - "gmail-transport.username-help": "Unesite punu email adresu ovdje,naročito ako koristite domenu upravljanu preko Google Appsa.", - "gmail-transport.password": "Lozinka", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Uredi predložak emaila", "template.select": "Odaberi predložak emaila", "template.revert": "Povrati na original ", diff --git a/public/language/hu/admin/settings/email.json b/public/language/hu/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/hu/admin/settings/email.json +++ b/public/language/hu/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/id/admin/settings/email.json b/public/language/id/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/id/admin/settings/email.json +++ b/public/language/id/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json index 625f6ca4d6..4439b1774d 100644 --- a/public/language/ja/admin/settings/email.json +++ b/public/language/ja/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "次の電子メールアドレスは「送信者」と「返信先」の欄に受信者が表示する電子メールを指します。", "from": "名前から", "from-help": "メールからの名前が表示されます。", - "gmail-routing": "Gmailのルーティング", - "gmail-routing-help1": "Gmailルーティングがセキュリティが強化されたアカウントでは機能しないという報告がありました。この場合、安全性の低いアプリを許可するようにGmailアカウントを設定する必要があります。", - "gmail-routing-help2": "この回避策の関連情報を参照するには、問題に関するこのNodeMailerの記事を参照してください。 代わりに、SendGrid、Mailgunなどのサードパーティ製電子メールプラグインを利用する方法もあります。利用可能なプラグインを参照する。", - "gmail-transport": "Gmail / Google Appsアカウントを使用してメールをルーティングする", - "gmail-transport.username": "ユーザー名", - "gmail-transport.username-help": "特にGoogle Appsの管理ドメインを使用している場合は、ここに完全なメールアドレスを入力してください。", - "gmail-transport.password": "パスワード", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "電子メールテンプレートの編集", "template.select": "電子メールテンプレートを選択", "template.revert": "オリジナルに戻す", diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json index c7f2f910a4..a9e349aa0c 100644 --- a/public/language/ko/admin/settings/email.json +++ b/public/language/ko/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "아래 이메일 주소는 수신인의 \"보낸 사람\"과 \"답장하기\" 항목에서 보이게 됩니다.", "from": "보낸 사람 이름", "from-help": "이메일에 표시할 보낸 사람 이름", - "gmail-routing": "Gmail 라우팅", - "gmail-routing-help1": "보안 설정이 강화된 Google 계정의 경우에는 Gmail 라우팅이 작동하지 않는다는 보고가 있었습니다. 그러한 경우에는, Gmail에서 보안 수준이 낮은 앱 허용을 사용해야 합니다.", - "gmail-routing-help2": "이 방법에 대한 더 자세한 정보는 이 문제에 관한 NodeMailer 기사를 참조 해주세요. 다른 대안으로는 SendGrid, Mailgun 등의 제 3의 이메일 플러그인을 사용하는 것이 있습니다. 여기서 가능한 플러그인을 검색해보세요.", - "gmail-transport": " 지메일/구글 계정을 통해 이메일을 라우팅", - "gmail-transport.username": "사용자명", - "gmail-transport.username-help": "구글 앱스와 연동된 도메인을 사용하신다면 특히, 이메일주소를 생략없이 적어주세요", - "gmail-transport.password": "패스워드", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "이메일 템플릿 수정", "template.select": "이메일 템플릿 선택", "template.revert": "수정 취소", diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/lt/admin/settings/email.json +++ b/public/language/lt/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/ms/admin/settings/email.json +++ b/public/language/ms/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/nb/admin/settings/email.json +++ b/public/language/nb/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/nl/admin/settings/email.json +++ b/public/language/nl/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json index 26f6e8a51d..4995bfa2b3 100644 --- a/public/language/pl/admin/settings/email.json +++ b/public/language/pl/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json index 7c648fd3f6..78f6443594 100644 --- a/public/language/pt-BR/admin/settings/email.json +++ b/public/language/pt-BR/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "O seguinte endereço de email se refere ao email que o recipiente verá nos campos \"De\" e \"Responder Para\".", "from": "Por Nome (From)", "from-help": "O nome de (from) para mostrar no email.", - "gmail-routing": "Roteamento do Gmail", - "gmail-routing-help1": "Tem havido rumores do Roteamento de Gmail não funcionar em contas como segurança fortalecida. Nestes cenários, você terá que configurar a sua conta de GMail para permitir apps menos seguras.\n", - "gmail-routing-help2": "Para mais informações sobre este workaround, por favor consulte artigo do NodeMailer sobre o assunto. Uma alternativa seria utilizar um plugin terceirizado de envio de emails tais como o SendGrid, Mailgun, etc. Explore os plugins disponíveis aqui.", - "gmail-transport": "Rotear emails através de uma conta do Gmail/Google Apps", - "gmail-transport.username": "Nome de Usuário", - "gmail-transport.username-help": "Entre com o endereço de email completo aqui, especialmente se você estiver usando um domínio administrado via Google Apps.", - "gmail-transport.password": "Senha", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Editar Modelo do Email", "template.select": "Escolher Modelo do Email", "template.revert": "Reverter ao Original", diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/pt-PT/admin/settings/email.json +++ b/public/language/pt-PT/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/ro/admin/settings/email.json +++ b/public/language/ro/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/ru/admin/manage/users.json b/public/language/ru/admin/manage/users.json index 150abcfb92..0af260521a 100644 --- a/public/language/ru/admin/manage/users.json +++ b/public/language/ru/admin/manage/users.json @@ -1,9 +1,9 @@ { - "users": "Users", - "edit": "Edit", - "make-admin": "Make Admin", - "remove-admin": "Remove Admin", - "validate-email": "Validate Email", + "users": "Пользователей", + "edit": "Редактировать", + "make-admin": "Сделать администратором", + "remove-admin": "Удалить администратора", + "validate-email": "Подтвердить адрес электронной почты", "send-validation-email": "Send Validation Email", "password-reset-email": "Send Password Reset Email", "ban": "Ban User(s)", diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/ru/admin/settings/email.json +++ b/public/language/ru/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/ru/success.json b/public/language/ru/success.json index 086fcfd701..c19af26e8a 100644 --- a/public/language/ru/success.json +++ b/public/language/ru/success.json @@ -1,7 +1,7 @@ { "success": "Успешно", "topic-post": "Запись была успешно создана", - "post-queued": "Your post is queued for approval.", + "post-queued": "Ваше сообщение помещено в очередь для одобрения.", "authentication-successful": "Авторизация выполнена успешно", "settings-saved": "Настройки сохранены" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 9851358016..ba4e4fcec0 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -13,9 +13,9 @@ "notify_me": "Подписаться на новые ответы", "quote": "Цитировать", "reply": "Ответить", - "replies_to_this_post": "%1 Replies", - "one_reply_to_this_post": "1 Reply", - "last_reply_time": "Last reply", + "replies_to_this_post": "%1 Ответов", + "one_reply_to_this_post": "1 Ответ", + "last_reply_time": "Последний ответ", "reply-as-topic": "Ответить, создав новую тему", "guest-login-reply": "Необходимо авторизоваться на сайте, чтобы оставить сообщение. Пожалуйста, зарегистрируйтесь или войдите на сайт.", "edit": "Редактировать", @@ -59,7 +59,7 @@ "thread_tools.unlock": "Открыть тему", "thread_tools.move": "Переместить тему", "thread_tools.move_all": "Переместить всё", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "Выберите категорию", "thread_tools.fork": "Создать дополнительную ветвь дискуссии", "thread_tools.delete": "Удалить тему", "thread_tools.delete-posts": "Удалить записи", diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 33bd08a5b1..40dad39d80 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -60,7 +60,7 @@ "username_taken_workaround": "Логин, который вы запросили, уже занят. Мы его немного изменили. Теперь ваш логин %1", "password_same_as_username": "Ваш пароль совпадает с именем пользователя, это очень небезопасно. Пожалуйста укажите другой пароль.", "password_same_as_email": "Ваш пароль совпадает с элетронной почтой, это очень небезопасно. Пожалуйста, укажите другой пароль.", - "weak_password": "Weak password.", + "weak_password": "Слабый пароль.", "upload_picture": "Загрузить фото", "upload_a_picture": "Загрузить фото", "remove_uploaded_picture": "Удалить фото", diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/rw/admin/settings/email.json +++ b/public/language/rw/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/sc/admin/settings/email.json +++ b/public/language/sc/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json index bae53dac5e..3900b02f72 100644 --- a/public/language/sk/admin/settings/email.json +++ b/public/language/sk/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/sl/admin/settings/email.json +++ b/public/language/sl/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json index 861b1f67f3..98d53d0cee 100644 --- a/public/language/sr/admin/settings/email.json +++ b/public/language/sr/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Označena email adresa se odnosi na email koga će primalac videti \"Od\" i \"Odgovori\" poljima.", "from": "Od koga", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail rutiranje", - "gmail-routing-help1": "Imamo izveštaje da Gmail rutiranje nije radilo na nalogu za povećanom bezbednošću. U takvom slučaju, moraćete da podesite Vaš GMail nalog da prihvati aplikacije sa manjom bezbednoću.", - "gmail-routing-help2": "Za više informacija o ovome, molimo konsultujte ovaj NodeMailer članak o ovom problemu. Alternativa bi bila da iskoristite \"third-party\" email plugin-ove kao što su SendGrid, Mailgun, itd. Pogledajte plugin-ove ovde.", - "gmail-transport": "Rutiraj email-ove kroz nalog Gmail/Google aplikacije.", - "gmail-transport.username": "Korisničko ime", - "gmail-transport.username-help": "Unesite punu email adresu ovde, pogotovo ako koristite Google aplikacije na upravljanom domenu.", - "gmail-transport.password": "Lozinka", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Promeni šablon Email-a", "template.select": "Izaberi šablon Email-a", "template.revert": "Vrati na Originalno podešavanje.", diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/sv/admin/settings/email.json +++ b/public/language/sv/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/th/admin/settings/email.json +++ b/public/language/th/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 1248b4e21d..6af6ddc763 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Kullanıcı Adı", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json index 4bf8f18180..cb043add64 100644 --- a/public/language/uk/admin/settings/email.json +++ b/public/language/uk/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "Отримувачі будуть бачити цю адресу в полях \"From\" та \"Reply To\".", "from": "Ім'я відправника", "from-help": "Ім'я відправника, що буде показано в електронних листах", - "gmail-routing": "Маршрутизація Gmail", - "gmail-routing-help1": "До нас надходили звіти про те, що маршрутизація Gmail не працює на аканутах з підвищеною безпекою. У таких випадках вам потрібно дозволити менш безпечні додатки у своєму Gmail акаунті.", - "gmail-routing-help2": "Щоб дізнатися більше про цей обхідний шлях, прочитайте цю статтю на NodeMailer. Альтернативою буде використання сторонніх плагінів для листування як то SendGrid, Mailgun, тощо. Переглянути наявні плагіни тут.", - "gmail-transport": "Маршрутизувати листи через акаунт Gmail або Google Apps", - "gmail-transport.username": "Ім'я користувача", - "gmail-transport.username-help": "Вкажіть тут повну електронну адресу, особливо якщо ви використовуєте керований домен Google Apps.", - "gmail-transport.password": "Пароль", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Редагувати шаблон листа", "template.select": "Обрати шаблон листа", "template.revert": "Повернути до оригіналу", diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json index 862ff359b9..1c41cdfb43 100644 --- a/public/language/zh-CN/admin/settings/email.json +++ b/public/language/zh-CN/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "下面的电子邮件地址代表收件人在“发件人”和“回复”中所看到的地址。", "from": "发送者", "from-help": "用于邮件中显示的发送者", - "gmail-routing": "Gmail 代发", - "gmail-routing-help1": "有报告称，Gmail 代发在安全性更高的账户上不工作。. 在这种情况下，你需要将您的Gmail帐户设为允许安全性较低的应用程式。", - "gmail-routing-help2": "有关此解决方法的详细信息， 请参阅此 NodeMailer 有关此问题的文章。 另一种方法是使用第三方电子邮件插件，如 SendGrid，Mailgun 等。在这里浏览可用的插件。", - "gmail-transport": "通过 Gmail / Google Apps 帐户代发电子邮件", - "gmail-transport.username": "用户名", - "gmail-transport.username-help": "请在这里输入完整的电子邮件地址，特别是如果您使用了 Google Apps 管理域。", - "gmail-transport.password": "密码", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "编辑电子邮件模板", "template.select": "选择电子邮件模板", "template.revert": "还原为初始模板", diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json index 1e92c88490..97696e1f44 100644 --- a/public/language/zh-TW/admin/settings/email.json +++ b/public/language/zh-TW/admin/settings/email.json @@ -4,13 +4,21 @@ "address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.", "from": "From Name", "from-help": "The from name to display in the email.", - "gmail-routing": "Gmail Routing", - "gmail-routing-help1": "There have been reports of Gmail Routing not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "gmail-routing-help2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "gmail-transport": "Route emails through a Gmail/Google Apps account", - "gmail-transport.username": "Username", - "gmail-transport.username-help": "Enter the full email address here, especially if you are using a Google Apps managed domain.", - "gmail-transport.password": "Password", + + "smtp-transport": "SMTP Transport", + "smtp-transport.enabled": "Use an external email server to send emails", + "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", + "smtp-transport.service": "Select a service", + "smtp-transport.service-custom": "Custom Service", + "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", + "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", + "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport.host": "SMTP Host", + "smtp-transport.port": "SMTP Port", + "smtp-transport.username": "Username", + "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", + "smtp-transport.password": "Password", + "template": "Edit Email Template", "template.select": "Select Email Template", "template.revert": "Revert to Original", From fdffaf9ed20e319c1e04ce198b225d31714bdda6 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 1 Sep 2017 19:29:03 -0400 Subject: [PATCH 15/25] re-organized ip blacklist page --- public/less/blacklist.less | 2 +- src/views/admin/manage/ip-blacklist.tpl | 38 +++++++++++-------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/public/less/blacklist.less b/public/less/blacklist.less index 30add959d5..d3724d85c2 100644 --- a/public/less/blacklist.less +++ b/public/less/blacklist.less @@ -1,6 +1,6 @@ #blacklist-rules { width: 100%; - height: 450px; + height: 357px; display: block; border: 1px solid #eee; padding: 5px 10px; diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl index e2378e5e5c..62d0446ec4 100644 --- a/src/views/admin/manage/ip-blacklist.tpl +++ b/src/views/admin/manage/ip-blacklist.tpl @@ -8,32 +8,11 @@

-
-
-
-
-
-
[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]
-
-
-
-
-
-
-
-
[[admin/manage/ip-blacklist:analytics.blacklist-daily]]
-
-
-
- -
-
- -
[[admin/manage/ip-blacklist:active-rules]]
+
@@ -54,6 +33,21 @@
+
+
+
+
+
+
[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]
+
+ +
+
+
+
+
[[admin/manage/ip-blacklist:analytics.blacklist-daily]]
+
+
From d4a11de07d22e902e9d462131c873a6cfc45ba25 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 1 Sep 2017 19:47:20 -0400 Subject: [PATCH 16/25] move blacklist.less into admin/manage/ip-blacklist.less --- public/less/admin/admin.less | 2 +- public/less/{blacklist.less => admin/manage/ip-blacklist.less} | 0 src/meta/css.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename public/less/{blacklist.less => admin/manage/ip-blacklist.less} (100%) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 0e4c590d00..124be23b5c 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -24,7 +24,7 @@ @import "./settings"; @import "../flags"; -@import "../blacklist"; +@import "./manage/ip-blacklist"; @import "./modules/alerts"; @import "./modules/selectable"; diff --git a/public/less/blacklist.less b/public/less/admin/manage/ip-blacklist.less similarity index 100% rename from public/less/blacklist.less rename to public/less/admin/manage/ip-blacklist.less diff --git a/src/meta/css.js b/src/meta/css.js index 7621f3b6dd..cf39d5f8f6 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -22,7 +22,7 @@ var buildImports = { '@import (inline) "../public/vendor/colorpicker/colorpicker.css";', '@import (inline) "../node_modules/cropperjs/dist/cropper.css";', '@import "../../public/less/flags.less";', - '@import "../../public/less/blacklist.less";', + '@import "../../public/less/admin/manage/ip-blacklist.less";', '@import "../../public/less/generics.less";', '@import "../../public/less/mixins.less";', '@import "../../public/less/global.less";', From 4628c2d2f476a1582d6a51834690830328be12c1 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 3 Sep 2017 09:23:09 +0000 Subject: [PATCH 17/25] Latest translations and fallbacks --- public/language/bg/admin/settings/email.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index b519703e08..9833fbb6bf 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -6,9 +6,9 @@ "from-help": "Името на изпращача, което да бъде показано в е-писмото.", "smtp-transport": "SMTP Transport", - "smtp-transport.enabled": "Use an external email server to send emails", - "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", - "smtp-transport.service": "Select a service", + "smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма", + "smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.", + "smtp-transport.service": "Изберете услуга", "smtp-transport.service-custom": "Custom Service", "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", From 7e82570e1f1561697fe87c41b61a9132e6d4d485 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 4 Sep 2017 09:23:30 +0000 Subject: [PATCH 18/25] Latest translations and fallbacks --- public/language/bg/admin/settings/email.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index 9833fbb6bf..2006b53886 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -5,19 +5,19 @@ "from": "Име за полето „От“", "from-help": "Името на изпращача, което да бъде показано в е-писмото.", - "smtp-transport": "SMTP Transport", + "smtp-transport": "Транспорт чрез SMTP", "smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма", "smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.", "smtp-transport.service": "Изберете услуга", - "smtp-transport.service-custom": "Custom Service", - "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", - "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.host": "SMTP Host", - "smtp-transport.port": "SMTP Port", - "smtp-transport.username": "Username", - "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", - "smtp-transport.password": "Password", + "smtp-transport.service-custom": "Персонализирана услуга", + "smtp-transport.service-help": "Изберете името на услугата по-горе, за да използвате известните данни за нея. Или изберете „Персонализирана услуга“ и въведете данните ѝ по-долу.", + "smtp-transport.gmail-warning1": "Има доклади, че услугата на Gmail не работи за акаунти с подсилена защита. В тези случаи ще трябва да настроите своя акаунт в GMail така, че да позволява използването на по-малко защитени приложения.", + "smtp-transport.gmail-warning2": "За повече информация относно това обиколно решение, моля, прегледайте тази статия за проблема в „NodeMailer“. Друго решение би било използването на добавка за е-поща от трета страна, като например „SendGrid“, „Mailgun“ и т.н. Вижте наличните добавки тук.", + "smtp-transport.host": "SMTP сървър", + "smtp-transport.port": "SMTP порт", + "smtp-transport.username": "Потребителско име", + "smtp-transport.username-help": "За услугата на Gmail, въведете пълния адрес на е-пощата тук, особено ако използвате управляван домейн на „Google Apps“.", + "smtp-transport.password": "Парола", "template": "Редактирана не шаблона за е-писма", "template.select": "Изберете шаблон за е-писма", From 61b0f0c4c39508cf59566a0c9c73a931f1fdbae0 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 6 Sep 2017 11:14:26 -0600 Subject: [PATCH 19/25] Catch uglify errors --- src/meta/minifier.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/meta/minifier.js b/src/meta/minifier.js index 4b64420701..a3e40d195a 100644 --- a/src/meta/minifier.js +++ b/src/meta/minifier.js @@ -230,23 +230,23 @@ function minifyJS(data, callback) { scripts[ref.filename] = ref.source; }); - try { - var minified = uglifyjs.minify(scripts, { - sourceMap: { - filename: data.filename, - url: data.filename + '.map', - includeSources: true, - }, - compress: false, - }); + var minified = uglifyjs.minify(scripts, { + sourceMap: { + filename: data.filename, + url: data.filename + '.map', + includeSources: true, + }, + compress: false, + }); - async.parallel([ - async.apply(fs.writeFile, data.destPath, minified.code), - async.apply(fs.writeFile, data.destPath + '.map', minified.map), - ], callback); - } catch (e) { - callback(e); + if (minified.error) { + return callback(minified.error); } + + async.parallel([ + async.apply(fs.writeFile, data.destPath, minified.code), + async.apply(fs.writeFile, data.destPath + '.map', minified.map), + ], callback); }); } actions.minifyJS = minifyJS; From 302f06df9519802d906cf4b553e314585f1bead9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 6 Sep 2017 15:08:51 -0400 Subject: [PATCH 20/25] fixes #5914 --- .../1.6.0/clear-stale-digest-template.js | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/upgrades/1.6.0/clear-stale-digest-template.js diff --git a/src/upgrades/1.6.0/clear-stale-digest-template.js b/src/upgrades/1.6.0/clear-stale-digest-template.js new file mode 100644 index 0000000000..8b7adeed4b --- /dev/null +++ b/src/upgrades/1.6.0/clear-stale-digest-template.js @@ -0,0 +1,31 @@ +'use strict'; + +var meta = require('../../meta'); + +var async = require('async'); +var crypto = require('crypto'); + +module.exports = { + name: 'Clearing stale digest templates that were accidentally saved as custom', + timestamp: Date.UTC(2017, 8, 6), + method: function (callback) { + var matches = [ + '112e541b40023d6530dd44df4b0d9c5d', // digest @ 75917e25b3b5ad7bed8ed0c36433fb35c9ab33eb + '110b8805f70395b0282fd10555059e9f', // digest @ 9b02bb8f51f0e47c6e335578f776ffc17bc03537 + '9538e7249edb369b2a25b03f2bd3282b', // digest @ 3314ab4b83138c7ae579ac1f1f463098b8c2d414 + ]; + + async.waterfall([ + async.apply(meta.configs.getFields, ['email:custom:digest']), + function (fieldset, next) { + var hash = fieldset['email:custom:digest'] ? crypto.createHash('md5').update(fieldset['email:custom:digest']).digest('hex') : null; + + if (matches.includes(hash)) { + meta.configs.remove('email:custom:digest', next); + } else { + setImmediate(next); + } + }, + ], callback); + }, +}; From 0b07068b13ad470c1cd3e74b4632ac25c469a07c Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 7 Sep 2017 09:23:30 +0000 Subject: [PATCH 21/25] Latest translations and fallbacks --- .../language/pt-BR/admin/extend/plugins.json | 6 ++--- .../pt-BR/admin/general/navigation.json | 2 +- .../pt-BR/admin/manage/ip-blacklist.json | 4 +-- public/language/pt-BR/admin/menu.json | 2 +- .../language/pt-BR/admin/settings/email.json | 26 +++++++++---------- .../pt-BR/admin/settings/general.json | 4 +-- .../language/pt-BR/admin/settings/post.json | 4 +-- public/language/pt-BR/notifications.json | 2 +- public/language/pt-BR/pages.json | 2 +- public/language/pt-BR/success.json | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/public/language/pt-BR/admin/extend/plugins.json b/public/language/pt-BR/admin/extend/plugins.json index 9f1ac9cfb4..0a29ecef33 100644 --- a/public/language/pt-BR/admin/extend/plugins.json +++ b/public/language/pt-BR/admin/extend/plugins.json @@ -45,7 +45,7 @@ "alert.incompatible": "Na

sua versão do NodeBB (v%1) o plugin pode ser atualizado até a sua v%2. Por favor atualize o seu NodeBB se você quiser instalar uma versão mais recente deste plugin.

", "alert.possibly-incompatible": "

Nenhuma Informação de Compatibilidade Encontrada

Este plugin não especificou uma versão específica para instalação dada a sua versão do NodeBB. A compatibilidade completa não pode ser garantid, e pode causar o seu NodeBB de não mais iniciar adequadamente.

Se ocorrer que o NodeBB não se inicie adequadamente:

$ ./nodebb reset plugin=\"%1\"

Continuar a instalação da última versão deste plugin?

", - "license.title": "Plugin License Information", - "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", - "license.cta": "Do you wish to continue with activating this plugin?" + "license.title": "Informação de Licença do Plugin", + "license.intro": "O plugin %1 está licenciado sob a %2. Por gentileza leia e entenda a licença antes de ativar este plugin.", + "license.cta": "Deseja continuar com a ativação deste plugin?" } diff --git a/public/language/pt-BR/admin/general/navigation.json b/public/language/pt-BR/admin/general/navigation.json index 72432c5c2b..a4a2d7b7b0 100644 --- a/public/language/pt-BR/admin/general/navigation.json +++ b/public/language/pt-BR/admin/general/navigation.json @@ -11,7 +11,7 @@ "only-admins": "Mostrar apenas para Administradores", "only-global-mods-and-admins": "Exibir apenas para Moderadores Globais e Administradores", "only-logged-in": "Mostrar apenas para usuários logados", - "only-guest": "Only display to guests", + "only-guest": "Mostrar apenas para visitantes", "open-new-window": "Abrir em uma nova janela", "installed-plugins-required": "Plugins Instalados Necessários:", diff --git a/public/language/pt-BR/admin/manage/ip-blacklist.json b/public/language/pt-BR/admin/manage/ip-blacklist.json index 454dc645de..20e19eea58 100644 --- a/public/language/pt-BR/admin/manage/ip-blacklist.json +++ b/public/language/pt-BR/admin/manage/ip-blacklist.json @@ -13,6 +13,6 @@ "alerts.applied-success": "Lista Negra Aplicada", - "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-hourly": "Figura 1 – Acessos na lista de bloqueio pot hora", + "analytics.blacklist-daily": "Figura 2 – Acessos na lista de bloqueio por dia" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/menu.json b/public/language/pt-BR/admin/menu.json index b45710eef0..b97836f043 100644 --- a/public/language/pt-BR/admin/menu.json +++ b/public/language/pt-BR/admin/menu.json @@ -12,7 +12,7 @@ "manage/tags": "Tags", "manage/users": "Usuários", "manage/registration": "Fila de Registro", - "manage/post-queue": "Post Queue", + "manage/post-queue": "Fileira da Posts", "manage/groups": "Grupos", "manage/ip-blacklist": "Lista Negra de IPs", diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json index 78f6443594..5831b45bea 100644 --- a/public/language/pt-BR/admin/settings/email.json +++ b/public/language/pt-BR/admin/settings/email.json @@ -5,19 +5,19 @@ "from": "Por Nome (From)", "from-help": "O nome de (from) para mostrar no email.", - "smtp-transport": "SMTP Transport", - "smtp-transport.enabled": "Use an external email server to send emails", - "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", - "smtp-transport.service": "Select a service", - "smtp-transport.service-custom": "Custom Service", - "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", - "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.host": "SMTP Host", - "smtp-transport.port": "SMTP Port", - "smtp-transport.username": "Username", - "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", - "smtp-transport.password": "Password", + "smtp-transport": "Trasporte por SMTP", + "smtp-transport.enabled": "Utilizar um servidor de email externo para enviar emails", + "smtp-transport-help": "Você pode escolher entre uma lista de serviços conhecidos ou adicioanr algum pessoal.", + "smtp-transport.service": "Escolha um serviço", + "smtp-transport.service-custom": "Serviço Personalizado", + "smtp-transport.service-help": "Escolha o nome de um serviço acima de modo a utilizar a informação conhecida sobre ele. Alternativamente, escolha 'Serviço Personalizado' e entre com os seus detalhes abaixo.", + "smtp-transport.gmail-warning1": "Houve relatos do serviço do Gmail não funcionar em contas com segurança aumentada. Nestes casos, você terá que configurar a sua contada do GMail para permitir apps menos seguros.", + "smtp-transport.gmail-warning2": "Para mais informação sobre este workaround, por gentileza consulte este artigo no NodeMailer sobre o assunto.. Uma alternativa seria utilizar um plugin de email terceirizado como o SendGrid, Maigun etc. . Explore pelos plugins disponíveis aqui.", + "smtp-transport.host": "Host SMTP", + "smtp-transport.port": "Porta SMTP", + "smtp-transport.username": "Nome de usuário", + "smtp-transport.username-help": "Para o serviço do Gmail, entre com o endereço de email completo aqui, especiamente se você estiver usando um domínio administrado pelo Google Apps.", + "smtp-transport.password": "Senha", "template": "Editar Modelo do Email", "template.select": "Escolher Modelo do Email", diff --git a/public/language/pt-BR/admin/settings/general.json b/public/language/pt-BR/admin/settings/general.json index 51f94f0ea2..20413a1002 100644 --- a/public/language/pt-BR/admin/settings/general.json +++ b/public/language/pt-BR/admin/settings/general.json @@ -2,8 +2,8 @@ "site-settings": "Configurações do Site", "title": "Título do Site", "title.url": "URL", - "title.url-placeholder": "The URL of the site title", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", + "title.url-placeholder": "A URL do título do site", + "title.url-help": "Quando o título é clicado, enviar os usuários para este endereço. Se deixado em branco, o usuário será enviado para o índice do fórum.", "title.name": "Nome da Sua Comunidade", "title.show-in-header": "Mostrar o Título do Site no Cabeçalho", "browser-title": "Título do Navegador", diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json index 4c03c6b7a0..550e2fce12 100644 --- a/public/language/pt-BR/admin/settings/post.json +++ b/public/language/pt-BR/admin/settings/post.json @@ -6,8 +6,8 @@ "sorting.most-votes": "Mais Votos", "sorting.topic-default": "Ordenação Padrão de Tópicos", "restrictions": "Restições de Postagem", - "restrictions.post-queue": "Enable post queue", - "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", + "restrictions.post-queue": "Ligar enfileiramento de posts", + "restrictions.post-queue-help": "Ligar o enfieiramento de posts colocará os posts de novos usuários numa fia por aprovação.", "restrictions.seconds-between": "Segundos entre Posts", "restrictions.seconds-between-new": "Segundos entre Posts para Novos Usuários", "restrictions.rep-threshold": "O tanto de reputação necessário para esta restrição ser retirada", diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index 038ab63ac5..555c8639aa 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1 lhe enviou um pedido de cadastro.", "new_register_multiple": "Há %1 pedidos de registro aguardando revisão.", "flag_assigned_to_you": "A Sinalização %1 foi desiganada para você", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "Post aguardando revisão", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", diff --git a/public/language/pt-BR/pages.json b/public/language/pt-BR/pages.json index 83ccc13436..d9d1bd7083 100644 --- a/public/language/pt-BR/pages.json +++ b/public/language/pt-BR/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "Ferramentas de Moderação", "flagged-content": "Conteúdo Sinalizado", "ip-blacklist": "Lista negra de IPs", - "post-queue": "Post Queue", + "post-queue": "Fila de Posts", "users/online": "Usuários Online", "users/latest": "Últimos Usuários", "users/sort-posts": "Usuários com mais posts", diff --git a/public/language/pt-BR/success.json b/public/language/pt-BR/success.json index 48bba91d32..a482ec700b 100644 --- a/public/language/pt-BR/success.json +++ b/public/language/pt-BR/success.json @@ -1,7 +1,7 @@ { "success": "Sucesso", "topic-post": "Você postou com sucesso.", - "post-queued": "Your post is queued for approval.", + "post-queued": "Seu post foi enfieirado para aprovação.", "authentication-successful": "Autenticação Bem-sucedida", "settings-saved": "Configurações salvas!" } \ No newline at end of file From a4532f011ac80bbbe4d0b78b97785a05050d1fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 7 Sep 2017 15:34:17 -0400 Subject: [PATCH 22/25] Blacklist fix (#5918) * closes #5917 * fix callback for upgrade script * delete key even if falsy, could be empty string * DRYer ternary --- src/meta/blacklist.js | 11 +++++++++-- src/upgrades/1.6.0/ipblacklist-fix.js | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/upgrades/1.6.0/ipblacklist-fix.js diff --git a/src/meta/blacklist.js b/src/meta/blacklist.js index 4a1eeeb71f..20f0e441ff 100644 --- a/src/meta/blacklist.js +++ b/src/meta/blacklist.js @@ -41,7 +41,7 @@ pubsub.on('blacklist:reload', Blacklist.load); Blacklist.save = function (rules, callback) { async.waterfall([ function (next) { - db.set('ip-blacklist-rules', rules, next); + db.setObject('ip-blacklist-rules', { rules: rules }, next); }, function (next) { Blacklist.load(next); @@ -51,7 +51,14 @@ Blacklist.save = function (rules, callback) { }; Blacklist.get = function (callback) { - db.get('ip-blacklist-rules', callback); + async.waterfall([ + function (next) { + db.getObject('ip-blacklist-rules', next); + }, + function (data, next) { + next(null, data && data.rules); + }, + ], callback); }; Blacklist.test = function (clientIp, callback) { diff --git a/src/upgrades/1.6.0/ipblacklist-fix.js b/src/upgrades/1.6.0/ipblacklist-fix.js new file mode 100644 index 0000000000..27afd49d97 --- /dev/null +++ b/src/upgrades/1.6.0/ipblacklist-fix.js @@ -0,0 +1,25 @@ +'use strict'; + +var async = require('async'); + +var db = require('../../database'); + +module.exports = { + name: 'Changing ip blacklist storage to object', + timestamp: Date.UTC(2017, 8, 7), + method: function (callback) { + var rules; + async.waterfall([ + function (next) { + db.get('ip-blacklist-rules', next); + }, + function (_rules, next) { + rules = _rules; + db.delete('ip-blacklist-rules', rules ? next : callback); + }, + function (next) { + db.setObject('ip-blacklist-rules', { rules: rules }, next); + }, + ], callback); + }, +}; From 9118323060567b5758b15422c8b6c23f51c88c40 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 8 Sep 2017 09:23:33 +0000 Subject: [PATCH 23/25] Latest translations and fallbacks --- public/language/de/admin/extend/plugins.json | 8 +-- .../language/de/admin/general/dashboard.json | 4 +- .../language/de/admin/general/navigation.json | 2 +- .../de/admin/manage/ip-blacklist.json | 4 +- public/language/de/admin/menu.json | 2 +- public/language/de/admin/settings/email.json | 22 +++---- .../language/de/admin/settings/general.json | 4 +- public/language/de/admin/settings/post.json | 4 +- .../language/de/admin/settings/uploads.json | 6 +- public/language/de/admin/settings/user.json | 6 +- public/language/de/notifications.json | 2 +- public/language/de/pages.json | 4 +- public/language/de/success.json | 2 +- .../language/tr/admin/advanced/database.json | 18 +++--- public/language/tr/admin/extend/plugins.json | 44 ++++++------- public/language/tr/admin/extend/rewards.json | 6 +- .../language/tr/admin/general/dashboard.json | 4 +- .../language/tr/admin/general/languages.json | 2 +- .../language/tr/admin/general/navigation.json | 12 ++-- .../language/tr/admin/manage/categories.json | 6 +- public/language/tr/admin/manage/groups.json | 30 ++++----- .../tr/admin/manage/registration.json | 2 +- public/language/tr/admin/manage/tags.json | 2 +- public/language/tr/admin/manage/users.json | 64 +++++++++---------- public/language/tr/admin/menu.json | 2 +- public/language/tr/admin/settings/email.json | 2 +- .../language/tr/admin/settings/general.json | 2 +- public/language/tr/admin/settings/group.json | 6 +- .../tr/admin/settings/notifications.json | 4 +- .../tr/admin/settings/reputation.json | 4 +- public/language/tr/admin/settings/user.json | 4 +- .../tr/admin/settings/web-crawler.json | 2 +- public/language/tr/email.json | 2 +- public/language/tr/global.json | 6 +- public/language/tr/groups.json | 2 +- public/language/tr/modules.json | 2 +- public/language/tr/notifications.json | 4 +- public/language/tr/pages.json | 2 +- public/language/tr/success.json | 2 +- public/language/tr/topic.json | 6 +- 40 files changed, 156 insertions(+), 156 deletions(-) diff --git a/public/language/de/admin/extend/plugins.json b/public/language/de/admin/extend/plugins.json index 741369872d..0a5309af6f 100644 --- a/public/language/de/admin/extend/plugins.json +++ b/public/language/de/admin/extend/plugins.json @@ -12,7 +12,7 @@ "reorder-plugins": "Plugins neu sortieren", "order-active": "Aktive Plugins sortieren", "dev-interested": "Daran interessiert selbst Plugins für NodeBB zu schreiben?", - "docs-info": "Full documentation regarding plugin authoring can be found in the NodeBB Docs Portal.", + "docs-info": "Die komplette Dokumentation zum erstellen von Plugins kann im NodeBB Docs Portal gefunden werden.", "order.description": "Bestimmte Plugins funktionieren optimal, wenn diese vor/nach anderen Plugins initialisiert werden.", "order.explanation": "Die Plugins werden in der hier spezifizierten Reihenfolge geladen, von oben nach unten", @@ -45,7 +45,7 @@ "alert.incompatible": "

NodeBB Version (v%1) ist nur für Aktualisierungen bis v%2 dieses Plugins bestimmt. Bitte aktualisiere NodeBB, wenn eine neuere Version dieses Plugins installiert werden soll.

", "alert.possibly-incompatible": "

Keine Kompatibilitätsinformationen gefunden

Dieses Plugin legte keine spezifische NodeBB version fest, welche für die Installation benötigt wird. Volle Kompatibilität kann nicht gewährleistet werden, was dazu führen könnte, dass ihr NodeBB nicht mehr korrekt startet.

Für den Fall, dass NodeBB nicht mehr ordnungsgemäß startet:

$ ./nodebb reset plugin=\"%1\"

Soll mit der installation der neuesten Version dieses Plugins fortgefahren werden?

", - "license.title": "Plugin License Information", - "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", - "license.cta": "Do you wish to continue with activating this plugin?" + "license.title": "Plugin-Lizenzinformation", + "license.intro": "Das Plugin %1is unter der %2 Lizenz lizenziert. Bitte ließ dir diese durch bevor du dieses Plugin aktivierst.", + "license.cta": "Willst du dieses Plugin wirklich aktivieren?" } diff --git a/public/language/de/admin/general/dashboard.json b/public/language/de/admin/general/dashboard.json index f4e54ec3ec..0ac3cfb243 100644 --- a/public/language/de/admin/general/dashboard.json +++ b/public/language/de/admin/general/dashboard.json @@ -23,8 +23,8 @@ "running-version": "Es läuft NodeBB v%1.", "keep-updated": "Stelle sicher, dass dein NodeBB immer auf dem neuesten Stand für die neuesten Sicherheits-Patches und Bug-fixes ist.", "up-to-date": "

NodeBB Version ist aktuell

", - "upgrade-available": "

A new version (v%1) has been released. Consider upgrading your NodeBB.

", - "prerelease-upgrade-available": "

This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.

", + "upgrade-available": "

Eine neue Version (v%1) ist erschienen. Erwäge NodeBB zu upgraden

", + "prerelease-upgrade-available": "

Du benutzt eine veraltete Vorabversion von NodeBB. eine neue Version (v%1) ist erschienen. Erwäge NodeBB zu upgraden.

", "prerelease-warning": "

Das ist eine pre-release Version von NodeBB. Es können ungewollte Fehler auftreten.

", "running-in-development": "Das Forum wurde im Entwicklermodus gestartet. Das Forum könnte potenziellen Gefahren ausgeliefert sein. Bitte kontaktiere den Systemadministrator.", diff --git a/public/language/de/admin/general/navigation.json b/public/language/de/admin/general/navigation.json index e589992ae9..6c2f32fe58 100644 --- a/public/language/de/admin/general/navigation.json +++ b/public/language/de/admin/general/navigation.json @@ -11,7 +11,7 @@ "only-admins": "Nur für Admins sichtbar", "only-global-mods-and-admins": "Nur für Globale Moderatoren und Admins sichtbar", "only-logged-in": "Nur für angemeldete Benutzer sichtbar", - "only-guest": "Only display to guests", + "only-guest": "Nur Gästen anzeigen", "open-new-window": "In neuem Fenster öffnen", "installed-plugins-required": "Benötigte installierte Plugins:", diff --git a/public/language/de/admin/manage/ip-blacklist.json b/public/language/de/admin/manage/ip-blacklist.json index 92456bd30e..f259d9db68 100644 --- a/public/language/de/admin/manage/ip-blacklist.json +++ b/public/language/de/admin/manage/ip-blacklist.json @@ -13,6 +13,6 @@ "alerts.applied-success": "Blacklist angewandt", - "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-hourly": "Figur 1 – Blacklist-Treffer pro Stunde", + "analytics.blacklist-daily": " Figur 2 – Blacklist-Treffer pro Tag" } \ No newline at end of file diff --git a/public/language/de/admin/menu.json b/public/language/de/admin/menu.json index 0b32e6e910..4bb3d2a47c 100644 --- a/public/language/de/admin/menu.json +++ b/public/language/de/admin/menu.json @@ -12,7 +12,7 @@ "manage/tags": "Tags", "manage/users": "Benutzer", "manage/registration": "Warteliste", - "manage/post-queue": "Post Queue", + "manage/post-queue": "Beitragswarteschlange", "manage/groups": "Gruppen", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index 56d72f72fb..280bd4209b 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -5,19 +5,19 @@ "from": "Name des Absenders", "from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.", - "smtp-transport": "SMTP Transport", - "smtp-transport.enabled": "Use an external email server to send emails", - "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", - "smtp-transport.service": "Select a service", - "smtp-transport.service-custom": "Custom Service", - "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select 'Custom Service' and enter the details below.", - "smtp-transport.gmail-warning1": "There have been reports of the Gmail service not working on accounts with heightened security. In those scenarios, you will have to configure your GMail account to allow less secure apps.", - "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", + "smtp-transport": "SMTP Konfiguration", + "smtp-transport.enabled": "Benutze einen externen Email-Server", + "smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.", + "smtp-transport.service": "Wähle einen Provider", + "smtp-transport.service-custom": "Benutzerdefiniert...", + "smtp-transport.service-help": "Wähle oben einen Provider aus um die bekannten informationen über diesen zu verwenden. Falls dein Provider nicht in der Liste sein sollte, wähle 'Benutzerdefiniert...' aus und gib die details manuell ein.", + "smtp-transport.gmail-warning1": "Es gab Berichte darüber, dass Gmail nicht mit Accounts mit erhöhten Sicherheitseinstellungen funktioniert. In diesem Fall wirst du deinen Gmail-Account configurieren müssen um den 'Zugriff weniger sicherer Apps' auf dein Konto zuzulassen.", + "smtp-transport.gmail-warning2": "Um mehr zu diesem Workaround zu erfahren, ließ dir bitten diesen NodeMailer Artikel zu diesem Problem durch. Eine Alternative wäre, Emailer-Plugins von dritten wie etwa SendGrid, Mailgun usw. zu verwenden. Verfügbare Plugins durchsuchen.", "smtp-transport.host": "SMTP Host", "smtp-transport.port": "SMTP Port", - "smtp-transport.username": "Username", - "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", - "smtp-transport.password": "Password", + "smtp-transport.username": "Benutzername", + "smtp-transport.username-help": "Bitte füge die komplette Email-Adresse für Gmail hier ein, insbesondere wenn du eine von Google Apps gemanagete domain verwendest.", + "smtp-transport.password": "Passwort", "template": "E-Mail Vorlage bearbeiten", "template.select": "E-Mail Vorlage auswählen", diff --git a/public/language/de/admin/settings/general.json b/public/language/de/admin/settings/general.json index 979ddb2470..de590afb18 100644 --- a/public/language/de/admin/settings/general.json +++ b/public/language/de/admin/settings/general.json @@ -2,8 +2,8 @@ "site-settings": "Forum Einstellungen", "title": "Forum Titel", "title.url": "URL", - "title.url-placeholder": "The URL of the site title", - "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", + "title.url-placeholder": "Die URL des Seitentitels", + "title.url-help": "Wenn der Titel angeklickt wird, werden Benutzer zu dieser Adresse geschickt, bei leerem Feld wird die Startseite verwendet.", "title.name": "Name Deiner Community", "title.show-in-header": "Titel im Header anzeigen", "browser-title": "Browser Titel", diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index 0857e8eecb..686b33012b 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -6,8 +6,8 @@ "sorting.most-votes": "Meiste Bewertungen", "sorting.topic-default": "Standardmäßige Themensortierung", "restrictions": "Posting beschränkungen", - "restrictions.post-queue": "Enable post queue", - "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", + "restrictions.post-queue": "Beitragswarteschlange verwenden", + "restrictions.post-queue-help": "Das verwenden der Beitragswarteschlange wird Beiträge von neuen Benutzern in eine Warteschlange zur Genehmigung setzen.", "restrictions.seconds-between": "Zeit zwischen der Erstellung von Beiträgen", "restrictions.seconds-between-new": "Zeit zwischen der Erstellung von Beiträgen für neue Nutzer", "restrictions.rep-threshold": "Vorrausgesetztes Ansehen um diese Beschränkung aufzuheben", diff --git a/public/language/de/admin/settings/uploads.json b/public/language/de/admin/settings/uploads.json index 2abafc014b..359d0f8c73 100644 --- a/public/language/de/admin/settings/uploads.json +++ b/public/language/de/admin/settings/uploads.json @@ -5,7 +5,7 @@ "max-image-width": "Bilder zu einer bestimmten Breite runterskalieren", "max-image-width-help": "(in Pixeln, standard 760 pixel, auf 0 setzen um zu deaktivieren)", "max-file-size": "Maximale Dateigröße (in KiB)", - "max-file-size-help": "(in kibibytes, default: 2048 KiB)", + "max-file-size-help": "(In Kibibytes, Standardmäßig 2048 KiB)", "allow-topic-thumbnails": "Nutzern erlauben Themen Thumbnails hochzuladen", "topic-thumb-size": "Thema Thumbnailgröße", "allowed-file-extensions": "Erlaubte Dateiendungen", @@ -18,9 +18,9 @@ "profile-image-dimension": "Profilbild-Abmessungen", "profile-image-dimension-help": "(in pixeln, standard: 128 pixel)", "max-profile-image-size": "Maximale Profibild-Dateigröße", - "max-profile-image-size-help": "(in kibibytes, default: 256 KiB)", + "max-profile-image-size-help": "(In Kibibytes, Standardmäßig 256 KiB)", "max-cover-image-size": "Maximale Deckbild-Dateigröße", - "max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)", + "max-cover-image-size-help": "(In Kibibytes, Standardmäßig 2048 KiB)", "keep-all-user-images": "Alte Avatar- und Deckbild-Versionen auf dem Server lassen", "profile-covers": "Profil Deckbilder", "default-covers": "Standard Profil-Deckbilder", diff --git a/public/language/de/admin/settings/user.json b/public/language/de/admin/settings/user.json index 31d04d849a..13809851b8 100644 --- a/public/language/de/admin/settings/user.json +++ b/public/language/de/admin/settings/user.json @@ -13,9 +13,9 @@ "disable-email-changes": "Deaktiviere Änderungen der E-Mail Adresse", "disable-password-changes": "Deaktiviere Änderungen des Passwortes", "allow-account-deletion": "Erlaube löschen des Kontos", - "user-info-private": "Hide user list and data from guests", - "hide-fullname": "Hide fullname from users", - "hide-email": "Hide email from users", + "user-info-private": "Die Benutzerliste mit Informationen vor Gästen verstecken", + "hide-fullname": "Den 'Kompletten Namen' von Benutzern verstecken", + "hide-email": "Die Email-Adresse von Benutzern verstecken", "themes": "Themes", "disable-user-skins": "Verhindere das Benutzer eigene Skins verwenden", "account-protection": "Kontosicherheit", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 2eeaa3c16b..3f29764fd0 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -41,7 +41,7 @@ "new_register": "%1 hat eine Registrationsanfrage geschickt.", "new_register_multiple": "Es erwarten %1 Registrierungsanfragen eine Überprüfung.", "flag_assigned_to_you": "Markierung %1 wurde Ihnen zugewiesen", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "Beitrag noch nicht Überprüft", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index 35f22415fd..1978c1b4a9 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -6,10 +6,10 @@ "popular-month": "Beliebte Themen dieses Monats", "popular-alltime": "Beliebteste Themen", "recent": "Neueste Themen", - "moderator-tools": "Moderator Tools", + "moderator-tools": "Moderator-Werkzeuge", "flagged-content": "Gemeldeter Inhalt", "ip-blacklist": "IP Blacklist", - "post-queue": "Post Queue", + "post-queue": "Beitragswarteschlange", "users/online": "Benutzer online", "users/latest": "Neuste Benutzer", "users/sort-posts": "Benutzer mit den meisten Beiträgen", diff --git a/public/language/de/success.json b/public/language/de/success.json index 8e56ce207b..a944624fc6 100644 --- a/public/language/de/success.json +++ b/public/language/de/success.json @@ -1,7 +1,7 @@ { "success": "Fertig", "topic-post": "Beitrag erfolgreich erstellt.", - "post-queued": "Your post is queued for approval.", + "post-queued": "Dein Beitrag wurde zur Genehmigung eingereicht", "authentication-successful": "Authentifizierung erfolgreich!", "settings-saved": "Einstellungen gespeichert!" } \ No newline at end of file diff --git a/public/language/tr/admin/advanced/database.json b/public/language/tr/admin/advanced/database.json index 39fccc540c..5345480c15 100644 --- a/public/language/tr/admin/advanced/database.json +++ b/public/language/tr/admin/advanced/database.json @@ -7,25 +7,25 @@ "mongo": "Mongo", "mongo.version": "MongoDB Sürümü", - "mongo.storage-engine": "Storage Engine", + "mongo.storage-engine": "Depolama Motoru", "mongo.collections": "Koleksiyonlar", "mongo.objects": "Objeler", - "mongo.avg-object-size": "Avg. Object Size", + "mongo.avg-object-size": "Ortalama Nesne Boyutu", "mongo.data-size": "Veri Boyutu", - "mongo.storage-size": "Storage Size", + "mongo.storage-size": "Depolama Boyutu", "mongo.index-size": "İndex Boyutu", "mongo.file-size": "Dosya Boyutu", "mongo.resident-memory": "Resident Memory", - "mongo.virtual-memory": "Virtual Memory", - "mongo.mapped-memory": "Mapped Memory", + "mongo.virtual-memory": "Sanal Hafıza", + "mongo.mapped-memory": "Planlanan Hafıza", "mongo.raw-info": "MongoDB Raw Info", "redis": "Redis", - "redis.version": "Redis Version", - "redis.connected-clients": "Connected Clients", + "redis.version": "Redis Versiyonu", + "redis.connected-clients": "Bağlı İstemciler", "redis.connected-slaves": "Connected Slaves", - "redis.blocked-clients": "Blocked Clients", - "redis.used-memory": "Used Memory", + "redis.blocked-clients": "Engellenen İstemciler", + "redis.used-memory": "Kullanılan Hafıza", "redis.memory-frag-ratio": "Memory Fragmentation Ratio", "redis.total-connections-recieved": "Total Connections Received", "redis.total-commands-processed": "Total Commands Processed", diff --git a/public/language/tr/admin/extend/plugins.json b/public/language/tr/admin/extend/plugins.json index 0f74d7bde9..dd2254be72 100644 --- a/public/language/tr/admin/extend/plugins.json +++ b/public/language/tr/admin/extend/plugins.json @@ -17,35 +17,35 @@ "order.description": "Certain plugins work ideally when they are initialised before/after other plugins.", "order.explanation": "Plugins load in the order specified here, from top to bottom", - "plugin-item.themes": "Themes", - "plugin-item.deactivate": "Deactivate", - "plugin-item.activate": "Activate", - "plugin-item.install": "Install", - "plugin-item.uninstall": "Uninstall", - "plugin-item.settings": "Settings", - "plugin-item.installed": "Installed", - "plugin-item.latest": "Latest", - "plugin-item.upgrade": "Upgrade", - "plugin-item.more-info": "For more information:", - "plugin-item.unknown": "Unknown", + "plugin-item.themes": "Temalar", + "plugin-item.deactivate": "Pasif", + "plugin-item.activate": "Aktif", + "plugin-item.install": "Yükle", + "plugin-item.uninstall": "Kaldır", + "plugin-item.settings": "Ayarlar", + "plugin-item.installed": "Yüklendi", + "plugin-item.latest": "Son", + "plugin-item.upgrade": "Güncelle", + "plugin-item.more-info": "Daha fazla bilgi için:", + "plugin-item.unknown": "Bilinmeyen", "plugin-item.unknown-explanation": "The state of this plugin could not be determined, possibly due to a misconfiguration error.", - "alert.enabled": "Plugin Enabled", - "alert.disabled": "Plugin Disabled", - "alert.upgraded": "Plugin Upgraded", - "alert.installed": "Plugin Installed", - "alert.uninstalled": "Plugin Uninstalled", - "alert.activate-success": "Please restart your NodeBB to fully activate this plugin", - "alert.deactivate-success": "Plugin successfully deactivated", - "alert.upgrade-success": "Please reload your NodeBB to fully upgrade this plugin", - "alert.install-success": "Plugin successfully installed, please activate the plugin.", - "alert.uninstall-success": "The plugin has been successfully deactivated and uninstalled.", + "alert.enabled": "Eklenti Aktif", + "alert.disabled": "Eklenti Devre dışı", + "alert.upgraded": "Eklendi Güncellendi", + "alert.installed": "Eklenti Kuruldu", + "alert.uninstalled": "Eklenti Kaldırıldı", + "alert.activate-success": "Bu eklentiyi tamamen aktif edebilmek için lütfen NodeBB'yi yeniden başlatın", + "alert.deactivate-success": "Eklenti başarıyla pasifleştirildi", + "alert.upgrade-success": "Bu eklentiyi tamamen güncelleyebilmek için lütfen NodeBB'yi yeniden başlatın", + "alert.install-success": "Eklenti başarıyla kuruldu, lütfen eklentiyi aktif edin.", + "alert.uninstall-success": "Eklenti başarıyla pasifleştirildi ve kaldırıldı.", "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", - "license.title": "Plugin License Information", + "license.title": "Eklenti Lisans Bilgisi", "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/tr/admin/extend/rewards.json b/public/language/tr/admin/extend/rewards.json index efbeadada9..454405a37f 100644 --- a/public/language/tr/admin/extend/rewards.json +++ b/public/language/tr/admin/extend/rewards.json @@ -4,14 +4,14 @@ "condition-is": "İse:", "condition-then": "Sonra:", "max-claims": "Amount of times reward is claimable", - "zero-infinite": "Enter 0 for infinite", + "zero-infinite": "Sınırsız için 0 girin", "delete": "Sil", "enable": "Etkinleştir", - "disable": "Devredışı", + "disable": "Devre dışı", "control-panel": "Ödül Kontrol", "new-reward": "Yeni Ödül", "alert.delete-success": "Ödül başarıyla silindi", - "alert.no-inputs-found": "Illegal reward - no inputs found!", + "alert.no-inputs-found": "Yasadışı ödül - giriş bulunamadı!", "alert.save-success": "Ödüller başarıyla kaydedildi" } \ No newline at end of file diff --git a/public/language/tr/admin/general/dashboard.json b/public/language/tr/admin/general/dashboard.json index 0ac42fe84b..e6a1c230d4 100644 --- a/public/language/tr/admin/general/dashboard.json +++ b/public/language/tr/admin/general/dashboard.json @@ -36,8 +36,8 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "Sistem Kontrol", - "reload": "Reload", - "restart": "Restart", + "reload": "Yeniden Yükle", + "restart": "Yeniden Başlat", "restart-warning": "NodeBB yeniden yüklemek veya yeniden başlatmak için mevcut tüm bağlantıları birkaç saniye düşürür.", "maintenance-mode": "Bakım Modu", "maintenance-mode-title": "NodeBB için bakım modunu ayarlamak için buraya tıklayın", diff --git a/public/language/tr/admin/general/languages.json b/public/language/tr/admin/general/languages.json index 9ca87d7776..5ca8e3ec08 100644 --- a/public/language/tr/admin/general/languages.json +++ b/public/language/tr/admin/general/languages.json @@ -1,6 +1,6 @@ { "language-settings": "Dil Ayarları", - "description": "The default language determines the language settings for all users who are visiting your forum.
Individual users can override the default language on their account settings page.", + "description": "Varsayılan dil, forumunuzu ziyaret eden tüm kullanıcılar için dil ayarlarını belirler.
Kullanıcılar, bireysel olarak hesap ayarları sayfasında varsayılan dili geçersiz kılabilir.", "default-language": "Varsayılan Dil", "auto-detect": "Ziyaretçiler için dili otomatik tespit et" } \ No newline at end of file diff --git a/public/language/tr/admin/general/navigation.json b/public/language/tr/admin/general/navigation.json index 58ee12ed62..b61a729249 100644 --- a/public/language/tr/admin/general/navigation.json +++ b/public/language/tr/admin/general/navigation.json @@ -15,14 +15,14 @@ "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", + "search-plugin": "Eklenti ara", - "btn.delete": "Delete", - "btn.disable": "Disable", - "btn.enable": "Enable", + "btn.delete": "Sil", + "btn.disable": "Devre dışı", + "btn.enable": "Etkin", "available-menu-items": "Available Menu Items", "custom-route": "Custom Route", - "core": "core", - "plugin": "plugin" + "core": "çekirdek", + "plugin": "eklenti" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index eb68238a46..05333b8155 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -22,7 +22,7 @@ "purge": "Kategoriyi Temizle", "enable": "Etkinleştir", - "disable": "Devredışı", + "disable": "Devre dışı", "edit": "Düzenle", "select-category": "Kategori Seç", @@ -52,14 +52,14 @@ "alert.created": "Yaratıldı", "alert.create-success": "Kategori başarıyla yaratıldı!", - "alert.none-active": "You have no active categories.", + "alert.none-active": "Aktif kategoriniz mevcut değil.", "alert.create": "Bir Kategori Yarat", "alert.confirm-moderate": "Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.", "alert.confirm-purge": "

Do you really want to purge this category \"%1\"?

Warning! All topics and posts in this category will be purged!

Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you'll want to \"disable\" the category instead.

", "alert.purge-success": "Category purged!", "alert.copy-success": "Ayarlar Kopyalandı!", "alert.set-parent-category": "Set Parent Category", - "alert.updated": "Updated Categories", + "alert.updated": "Güncellenen Kategoriler", "alert.updated-success": "Category IDs %1 successfully updated.", "alert.upload-image": "Kategori görseli yükle", "alert.find-user": "Bir Kullanıcı Ara", diff --git a/public/language/tr/admin/manage/groups.json b/public/language/tr/admin/manage/groups.json index f076da3bde..cb136c7c25 100644 --- a/public/language/tr/admin/manage/groups.json +++ b/public/language/tr/admin/manage/groups.json @@ -6,30 +6,30 @@ "edit": "Düzenle", "search-placeholder": "Ara", "create": "Grup Oluştur", - "description-placeholder": "A short description about your group", + "description-placeholder": "Grup hakkında kısa bir açıklama yazın", "create-button": "Oluştur", "alerts.create-failure": "Uh-Oh

There was a problem creating your group. Please try again later!

", "alerts.confirm-delete": "Are you sure you wish to delete this group?", - "edit.name": "Name", - "edit.description": "Description", - "edit.user-title": "Title of Members", - "edit.icon": "Group Icon", - "edit.label-color": "Group Label Color", - "edit.show-badge": "Show Badge", - "edit.private-details": "If enabled, joining of groups requires approval from a group owner.", + "edit.name": "İsim", + "edit.description": "Açıklama", + "edit.user-title": "Kullanıcıların Başlığı", + "edit.icon": "Grup Simgesi", + "edit.label-color": "Grubun Etiket Rengi", + "edit.show-badge": "Rozeti Göster", + "edit.private-details": "Gruba katılmak için, eğer etkinse grup sahibinin onayı gerekir.", "edit.private-override": "Warning: Private groups is disabled at system level, which overrides this option.", - "edit.disable-requests": "Disable join requests", - "edit.hidden": "Hidden", - "edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", - "edit.add-user": "Add User to Group", - "edit.add-user-search": "Search Users", - "edit.members": "Member List", + "edit.disable-requests": "Katılım isteklerini devre dışı bırak", + "edit.hidden": "Gizli", + "edit.hidden-details": "Bu grup eğer etkinse grup listelerinde bulunmaz, ve kullanıcılar bizzat davet eder", + "edit.add-user": "Gruba Kullanıcı Ekle", + "edit.add-user-search": "Kullanıcıları Ara", + "edit.members": "Üye Listesi", "control-panel": "Groups Control Panel", "revert": "Revert", "edit.no-users-found": "No Users Found", "edit.confirm-remove-user": "Are you sure you want to remove this user?", - "edit.save-success": "Changes saved!" + "edit.save-success": "Değişiklikler kaydedildi!" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/registration.json b/public/language/tr/admin/manage/registration.json index 649b24e36f..d42267957e 100644 --- a/public/language/tr/admin/manage/registration.json +++ b/public/language/tr/admin/manage/registration.json @@ -12,7 +12,7 @@ "invitations": "Invitations", "invitations.description": "Below is a complete list of invitations sent. Use ctrl-f to search through the list by email or username.

The username will be displayed to the right of the emails for users who have redeemed their invitations.", - "invitations.inviter-username": "Inviter Username", + "invitations.inviter-username": "Davet Edenin Kullanıcı Adı", "invitations.invitee-email": "Invitee Email", "invitations.invitee-username": "Invitee Username (if registered)", diff --git a/public/language/tr/admin/manage/tags.json b/public/language/tr/admin/manage/tags.json index bcde2fcadb..accb8b8dec 100644 --- a/public/language/tr/admin/manage/tags.json +++ b/public/language/tr/admin/manage/tags.json @@ -9,7 +9,7 @@ "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", - "name": "Tag Name", + "name": "Etiket Adı", "alerts.editing-multiple": "Editing multiple tags", "alerts.editing-x": "Editing \"%1\" tag", diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index 6cacd0e9b9..bf2bad33ca 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -11,54 +11,54 @@ "unban": "Unban User(s)", "reset-lockout": "Reset Lockout", "reset-flags": "Bayrakları Sıfırla", - "delete": "Delete User(s)", - "purge": "Delete User(s) and Content", + "delete": "Kullanıcı(ları) Sil", + "purge": "Kullanıcıyı(ları) ve İçeriği Sil", "download-csv": "Download CSV", "invite": "Invite", - "new": "New User", + "new": "Yeni Kullanıcı", - "pills.latest": "Latest Users", + "pills.latest": "En Yeni Kullanıcılar", "pills.unvalidated": "Not Validated", "pills.no-posts": "No Posts", "pills.top-posters": "Top Posters", "pills.top-rep": "Most Reputation", - "pills.inactive": "Inactive", + "pills.inactive": "Etkin değil", "pills.flagged": "Most Flagged", "pills.banned": "Yasaklandı", - "pills.search": "User Search", + "pills.search": "Kullanıcı Ara", - "search.username": "By User Name", - "search.username-placeholder": "Enter a username to search", - "search.email": "By Email", - "search.email-placeholder": "Enter a email to search", + "search.username": "Kullanıcı Adına Göre", + "search.username-placeholder": "Aramak için bir kullanıcı adı girin", + "search.email": "Eposta'ya göre", + "search.email-placeholder": "Aramak için bir eposta adresi girin", "search.ip": "By IP Address", "search.ip-placeholder": "Enter an IP Address to search", - "search.not-found": "User not found!", + "search.not-found": "Kullanıcı bulunamadı!", - "inactive.3-months": "3 months", - "inactive.6-months": "6 months", - "inactive.12-months": "12 months", + "inactive.3-months": "3 ay", + "inactive.6-months": "6 ay", + "inactive.12-months": "12 ay", "users.uid": "uid", - "users.username": "username", - "users.email": "email", + "users.username": "kullanıcı adı", + "users.email": "eposta", "users.postcount": "postcount", - "users.reputation": "reputation", - "users.flags": "flags", + "users.reputation": "saygınlık", + "users.flags": "bayraklar", "users.joined": "joined", - "users.last-online": "last online", + "users.last-online": "en son çevrimiçi", "users.banned": "banned", - "create.username": "User Name", - "create.email": "Email", - "create.email-placeholder": "Email of this user", - "create.password": "Password", - "create.password-confirm": "Confirm Password", + "create.username": "Kullanıcı Adı", + "create.email": "E-posta", + "create.email-placeholder": "Bu kullanıcının eposta adresi", + "create.password": "Parola", + "create.password-confirm": "Parolayı Onayla", "temp-ban.length": "Ban Length", "temp-ban.reason": "Reason (Optional)", - "temp-ban.hours": "Hours", - "temp-ban.days": "Days", + "temp-ban.hours": "Saat", + "temp-ban.days": "Gün", "temp-ban.explanation": "Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.", "alerts.confirm-ban": "Do you really want to ban this user permanently?", @@ -78,14 +78,14 @@ "alerts.confirm-delete": "Warning!
Do you really want to delete user(s)?
This action is not reversable! Only the user account will be deleted, their posts and topics will remain.", "alerts.delete-success": "User(s) Deleted!", "alerts.confirm-purge": "Warning!
Do you really want to delete user(s) and their content?
This action is not reversable! All user data and content will be erased!", - "alerts.create": "Create User", - "alerts.button-create": "Create", - "alerts.button-cancel": "Cancel", - "alerts.error-passwords-different": "Passwords must match!", + "alerts.create": "Kullanıcı Oluştur", + "alerts.button-create": "Oluştur", + "alerts.button-cancel": "İptal", + "alerts.error-passwords-different": "Şifreler aynı olmalı!", "alerts.error-x": "Error

%1

", - "alerts.create-success": "User created!", + "alerts.create-success": "Kullanıcı oluşturuldu!", "alerts.prompt-email": "Email: ", - "alerts.email-sent-to": "An invitation email has been sent to %1", + "alerts.email-sent-to": "%1'e bir davet maili gönderildi", "alerts.x-users-found": "%1 user(s) found! Search took %2 ms." } \ No newline at end of file diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json index 0449c7cd44..37a510d46d 100644 --- a/public/language/tr/admin/menu.json +++ b/public/language/tr/admin/menu.json @@ -8,7 +8,7 @@ "general/social": "Sosyal", "section-manage": "Yönet", - "manage/categories": "Categories", + "manage/categories": "Kategoriler", "manage/tags": "Etiketler", "manage/users": "Kullanıcılar", "manage/registration": "Registration Queue", diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 6af6ddc763..747c5157c3 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -15,7 +15,7 @@ "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", "smtp-transport.host": "SMTP Host", "smtp-transport.port": "SMTP Port", - "smtp-transport.username": "Username", + "smtp-transport.username": "Kullanıcı Adı", "smtp-transport.username-help": "For the Gmail service, enter the full email address here, especially if you are using a Google Apps managed domain.", "smtp-transport.password": "Password", diff --git a/public/language/tr/admin/settings/general.json b/public/language/tr/admin/settings/general.json index 577221dbd7..f2ce2f50fa 100644 --- a/public/language/tr/admin/settings/general.json +++ b/public/language/tr/admin/settings/general.json @@ -10,7 +10,7 @@ "browser-title-help": "If no browser title is specified, the site title will be used", "title-layout": "Title Layout", "title-layout-help": "Define how the browser title will be structured ie. {pageTitle} | {browserTitle}", - "description.placeholder": "A short description about your community", + "description.placeholder": "Topluluk hakkında kısa bir açıklama yazın", "description": "Site Açıklaması", "keywords": "Site Anahtar Kelimeler", "keywords-placeholder": "Keywords describing your community, comma-separated", diff --git a/public/language/tr/admin/settings/group.json b/public/language/tr/admin/settings/group.json index 91767214e6..d3483828f2 100644 --- a/public/language/tr/admin/settings/group.json +++ b/public/language/tr/admin/settings/group.json @@ -1,11 +1,11 @@ { "general": "Genel", "private-groups": "Gizli Grup", - "private-groups.help": "If enabled, joining of groups requires the approval of the group owner (Default: enabled)", + "private-groups.help": "Eğer etkinse, gruba katılmak için grup sahibinin onayı gerekir. (Normali: Etkin)", "private-groups.warning": "Beware! If this option is disabled and you have private groups, they automatically become public.", "allow-creation": "Allow Group Creation", - "allow-creation-help": "If enabled, users can create groups (Default: disabled)", - "max-name-length": "Maximum Group Name Length", + "allow-creation-help": "Eğer etkinse kullanıcılar grup oluşturabilir (Normali: Pasif)", + "max-name-length": "Maksimum Grup Adı Uzunluğu", "cover-image": "Group Cover Image", "default-cover": "Default Cover Images", "default-cover-help": "Add comma-separated default cover images for groups that don't have an uploaded cover image" diff --git a/public/language/tr/admin/settings/notifications.json b/public/language/tr/admin/settings/notifications.json index 578a947cf0..75279f7960 100644 --- a/public/language/tr/admin/settings/notifications.json +++ b/public/language/tr/admin/settings/notifications.json @@ -1,5 +1,5 @@ { "notifications": "Bildiriler", - "welcome-notification": "Hoşgeldin Bildirimi", - "welcome-notification-link": "Hoşgeldin Bildiri Bağlantısı" + "welcome-notification": "Hoş Geldin Bildirimi", + "welcome-notification-link": "Hoş Geldin Bildiri Bağlantısı" } \ No newline at end of file diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 76f75d840e..a0f7f93cbe 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -1,7 +1,7 @@ { "reputation": "Oylama Ayarları", - "disable": "Oylama Sistemini Devredışı", - "disable-down-voting": "Eksi oyu devredışı bırak", + "disable": "Oylama Sistemini Devre Dışı", + "disable-down-voting": "Eksi oyu devre dışı bırak", "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json index eb98c1ad78..b4ebfef02c 100644 --- a/public/language/tr/admin/settings/user.json +++ b/public/language/tr/admin/settings/user.json @@ -14,7 +14,7 @@ "disable-password-changes": "Parola değişikliği kapalı", "allow-account-deletion": "Hesap silmeye izin ver", "user-info-private": "Hide user list and data from guests", - "hide-fullname": "Hide fullname from users", + "hide-fullname": "Kullanıcı adını gizle", "hide-email": "Hide email from users", "themes": "Temalar", "disable-user-skins": "Prevent users from choosing a custom skin", @@ -48,7 +48,7 @@ "user-search-results-per-page": "Number of results to display", "default-user-settings": "Default User Settings", "show-email": "Email Göster", - "show-fullname": "Full Adı Göster", + "show-fullname": "Tam adı göster", "restrict-chat": "Only allow chat messages from users I follow", "outgoing-new-tab": "Open outgoing links in new tab", "topic-search": "Enable In-Topic Searching", diff --git a/public/language/tr/admin/settings/web-crawler.json b/public/language/tr/admin/settings/web-crawler.json index 06ad724d67..a3e94189ca 100644 --- a/public/language/tr/admin/settings/web-crawler.json +++ b/public/language/tr/admin/settings/web-crawler.json @@ -3,7 +3,7 @@ "robots-txt": "Özel Robots.txtVarsayılan olarak bırakmak için boş bırak", "sitemap-feed-settings": "Site Haritası & Besleyici Ayarları", "disable-rss-feeds": "RSS Besleyicilerini Devre dışı bırak", - "disable-sitemap-xml": "sitemap.xml devredışı bırak", + "disable-sitemap-xml": "sitemap.xml devre dışı bırak", "sitemap-topics": "Site Haritası'nda görüntülenecek başlıkların sayısı", "clear-sitemap-cache": "Site haritası çerezlerini temizle", "view-sitemap": "Site haritasını gör" diff --git a/public/language/tr/email.json b/public/language/tr/email.json index 5c1233f451..e1007b3b1a 100644 --- a/public/language/tr/email.json +++ b/public/language/tr/email.json @@ -1,6 +1,6 @@ { "password-reset-requested": "Parola Değiştirme İsteği Gönderildi", - "welcome-to": "Hoşgeldiniz", + "welcome-to": "Hoş geldin %1", "invite": "%1 sizi davet etti", "greeting_no_name": "Merhaba", "greeting_with_name": "Merhaba %1", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 747f0ca087..b308e3ed8e 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -16,7 +16,7 @@ "please_log_in": "Lütfen Giriş Yapınız", "logout": "Çıkış", "posting_restriction_info": "İleti gönderme sadece kayıtlı kullancılar içindir, giriş yapmak için buraya tıklayın.", - "welcome_back": "Tekrar Hoşgeldiniz", + "welcome_back": "Tekrar Hoş Geldiniz", "you_have_successfully_logged_in": "Başarıyla giriş yaptınız!", "save_changes": "Değişiklikleri kaydet", "save": "Kaydet", @@ -57,7 +57,7 @@ "upvoted": "Artı", "downvoters": "Eksi", "downvoted": "Eksi", - "views": "Görünüm", + "views": "Görüntülenme", "reputation": "Saygınlık", "read_more": "daha fazla oku", "more": "Daha Fazla", @@ -104,6 +104,6 @@ "cookies.accept": "Anladım!", "cookies.learn_more": "Daha Fazla", "edited": "Düzenlendi", - "disabled": "Devredışı", + "disabled": "Devre dışı", "select": "Seç" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index ccf4335579..e09205c7c3 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -25,7 +25,7 @@ "details.latest_posts": "En son iletiler", "details.private": "Özel", "details.disableJoinRequests": "Katılma isteklerini devre dışı bırak", - "details.grant": "Gurup sahibi yap/yapma", + "details.grant": "Grup Sahibi Yap/Kaldır", "details.kick": "Dışarı at", "details.kick_confirm": "Bu üyeyi bu gruptan silmek istediğinden emin misin?", "details.owner_options": "Grup Yöneticisi", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index 0ec408ba31..c105df535d 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -24,7 +24,7 @@ "composer.compose": "Yaz", "composer.show_preview": "Önizleme Göster", "composer.hide_preview": "Önizleme Sakla", - "composer.user_said_in": "%1 %2 içinde söyledi:", + "composer.user_said_in": "%1, içinde söyledi: %2", "composer.user_said": "%1 söyledi:", "composer.discard": "Bu iletiyi iptal etmek istediğinizden eminmisiniz?", "composer.submit_and_lock": "Gönder ve Kitle", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 11b9b13e10..339f380886 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -41,9 +41,9 @@ "new_register": "%1 kayıt olma isteği gönderdi.", "new_register_multiple": "Beklemede %1 kayıt olma isteği bulunmaktadır.", "flag_assigned_to_you": "Bayrak %1 size devredildi", - "post_awaiting_review": "Post awaiting review", + "post_awaiting_review": "İleti inceleme bekliyor", "email-confirmed": "E-posta onaylandı", - "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", + "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktif edildi.", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", "email-confirm-sent": "Onay e-postası gönderildi." } \ No newline at end of file diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index 4cf9619d5d..f3d2ca9d14 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -9,7 +9,7 @@ "moderator-tools": "Moderatör Araçları", "flagged-content": "Bayraklanan İçerik", "ip-blacklist": "IP Karaliste", - "post-queue": "Post Queue", + "post-queue": "İleti Kuyruğu", "users/online": "Çevrimiçi Kullanıcılar", "users/latest": "En Yeni Kullanıcılar", "users/sort-posts": "En çok ileti gönderen kullanıcılar", diff --git a/public/language/tr/success.json b/public/language/tr/success.json index 63075061fc..51c1263685 100644 --- a/public/language/tr/success.json +++ b/public/language/tr/success.json @@ -1,7 +1,7 @@ { "success": "Başarılı", "topic-post": "Başarıyla gönderim yaptınız.", - "post-queued": "Your post is queued for approval.", + "post-queued": "İletiniz onay için sıraya alındı.", "authentication-successful": "Doğrulama Başarılı", "settings-saved": "Ayarlar kaydoldu!" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 104e10c766..8eddbf3161 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -51,10 +51,10 @@ "watching.description": "Yeni bir ileti geldiğinde beni bildir.
Okunmamış olarak göster.", "not-watching.description": "Yeni bir ileti geldiğinde bildirme.
Kategori susturulmamışsa okunmamış olarak göster.", "ignoring.description": "Yeni bir ileti geldiğinde bildirme.
Okunmamış olarak gösterme.", - "thread_tools.title": "Konu Ayaları", + "thread_tools.title": "Konu Ayarları", "thread_tools.markAsUnreadForAll": "Hepsini okundu işaretle", - "thread_tools.pin": "Başlığı İğnele", - "thread_tools.unpin": "Başlığı İğneleme", + "thread_tools.pin": "Başlığı Sabitle", + "thread_tools.unpin": "Başlığı Sabitleme", "thread_tools.lock": "Başlığı Kitle", "thread_tools.unlock": "Başlığı Aç", "thread_tools.move": "Başlığı Taşı", From f7d78771f8c359021267bdc4a071ca7cfc8ac960 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 8 Sep 2017 11:12:31 -0400 Subject: [PATCH 24/25] fixes #5921 --- src/plugins/data.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/data.js b/src/plugins/data.js index ed81eed678..164fa8eb1c 100644 --- a/src/plugins/data.js +++ b/src/plugins/data.js @@ -196,7 +196,8 @@ function getScripts(pluginData, target, callback) { } var scripts = []; - async.each(input, function (filePath, next) { + async.eachSeries(input, function (filePath, next) { + console.log(filePath); resolveModulePath(pluginData.path, filePath, function (err, modulePath) { if (err) { return next(err); From 4976d1301358573f53862692c84ae3359fe040b7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 8 Sep 2017 11:25:45 -0400 Subject: [PATCH 25/25] removed console log --- src/plugins/data.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/data.js b/src/plugins/data.js index 164fa8eb1c..1fe4b2e861 100644 --- a/src/plugins/data.js +++ b/src/plugins/data.js @@ -197,7 +197,6 @@ function getScripts(pluginData, target, callback) { var scripts = []; async.eachSeries(input, function (filePath, next) { - console.log(filePath); resolveModulePath(pluginData.path, filePath, function (err, modulePath) { if (err) { return next(err);