diff --git a/public/language/ja/admin/extend/widgets.json b/public/language/ja/admin/extend/widgets.json
index 7a2e9e08a2..26df43c011 100644
--- a/public/language/ja/admin/extend/widgets.json
+++ b/public/language/ja/admin/extend/widgets.json
@@ -14,6 +14,6 @@
 
 	"alert.confirm-delete": "このウィジェットを削除してもよろしいですか？",
 	"alert.updated": "ウィジェットが更新されました。",
-	"alert.update-success": "Successfully updated widgets"
+	"alert.update-success": "ウィジェットを保存しました"
 
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/general/dashboard.json b/public/language/ja/admin/general/dashboard.json
index d7637651c0..c650f6043c 100644
--- a/public/language/ja/admin/general/dashboard.json
+++ b/public/language/ja/admin/general/dashboard.json
@@ -15,41 +15,41 @@
 	"running-version": "<strong>NodeBB v <span id = \"version\">％1 </ span> </ strong>を実行しています。",
 	"keep-updated": "常に最新のセキュリティパッチとバグ修正のためにNodeBBが最新であることを確認してください。",
 	"up-to-date": "<p>あなたは<strong>最新の状態</ strong>です。<i class = \"fa fa-check\"> </ i> </ p>",
-	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
-	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
+	"upgrade-available": "<p>新しいバージョン (v%1) がリリースされました。<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">NodeBBのアップグレード</a>を検討してください。</p>",
+	"prerelease-upgrade-available": "<p>これはNodeBBの旧リリースのバージョンです。新しいバージョン(v％1)がリリースされました。<a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\"> NodeBBのアップグレード</a>を検討してください。</ p>",
+	"prerelease-warning": "<p>これはNodeBBの<strong>プレリリース版</ strong>です。意図しないバグが発生することがあります。<i class=\"fa fa-exclamation-triangle\"></i></p>",
 
 	"notices": "通知",
 
-	"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",
-
-	"active-users": "Active Users",
-	"active-users.users": "Users",
-	"active-users.guests": "Guests",
-	"active-users.total": "Total",
-	"active-users.connections": "Connections",
-
-	"anonymous-registered-users": "Anonymous vs Registered Users",
-	"anonymous": "Anonymous",
-	"registered": "Registered",
-
-	"user-presence": "User Presence",
-	"on-categories": "On categories list",
-	"reading-posts": "Reading posts",
-	"browsing-topics": "Browsing topics",
-	"recent": "Recent",
-	"unread": "Unread",
-
-	"high-presence-topics": "High Presence Topics",
-
-	"graphs.page-views": "Page Views",
-	"graphs.unique-visitors": "Unique Visitors",
-	"graphs.registered-users": "Registered Users",
-	"graphs.anonymous-users": "Anonymous Users"
+	"control-panel": "システムコントロール",
+	"reload": "再読み込み",
+	"restart": "再起動",
+	"restart-warning": "NodeBBを再読み込み、または再起動すると、数秒間既存の接続がすべて破棄されます。",
+	"maintenance-mode": "メンテナンスモード",
+	"maintenance-mode-title": "NodeBBのメンテナンスモードを設定するには、ここをクリックしてください",
+	"realtime-chart-updates": "リアルタイムチャートの更新",
+
+	"active-users": "アクティブユーザー",
+	"active-users.users": "ユーザー",
+	"active-users.guests": "ゲスト",
+	"active-users.total": "総合",
+	"active-users.connections": "接続",
+
+	"anonymous-registered-users": "匿名 vs 登録ユーザー",
+	"anonymous": "匿名",
+	"registered": "登録数",
+
+	"user-presence": "ユーザープレゼンス",
+	"on-categories": "カテゴリ一覧",
+	"reading-posts": "記事を読む",
+	"browsing-topics": "スレッドを閲覧",
+	"recent": "最近",
+	"unread": "未読",
+
+	"high-presence-topics": "ハイプレゼンススレッド",
+
+	"graphs.page-views": "ページビュー",
+	"graphs.unique-visitors": "ユニークな訪問者",
+	"graphs.registered-users": "登録したユーザー",
+	"graphs.anonymous-users": "匿名ユーザー"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/general/navigation.json b/public/language/ja/admin/general/navigation.json
index d14c3370f0..60aeb2a5c5 100644
--- a/public/language/ja/admin/general/navigation.json
+++ b/public/language/ja/admin/general/navigation.json
@@ -16,12 +16,12 @@
 	"installed-plugins-required": "インストール済みのプラグインが必要です:",
 	"search-plugin": "検索プラグイン",
 
-	"btn.delete": "Delete",
-	"btn.disable": "Disable",
+	"btn.delete": "削除",
+	"btn.disable": "無効",
 	"btn.enable": "有効",
 
 	"available-menu-items": "利用可能なメニューアイテム",
-	"custom-route": "Custom Route",
-	"core": "core",
-	"plugin": "plugin"
+	"custom-route": "カスタムルート",
+	"core": "コア",
+	"plugin": "プラグイン"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json
index 4efaca1f9c..03a889ab0b 100644
--- a/public/language/ja/admin/manage/categories.json
+++ b/public/language/ja/admin/manage/categories.json
@@ -1,8 +1,8 @@
 {
-	"settings": "カテゴリー設定",
+	"settings": "カテゴリ設定",
 	"privileges": "特権",
 
-	"name": "カテゴリー名",
+	"name": "カテゴリ名",
 	"description": "カテゴリの説明",
 	"bg-color": "背景色",
 	"text-color": "テキストカラー",
@@ -12,57 +12,57 @@
 	"ext-link": "外部リンク",
 	"upload-image": "画像をアップロード",
 	"delete-image": "削除",
-	"category-image": "カテゴリー画像",
+	"category-image": "カテゴリ画像",
 	"parent-category": "親カテゴリ",
-	"optional-parent-category": "(Optional) Parent Category",
-	"parent-category-none": "(None)",
+	"optional-parent-category": "(任意)親カテゴリ",
+	"parent-category-none": "(無い)",
 	"copy-settings": "設定をコピー",
 	"optional-clone-settings": "カテゴリからのクローン設定(任意)",
-	"purge": "Purge Category",
+	"purge": "カテゴリを切り離す",
 
-	"enable": "Enable",
-	"disable": "Disable",
-	"edit": "Edit",
+	"enable": "有効",
+	"disable": "無効",
+	"edit": "編集",
 
-	"select-category": "Select Category",
-	"set-parent-category": "Set Parent Category",
+	"select-category": "カテゴリを選択",
+	"set-parent-category": "親カテゴリとして設定",
 
-	"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": "<strong>Note</strong>: 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.inherit": "If the <code>registered-users</code> group is granted a specific privilege, all other groups receive an <strong>implicit privilege</strong>, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the <code>registered-users</code> user group, and so, privileges for additional groups need not be explicitly granted.",
+	"privileges.description": "このセクションでは、このカテゴリのアクセス制御権限を設定できます。権限は、ユーザー単位またはグループ単位で付与できます。新しいユーザーをこのテーブルに追加するには、以下のフォームで検索します。",
+	"privileges.warning": "<strong>注</ strong>:特権の設定はすぐに有効になります。これらの設定を調整した後は、カテゴリを保存する必要はありません。",
+	"privileges.section-viewing": "特権の表示",
+	"privileges.section-posting": "権限の譲渡",
+	"privileges.section-moderation": "モデレート特権",
+	"privileges.section-user": "ユーザー",
+	"privileges.search-user": "ユーザーを追加",
+	"privileges.no-users": "このカテゴリにはユーザー固有の権限はありません。",
+	"privileges.section-group": "グループ",
+	"privileges.group-private": "このグループはプライベートです",
+	"privileges.search-group": "グループを追加",
+	"privileges.copy-to-children": "子要素にコピーする",
+	"privileges.copy-from-category": "カテゴリからのコピー",
+	"privileges.inherit": "<code>登録済ユーザー</ code>グループに特定の権限が与えられている場合、他のすべてのグループはたとえ明示的に定義/検査されていなくても<strong>暗黙の特権</ strong>があります。すべてのユーザーは<code>登録済ユーザー</code>のユーザーグループの一部で、この暗黙の特権が表示されるため、追加グループの特権を明示的に付与する必要はありません。",
 
-	"analytics.back": "Back to Categories List",
-	"analytics.title": "Analytics for \"%1\" category",
-	"analytics.pageviews-hourly": "<strong>Figure 1</strong> &ndash; Hourly page views for this category</small>",
-	"analytics.pageviews-daily": "<strong>Figure 2</strong> &ndash; Daily page views for this category</small>",
-	"analytics.topics-daily": "<strong>Figure 3</strong> &ndash; Daily topics created in this category</small>",
-	"analytics.posts-daily": "<strong>Figure 4</strong> &ndash; Daily posts made in this category</small>",
+	"analytics.back": "カテゴリ一覧に戻る",
+	"analytics.title": "カテゴリ\"%1\"のアナリティクス",
+	"analytics.pageviews-hourly": "<strong>図 1</strong> &ndash;このカテゴリの時間別ページビュー</small>",
+	"analytics.pageviews-daily": "<strong>図2 </ strong>＆ndash;このカテゴリの日ごとのページビュー数</ small>",
+	"analytics.topics-daily": "<strong>図3 </ strong>＆ndash;このカテゴリで作成された日別のスレッド</ small>",
+	"analytics.posts-daily": "<strong>図4 </ strong>＆ndash;このカテゴリで作成された日ごとの投稿</ small>",
 
-	"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": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
-	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
-	"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.user-search": "Search for a user here...",
-	"alert.find-group": "Find a Group",
-	"alert.group-search": "Search for a group here..."
+	"alert.created": "作成されました",
+	"alert.create-success": "カテゴリが正常に作成されました!",
+	"alert.none-active": "アクティブなカテゴリがありません。",
+	"alert.create": "カテゴリを作成",
+	"alert.confirm-moderate": "<strong>このユーザーグループに管理権限を付与してもよろしいですか？</strong>このグループは一般公開されており、任意のユーザーが自由に参加できます。",
+	"alert.confirm-purge": "<p class=\"lead\">本当にこのカテゴリ \"％1\"を切り離しますか？</p><h5><strong class=\"text-danger\">警告!</strong>このカテゴリのすべてのスレッドと投稿が削除されます。</h5> <p class=\"help-block\">カテゴリをパージすると、すべてのスレッドと投稿が削除され、データベースからカテゴリが削除されます。<em>一時的に</ em>カテゴリを削除する場合は、代わりにカテゴリを無効にすることをおすすめします。</p>",
+	"alert.purge-success": "カテゴリが切り離されました！",
+	"alert.copy-success": "設定をコピーしました。",
+	"alert.set-parent-category": "親カテゴリとして設定",
+	"alert.updated": "カテゴリが更新されました",
+	"alert.updated-success": "カテゴリID％1が正常に更新されました。",
+	"alert.upload-image": "カテゴリ画像をアップロード",
+	"alert.find-user": "ユーザーの検索",
+	"alert.user-search": "ここでユーザーを検索...",
+	"alert.find-group": "グループを探す",
+	"alert.group-search": "ここでグループを検索する..."
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/flags.json b/public/language/ja/admin/manage/flags.json
index 40f6826a26..0b127a26ca 100644
--- a/public/language/ja/admin/manage/flags.json
+++ b/public/language/ja/admin/manage/flags.json
@@ -13,7 +13,7 @@
 	"read-more": "続きを読む",
 	"flagged-x-times": "この投稿には％1回のフラグが設定されています(s):",
 	"dismiss": "このフラグを却下する",
-	"delete-post": "Delete the Post",
+	"delete-post": "投稿を削除",
 
-	"alerts.confirm-delete-post": "Do you really want to delete this post?"
+	"alerts.confirm-delete-post": "本当にこの投稿を削除しますか？"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/groups.json b/public/language/ja/admin/manage/groups.json
index 6f43233a01..56aaeaa1d4 100644
--- a/public/language/ja/admin/manage/groups.json
+++ b/public/language/ja/admin/manage/groups.json
@@ -15,20 +15,20 @@
 	"edit.description": "説明",
 	"edit.user-title": "メンバーのタイトル",
 	"edit.icon": "グループアイコン",
-	"edit.label-color": "Group Label Color",
+	"edit.label-color": "グループのラベル色",
 	"edit.show-badge": "バッジを表示",
-	"edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
+	"edit.private-details": "有効になっている場合、グループの参加にはグループオーナーの承認が必要です。",
 	"edit.private-override": "警告:プライベートグループはシステムレベルで無効になっており、このオプションは無効になります。",
-	"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",
-	"control-panel": "Groups Control Panel",
-	"revert": "Revert",
+	"edit.disable-requests": "参加申請を無効にする",
+	"edit.hidden": "非表示",
+	"edit.hidden-details": "有効の場合、このグループはグループ一覧で発見することは出来ず、ユーザーが手動で招待する必要があります。",
+	"edit.add-user": "グループにユーザーを追加",
+	"edit.add-user-search": "ユーザー検索",
+	"edit.members": "メンバー一覧",
+	"control-panel": "グループのコントロールパネル",
+	"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.no-users-found": "ユーザーが見つかりません",
+	"edit.confirm-remove-user": "このユーザーを削除してもよろしいですか？",
+	"edit.save-success": "設定を保存しました。"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/registration.json b/public/language/ja/admin/manage/registration.json
index 2b6ae0756a..77f1fde08b 100644
--- a/public/language/ja/admin/manage/registration.json
+++ b/public/language/ja/admin/manage/registration.json
@@ -16,5 +16,5 @@
 	"invitations.invitee-email": "招待メール",
 	"invitations.invitee-username": "招待されたユーザー名(登録されている場合)",
 
-	"invitations.confirm-delete": "Are you sure you wish to delete this invitation?"
+	"invitations.confirm-delete": "この招待状を削除してもよろしいですか？"
 } 
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/tags.json b/public/language/ja/admin/manage/tags.json
index 2ae8e5859c..2639e71b65 100644
--- a/public/language/ja/admin/manage/tags.json
+++ b/public/language/ja/admin/manage/tags.json
@@ -14,5 +14,5 @@
 	"alerts.editing-multiple": "複数のタグを編集する",
 	"alerts.editing-x": "\"％1\"のタグを編集",
 	"alerts.confirm-delete": "選択したタグを削除しますか？",
-	"alerts.update-success": "Tag Updated!"
+	"alerts.update-success": "タグが更新されました!"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/manage/users.json b/public/language/ja/admin/manage/users.json
index 0520322ad4..93474055c7 100644
--- a/public/language/ja/admin/manage/users.json
+++ b/public/language/ja/admin/manage/users.json
@@ -13,79 +13,79 @@
 	"reset-flags": "最近のフラグ",
 	"delete": "ユーサー(s)を削除します",
 	"purge": "ユーザー(s)とコンテンツを削除する",
-	"download-csv": "Download CSV",
+	"download-csv": "CSVでダウンロード",
 	"invite": "招待",
 	"new": "新しいユーザー",
 
 	"pills.latest": "新しいユーザー",
-	"pills.unvalidated": "Not Validated",
-	"pills.no-posts": "No Posts",
-	"pills.top-posters": "Top Posters",
-	"pills.top-rep": "Most Reputation",
-	"pills.inactive": "Inactive",
-	"pills.flagged": "Most Flagged",
-	"pills.banned": "Banned",
-	"pills.search": "User Search",
+	"pills.unvalidated": "検証されていない",
+	"pills.no-posts": "投稿がありません",
+	"pills.top-posters": "最も投稿したユーザー",
+	"pills.top-rep": "最も評価されたユーザー",
+	"pills.inactive": "非アクティブ",
+	"pills.flagged": "最もフラグが付けられたもの",
+	"pills.banned": "BANされた",
+	"pills.search": "ユーザーを検索",
 
-	"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.ip": "By IP Address",
-	"search.ip-placeholder": "Enter an IP Address to search",
-	"search.not-found": "User not found!",
+	"search.username": "ユーザー名別",
+	"search.username-placeholder": "検索するユーザー名を入力してください",
+	"search.email": "Eメール別",
+	"search.email-placeholder": "検索するメールアドレスを入力してください",
+	"search.ip": "IP アドレス別",
+	"search.ip-placeholder": "検索するIPアドレスを入力してください",
+	"search.not-found": "ユーザーが見つかりません!",
 
-	"inactive.3-months": "3 months",
-	"inactive.6-months": "6 months",
-	"inactive.12-months": "12 months",
+	"inactive.3-months": "3ヶ月",
+	"inactive.6-months": "6ヶ月",
+	"inactive.12-months": "12ヶ月",
 
-	"users.uid": "uid",
-	"users.username": "username",
-	"users.email": "email",
-	"users.postcount": "postcount",
-	"users.reputation": "reputation",
-	"users.flags": "flags",
-	"users.joined": "joined",
-	"users.last-online": "last online",
-	"users.banned": "banned",
+	"users.uid": "ユーザーID",
+	"users.username": "ユーザー名",
+	"users.email": "メール",
+	"users.postcount": "投稿カウント",
+	"users.reputation": "評価",
+	"users.flags": "フラグ",
+	"users.joined": "参加",
+	"users.last-online": "最後オンライン",
+	"users.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": "ユーザー名",
+	"create.email": "メール",
+	"create.email-placeholder": "このユーザーのメール",
+	"create.password": "パスワード",
+	"create.password-confirm": "パスワードを確認",
 
-	"temp-ban.length": "Ban Length",
-	"temp-ban.reason": "Reason <span class=\"text-muted\">(Optional)</span>",
-	"temp-ban.hours": "Hours",
-	"temp-ban.days": "Days",
-	"temp-ban.explanation": "Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.",
+	"temp-ban.length": "BANの長さ",
+	"temp-ban.reason": "理由<span class = \"text-muted\">(任意)</ span>",
+	"temp-ban.hours": "時間",
+	"temp-ban.days": "日",
+	"temp-ban.explanation": "禁止期間の長さを入力します。0にすると永久に禁止と解釈されますのでご注意ください。",
 
-	"alerts.confirm-ban": "Do you really want to ban this user <strong>permanently</strong>?",
-	"alerts.confirm-ban-multi": "Do you really want to ban these users <strong>permanently</strong>?",
-	"alerts.ban-success": "User(s) banned!",
-	"alerts.button-ban-x": "Ban %1 user(s)",
-	"alerts.unban-success": "User(s) unbanned!",
-	"alerts.lockout-reset-success": "Lockout(s) reset!",
-	"alerts.flag-reset-success": "Flags(s) reset!",
-	"alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!",
-	"alerts.make-admin-success": "User(s) are now administrators.",
-	"alerts.confirm-remove-admin": "Do you really want to remove admins?",
-	"alerts.remove-admin-success": "User(s) are no longer administrators.",
-	"alerts.confirm-validate-email": "Do you want to validate email(s) of these user(s)?",
-	"alerts.validate-email-success": "Emails validated",
-	"alerts.password-reset-confirm": "Do you want to send password reset email(s) to these user(s)?",
-	"alerts.confirm-delete": "<b>Warning!</b><br/>Do you really want to delete user(s)?<br/> 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": "<b>Warning!</b><br/>Do you really want to delete user(s) and their content?<br/> 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.error-x": "<strong>Error</strong><p>%1</p>",
-	"alerts.create-success": "User created!",
+	"alerts.confirm-ban": "あなたは本当にこのユーザーを<strong>永久に</strong>禁止しますか？",
+	"alerts.confirm-ban-multi": "あなたは本当にこれらのユーザーを<strong>恒久的に</ strong>禁止しますか？",
+	"alerts.ban-success": "ユーザー(s)は停止されました!",
+	"alerts.button-ban-x": "Banされた %1 ユーザー(s)",
+	"alerts.unban-success": "ユーザー(s)は禁止されています！",
+	"alerts.lockout-reset-success": "ロックアウト(s)がリセットされました!",
+	"alerts.flag-reset-success": "フラグ(s)をリセット!",
+	"alerts.no-remove-yourself-admin": "あなたは管理者なので自分自身を削除することはできません!",
+	"alerts.make-admin-success": "ユーザー(s)は、現在管理者です。",
+	"alerts.confirm-remove-admin": "本当に管理者を削除しますか？",
+	"alerts.remove-admin-success": "ユーザー(s)はもはや管理者ではありません。",
+	"alerts.confirm-validate-email": "これらのユーザー(s)の電子メール(s)を検証しますか?",
+	"alerts.validate-email-success": "電子メールが検証されました",
+	"alerts.password-reset-confirm": "これらのユーザー(s)にパスワードリセットのメール(s)を送信しますか？",
+	"alerts.confirm-delete": "<b>警告！</b><br/>本当にユーザー(s)を削除しますか？<br/>この操作は元に戻すことはできません！ユーザーアカウントのみが削除され、投稿とスレッドは残ります。",
+	"alerts.delete-success": "ユーザー(s)は削除されました!",
+	"alerts.confirm-purge": "<b>警告！</b><br/>本当にユーザー(s)とそのコンテンツを削除しますか？<br/>この操作は元に戻すことはできません。すべてのユーザーデータとコンテンツが消去されます。",
+	"alerts.create": "ユーザーを作成",
+	"alerts.button-create": "作成",
+	"alerts.button-cancel": "キャンセル",
+	"alerts.error-passwords-different": "パスワードが一致する必要があります!",
+	"alerts.error-x": "<strong>エラー</strong><p>%1</p>",
+	"alerts.create-success": "ユーザーが作成されました!",
 
-	"alerts.prompt-email": "Email: ",
-	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.prompt-email": "メール:",
+	"alerts.email-sent-to": "招待メールが%1に送られました。",
+	"alerts.x-users-found": "ユーザー(s)％1が見つかりました!検索には％2ミリ秒かかりました。"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/menu.json b/public/language/ja/admin/menu.json
index 4d3e74ccf1..904ea0bcc8 100644
--- a/public/language/ja/admin/menu.json
+++ b/public/language/ja/admin/menu.json
@@ -8,68 +8,68 @@
 	"general/social": "ソーシャル",
 
 	"section-manage": "メッセージ",
-	"manage/categories": "カテゴリー",
+	"manage/categories": "カテゴリ",
 	"manage/tags": "タグ",
 	"manage/users": "ユーザー",
 	"manage/registration": "登録キュー",
 	"manage/groups": "グループ",
 	"manage/flags": "フラグ",
-	"manage/ip-blacklist": "IP Blacklist",
+	"manage/ip-blacklist": "IPブラックリスト",
 
-	"section-settings": "Settings",
+	"section-settings": "設定",
 	"settings/general": "一般",
 	"settings/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",
-	"settings/cookies": "Cookies",
-	"settings/web-crawler": "Web Crawler",
-	"settings/sockets": "Sockets",
-	"settings/advanced": "Advanced",
+	"settings/email": "メール",
+	"settings/user": "ユーザー",
+	"settings/group": "グループ",
+	"settings/guest": "ゲスト",
+	"settings/uploads": "アップロード",
+	"settings/post": "投稿",
+	"settings/chat": "チャット",
+	"settings/pagination": "ページ",
+	"settings/tags": "タグ",
+	"settings/notifications": "通知",
+	"settings/cookies": "クッキー",
+	"settings/web-crawler": "Webクローラー",
+	"settings/sockets": "接続数",
+	"settings/advanced": "高度",
 
-	"settings.page-title": "%1 Settings",
+	"settings.page-title": "%1の設定",
 
-	"section-appearance": "Appearance",
-	"appearance/themes": "Themes",
-	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"section-appearance": "外観",
+	"appearance/themes": "テーマ",
+	"appearance/skins": "スキン",
+	"appearance/customise": "カスタムHTML & CSS",
 
-	"section-extend": "Extend",
-	"extend/plugins": "Plugins",
-	"extend/widgets": "Widgets",
-	"extend/rewards": "Rewards",
+	"section-extend": "拡張",
+	"extend/plugins": "プラグイン",
+	"extend/widgets": "ウィジェット",
+	"extend/rewards": "報酬",
 
-	"section-social-auth": "Social Authentication",
+	"section-social-auth": "ソーシャル認証",
 
-	"section-plugins": "Plugins",
-	"extend/plugins.install": "Install Plugins",
+	"section-plugins": "プラグイン",
+	"extend/plugins.install": "プラグインをインストール",
 
-	"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": "高度",
+	"advanced/database": "データベース",
+	"advanced/events": "イベント",
+	"advanced/logs": "ログ",
+	"advanced/errors": "エラー",
+	"advanced/cache": "キャッシュ",
+	"development/logger": "ロガー",
+	"development/info": "情報",
 
-	"reload-forum": "Reload Forum",
-	"restart-forum": "Restart Forum",
-	"logout": "Log out",
-	"view-forum": "View Forum",
+	"reload-forum": "フォーラムを再読み込み",
+	"restart-forum": "フォーラムを再開",
+	"logout": "ログアウト",
+	"view-forum": "フォーラムを表示",
 
-	"search.placeholder": "Search...",
-	"search.no-results": "No results...",
-	"search.search-forum": "Search the forum for <strong></strong>",
-	"search.keep-typing": "Type more to see results...",
-	"search.start-typing": "Start typing to see results...",
+	"search.placeholder": "検索...",
+	"search.no-results": "結果がありません...",
+	"search.search-forum": "フォーラムで<strong></ strong>を検索",
+	"search.keep-typing": "結果を見るにはもっと入力してください...",
+	"search.start-typing": "結果を見るために入力を開始...",
 
-	"connection-lost": "Connection to %1 has been lost, attempting to reconnect..."
+	"connection-lost": "％1への接続が切れたので、再接続しています..."
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json
index b39e9e4923..f54cb6d4d7 100644
--- a/public/language/ja/admin/settings/advanced.json
+++ b/public/language/ja/admin/settings/advanced.json
@@ -13,7 +13,7 @@
 	"traffic.help": "NodeBBは、トラフィックの多い状況で要求を自動的に拒否するモジュールを備えています。これらの設定はここで調整することができますが、はじめはデフォルト設定にしておくことをお勧めします。",
 	"traffic.enable": "トラフィック管理を有効にする",
 	"traffic.event-lag": "イベントループの場所のしきい値(ミリ秒単位)",
-	"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.event-lag-help": "この値を下げるとページの読み込み時間が短縮されますが、さらに多くのユーザーには「過剰な読み込み」メッセージが表示されます。(再起動が必要)",
+	"traffic.lag-check-interval": "チェック間隔(ミリ秒単位)",
+	"traffic.lag-check-interval-help": "この値を小さくすると、NodeBBは負荷のスパイクに対してより敏感になりますが、チェックが過敏になる可能性もあります。(再起動が必要)"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json
index e66bf3ed9c..625f6ca4d6 100644
--- a/public/language/ja/admin/settings/email.json
+++ b/public/language/ja/admin/settings/email.json
@@ -13,13 +13,13 @@
 	"gmail-transport.password": "パスワード",
 	"template": "電子メールテンプレートの編集",
 	"template.select": "電子メールテンプレートを選択",
-	"template.revert": "Revert to Original",
+	"template.revert": "オリジナルに戻す",
 	"testing": "Eメールテスト",
 	"testing.select": "電子メールテンプレートを選択",
-	"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. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"testing.send": "テスト電子メールを送信する",
+	"testing.send-help": "テスト電子メールは、現在ログインしているユーザーの電子メールアドレスに送信されます。",
+	"subscriptions": "メール購読",
+	"subscriptions.disable": "購読者の通知メールを無効にする",
+	"subscriptions.hour": "ダイジェストアワー",
+	"subscriptions.hour-help": "スケジュールされたメールのダイジェストを送信する時間を表す数字を入力してください(深夜は<code>0</ code>、午後5:00は<code>17</code>)これはサーバー自体に基づく時間であり、システムの時計と正確に一致しない場合があります。<span id=\"serverTime\"></ span> <br />次の日のダイジェストは<span id=\"nextDigestTime\"></span>"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/general.json b/public/language/ja/admin/settings/general.json
index fa8bf6e0be..18ad7762db 100644
--- a/public/language/ja/admin/settings/general.json
+++ b/public/language/ja/admin/settings/general.json
@@ -13,18 +13,18 @@
 	"keywords-placeholder": "あなたのコミュニティを記述するキーワード、カンマ区切り",
 	"logo": "サイトロゴ",
 	"logo.image": "画像",
-	"logo.image-placeholder": "Path to a logo to display on forum header",
+	"logo.image-placeholder": "フォーラムのヘッダーに表示するロゴのパス",
 	"logo.upload": "アップロード",
 	"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"
+	"logo.url-placeholder": "サイトロゴのURL",
+	"logo.url-help": "ロゴをクリックすると、ユーザーをこのアドレスに送信します。空白のままにすると、ユーザーはフォーラムのインデックスに送信されます。",
+	"logo.alt-text": "全てのテキスト:",
+	"log.alt-text-placeholder": "アクセシビリティのための代替テキスト",
+	"favicon": "お気に入りアイコン",
+	"favicon.upload": "アップロード",
+	"touch-icon": "多い",
+	"touch-icon.upload": "アップロード",
+	"touch-icon.help": "推奨サイズとフォーマット：192x192、PNG形式のみ。タッチアイコンが指定されていない場合、NodeBBはファビコンを使用します。",
+	"outgoing-links": "外部サイトへのリンク",
+	"outgoing-links.warning-page": "送信リンクの警告ページを使用"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/pagination.json b/public/language/ja/admin/settings/pagination.json
index e748414714..8cafd8490d 100644
--- a/public/language/ja/admin/settings/pagination.json
+++ b/public/language/ja/admin/settings/pagination.json
@@ -1,9 +1,9 @@
 {
 	"pagination": "ページ設定",
 	"enable": "スクロールでのページ自動ロードはしない",
-	"topics": "トピックページ",
+	"topics": "スレッドページ",
 	"posts-per-page": "ページごとの投稿数",
 	"categories": "カテゴリページ",
 	"topics-per-page": "ページごとのスレッド数",
-	"initial-num-load": "未読、最近、および人気に読み込むトピックの初期数"
+	"initial-num-load": "未読、最近、および人気に読み込むスレッドの初期数"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json
index 2c17fed616..b82142e0e2 100644
--- a/public/language/ja/admin/settings/post.json
+++ b/public/language/ja/admin/settings/post.json
@@ -9,36 +9,36 @@
 	"restrictions.seconds-between": "投稿間の秒数",
 	"restrictions.seconds-between-new": "新規ユーザーの投稿間の秒数",
 	"restrictions.rep-threshold": "この制限が解除される前の評判しきい値",
-	"restrictions.seconds-defore-new": "Seconds before new user can post",
+	"restrictions.seconds-defore-new": "新しいユーザーが投稿できるまでの秒数",
 	"restrictions.seconds-edit-after": "投稿後にユーザーが投稿を編集できる秒数。(0は無効)",
 	"restrictions.seconds-delete-after": "投稿後にユーザーが投稿を削除できる秒数。(0は無効)",
-	"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.replies-no-delete": "ユーザーが自分のスレッドを削除できなくなった後の返信数(0は無効)",
+	"restrictions.min-title-length": "タイトルの最小文字数",
 	"restrictions.max-title-length": "タイトルの最大文字数",
 	"restrictions.min-post-length": "投稿の最小文字数",
-	"restrictions.max-post-length": "Maximum Post Length",
-	"restrictions.days-until-stale": "Days until Topic is considered stale",
-	"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.cut-off-help": "Dates &amp; 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).<br /><em>(Default: <code>30</code>, or one month). Set to 0 to always display dates, leave blank to always display relative times.</em>",
-	"teaser": "Teaser Post",
-	"teaser.last-post": "Last &ndash; Show the latest post, including the original post, if no replies",
-	"teaser.last-reply": "Last &ndash; 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",
-	"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"
+	"restrictions.max-post-length": "投稿の最大文字数",
+	"restrictions.days-until-stale": "スレッドが古くなるまでの日数",
+	"restrictions.stale-help": "スレッドが「古い」とみなされた場合、そのスレッドに返信しようとするユーザーに警告が表示されます。",
+	"timestamp": "タイムスタンプ",
+	"timestamp.cut-off": "日付のカットオフ(日数)",
+	"timestamp.cut-off-help": "日付&amp;時間は相対的な方法で表示されます(例:「3時間前」/「5日前」)。そしてさまざまな地域にローカライズされています。\n\\t\\t\\t\\t\\t言語。特定のポイントの後、このテキストは、ローカライズされた日付自体を表示するように切り替えることができます。\n\\t\\t\\t\\t\\t(例:2016年11月5日15:30)<br /><em>(デフォルト：<code>30 </code>、または1か月)。日付を常に表示するには0に設定し、常に相対時間を表示するには空白のままにします。</em>",
+	"teaser": "ティーザーの投稿",
+	"teaser.last-post": "最後＆ndash;返信がない場合は、元の投稿を含む最新の投稿を表示",
+	"teaser.last-reply": "最後＆ndash;最新の返信を表示するか、返信がない場合は「返信なし」のプレースホルダを表示する",
+	"teaser.first": "最初",
+	"unread": "未読の設定",
+	"unread.cutoff": "未読のカットオフ日",
+	"unread.min-track-last": "最後に読み込みを行う前に追跡するスレッドの最小投稿数",
+	"signature": "署名の設定",
+	"signature.disable": "署名を無効にする",
+	"signature.no-links": "署名内のリンクを無効にする",
+	"signature.no-images": "署名内の画像を無効にする",
+	"signature.max-length": "署名の最大文字数",
+	"composer": "Composerの設定",
+	"composer-help": "次の設定は、投稿者の機能や外観を制御します。\n\\t\\t\\t\\tユーザーに新しいスレッドを作成したり、既存のトピックに返信したりできます。",
+	"composer.show-help": "「ヘルプ」タグを表示",
+	"composer.enable-plugin-help": "プラグインがヘルプタブにコンテンツを追加できるようにする",
+	"composer.custom-help": "カスタムヘルプテキスト",
+	"ip-tracking": "IPトラッキング",
+	"ip-tracking.each-post": "各投稿のトラックIPアドレス"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/tags.json b/public/language/ja/admin/settings/tags.json
index 98b6c561fe..08c54008f7 100644
--- a/public/language/ja/admin/settings/tags.json
+++ b/public/language/ja/admin/settings/tags.json
@@ -1,12 +1,12 @@
 {
     "tag": "タグ設定",
-    "min-per-topic": "トピックごとの最小タグ数",
-    "max-per-topic": "トピックごとの最大タグ数",
+    "min-per-topic": "スレッドごとの最小タグ数",
+    "max-per-topic": "スレッドごとの最大タグ数",
     "min-length": "タグの最小文字数",
     "max-length": "タグの最大文字数",
     "goto-manage": "タグ管理ページにアクセスするには、ここをクリックしてください。",
     "privacy": "プライバシー",
     "list-private": "タグリストを非公開にする",
-    "related-topics": "関連トピック",
-    "max-related-topics": "表示する関連トピックの最大数(テーマでサポートされている場合)"
+    "related-topics": "関連スレッド",
+    "max-related-topics": "表示する関連スレッドの最大数(テーマでサポートされている場合)"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/uploads.json b/public/language/ja/admin/settings/uploads.json
index 66abd79209..d5520e2603 100644
--- a/public/language/ja/admin/settings/uploads.json
+++ b/public/language/ja/admin/settings/uploads.json
@@ -6,23 +6,23 @@
 	"max-image-width-help": "(ピクセル単位、デフォルト:760px、無効にするには0に設定)",
 	"max-file-size": "最大ファイルサイズ(KB)",
 	"max-file-size-help": "(キロバイト単位、デフォルト：2048 KB)",
-	"allow-topic-thumbnails": "ユーザーがトピックサムネイルをアップロードできるようにする",
-	"topic-thumb-size": "トピックのサムネイルの大きさ",
+	"allow-topic-thumbnails": "ユーザーがスレッドのサムネイルをアップロードできるようにする",
+	"topic-thumb-size": "スレッドのサムネイルの大きさ",
 	"allowed-file-extensions": "ファイル拡張子が有効になりました。",
-	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>).\n\t\t\t\t\tAn empty list means all extensions are allowed.",
+	"allowed-file-extensions-help": "ここにファイル拡張子のカンマ区切りリストを入力します(例：<code> pdf、xls、doc </ code>)。\n\\t\\t\\t\\t\\t空リストは、すべての拡張が許可されていることを意味します。",
 	"profile-avatars": "プロフィールの顔写真",
 	"allow-profile-image-uploads": "ユーザーがプロフィール画像をアップロードできるようにする。",
-	"convert-profile-image-png": "Convert profile image uploads to PNG",
-	"default-avatar": "Custom Default Avatar",
+	"convert-profile-image-png": "プロフィール画像のアップロードをPNGに変換する",
+	"default-avatar": "カスタムデフォルトアバター",
 	"upload": "アップロード",
 	"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 kilobytes, default: 256 KiB)",
-	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kilobytes, 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"
+	"profile-image-dimension-help": "(ピクセルで、デフォルト：128px)",
+	"max-profile-image-size": "プロフィール画像の最大ファイルサイズ",
+	"max-profile-image-size-help": "(キロバイト単位、デフォルト：256KB)",
+	"max-cover-image-size": "カバー画像の最大サイズ",
+	"max-cover-image-size-help": "(キロバイト、デフォルト:2,048KB)",
+	"keep-all-user-images": "古いバージョンのアバターとプロファイルカバーをサーバーに保管",
+	"profile-covers": "プロフィールのカバー",
+	"default-covers": "デフォルトのカバー画像",
+	"default-covers-help": "アップロードされたカバー画像を持たないアカウントのカンマ区切りのデフォルト表紙画像を追加する"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/user.json b/public/language/ja/admin/settings/user.json
index 3244fc70bc..ee78fda0f4 100644
--- a/public/language/ja/admin/settings/user.json
+++ b/public/language/ja/admin/settings/user.json
@@ -13,47 +13,47 @@
 	"disable-email-changes": "Eメールの変更を無効にする",
 	"disable-password-changes": "パスワードの変更を無効にする",
 	"allow-account-deletion": "アカウントが解除されました",
-	"user-info-private": "Make user info private",
+	"user-info-private": "ユーザー情報を非公開にする",
 	"themes": "テーマ",
 	"disable-user-skins": "ユーザーがカスタムスキンを選択できないようにする",
-	"account-protection": "Account Protection",
-	"login-attempts": "Login attempts per hour",
-	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
-	"lockout-duration": "Account Lockout Duration (minutes)",
-	"login-days": "Days to remember user login sessions",
-	"password-expiry-days": "Force password reset after a set number of days",
-	"registration": "User Registration",
-	"registration-type": "Registration Type",
-	"registration-type.normal": "Normal",
-	"registration-type.admin-approval": "Admin Approval",
-	"registration-type.admin-approval-ip": "Admin Approval for IPs",
-	"registration-type.invite-only": "Invite Only",
-	"registration-type.admin-invite-only": "Admin Invite Only",
-	"registration-type.disabled": "No registration",
-	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
-	"registration.max-invites": "Maximum Invitations per User",
-	"max-invites": "Maximum Invitations per User",
-	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
-	"min-username-length": "Minimum Username Length",
-	"max-username-length": "Maximum Username Length",
-	"min-password-length": "Minimum Password Length",
-	"max-about-me-length": "Maximum About Me Length",
-	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
-	"user-search": "User Search",
-	"user-search-results-per-page": "Number of results to display",
-	"default-user-settings": "Default User Settings",
-	"show-email": "Show email",
-	"show-fullname": "Show fullname",
-	"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",
-	"digest-freq": "Subscribe to Digest",
-	"digest-freq.off": "Off",
-	"digest-freq.daily": "Daily",
-	"digest-freq.weekly": "Weekly",
-	"digest-freq.monthly": "Monthly",
-	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
-	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
-	"follow-created-topics": "Follow topics you create",
-	"follow-replied-topics": "Follow topics that you reply to"
+	"account-protection": "アカウント保護",
+	"login-attempts": "時間ごとのログイン試行",
+	"login-attempts-help": "ユーザのアカウントへのログイン試行数がこの値を超える場合、そのアカウントは予め設定された時間だけロックされます。",
+	"lockout-duration": "アカウントロックアウト期間(分)",
+	"login-days": "ユーザーのログインセッションを覚える日数",
+	"password-expiry-days": "指定した日数後にパスワードを強制的にリセットする",
+	"registration": "ユーザー登録",
+	"registration-type": "登録タイプ",
+	"registration-type.normal": "標準",
+	"registration-type.admin-approval": "管理者承認",
+	"registration-type.admin-approval-ip": "IPの管理者承認",
+	"registration-type.invite-only": "招待のみ",
+	"registration-type.admin-invite-only": "管理者招待のみ",
+	"registration-type.disabled": "登録なし",
+	"registration-type.help": "通常 - ユーザーは/登録ページから登録できます。<br/>\n管理者承認 - ユーザー登録は、管理者向けの<a href=\"%1/admin/manage/registration\">承認待ちキュー</a>に配置されます。<br/>\nIPの管理者承認 - 新規ユーザーの場合は通常、アカウントが既に設定されているIPアドレスの管理者承認の場合。\n招待のみ - ユーザーは<a href=\"%1/users\" target=\"_blank\">ユーザー</a>ページから他のユーザーを招待できます。<br/>\n管理者招待のみ - 管理者のみが<a href=\"%1/users\" target=\"_blank\">ユーザー</a>と<a href=\"%1/admin/manage/users\">管理者/管理者から他のユーザーを招待できます/ users </a>ページ\n登録なし - ユーザー登録なし。<br/>",
+	"registration.max-invites": "ユーザーごとの最大招待数",
+	"max-invites": "ユーザーごとの最大招待数",
+	"max-invites-help": "無制限の場合は0です。管理者は無限の招待を受ける<br>「招待のみ」にのみ適用されます",
+	"min-username-length": "ユーザー名の最小文字数",
+	"max-username-length": "ユーザー名の最大文字数",
+	"min-password-length": "パスワードの最小文字数",
+	"max-about-me-length": "概要の最大文字数",
+	"terms-of-use": "フォーラム利用規約<small>(空白のままにしておくと無効になります)</ small>",
+	"user-search": "ユーザーを検索",
+	"user-search-results-per-page": "結果数を表示",
+	"default-user-settings": "デフォルトユーザー設定",
+	"show-email": "メールを表示",
+	"show-fullname": "フルネームで表示",
+	"restrict-chat": "フォローしたユーザーからのチャットメッセージだけを許可する",
+	"outgoing-new-tab": "外部リンクを新しいタブで開く",
+	"topic-search": "インースレッドの検索を有効にします",
+	"digest-freq": "お知らせを購読する",
+	"digest-freq.off": "オフ",
+	"digest-freq.daily": "デイリー",
+	"digest-freq.weekly": "ウィークリー",
+	"digest-freq.monthly": "マンスリー",
+	"email-chat-notifs": "オンラインではない時に新しいチャットメッセージを受信した場合、通知メールを送信する。",
+	"email-post-notif": "購読中のスレッドに返信があった場合、メールで通知する。",
+	"follow-created-topics": "投稿したスレッドをフォローします",
+	"follow-replied-topics": "返信したスレッドをフォローします"
 }
\ No newline at end of file
diff --git a/public/language/ja/admin/settings/web-crawler.json b/public/language/ja/admin/settings/web-crawler.json
index b7767cb68b..07f2dc0afb 100644
--- a/public/language/ja/admin/settings/web-crawler.json
+++ b/public/language/ja/admin/settings/web-crawler.json
@@ -4,7 +4,7 @@
 	"sitemap-feed-settings": "サイトマップとフィードの設定",
 	"disable-rss-feeds": "RSSフィードを無効にする",
 	"disable-sitemap-xml": "Sitemap.xmlを無効にする",
-	"sitemap-topics": "サイトマップに表示するトピックの数",
+	"sitemap-topics": "サイトマップに表示するスレッドの数",
 	"clear-sitemap-cache": "サイトマップのキャッシュをクリア",
 	"view-sitemap": "サイトマップを表示"
 }
\ No newline at end of file
diff --git a/public/language/ja/category.json b/public/language/ja/category.json
index 832d90f6eb..78cf520d70 100644
--- a/public/language/ja/category.json
+++ b/public/language/ja/category.json
@@ -1,9 +1,9 @@
 {
-    "category": "カテゴリー",
-    "subcategories": "サブカテゴリー",
-    "new_topic_button": "新規トピック",
+    "category": "カテゴリ",
+    "subcategories": "サブカテゴリ",
+    "new_topic_button": "新規スレッド",
     "guest-login-post": "投稿するにはログインしてください",
-    "no_topics": "<strong>まだトピックはありません</strong><br />最初のトピックを書いてみませんか？",
+    "no_topics": "<strong>まだスレッドはありません</strong><br />最初のスレッドを書いてみませんか？",
     "browsing": "閲覧中",
     "no_replies": "返事はまだありません",
     "no_new_posts": "新しい投稿はありません",
@@ -12,8 +12,8 @@
     "ignore": "無視する",
     "watching": "ウォッチ中",
     "ignoring": "無視しています",
-    "watching.description": "未読トピックを表示",
-    "ignoring.description": "未読トピックを表示しない",
+    "watching.description": "未読スレッドを表示",
+    "ignoring.description": "未読スレッドを表示しない",
     "watch.message": "あなたは現在、このカテゴリと全てのサブカテゴリで行われる更新をウォッチしています。",
     "ignore.message": "あなたは現在、このカテゴリと全てのサブカテゴリで行われる更新を無視しています。",
     "watched-categories": "ウォッチ中のカテゴリ"
diff --git a/public/language/ja/email.json b/public/language/ja/email.json
index d94f3b3f6d..461b393f30 100644
--- a/public/language/ja/email.json
+++ b/public/language/ja/email.json
@@ -17,10 +17,10 @@
     "reset.notify.text1": "%1にてパスワードのリセットが行われたことをお知らせします。",
     "reset.notify.text2": "もしあなたがリセットを行っていない場合は、すぐに管理者に通報してください。",
     "digest.notifications": "%1さんからの未読通知があります:",
-    "digest.latest_topics": "%1からの新しいトピック",
+    "digest.latest_topics": "%1からの新しいスレッド",
     "digest.cta": "クリックで%1を見る",
     "digest.unsub.info": "このまとめはあなたの購読設定により送られました。",
-    "digest.no_topics": "%1にはアクティブなトピックがありません。",
+    "digest.no_topics": "%1にはアクティブなスレッドがありません。",
     "digest.day": "日",
     "digest.week": "週",
     "digest.month": "月",
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index 27511fe91c..d01ac87df2 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -4,7 +4,7 @@
     "account-locked": "あなたのアカウントは一時的にロックされています",
     "search-requires-login": "検索するにはアカウントが必要です - ログインするかアカウントを作成してください。",
     "invalid-cid": "無効なカテゴリID",
-    "invalid-tid": "無効なトピックID",
+    "invalid-tid": "無効なスレッドID",
     "invalid-pid": "無効な投稿ID",
     "invalid-uid": "無効なユーザーID",
     "invalid-username": "無効なユーザー名",
@@ -34,7 +34,7 @@
     "blacklisted-ip": "申し訳ありませんがあなたのIPアドレスは当コミュニティで停止されています。もし誤ったエラーだと思われる場合は管理者にお問い合わせください。",
     "ban-expiry-missing": "この停止の終了日を入力してください。",
     "no-category": "カテゴリは存在しません",
-    "no-topic": "トピックは存在しません",
+    "no-topic": "スレッドは存在しません",
     "no-post": "投稿は存在しません",
     "no-group": "グループは存在しません",
     "no-user": "ユーザーは存在しません",
@@ -56,19 +56,19 @@
     "post-delete-duration-expired-hours-minutes": "あなたは%1 時間(s) %2 分(s)後に投稿を削除することが許可されています。",
     "post-delete-duration-expired-days": "あなたは%1 日(s)後に投稿を削除することが許可されています。",
     "post-delete-duration-expired-days-hours": "あなたは%1 日(s) %2 時間(s)後に投稿を削除することが許可されています。",
-    "cant-delete-topic-has-reply": "応答待ちの場合、あなたのトピックは削除できません。",
-    "cant-delete-topic-has-replies": "%1 の応答待ちの場合、あなたのトピックは削除できません。",
+    "cant-delete-topic-has-reply": "応答待ちの場合、あなたのスレッドは削除できません。",
+    "cant-delete-topic-has-replies": "%1 の応答待ちの場合、あなたのスレッドは削除できません。",
     "content-too-short": "より長く投稿を書いて下さい。投稿にはせめて%1文字が必要です。",
     "content-too-long": "より短く投稿を書いて下さい。投稿が%1文字以上が許されません。",
     "title-too-short": "より長くタイトルを書いて下さい。タイトルはせめて%1文字が必要です。",
     "title-too-long": "より短くタイトルを書いて下さい。タイトルは%1文字以上が許されません。",
-    "category-not-selected": "カテゴリーが選択されていません。",
+    "category-not-selected": "カテゴリが選択されていません。",
     "too-many-posts": "あなたは%1秒間に一つの投稿しか許されます－少し待ってまた投稿してください",
     "too-many-posts-newbie": "あなたは%2評判を得ているまで、新しいユーザーとしては、一度だけごとに%1秒を投稿することができます - 再び投稿する前にお待ちください",
     "tag-too-short": "%1文字(s)以上でタグを入力してください。",
     "tag-too-long": "%1文字(s)以内でタグを入力してください。",
-    "not-enough-tags": "タグが足りません。トピックはせめて%1タグが必要です。",
-    "too-many-tags": "タグが多すぎます。トピックは%1のタグ以上が許されません。",
+    "not-enough-tags": "タグが足りません。スレッドはせめて%1のタグ(s)が必要です。",
+    "too-many-tags": "タグが多すぎます。スレッドは%1のタグ(s)以上が許されません。",
     "still-uploading": "アップロードが完成するまでお待ちください。",
     "file-too-big": "%1kBより大きいサイズファイルが許されません－より小さいファイルをアップして下さい。",
     "guest-upload-disabled": "ゲストさんからのアップを無効にしています",
@@ -91,9 +91,9 @@
     "group-already-requested": "あなたのメンバーシップの要求が既に提出されました",
     "post-already-deleted": "この投稿が既に削除されました",
     "post-already-restored": "この投稿が既に復元されました",
-    "topic-already-deleted": "このトピックが既に削除されました",
-    "topic-already-restored": "このトピックが既に復元されました",
-    "cant-purge-main-post": "あなたはこの主な投稿をパージできませんので、削除して下さい",
+    "topic-already-deleted": "このスレッドは既に削除されました",
+    "topic-already-restored": "このスレッドは既に復元されました",
+    "cant-purge-main-post": "メインの投稿を削除することはできません。代わりにスレッドを削除してください",
     "topic-thumbnails-are-disabled": "スレッドのサムネイルが無効された",
     "invalid-file": "無効なファイル",
     "uploads-are-disabled": "アップロードが無効された",
diff --git a/public/language/ja/global.json b/public/language/ja/global.json
index 88e115ff6c..548cc937d3 100644
--- a/public/language/ja/global.json
+++ b/public/language/ja/global.json
@@ -103,5 +103,5 @@
     "cookies.message": "このWEBサイトは、心地良くご使用頂くためにクッキーを使用しています。",
     "cookies.accept": "了解!",
     "cookies.learn_more": "もっと詳しく",
-    "edited": "Edited"
+    "edited": "編集されました"
 }
\ No newline at end of file
diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json
index 3bdc18aa6c..8b60fbbd52 100644
--- a/public/language/ja/groups.json
+++ b/public/language/ja/groups.json
@@ -53,5 +53,5 @@
     "upload-group-cover": "グループのカバーをアップロード",
     "bulk-invite-instructions": "ユーザー名をカンマ区切りして入力することで、このグループへ招待します。",
     "bulk-invite": "バルク招待",
-    "remove_group_cover_confirm": "Are you sure you want to remove the cover picture?"
+    "remove_group_cover_confirm": "カバー写真を削除してもよろしいですか？"
 }
\ No newline at end of file
diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json
index 7b12c5f498..938c217701 100644
--- a/public/language/ja/modules.json
+++ b/public/language/ja/modules.json
@@ -13,7 +13,7 @@
     "chat.contacts": "お問い合わせ",
     "chat.message-history": "メッセージ履歴",
     "chat.pop-out": "チャットを別ウィンドウで表示する",
-    "chat.minimize": "Minimize",
+    "chat.minimize": "最小化",
     "chat.maximize": "最大化",
     "chat.seven_days": "7日間",
     "chat.thirty_days": "30日間",
@@ -38,7 +38,7 @@
     "composer.upload-picture": "画像をアップロード",
     "composer.upload-file": "ファイルをアップロード",
     "composer.zen_mode": "Zen モード",
-    "composer.select_category": "カテゴリーを選択",
+    "composer.select_category": "カテゴリを選択",
     "bootbox.ok": "OK",
     "bootbox.cancel": "キャンセル",
     "bootbox.confirm": "確認",
diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json
index 34b16e4c88..e525f8a638 100644
--- a/public/language/ja/notifications.json
+++ b/public/language/ja/notifications.json
@@ -22,7 +22,7 @@
     "user_posted_to": "<strong>%1</strong>さんは <strong>%2</strong>に返信しました。",
     "user_posted_to_dual": "<strong>%1</strong> と <strong>%2</strong> は、返信しました: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> と %2 または他のユーザーが返信しました: <strong>%3</strong>",
-    "user_posted_topic": "<strong>%1</strong> が新しいトピックを投稿しました。: <strong>%2</strong>",
+    "user_posted_topic": "<strong>%1</strong> が新しいスレッドを投稿しました。: <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong>があなたをフォローしました。",
     "user_started_following_you_dual": "<strong>%1</strong> と <strong>%2</strong> があなたをフォローしました。",
     "user_started_following_you_multiple": "<strong>%1</strong> と %2 または他のユーザーがあなたをフォローしました。",
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index f444297ef7..e25dffa625 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/pages.json
@@ -1,10 +1,10 @@
 {
     "home": "ホーム",
-    "unread": "未読トピック",
-    "popular-day": "今日人気のトピック",
-    "popular-week": "今週人気のトピック",
-    "popular-month": "今月人気のトピック",
-    "popular-alltime": "人気のトピック",
+    "unread": "未読スレッド",
+    "popular-day": "本日人気のスレッド",
+    "popular-week": "今週人気のスレッド",
+    "popular-month": "今月人気のスレッド",
+    "popular-alltime": "人気のスレッド",
     "recent": "最新スレッド",
     "flagged-content": "フラグ付きコンテンツ",
     "ip-blacklist": "IPブラックリスト",
@@ -17,7 +17,7 @@
     "users/search": "ユーザーを検索",
     "notifications": "通知",
     "tags": "タグ",
-    "tag": "トピックは\"%1\"の下にタグ付けされました",
+    "tag": "スレッドは\"%1\"の下にタグ付けされました",
     "register": "アカウントを登録",
     "registration-complete": "登録完了",
     "login": "あなたのアカウントでログイン",
@@ -27,8 +27,8 @@
     "group": "%1 グループ",
     "chats": "チャット",
     "chat": "%1とチャットします",
-    "flags": "Flags",
-    "flag-details": "Flag %1 Details",
+    "flags": "フラグ",
+    "flag-details": "フラグ％1の詳細",
     "account/edit": "編集中 \"%1\"",
     "account/edit/password": "\"%1\"のパスワードを編集中",
     "account/edit/username": "\"%1\"のユーザー名を編集中",
@@ -41,7 +41,7 @@
     "account/groups": "%1 グループ",
     "account/bookmarks": "%1のブックマークされた投稿",
     "account/settings": "ユーザー設定",
-    "account/watched": " %1がトピックを見ました。",
+    "account/watched": " %1がスレッドを見ました。",
     "account/upvoted": "%1が投稿を高評価しました",
     "account/downvoted": "%1が投稿を低評価しました",
     "account/best": "%1のベストな投稿",
diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json
index d5fab488e6..57aed3f560 100644
--- a/public/language/ja/recent.json
+++ b/public/language/ja/recent.json
@@ -6,13 +6,13 @@
     "year": "年",
     "alltime": "全て",
     "no_recent_topics": "最近のスレッドはありません。",
-    "no_popular_topics": "人気トピックはありません。",
-    "there-is-a-new-topic": "新しいトピックがあります。",
-    "there-is-a-new-topic-and-a-new-post": "新しいトピックと投稿があります。",
-    "there-is-a-new-topic-and-new-posts": "新しいトピックと%1件の投稿があります。",
-    "there-are-new-topics": "新しいトピックが%1個あります。",
-    "there-are-new-topics-and-a-new-post": "新しいトピックがと投稿が%1件あります。",
-    "there-are-new-topics-and-new-posts": "新しいトピックが%1件、新しい投稿が%2件あります。",
+    "no_popular_topics": "人気スレッドはありません。",
+    "there-is-a-new-topic": "新しいスレッドがあります。",
+    "there-is-a-new-topic-and-a-new-post": "新しいスレッドと投稿があります。",
+    "there-is-a-new-topic-and-new-posts": "新しいスレッドと%1件の投稿があります。",
+    "there-are-new-topics": "新しいスレッドが%1個あります。",
+    "there-are-new-topics-and-a-new-post": "新しいスレッドがと投稿が%1件あります。",
+    "there-are-new-topics-and-new-posts": "新しいスレッドが%1件、新しい投稿が%2件あります。",
     "there-is-a-new-post": "新しい投稿があります。",
     "there-are-new-posts": "新しい投稿が%1件あります。",
     "click-here-to-reload": "ここを押して、更新します。"
diff --git a/public/language/ja/search.json b/public/language/ja/search.json
index 5f4fc8f51a..3acc384406 100644
--- a/public/language/ja/search.json
+++ b/public/language/ja/search.json
@@ -25,10 +25,10 @@
     "one-year": "1年",
     "sort-by": "並び替え",
     "last-reply-time": "最後の返信時間",
-    "topic-title": "トピック題名",
+    "topic-title": "スレッドのタイトル",
     "number-of-replies": "返信数",
     "number-of-views": "表示数",
-    "topic-start-date": "トピック開始日",
+    "topic-start-date": "スレッド開始日",
     "username": "ユーザー名",
     "category": "カテゴリ",
     "descending": "降順",
diff --git a/public/language/ja/tags.json b/public/language/ja/tags.json
index 3d0cb038b5..8c619745a3 100644
--- a/public/language/ja/tags.json
+++ b/public/language/ja/tags.json
@@ -1,5 +1,5 @@
 {
-    "no_tag_topics": "このタグに関連するトピックはありません。",
+    "no_tag_topics": "このタグに関連するスレッドはありません。",
     "tags": "タグ",
     "enter_tags_here": "ここにタグを入力します。一つのタグが%1から%2までの文字にして下さい。",
     "enter_tags_here_short": "タグを入れます…",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 005910aaf0..8856d6ed93 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -1,24 +1,24 @@
 {
-    "topic": "トピック",
-    "topic_id": "トピックID",
-    "topic_id_placeholder": "トピックIDを入力してください",
-    "no_topics_found": "トピックが見つかりません！",
+    "topic": "スレッド",
+    "topic_id": "スレッドID",
+    "topic_id_placeholder": "スレッドIDを入力してください",
+    "no_topics_found": "スレッドが見つかりません！",
     "no_posts_found": "投稿はありません！",
     "post_is_deleted": "この投稿が削除されました！",
-    "topic_is_deleted": "このトピックは削除されました！",
+    "topic_is_deleted": "このスレッドは削除されました！",
     "profile": "プロフィール",
     "posted_by": "%1さんが投稿",
     "posted_by_guest": "ゲストさんが投稿",
     "chat": "チャット",
-    "notify_me": "このトピックに新しく投稿された時に通知する",
+    "notify_me": "このスレッドに新しく投稿された時に通知する",
     "quote": "引用",
     "reply": "返信",
     "replies_to_this_post": "返信: %1件",
-    "reply-as-topic": "トピックとして返信する",
+    "reply-as-topic": "スレッドとして返信する",
     "guest-login-reply": "投稿するのにログインして下さい",
     "edit": "編集",
     "delete": "削除",
-    "purge": "粛清",
+    "purge": "切り離し",
     "restore": "リストア",
     "move": "移動",
     "fork": "フォーク",
@@ -47,26 +47,26 @@
     "flag_manage_history_state": "%1に更新された状態",
     "flag_manage_history_notes": "フラグのメモが更新されました",
     "flag_manage_saved": "フラグの詳細が更新されました",
-    "deleted_message": "このトピックが削除されました。トピック管理権を持っているユーザーにしか読めません。",
+    "deleted_message": "このスレッドが削除されました。スレッド管理権を持っているユーザーにしか読めません。",
     "following_topic.message": "このスレッドが更新された際に通知を受け取ります。",
-    "not_following_topic.message": "あなたはトピック一覧を未読にすると、このトピックを参照できます。ただし誰かがこのトピックに投稿したときは通知を受信できません。",
-    "ignoring_topic.message": "あなたは、これ以上この未読トピックを一覧に表示しておくことが出来なくなります。追跡するか、あなたの投稿が高評価を受けると通知されます。",
+    "not_following_topic.message": "あなたはスレッド一覧を未読にすると、このスレッドを参照できます。ただし誰かがこのスレッドに投稿したときは通知を受信できません。",
+    "ignoring_topic.message": "あなたは、これ以上この未読スレッドを一覧に表示しておくことが出来なくなります。追跡するか、あなたの投稿が高評価を受けると通知されます。",
     "login_to_subscribe": "このスレッドを購読するためにログインが必要です。",
     "markAsUnreadForAll.success": "すべてのスレッドを未読にしました。",
     "mark_unread": "未読としてマーク",
-    "mark_unread.success": "トピックは未読にマークされました。",
+    "mark_unread.success": "スレッドは未読にマークされました。",
     "watch": "ウオッチ",
     "unwatch": "ウオッチ解除",
     "watch.title": "新しい投稿の通知を受ける",
-    "unwatch.title": "このトピックの通知を停止します",
+    "unwatch.title": "このスレッドの通知を停止します",
     "share_this_post": "投稿を共有",
     "watching": "ウォッチ中",
     "not-watching": "ウォッチ中ではありません",
     "ignoring": "無視",
-    "watching.description": "新しい返信のお知らせです。<br/>未読のトピックを表示",
-    "not-watching.description": "新しく返信通知を受け取らない。<br/>カテゴリが無視されていない場合、未読のトピックを表示します。",
-    "ignoring.description": "新しく返信通知を受け取らない。<br/>未読のトピックは表示されません。",
-    "thread_tools.title": "トピックのツール",
+    "watching.description": "新しい返信のお知らせです。<br/>未読のスレッドを表示",
+    "not-watching.description": "新しく返信通知を受け取らない。<br/>カテゴリが無視されていない場合、未読のスレッドを表示します。",
+    "ignoring.description": "新しく返信通知を受け取らない。<br/>未読のスレッドは表示されません。",
+    "thread_tools.title": "スレッドツール",
     "thread_tools.markAsUnreadForAll": "すべて未読にマーク",
     "thread_tools.pin": "スレッドを最上部に固定",
     "thread_tools.unpin": "スレッドの固定を解除",
@@ -79,13 +79,13 @@
     "thread_tools.delete-posts": "投稿を削除します",
     "thread_tools.delete_confirm": "本当にこの投稿を削除しますか？",
     "thread_tools.restore": "スレッドをリストア",
-    "thread_tools.restore_confirm": "本当にこのトピックを戻しますか？",
-    "thread_tools.purge": "トピックを粛清します",
-    "thread_tools.purge_confirm": "本当にこのトピックを粛清しますか？",
+    "thread_tools.restore_confirm": "本当にこのスレッドを戻しますか？",
+    "thread_tools.purge": "スレッドを切り離します",
+    "thread_tools.purge_confirm": "本当にこのスレッドを切り離しますか？",
     "topic_move_success": "このスレッドを%1に移動しました。",
     "post_delete_confirm": "本当にこの投稿を削除しますか？",
     "post_restore_confirm": "本当にこの投稿を元に戻しますか？",
-    "post_purge_confirm": "本当にこの投稿を粛清しますか？",
+    "post_purge_confirm": "本当にこの投稿を切り離しますか？",
     "load_categories": "板をローディング中...",
     "disabled_categories_note": "使用不可の板はグレーに表示されます。",
     "confirm_move": "移動",
@@ -95,7 +95,7 @@
     "bookmarks.has_no_bookmarks": "まだ投稿をブックマークしていません。",
     "loading_more_posts": "もっと見る",
     "move_topic": "スレッドを移動",
-    "move_topics": "トピックを移動する",
+    "move_topics": "スレッドを移動する",
     "move_post": "投稿を移動",
     "post_moved": "投稿を移動しました！",
     "fork_topic": "スレッドをフォーク",
@@ -103,9 +103,9 @@
     "fork_topic_instruction": "フォークしたい投稿をクリックして",
     "fork_no_pids": "投稿が選択されていません！",
     "fork_pid_count": "%1 投稿(s)が選択されました",
-    "fork_success": "トピックをフォークするのに成功しました。ここを押して、このフォークしたトピックに行きます。",
-    "delete_posts_instruction": "削除または粛清するには、当てはまる投稿を押してください",
-    "composer.title_placeholder": "スレッドのタイトルを入力して...",
+    "fork_success": "スレッドをフォークするのに成功しました。ここを押して、このフォークしたスレッドに行きます。",
+    "delete_posts_instruction": "削除または切り離するには、当てはまる投稿を押してください",
+    "composer.title_placeholder": "スレッドのタイトルを入力...",
     "composer.handle_placeholder": "名前",
     "composer.discard": "破棄する",
     "composer.submit": "保存する",
@@ -127,10 +127,10 @@
     "newest_to_oldest": "古い順に",
     "most_votes": "最高評価",
     "most_posts": "最高投稿",
-    "stale.title": "新しいトピックを作りますか？",
-    "stale.warning": "あなたが返信しようとしてるトピックが古いトピックです。新しいトピックを作って、そしてこのトピックが参考として入れた方を勧めます。そうしますか？",
-    "stale.create": "新しいトピックを作ります。",
-    "stale.reply_anyway": "とにかく、このトピックに返信します",
+    "stale.title": "新しいスレッドを作りますか？",
+    "stale.warning": "あなたが返信しようとしてるスレッドが古いスレッドです。新しいスレッドを作って、そしてこのスレッドが参考として入れた方を勧めます。そうしますか？",
+    "stale.create": "新しいスレッドを作ります。",
+    "stale.reply_anyway": "とにかく、このスレッドに返信します",
     "link_back": "返信: [%1](%2)",
     "spam": "スパム",
     "offensive": "攻撃",
diff --git a/public/language/ja/unread.json b/public/language/ja/unread.json
index a49ff984b0..47909bf086 100644
--- a/public/language/ja/unread.json
+++ b/public/language/ja/unread.json
@@ -1,13 +1,13 @@
 {
     "title": "未読",
-    "no_unread_topics": "未読のトピックがあります。",
+    "no_unread_topics": "未読のスレッドがあります。",
     "load_more": "もっと見る",
     "mark_as_read": "既読にする",
     "selected": "選択済み",
     "all": "全て",
     "all_categories": "全てのカテゴリ",
     "topics_marked_as_read.success": "すべてのスレッドを既読にしました。",
-    "all-topics": "すべてのトピック",
-    "new-topics": "新しいトピック",
-    "watched-topics": "トピックをウォッチしました"
+    "all-topics": "すべてのスレッド",
+    "new-topics": "新しいスレッド",
+    "watched-topics": "スレッドをウォッチしました"
 }
\ No newline at end of file
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index e29a50ee5f..e573a94005 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -63,7 +63,7 @@
     "upload_a_picture": "画像をアップロード",
     "remove_uploaded_picture": "アップした写真を取り消します",
     "upload_cover_picture": "カバー写真をアップロード",
-    "remove_cover_picture_confirm": "Are you sure you want to remove the cover picture?",
+    "remove_cover_picture_confirm": "カバー写真を削除してもよろしいですか？",
     "settings": "設定",
     "show_email": "メールアドレスを表示",
     "show_fullname": "フルネームで表示",
@@ -75,19 +75,19 @@
     "digest_weekly": "ウィークリー",
     "digest_monthly": "マンスリー",
     "send_chat_notifications": "オンラインではない時に新しいチャットメッセージを受信した場合、通知メールを送信する。",
-    "send_post_notifications": "購読中のトピックに返信があった場合、メールで通知する。",
+    "send_post_notifications": "購読中のスレッドに返信があった場合、メールで通知する。",
     "settings-require-reload": "変化がありましてブラウザを更新する必要があります。ここを押して、ページ更新します。",
     "has_no_follower": "フォロワーはまだいません :(",
     "follows_no_one": "フォロー中のユーザーはまだいません :(",
     "has_no_posts": "このユーザーはまだ一つも投稿していません",
-    "has_no_topics": "このユーザーはまだ一つもトピックを作っていません",
-    "has_no_watched_topics": "このユーザーはまだ一つもトピックをウオッチしていません",
+    "has_no_topics": "このユーザーはまだ一つもスレッドを作っていません",
+    "has_no_watched_topics": "このユーザーはまだ一つもスレッドをウォッチしていません",
     "has_no_upvoted_posts": "このユーザーはまだ一つも投稿に高評価を付けていません。",
     "has_no_downvoted_posts": "このユーザーはまだ一つも投稿に低評価を付けていません。",
     "has_no_voted_posts": "このユーザーは投稿を評価していません。",
     "email_hidden": "メールアドレスを非表示",
     "hidden": "非表示",
-    "paginate_description": "無限スクロールの代わりに、投稿やトピックをページ別で切り替える。",
+    "paginate_description": "無限スクロールの代わりに、投稿やスレッドをページ別で切り替える。",
     "topics_per_page": "ページごとのスレッド数",
     "posts_per_page": "ページごとの投稿数",
     "notification_sounds": "通知の時に音を鳴らします",
@@ -98,13 +98,13 @@
     "no-sound": "無音",
     "browsing": "ブラウジングの設定",
     "open_links_in_new_tab": "外部リンクを新しいタブで開く",
-    "enable_topic_searching": "インートピックの検索を有効にします",
-    "topic_search_help": "有効にしたら、インートピックの検索はブラウザの既定機能を無視して、スクリーンに示したよりトピック内からの全部を検索します",
+    "enable_topic_searching": "インースレッドの検索を有効にします",
+    "topic_search_help": "有効にしたら、インースレッドの検索はブラウザの既定機能を無視して、スクリーンに示したよりスレッド内からの全部を検索します",
     "delay_image_loading": "画像読み込みを遅延させる",
-    "image_load_delay_help": "有効の場合、トピック内の画像はスクロールされるまで読み込みません",
+    "image_load_delay_help": "有効の場合、スレッド内の画像はスクロールされるまで読み込みません",
     "scroll_to_my_post": "返信を投稿した後、新しい投稿を表示する",
-    "follow_topics_you_reply_to": "あなたが返信するトピックをウォッチ",
-    "follow_topics_you_create": "あなたが作成したトピックをウォッチする",
+    "follow_topics_you_reply_to": "あなたが返信するスレッドをウォッチ",
+    "follow_topics_you_create": "あなたが作成したスレッドをウォッチする",
     "grouptitle": "グループ題名",
     "no-group-title": "グループ名がありません",
     "select-skin": "スキンを選んで下さい",
diff --git a/public/language/ja/users.json b/public/language/ja/users.json
index 514a3f08dd..a79f15c4cc 100644
--- a/public/language/ja/users.json
+++ b/public/language/ja/users.json
@@ -12,9 +12,9 @@
     "invite": "招待",
     "invitation-email-sent": "招待メールが%1に送られました。",
     "user_list": "ユーザー一覧",
-    "recent_topics": "最新トピック",
-    "popular_topics": "人気トピック",
-    "unread_topics": "未読トピック",
+    "recent_topics": "最新スレッド",
+    "popular_topics": "人気のスレッド",
+    "unread_topics": "未読スレッド",
     "categories": "カテゴリ",
     "tags": "タグ",
     "no-users-found": "ユーザーが見つかりません!"
diff --git a/public/language/pl/admin/advanced/errors.json b/public/language/pl/admin/advanced/errors.json
index 9b168474d1..97600d679f 100644
--- a/public/language/pl/admin/advanced/errors.json
+++ b/public/language/pl/admin/advanced/errors.json
@@ -1,14 +1,14 @@
 {
-	"figure-x": "Figure %1",
-	"error-events-per-day": "<code>%1</code> events per day",
+	"figure-x": "Błąd %1",
+	"error-events-per-day": "<code>%1</code> wydarzeń dziennie",
 	"error.404": "404 Nie znaleziono",
 	"error.503": "503 Usługa niedostępna",
 	"manage-error-log": "Zarządzaj dziennikiem błędów",
 	"export-error-log": "Eksportuj dziennik błędów (CSV)",
 	"clear-error-log": "Wyczyść dziennik błędów",
-	"route": "Route",
-	"count": "Count",
-	"no-routes-not-found": "Hooray! There are no routes that were not found.",
+	"route": "Scieżka",
+	"count": "Licznik",
+	"no-routes-not-found": "Brawo! Nie znaleziono błędów.",
 	"clear404-confirm": "Czy chcesz wyczyścić dziennik błędów 404?",
 	"clear404-success": "Wyczyszczono błędy \"404 Nie znaleziono\""
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/advanced/logs.json b/public/language/pl/admin/advanced/logs.json
index 0882641e77..13b4d79a61 100644
--- a/public/language/pl/admin/advanced/logs.json
+++ b/public/language/pl/admin/advanced/logs.json
@@ -2,6 +2,6 @@
 	"logs": "Logi",
 	"control-panel": "Logi Panelu Kontroli",
 	"reload": "Przeładuj logi",
-	"clear": "Clear Logs",
-	"clear-success": "Logs Cleared!"
+	"clear": "Wyczyść Logi",
+	"clear-success": "Logi Wyczyszczone!"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/appearance/themes.json b/public/language/pl/admin/appearance/themes.json
index 85e4d62eba..eca6731adc 100644
--- a/public/language/pl/admin/appearance/themes.json
+++ b/public/language/pl/admin/appearance/themes.json
@@ -2,10 +2,10 @@
     "checking-for-installed": "Sprawdzanie zainstalowanego stylu...",
     "homepage": "Strona główna",
     "select-theme": "Wybierz Styl",
-    "current-theme": "Current Theme",
-    "no-themes": "No installed themes found",
-    "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?",
-    "theme-changed": "Theme Changed",
-    "revert-success": "You have successfully reverted your NodeBB back to it's default theme.",
-    "restart-to-activate": "Please restart your NodeBB to fully activate this theme"
+    "current-theme": "Aktualny Styl",
+    "no-themes": "Brak zainstalowanych stylów",
+    "revert-confirm": "Czy na pewno chcesz przywrócić domyślny styl NodeBB?",
+    "theme-changed": "Styl Zmieniony",
+    "revert-success": "Pomyślnie przywrócono domyślny styl NodeBB.",
+    "restart-to-activate": "Proszę zrestartować NodeBB, aby styl poprawnie działał."
 }
\ 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 a5e2715f2a..6ac7776536 100644
--- a/public/language/pl/admin/extend/plugins.json
+++ b/public/language/pl/admin/extend/plugins.json
@@ -1,45 +1,45 @@
 {
 	"installed": "Zainstalowane",
-	"active": "Active",
+	"active": "Aktywne",
 	"inactive": "Nieaktywny",
-	"out-of-date": "Out of Date",
-	"none-found": "No plugins found.",
-	"none-active": "No Active Plugins",
-	"find-plugins": "Find Plugins",
+	"out-of-date": "Nieaktualne",
+	"none-found": "Nie znaleziono pluginów",
+	"none-active": "Brak aktywnych pluginów",
+	"find-plugins": "Znajdź plugin",
 
-	"plugin-search": "Plugin Search",
-	"plugin-search-placeholder": "Search for plugin...",
-	"reorder-plugins": "Re-order Plugins",
-	"order-active": "Order Active Plugins",
-	"dev-interested": "Interested in writing plugins for NodeBB?",
-	"docs-info": "Full documentation regarding plugin authoring can be found in the <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
+	"plugin-search": "Szukaj pluginów",
+	"plugin-search-placeholder": "Szukaj pluginów...",
+	"reorder-plugins": "Posortuj Pluginy",
+	"order-active": "Posortuj Aktywne Pluginy",
+	"dev-interested": "Zainteresowany pisanie pluginów do NodeBB??",
+	"docs-info": "Pełna dokumentacje dotycząca pisania pluginów znajduje się tutaj <a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB Docs Portal</a>.",
 
 	"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": "Style",
+	"plugin-item.deactivate": "Dezaktywować",
+	"plugin-item.activate": "Aktywne",
+	"plugin-item.install": "Zainstaluj",
+	"plugin-item.uninstall": "Odinstaluj",
+	"plugin-item.settings": "Ustawienia",
+	"plugin-item.installed": "Zainstalowane",
+	"plugin-item.latest": "Ostatnie",
+	"plugin-item.upgrade": "Zaktualizuj",
+	"plugin-item.more-info": "Po więcej informacji:",
+	"plugin-item.unknown": "Nieznane",
 	"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": "Plugin Włączony",
+	"alert.disabled": "Plugin Wyłączony",
+	"alert.upgraded": "Plugin Zaktualizowany",
+	"alert.installed": "Plugin Zainstalowany",
+	"alert.uninstalled": "Plugin Odinstalowany",
+	"alert.activate-success": "Proszę zrestartować NodeBB, aby poprawnie działał plugin.",
+	"alert.deactivate-success": "Plugin pomyślnie dezaktywowany",
+	"alert.upgrade-success": "Proszę przeładować NodeBB, aby poprawnie działał plugin",
+	"alert.install-success": "Plugin pomyślnie zainstalowany, proszę aktywować go.",
+	"alert.uninstall-success": "Plugin został pomyślnie zdezaktywowany oraz odinstalowany.",
 	"alert.suggest-error": "<p>NodeBB could not reach the package manager, proceed with installation of latest version?</p><div class=\"alert alert-danger\"><strong>Server returned (%1)</strong>: %2</div>",
 	"alert.package-manager-unreachable": "<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>",
 	"alert.incompatible": "<p>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.</p>",
diff --git a/public/language/pl/admin/extend/rewards.json b/public/language/pl/admin/extend/rewards.json
index 6eb12d1f33..d4bf572396 100644
--- a/public/language/pl/admin/extend/rewards.json
+++ b/public/language/pl/admin/extend/rewards.json
@@ -1,17 +1,17 @@
 {
 	"rewards": "Nagrody",
-	"condition-if-users": "If User's",
+	"condition-if-users": "Jeżeli Użytkownik",
 	"condition-is": "Jest:",
-	"condition-then": "Then:",
-	"max-claims": "Amount of times reward is claimable",
-	"zero-infinite": "Enter 0 for infinite",
-	"delete": "Delete",
-	"enable": "Enable",
-	"disable": "Disable",
-	"control-panel": "Rewards Control",
-	"new-reward": "New Reward",
+	"condition-then": "To:",
+	"max-claims": "Ile razy nagroda może zostać przyznana",
+	"zero-infinite": "Wpisz 0, aby nieskończona ilość razy",
+	"delete": "Usuń",
+	"enable": "Włącz",
+	"disable": "Wyłącz",
+	"control-panel": "Ustawienia Nagród",
+	"new-reward": "Nowa Nagroda",
 
-	"alert.delete-success": "Successfully deleted reward",
-	"alert.no-inputs-found": "Illegal reward - no inputs found!",
-	"alert.save-success": "Successfully saved rewards"
+	"alert.delete-success": "Pomyślnie usunięto nagrodę",
+	"alert.no-inputs-found": "Niepoprawnie dodana nagroda ",
+	"alert.save-success": "Pomyślnie zapisano nagrodę"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/extend/widgets.json b/public/language/pl/admin/extend/widgets.json
index 45af5a35cc..379b1df398 100644
--- a/public/language/pl/admin/extend/widgets.json
+++ b/public/language/pl/admin/extend/widgets.json
@@ -4,7 +4,7 @@
 	"none-installed": "No widgets found! Activate the essential widgets plugin in the <a href=\"%1\">plugins</a> control panel.",
 	"containers.available": "Available Containers",
 	"containers.explanation": "Drag and drop on top of any active widget",
-	"containers.none": "None",
+	"containers.none": "Żadna",
 	"container.well": "Well",
 	"container.jumbotron": "Jumbotron",
 	"container.panel": "Panel",
diff --git a/public/language/pl/admin/general/homepage.json b/public/language/pl/admin/general/homepage.json
index 7afc8608b1..204f166db1 100644
--- a/public/language/pl/admin/general/homepage.json
+++ b/public/language/pl/admin/general/homepage.json
@@ -1,7 +1,7 @@
 {
 	"home-page": "Strona Główna",
-	"description": "Choose what page is shown when users navigate to the root URL of your forum.",
-	"home-page-route": "Home Page Route",
-	"custom-route": "Custom Route",
-	"allow-user-home-pages": "Allow User Home Pages"
+	"description": "Wybierz stronę główną dla Twojego forum.",
+	"home-page-route": "Strona Główna",
+	"custom-route": "Niestandardowy Adres",
+	"allow-user-home-pages": "Pozwól użytkownikom na zmienienie strony głownej"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/general/languages.json b/public/language/pl/admin/general/languages.json
index f5f3c02873..d8779b4524 100644
--- a/public/language/pl/admin/general/languages.json
+++ b/public/language/pl/admin/general/languages.json
@@ -1,5 +1,5 @@
 {
 	"language-settings": "Ustawienia Językowe",
-	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language"
+	"description": "Domyślnym językiem określa ustawienia języka dla wszystkich użytkowników, którzy odwiedzają forum. <br /> Użytkownicy mogą zmienić domyślny język, w ustawieniach konta.",
+	"default-language": "Domyślny Język"
 }
\ 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 622a4b8277..42302c6834 100644
--- a/public/language/pl/admin/general/navigation.json
+++ b/public/language/pl/admin/general/navigation.json
@@ -1,24 +1,24 @@
 {
 	"icon": "Ikona:",
 	"change-icon": "zmień",
-	"route": "Route:",
+	"route": "Ścieżka:",
 	"tooltip": "Tooltip:",
-	"text": "Text:",
+	"text": "Tekst:",
 	"text-class": "Text Class: <small>optional</small>",
 	"id": "ID: <small>optional</small>",
 
 	"properties": "Properties:",
-	"only-admins": "Only display to Admins",
-	"only-global-mods-and-admins": "Only display to Global Moderators and Admins",
-	"only-logged-in": "Only display to logged in users",
-	"open-new-window": "Open in a new window",
+	"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",
+	"open-new-window": "Otwórz w nowym oknie",
 
 	"installed-plugins-required": "Installed Plugins Required:",
 	"search-plugin": "Search plugin",
 
-	"btn.delete": "Delete",
-	"btn.disable": "Disable",
-	"btn.enable": "Enable",
+	"btn.delete": "Usunąć",
+	"btn.disable": "Wyłącz",
+	"btn.enable": "Włącz",
 
 	"available-menu-items": "Available Menu Items",
 	"custom-route": "Custom Route",
diff --git a/public/language/pl/admin/general/social.json b/public/language/pl/admin/general/social.json
index 23aedfcfaa..a3b9bd0377 100644
--- a/public/language/pl/admin/general/social.json
+++ b/public/language/pl/admin/general/social.json
@@ -1,5 +1,5 @@
 {
-	"post-sharing": "Post Sharing",
+	"post-sharing": "Udostępnianie postów",
 	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
 	"save-success": "Successfully saved Post Sharing Networks!"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/general/sounds.json b/public/language/pl/admin/general/sounds.json
index f580b60beb..f979492b45 100644
--- a/public/language/pl/admin/general/sounds.json
+++ b/public/language/pl/admin/general/sounds.json
@@ -1,9 +1,9 @@
 {
 	"notifications": "Powiadomienia",
-	"chat-messages": "Chat Messages",
-	"play-sound": "Play",
-	"incoming-message": "Incoming Message",
-	"outgoing-message": "Outgoing Message",
-	"upload-new-sound": "Upload New Sound",
-	"saved": "Settings Saved"
+	"chat-messages": "Wiadomości Czatu",
+	"play-sound": "Otwórz",
+	"incoming-message": "Przychodzące Wiadomości",
+	"outgoing-message": "Wychodzące Wiadomości",
+	"upload-new-sound": "Prześlij Nowy Dźwięk",
+	"saved": "Ustawienia Zapisane"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/manage/categories.json b/public/language/pl/admin/manage/categories.json
index bfa42918c6..4eb8a57259 100644
--- a/public/language/pl/admin/manage/categories.json
+++ b/public/language/pl/admin/manage/categories.json
@@ -1,68 +1,68 @@
 {
 	"settings": "Ustawienia kategorii",
-	"privileges": "Privileges",
+	"privileges": "Przywileje",
 
 	"name": "Nazwa Kategorii",
-	"description": "Category Description",
-	"bg-color": "Background Colour",
-	"text-color": "Text Colour",
-	"bg-image-size": "Background Image Size",
-	"custom-class": "Custom Class",
-	"num-recent-replies": "# of Recent Replies",
-	"ext-link": "External Link",
-	"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",
+	"description": "Opis kategorii",
+	"bg-color": "Kolor tła",
+	"text-color": "Kolor tekstu",
+	"bg-image-size": "Wielkość obrazka tła",
+	"custom-class": "Niestandardowa klasa",
+	"num-recent-replies": "# z Ostatnich Odpowiedzi",
+	"ext-link": "Zewnętrzny Link",
+	"upload-image": "Prześlij Obrazek",
+	"delete-image": "Usunąć",
+	"category-image": "Obrazek Kategorii",
+	"parent-category": "Kategoria nadrzędna",
+	"optional-parent-category": "(Opcjonalne) Kategoria nadrzędna",
+	"parent-category-none": "(Żadna)",
+	"copy-settings": "Skopiować ustawienia z",
+	"optional-clone-settings": "(Opcjonalnie) Spoiowanie ustawień z kategorii",
+	"purge": "Usuń kategorie",
 
-	"enable": "Enable",
-	"disable": "Disable",
-	"edit": "Edit",
+	"enable": "Włączona",
+	"disable": "Wyłączona",
+	"edit": "Edytuj",
 
-	"select-category": "Select Category",
-	"set-parent-category": "Set Parent Category",
+	"select-category": "Wybierz Kategorie",
+	"set-parent-category": "Ustaw nadrzędną kategorie",
 
-	"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": "<strong>Note</strong>: 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.description": "Można skonfigurować uprawnienia kontroli dostępu do tej kategorii w tej sekcji. Uprawnienia mogą być przyznawane dla każdego użytkownika lub dla poszczególnych grup. Możesz dodać nowego użytkownika do tej tabeli, wyszukując je w poniższym formularzu.",
+	"privileges.warning": "<strong>Uwaga</strong>: Przywileje zapisują się natychmiastowo. Nie ma znaczenie czy klikniesz zapisz.",
+	"privileges.section-viewing": "Lista Przywilejów",
+	"privileges.section-posting": "Przywileje do pisania",
+	"privileges.section-moderation": "Przywileje do moderowania",
+	"privileges.section-user": "Użytkownik",
+	"privileges.search-user": "Dodaj użytkownika",
 	"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-group": "Grupa",
+	"privileges.group-private": "Ta grupa jest prywatna",
+	"privileges.search-group": "Dodaj grupę",
+	"privileges.copy-to-children": "Skopiuj z podrzędnej",
+	"privileges.copy-from-category": "Skopiuj z kategorii",
 	"privileges.inherit": "If the <code>registered-users</code> group is granted a specific privilege, all other groups receive an <strong>implicit privilege</strong>, even if they are not explicitly defined/checked. This implicit privilege is shown to you because all users are part of the <code>registered-users</code> 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": "Wróć do listy kategorii",
+	"analytics.title": "Analityka dla \"%1\" kategorii",
 	"analytics.pageviews-hourly": "<strong>Figure 1</strong> &ndash; Hourly page views for this category</small>",
 	"analytics.pageviews-daily": "<strong>Figure 2</strong> &ndash; Daily page views for this category</small>",
 	"analytics.topics-daily": "<strong>Figure 3</strong> &ndash; Daily topics created in this category</small>",
 	"analytics.posts-daily": "<strong>Figure 4</strong> &ndash; Daily posts made in this category</small>",
 
-	"alert.created": "Created",
-	"alert.create-success": "Category successfully created!",
-	"alert.none-active": "You have no active categories.",
-	"alert.create": "Create a Category",
+	"alert.created": "Stworzony",
+	"alert.create-success": "Kategoria pomyślnie dodana!",
+	"alert.none-active": "Nie masz aktywnych kategorii.",
+	"alert.create": "Stwórz kategorie",
 	"alert.confirm-moderate": "<strong>Are you sure you wish to grant the moderation privilege to this user group?</strong> This group is public, and any users can join at will.",
 	"alert.confirm-purge": "<p class=\"lead\">Do you really want to purge this category \"%1\"?</p><h5><strong class=\"text-danger\">Warning!</strong> All topics and posts in this category will be purged!</h5> <p class=\"help-block\">Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category <em>temporarily</em>, you'll want to \"disable\" the category instead.</p>",
-	"alert.purge-success": "Category purged!",
-	"alert.copy-success": "Settings Copied!",
-	"alert.set-parent-category": "Set Parent Category",
-	"alert.updated": "Updated Categories",
+	"alert.purge-success": "Kategoria usunięta!",
+	"alert.copy-success": "Ustawienie skopiowane!",
+	"alert.set-parent-category": "Ustaw nadrzędną kategorie",
+	"alert.updated": "Zaktualizuj kategorie",
 	"alert.updated-success": "ID kategorii %1 pomyślnie zaktualizowano.",
-	"alert.upload-image": "Upload category image",
-	"alert.find-user": "Find a User",
-	"alert.user-search": "Search for a user here...",
-	"alert.find-group": "Find a Group",
-	"alert.group-search": "Search for a group here..."
+	"alert.upload-image": "Prześlij obrazek kategorii",
+	"alert.find-user": "Znajdź użytkownika",
+	"alert.user-search": "Szukaj użytkownika tutaj...",
+	"alert.find-group": "Szukaj grupę",
+	"alert.group-search": "Szukaj grupę tutaj..."
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/manage/groups.json b/public/language/pl/admin/manage/groups.json
index fe091a8bad..3de74fad4a 100644
--- a/public/language/pl/admin/manage/groups.json
+++ b/public/language/pl/admin/manage/groups.json
@@ -1,34 +1,34 @@
 {
 	"name": "Nazwa Grupy",
-	"description": "Group Description",
+	"description": "Opis Grupy",
 	"system": "System Grup",
-	"edit": "Edit",
-	"search-placeholder": "Search",
-	"create": "Create Group",
-	"description-placeholder": "A short description about your group",
-	"create-button": "Create",
+	"edit": "Edytuj",
+	"search-placeholder": "Szukaj",
+	"create": "Stwórz Grupę",
+	"description-placeholder": "Krótki opisz grupy",
+	"create-button": "Stwórz",
 
-	"alerts.create-failure": "<strong>Uh-Oh</strong><p>There was a problem creating your group. Please try again later!</p>",
-	"alerts.confirm-delete": "Are you sure you wish to delete this group?",
+	"alerts.create-failure": "<strong>Uh-Oh</strong><p>Wystąpił problem podczas tworzenia grupy. Spróbuj ponownie później</p>",
+	"alerts.confirm-delete": "Czy na pewno chcesz usunąć tę grupę?",
 
-	"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.name": "Nazwa",
+	"edit.description": "Opis",
+	"edit.user-title": "Tytuł Członków ",
+	"edit.icon": "Ikona Grupy",
+	"edit.label-color": "Kolor Etykiety Grupy",
+	"edit.show-badge": "Pokaż Etykietę",
 	"edit.private-details": "If enabled, joining of groups requires approval from a group owner.",
-	"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",
-	"control-panel": "Groups Control Panel",
-	"revert": "Revert",
+	"edit.private-override": "Ostrzeżenie: Prywatne grupy są wyłączone w ustawieniach, co powoduje przesłonięcia opcji.",
+	"edit.disable-requests": "Wyłącz prośby o dołączenie",
+	"edit.hidden": "Ukryta",
+	"edit.hidden-details": "Jeśli opcja jest włączona, grupa ta nie będzie widoczna dla użytkowników.",
+	"edit.add-user": "Dodaj użytkownika do grupy",
+	"edit.add-user-search": "Szukaj Użytkownika",
+	"edit.members": "Lista Członków",
+	"control-panel": "Panel sterowania",
+	"revert": "Cofnij",
 
-	"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.no-users-found": "Nie znaleziono użytkowników",
+	"edit.confirm-remove-user": "Jesteś pewny, że chcesz usunąć tego użytkownika?",
+	"edit.save-success": "Zmiany zapisane!"
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/menu.json b/public/language/pl/admin/menu.json
index 6a4995ea6e..4c2f6b4b53 100644
--- a/public/language/pl/admin/menu.json
+++ b/public/language/pl/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",
+	"section-general": "Ogólne",
+	"general/dashboard": "Główna",
+	"general/homepage": "Strona Startowa",
+	"general/navigation": "Nawigacja",
+	"general/languages": "Język",
+	"general/sounds": "Dźwięki",
 	"general/social": "Social",
 
-	"section-manage": "Manage",
-	"manage/categories": "Categories",
-	"manage/tags": "Tags",
-	"manage/users": "Users",
-	"manage/registration": "Registration Queue",
-	"manage/groups": "Groups",
-	"manage/flags": "Flags",
-	"manage/ip-blacklist": "IP Blacklist",
+	"section-manage": "Zarządzanie",
+	"manage/categories": "Kategorie",
+	"manage/tags": "Tagi",
+	"manage/users": "Użytkownicy",
+	"manage/registration": "Kolejka Rejestracji",
+	"manage/groups": "Grupy",
+	"manage/flags": "Flagi",
+	"manage/ip-blacklist": "Czarna Lista IP",
 
-	"section-settings": "Settings",
-	"settings/general": "General",
-	"settings/reputation": "Reputation",
+	"section-settings": "Ustawienia",
+	"settings/general": "Ogólne",
+	"settings/reputation": "Reputacja",
 	"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",
-	"settings/cookies": "Cookies",
+	"settings/user": "Użytkownik",
+	"settings/group": "Grupa",
+	"settings/guest": "Gość",
+	"settings/uploads": "Przesłane",
+	"settings/post": "Posty",
+	"settings/chat": "Czat",
+	"settings/pagination": "Paginacja",
+	"settings/tags": "Tagi",
+	"settings/notifications": "Powiadomienia",
+	"settings/cookies": "Ciasteczka",
 	"settings/web-crawler": "Web Crawler",
 	"settings/sockets": "Sockets",
-	"settings/advanced": "Advanced",
+	"settings/advanced": "Zaawansowane",
 
-	"settings.page-title": "%1 Settings",
+	"settings.page-title": "%1 Ustawienia",
 
-	"section-appearance": "Appearance",
-	"appearance/themes": "Themes",
-	"appearance/skins": "Skins",
-	"appearance/customise": "Custom HTML & CSS",
+	"section-appearance": "Wygląd",
+	"appearance/themes": "Style",
+	"appearance/skins": "Skórki",
+	"appearance/customise": "Niestandardowy HTML & CSS",
 
 	"section-extend": "Extend",
-	"extend/plugins": "Plugins",
-	"extend/widgets": "Widgets",
-	"extend/rewards": "Rewards",
+	"extend/plugins": "Pluginy",
+	"extend/widgets": "Widgety",
+	"extend/rewards": "Nagrody",
 
-	"section-social-auth": "Social Authentication",
+	"section-social-auth": "Alternatywne Logowanie",
 
-	"section-plugins": "Plugins",
-	"extend/plugins.install": "Install Plugins",
+	"section-plugins": "Pluginy",
+	"extend/plugins.install": "Zainstalowane Pluginy",
 
-	"section-advanced": "Advanced",
-	"advanced/database": "Database",
-	"advanced/events": "Events",
-	"advanced/logs": "Logs",
-	"advanced/errors": "Errors",
-	"advanced/cache": "Cache",
+	"section-advanced": "Zaawansowane",
+	"advanced/database": "Baza Danych",
+	"advanced/events": "Wydarzenia",
+	"advanced/logs": "Logi",
+	"advanced/errors": "Błędy",
+	"advanced/cache": "Pamięć",
 	"development/logger": "Logger",
-	"development/info": "Info",
+	"development/info": "Informacja",
 
-	"reload-forum": "Reload Forum",
-	"restart-forum": "Restart Forum",
-	"logout": "Log out",
-	"view-forum": "View Forum",
+	"reload-forum": "Przeładuj Forum",
+	"restart-forum": "Restartuj Forum",
+	"logout": "Wyloguj się",
+	"view-forum": "Zobacz Forum",
 
-	"search.placeholder": "Search...",
-	"search.no-results": "No results...",
-	"search.search-forum": "Search the forum for <strong></strong>",
-	"search.keep-typing": "Type more to see results...",
-	"search.start-typing": "Start typing to see results...",
+	"search.placeholder": "Szukaj...",
+	"search.no-results": "Brak rezultatów...",
+	"search.search-forum": "Szukaj w forum <strong></strong>",
+	"search.keep-typing": "Wpisz więcej, aby zobaczyć wyniki ...",
+	"search.start-typing": "Zacznij pisać, aby zobaczyć wyniki ...",
 
-	"connection-lost": "Connection to %1 has been lost, attempting to reconnect..."
+	"connection-lost": "Połączenie z %1 zostało utracone, próba ponownego połączenia..."
 }
\ No newline at end of file
diff --git a/public/language/pl/admin/settings/advanced.json b/public/language/pl/admin/settings/advanced.json
index 1afa2c69f0..d931155ad3 100644
--- a/public/language/pl/admin/settings/advanced.json
+++ b/public/language/pl/admin/settings/advanced.json
@@ -1,8 +1,8 @@
 {
 	"maintenance-mode": "Tryb Konserwacji",
 	"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",
+	"maintenance-mode.message": "Wiadomość podczas konserwacji",
+	"headers": "Nagłówek",
 	"headers.allow-from": "Set ALLOW-FROM to Place NodeBB in an iFrame",
 	"headers.powered-by": "Customise the \"Powered By\" header sent by NodeBB",
 	"headers.acao": "Access-Control-Allow-Origin",
diff --git a/public/language/pl/admin/settings/reputation.json b/public/language/pl/admin/settings/reputation.json
index 00dca4d9d1..a2cf0c4eb6 100644
--- a/public/language/pl/admin/settings/reputation.json
+++ b/public/language/pl/admin/settings/reputation.json
@@ -1,7 +1,7 @@
 {
 	"reputation": "Ustawienia Reputacji",
-	"disable": "Disable Reputation System",
-	"disable-down-voting": "Disable Down Voting",
+	"disable": "Wyłącz System Reputacji",
+	"disable-down-voting": "Wyłącz System \"Głosów przeciw\"",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"min-rep-flag": "Minimum reputation to flag posts"
diff --git a/public/language/pl/admin/settings/user.json b/public/language/pl/admin/settings/user.json
index bdabb075e9..94df909293 100644
--- a/public/language/pl/admin/settings/user.json
+++ b/public/language/pl/admin/settings/user.json
@@ -1,38 +1,38 @@
 {
-	"authentication": "Authentication",
-	"allow-local-login": "Allow local login",
-	"require-email-confirmation": "Require Email Confirmation",
-	"email-confirm-interval": "User may not resend a confirmation email until",
-	"email-confirm-email2": "minutes have elapsed",
-	"allow-login-with": "Allow login with",
-	"allow-login-with.username-email": "Username or Email",
-	"allow-login-with.username": "Username Only",
-	"allow-login-with.email": "Email Only",
-	"account-settings": "Account Settings",
-	"disable-username-changes": "Disable username changes",
-	"disable-email-changes": "Disable email changes",
-	"disable-password-changes": "Disable password changes",
-	"allow-account-deletion": "Allow account deletion",
-	"user-info-private": "Make user info private",
-	"themes": "Themes",
-	"disable-user-skins": "Prevent users from choosing a custom skin",
-	"account-protection": "Account Protection",
-	"login-attempts": "Login attempts per hour",
+	"authentication": "Autoryzacja",
+	"allow-local-login": "Pozwól na lokalne logowanie",
+	"require-email-confirmation": "Wymagaj Potwierdzenie Emailu",
+	"email-confirm-interval": "Użytkownik nie może ponownie wysłać email z potwierdzeniem, aż",
+	"email-confirm-email2": "minut upłynęło",
+	"allow-login-with": "Pozwól na logowanie przy użyciu",
+	"allow-login-with.username-email": "Nazwy użytkownika oraz Emailu",
+	"allow-login-with.username": "Tylko Nazwy Użytkownia",
+	"allow-login-with.email": "Tylko Emailu",
+	"account-settings": "Ustawienia Konta",
+	"disable-username-changes": "Wyłącz możliwość zmiany nazwy użytkownika",
+	"disable-email-changes": "Wyłącz możliwość zmiany emaila",
+	"disable-password-changes": "Wyłącz możliwość zmiany hasła",
+	"allow-account-deletion": "Pozwól na możliwość usunięcia konta",
+	"user-info-private": "Informację użytkownika są prywatne",
+	"themes": "Style",
+	"disable-user-skins": "Uniemożliwić użytkownikom wybranie niestandardowej skórę",
+	"account-protection": "Ochrona Konta",
+	"login-attempts": "Prób logowania na godzinę",
 	"login-attempts-help": "If login attempts to a user&apos;s account exceeds this threshold, that account will be locked for a pre-configured amount of time",
-	"lockout-duration": "Account Lockout Duration (minutes)",
-	"login-days": "Days to remember user login sessions",
-	"password-expiry-days": "Force password reset after a set number of days",
-	"registration": "User Registration",
-	"registration-type": "Registration Type",
-	"registration-type.normal": "Normal",
-	"registration-type.admin-approval": "Admin Approval",
-	"registration-type.admin-approval-ip": "Admin Approval for IPs",
-	"registration-type.invite-only": "Invite Only",
-	"registration-type.admin-invite-only": "Admin Invite Only",
-	"registration-type.disabled": "No registration",
+	"lockout-duration": "Czas trwania blokady konta (minuty)",
+	"login-days": "Ilość dni zapamiętywania sesji logowania użytkownika",
+	"password-expiry-days": "Wymuś restotwanie hasła po określonej liczbie dni",
+	"registration": "Rejestracja Użytkownika",
+	"registration-type": "Typ Rejestracji",
+	"registration-type.normal": "Normalna",
+	"registration-type.admin-approval": "Zatwierdzania przez administratora",
+	"registration-type.admin-approval-ip": "Zatwierdzania przez administratora dla IP",
+	"registration-type.invite-only": "Zaproszenia",
+	"registration-type.admin-invite-only": "Zaproszenie przez administracje",
+	"registration-type.disabled": "Brak możliwości rejestracji",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
-	"registration.max-invites": "Maximum Invitations per User",
-	"max-invites": "Maximum Invitations per User",
+	"registration.max-invites": "Maksymalnie ilość zaproszeń przez użytkownika",
+	"max-invites": "Maksymalnie ilość zaproszeń przez użytkownika",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
 	"min-username-length": "Minimum Username Length",
 	"max-username-length": "Maximum Username Length",
@@ -41,19 +41,19 @@
 	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
 	"user-search": "User Search",
 	"user-search-results-per-page": "Number of results to display",
-	"default-user-settings": "Default User Settings",
-	"show-email": "Show email",
-	"show-fullname": "Show fullname",
+	"default-user-settings": "Domyślne ustawienie użytkownia",
+	"show-email": "Pokaż email",
+	"show-fullname": "Pokaż imię",
 	"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",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
-	"digest-freq.daily": "Daily",
-	"digest-freq.weekly": "Weekly",
-	"digest-freq.monthly": "Monthly",
+	"digest-freq.daily": "Dzienny ",
+	"digest-freq.weekly": "Tygodniowy",
+	"digest-freq.monthly": "Miesięczny",
 	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
 	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
-	"follow-created-topics": "Follow topics you create",
-	"follow-replied-topics": "Follow topics that you reply to"
+	"follow-created-topics": "Śledź tematy, które stworzyłeś",
+	"follow-replied-topics": "Śledź tematy, w których się wypowiedziałeś "
 }
\ No newline at end of file
diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json
index f348e7059b..2c4b9cb728 100644
--- a/public/language/sr/modules.json
+++ b/public/language/sr/modules.json
@@ -11,7 +11,7 @@
     "chat.no-users-in-room": "Нема корисника у овој соби",
     "chat.recent-chats": "Недавна ћаскања",
     "chat.contacts": "Контакти",
-    "chat.message-history": "Историјат порука",
+    "chat.message-history": "Историја порука",
     "chat.pop-out": "Истакни ћаскање",
     "chat.minimize": "Умањи",
     "chat.maximize": "Увећај",
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index 20ac0c5243..44fb671866 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/topic.json
@@ -38,7 +38,7 @@
     "flag_manage_assignee": "Заступник",
     "flag_manage_state": "Стање",
     "flag_manage_state_open": "Ново/Отвори",
-    "flag_manage_state_wip": "Посао у току",
+    "flag_manage_state_wip": "Рад у току",
     "flag_manage_state_resolved": "Решено",
     "flag_manage_state_rejected": "Одбијено",
     "flag_manage_notes": "Дељене белешке",