- {{#each group in model.displayGroups}}
+ {{#each model.displayGroups as |group|}}
{{#link-to 'group' group class="group-link"}}{{group.name}}{{/link-to}}
{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index 86c791e9e9..bed82ddb6c 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -26,22 +26,8 @@
{{/if}}
- {{#each ic in model itemController="directory-item"}}
-
- <%= link_to "#{Discourse.base_url}/t/#{@tag_id}", itemprop: 'item' do %>
+ <%= link_to "#{Discourse.base_url}/tags/#{@tag_id}", itemprop: 'item' do %>
<%= @tag_id %>
<% end %>
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 2bf819fd08..4c7c93e4f7 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -2704,7 +2704,6 @@ de:
-
tagging:
all_tags: "Alle Tags"
selector_all_tags: "Alle Tags"
@@ -2719,7 +2718,6 @@ de:
sort_by: "Sortieren nach:"
sort_by_count: "Anzahl"
sort_by_name: "Name"
-
notifications:
watching:
title: "Beobachten"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c9d7675d98..95200674c1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -773,6 +773,8 @@ en:
top_links: "Top Links"
no_links: "No links yet."
most_liked_by: "Most Liked By"
+ most_liked_users: "Most Liked"
+ most_replied_to_users: "Most Replied To"
no_likes: "No likes yet."
@@ -2591,10 +2593,18 @@ en:
block_failed: 'There was a problem blocking the user.'
block_confirm: 'Are you sure you want to block this user? They will not be able to create any new topics or posts.'
block_accept: 'Yes, block this user'
+ bounce_score: "Bounce Score"
+ reset_bounce_score:
+ label: "Reset"
+ title: "Reset bounce score back to 0"
deactivate_explanation: "A deactivated user must re-validate their email."
suspended_explanation: "A suspended user can't log in."
block_explanation: "A blocked user can't post or start topics."
- stage_explanation: "A staged user can only post via email in specific topics."
+ staged_explanation: "A staged user can only post via email in specific topics."
+ bounce_score_explanation:
+ none: "No bounces were received recently from that email."
+ some: "Some bounces were received recently from that email."
+ threshold_reached: "Received too many bounces from that email."
trust_level_change_failed: "There was a problem changing the user's trust level."
suspend_modal_title: "Suspend User"
trust_level_2_users: "Trust Level 2 Users"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 36e3c53d8e..d179e829a7 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -2717,7 +2717,6 @@ es:
-
tagging:
all_tags: "Etiquetas"
selector_all_tags: "etiquetas"
@@ -2731,7 +2730,6 @@ es:
sort_by: "Ordenar por:"
sort_by_count: "volumen"
sort_by_name: "nombre"
-
notifications:
watching:
title: "Vigilar"
@@ -2745,7 +2743,6 @@ es:
muted:
title: "Silenciar"
description: "No se te notificará de nuevos temas con esta etiqueta, ni aparecerán en tu pestaña de temas no leídos."
-
topics:
none:
unread: "No tienes temas sin leer."
@@ -2767,4 +2764,3 @@ es:
top: "No hay más temas top."
bookmarks: "No hay más temas en marcadores."
search: "No hay más resultados de búsqueda."
-
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 4706ddeb46..25d633f054 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -2444,7 +2444,6 @@ fa_IR:
delete_confirm: "آیا مطمئنید که می خواهید این برچسب را خذف کنید?"
rename_tag: "تغییر نام برچسب"
rename_instructions: "یک نام جدید برای برچسب انتخاب نمایید:"
-
notifications:
watching:
title: "تماشا"
@@ -2458,4 +2457,3 @@ fa_IR:
muted:
title: "بی صدا"
description: "به شما هیچ چیزی در باره نوشته های این تگ اطلاع رسانی نخواهد شد."
-
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 2136048863..45020c1e42 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -2671,7 +2671,6 @@ fi:
delete_confirm: "Haluatko varmasti poistaa tagin?"
rename_tag: "Uudelleennimeä tagi"
rename_instructions: "Valitse tagin uusi nimi:"
-
notifications:
watching:
title: "Tarkkaile"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index af91e9c360..b4bb96cb60 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -2726,7 +2726,6 @@ fr:
delete_confirm: "Êtes-vous sûr de vouloir supprimer ce tag ?"
rename_tag: "Renommer ce tag"
rename_instructions: "Choisissez un nouveau nom pour le tag :"
-
notifications:
watching:
title: "Surveiller"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index f6984914e9..06b4f1e4d3 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -122,7 +122,7 @@ ja:
log_in: "ログイン"
age: "経過"
joined: "参加時刻"
- admin_title: "管理者"
+ admin_title: "Admin"
flags_title: "通報"
show_more: "もっと見る"
show_help: "オプション"
@@ -299,11 +299,11 @@ ja:
none: "なし"
notifications:
watching:
- title: "ウォッチ"
+ title: "ウォッチ中"
tracking:
title: "追跡中"
regular:
- title: "ノーマル"
+ title: "デフォルト"
muted:
title: "ミュート"
user_action_groups:
@@ -334,7 +334,7 @@ ja:
position: "位置"
posts: "投稿"
topics: "トピック"
- latest: "最新ポスト"
+ latest: "最新の投稿"
latest_by: "最新投稿： "
toggle_ordering: "カテゴリの並び替えモードを切り替え"
subcategories: "サブカテゴリ:"
@@ -372,7 +372,7 @@ ja:
private_messages: "メッセージ"
activity_stream: "アクティビティ"
preferences: "設定"
- expand_profile: "展開"
+ expand_profile: "開く"
bookmarks: "ブックマーク"
bio: "自己紹介"
invited_by: "招待した人: "
@@ -399,7 +399,7 @@ ja:
moderator: "{{user}} はモデレータです"
admin: "{{user}} は管理者です"
moderator_tooltip: "このユーザはモデレータであり"
- admin_tooltip: "このユーザは管理者であり"
+ admin_tooltip: "このユーザは管理者です"
blocked_tooltip: "このユーザはブロックされています"
suspended_notice: "このユーザは {{date}} まで凍結状態です。"
suspended_reason: "理由: "
@@ -511,14 +511,14 @@ ja:
last_seen: "最後のアクティビティ"
created: "参加日"
log_out: "ログアウト"
- location: "所在地"
+ location: "場所"
card_badge:
title: "ユーザカードバッジ"
website: "ウェブサイト"
email_settings: "メール"
like_notification_frequency:
title: "いいねされた時に通知"
- always: "いつも"
+ always: "常時"
email_previous_replies:
always: "常に"
email_digests:
@@ -556,9 +556,9 @@ ja:
none: "保留中の招待はありません。"
truncated:
other: "{{count}} 件の招待を表示しています。"
- redeemed: "受理された招待"
- redeemed_tab: "受理"
- redeemed_at: "受理日"
+ redeemed: "受け取られた招待"
+ redeemed_tab: "受け取られた"
+ redeemed_at: "受け取り日"
pending: "保留中の招待"
pending_tab: "保留中"
topics_entered: "閲覧したトピック数"
@@ -582,7 +582,7 @@ ja:
password:
title: "パスワード"
too_short: "パスワードが短すぎます。"
- common: "このパスワードは他の人が使用している可能性があります。"
+ common: "このパスワードは他のユーザが使用している可能性があります。"
same_as_username: "パスワードがユーザ名と一致しています"
same_as_email: "パスワードとメールアドレスが一致しています"
ok: "パスワード OK。"
@@ -591,12 +591,12 @@ ja:
title: "情報"
stats: "統計"
time_read: "読んだ時間"
- likes_given:
- other: "likes をあげた数"
- likes_received:
- other: "likes をもらった数"
+ topic_count:
+ other: "つのトピックを作成"
posts_read:
other: "読んだ投稿"
+ bookmark_count:
+ other: "つのブックマーク"
no_replies: "まだ返信はありません。"
no_topics: "まだトピックはありません。"
no_badges: "まだバッジはありません。"
@@ -641,7 +641,7 @@ ja:
logout: "ログアウトしました"
refresh: "更新"
read_only_mode:
- enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けたり等のアクションは現在出来ません。"
+ enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けるなどのアクションは現在出来ません。"
login_disabled: "読み取り専用モードにされています。ログインできません。"
learn_more: "より詳しく..."
year: '年'
@@ -819,7 +819,7 @@ ja:
title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知"
none: "通知はありません"
more: "通知をすべて確認する"
- total_flagged: "フラグが立った投稿の合計"
+ total_flagged: "通報された投稿の合計"
mentioned: "
{{username}} {{description}}
"
quoted: "
{{username}} {{description}}
"
replied: "
{{username}} {{description}}
"
@@ -832,7 +832,7 @@ ja:
invitee_accepted: "
{{username}} accepted your invitation
"
moved_post: "
{{username}} moved {{description}}
"
linked: "
{{username}} {{description}}
"
- granted_badge: "
{{description}}バッジを付けられました
"
+ granted_badge: "
{{description}}バッジをゲットしました
"
group_message_summary:
other: "
{{count}}件のメッセージが{{group_name}}へ着ています
"
alt:
@@ -878,7 +878,7 @@ ja:
category: "\"{{category}}\" カテゴリで検索する"
topic: "このトピックを探す"
private_messages: "メッセージ検索"
- hamburger_menu: "他のトピック一覧 or カテゴリ へ行く"
+ hamburger_menu: "他のトピック一覧やカテゴリを見る"
go_back: '戻る'
not_logged_in_user: 'ユーザアクティビティと設定ページ'
current_user: 'ユーザページに移動'
@@ -988,7 +988,7 @@ ja:
'3_6': 'このカテゴリに参加中のため通知されます'
'3_5': 'このトピックに参加中のため通知されます'
'3_2': 'このトピックに参加中のため通知されます。'
- '3_1': 'このトピックの作成者なため、通知されます。'
+ '3_1': 'このトピックを作成したため通知されます。'
'3': 'このトピックに参加中のため通知されます。'
'2_8': 'このカテゴリを追跡しているため通知されます。'
'2_4': 'このトピックに返信したため通知されます。'
@@ -1000,10 +1000,10 @@ ja:
'0_2': 'このトピックに関して一切通知を受け取りません。'
'0': 'このトピックに関して一切通知を受け取りません。'
watching_pm:
- title: "参加中"
+ title: "ウォッチ中"
description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。"
watching:
- title: "参加中"
+ title: "ウォッチ中"
description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。"
tracking_pm:
title: "追跡中"
@@ -1012,10 +1012,10 @@ ja:
title: "追跡中"
description: "新しい返信の数がこのトピックに表示されます。他のユーザから@ユーザ名でメンションされた場合や、投稿へ返信された場合に通知されます。"
regular:
- title: "ノーマル"
+ title: "デフォルト"
description: "他のユーザからメンションされた場合か、投稿に返信された場合に通知されます。"
regular_pm:
- title: "ノーマル"
+ title: "デフォルト"
description: "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。"
muted_pm:
title: "ミュートされました"
@@ -1037,6 +1037,8 @@ ja:
invisible: "リストから非表示にする"
visible: "リストに表示"
reset_read: "読み込みデータをリセット"
+ make_public: "公開トピックへ変更"
+ make_private: "プライベートメッセージへ変更"
feature:
pin: "トピックをピン留めする..."
unpin: "トピックの固定を解除"
@@ -1147,14 +1149,14 @@ ja:
edit_reason: "理由: "
post_number: "投稿{{number}}"
last_edited_on: "投稿の最終編集日"
- reply_as_new_topic: "リンクされたトピックとして返信"
- continue_discussion: "{{postLink}} からのディスカッションを継続:"
+ reply_as_new_topic: "トピックへのリンクを付けて返信"
+ continue_discussion: "{{postLink}} から:"
follow_quote: "引用した投稿に移動"
show_full: "全て表示"
show_hidden: '隠されたコンテンツを表示する'
deleted_by_author:
other: "(投稿は投稿者により削除されました。フラグがついていない場合、%{count}時間後に自動的に削除されます)"
- expand_collapse: "展開/折りたたみ"
+ expand_collapse: "開く/折りたたみ"
gap:
other: "{{count}}個の返信をすべて表示する"
more_links: "{{count}} つのリンク..."
@@ -1170,9 +1172,7 @@ ja:
create: "申し訳ありませんが、投稿中にエラーが発生しました。もう一度やり直してください。"
edit: "申し訳ありませんが、投稿の編集中にエラーが発生しました。もう一度やり直してください。"
upload: "申し訳ありませんが、ファイルアップロード中にエラーが発生しました。もう一度やり直してください。"
- file_too_large: "申し訳ありませんが、アップロード対象ファイルが大きすぎます (最大サイズは {{max_size_kb}}KB)"
too_many_uploads: "申し訳ありませんが、複数のファイルは同時にアップロードできません。"
- too_many_dragged_and_dropped_files: "申し訳ありません。一度にドラッグ&ドロップできるのは10ファイルまでです"
upload_not_authorized: "申し訳ありませんが、対象ファイルをアップロードする権限がありません (利用可能な拡張子: {{authorized_extensions}})."
image_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザは画像のアップロードができません。"
attachment_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザはファイルの添付ができません。"
@@ -1192,7 +1192,7 @@ ja:
undo_like: "「いいね！」を取り消す"
edit: "この投稿を編集"
edit_anonymous: "投稿を編集するには、ログインする必要があります"
- flag: "この投稿にフラグをつける、またはプライベート通知を送る"
+ flag: "この投稿を通報する、またはプライベート通知を送る"
delete: "投稿を削除する"
undelete: "投稿を元に戻す"
share: "投稿のリンクを共有する"
@@ -1213,7 +1213,7 @@ ja:
actions:
flag: '通報'
defer_flags:
- other: "受理された通報"
+ other: "取り下げた通報"
it_too:
off_topic: "通報する"
spam: "通報する"
@@ -1236,7 +1236,7 @@ ja:
by_you:
off_topic: "関係のない話題として通報しました"
spam: "スパム報告として通報しました"
- inappropriate: "不適切であると報告するフラグを立てました"
+ inappropriate: "不適切であると報告されています"
notify_moderators: "スタッフによる確認が必要として通報しました"
notify_user: "このユーザにメッセージを送信しました"
bookmark: "この投稿をブックマークしました"
@@ -1338,7 +1338,7 @@ ja:
auto_close_label: "トピックが自動的にクローズするまでの時間:"
auto_close_units: "時間"
email_in: "カスタムメールアドレス:"
- email_in_allow_strangers: "登録されていないユーザからメールを受けとります。"
+ email_in_allow_strangers: "登録されていないユーザからメールを受け取ります"
email_in_disabled: "メールでの新規投稿は、サイトの設定で無効になっています。メールでの新規投稿を有効にするには"
email_in_disabled_click: '"email in"設定を有効にしてください'
allow_badges_label: "このカテゴリでバッジが付与されることを許可"
@@ -1352,16 +1352,16 @@ ja:
parent: "親カテゴリ"
notifications:
watching:
- title: "カテゴリ参加中"
+ title: "ウォッチ中"
tracking:
title: "追跡中"
regular:
- title: "ノーマル"
+ title: "デフォルト"
description: "他のユーザからメンションされた場合や、投稿に返信された場合に通知されます。"
muted:
title: "ミュート中"
flagging:
- title: '私達のコミュニティの維持を助けてくれてありがとうごうざいます'
+ title: '報告していただきありがとうございます。'
action: '投稿を通報'
take_action: "アクションをする"
notify_action: 'メッセージ'
@@ -1378,13 +1378,13 @@ ja:
inappropriate: "不適切"
spam: "スパム"
custom_placeholder_notify_user: "具体的に、建設的に、そして常に親切にしましょう。"
- custom_placeholder_notify_moderators: "特に何を懸念しているかを伝えてください。可能な場合、関連するリンクや例を提供してください。"
+ custom_placeholder_notify_moderators: "特にどのような問題が発生しているか記入して下さい。可能なら、関連するリンクなどを教えて下さい。"
custom_message:
at_least: "少なくとも{{n}}文字入力してください"
more: "あと{{n}}文字..."
left: "残り{{n}}文字"
flagging_topic:
- title: "私達のコミュニティの維持を助けてくれてありがとうごうざいます"
+ title: "報告していただきありがとうございます。"
action: "トピックを通報"
notify_action: "メッセージ"
topic_map:
@@ -1520,7 +1520,7 @@ ja:
admin_js:
type_to_filter: "設定項目を検索..."
admin:
- title: 'Discourse 管理者'
+ title: 'Discourseの管理者'
moderator: 'モデレータ'
dashboard:
title: "ダッシュボード"
@@ -1533,7 +1533,7 @@ ja:
no_check_performed: "アップデートの確認が正しく動作していません。sidekiq が起動していることを確認してください。"
stale_data: "最近アップデートの確認が正しく動作していません。sidekiq が起動していることを確認してください。"
version_check_pending: "まるでアップデート直後のようです。素晴らしい！"
- installed_version: "Installed"
+ installed_version: "インストール済み"
latest_version: "最新"
problems_found: "Discourse のインストールにいくつか問題が発見されました:"
last_checked: "最終チェック"
@@ -1564,7 +1564,6 @@ ja:
30_days_ago: "30日前"
all: "全て"
view_table: "table"
- view_chart: "bar chart"
refresh_report: "Refresh Report"
start_date: "Start Date"
end_date: "End Date"
@@ -1573,9 +1572,9 @@ ja:
by: "by"
flags:
title: "通報"
- old: "古いフラグ"
- active: "アクティブなフラグ"
- agree: "賛成"
+ old: "古い通報"
+ active: "アクティブな通報"
+ agree: "賛成する"
agree_title: "有効で、間違いが無いものとして通報を行う"
agree_flag_modal_title: "Agree and..."
agree_flag_hide_post: "賛成(ポスト非表示 + プライベートメッセージ送信)"
@@ -1584,11 +1583,11 @@ ja:
agree_flag_restore_post_title: "この投稿を復元"
agree_flag: "通報に賛成"
agree_flag_title: "投稿を変更できなくする事に賛成"
- defer_flag: "受理"
- defer_flag_title: "通報を削除します。何のアクションも必要としません"
+ defer_flag: "取り下げる"
+ defer_flag_title: "通報を削除します。何も行いません。"
delete: "削除する"
delete_title: "この通報で通報されている投稿を削除します"
- delete_post_defer_flag: "投稿を削除し、通報を受理します"
+ delete_post_defer_flag: "投稿を削除し、通報を取り下げます"
delete_post_defer_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
delete_post_agree_flag: "投稿を削除することに賛成します"
delete_post_agree_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
@@ -1599,13 +1598,13 @@ ja:
disagree_flag_unhide_post_title: "投稿への通報を削除し、投稿を表示します"
disagree_flag: "反対する"
disagree_flag_title: "無効または、不正としてこの通報を拒否します"
- clear_topic_flags: "トピックのフラグをクリアしました"
+ clear_topic_flags: "完了"
clear_topic_flags_title: "このトピックについての問題が解決されました。「完了」をクリックして通報の対応を完了します。"
more: "(more replies...)"
dispositions:
- agreed: "賛成した。"
+ agreed: "賛成しました。"
disagreed: "反対する"
- deferred: "deferred"
+ deferred: "取り下げられた"
flagged_by: "通報者: "
resolved_by: "解決方法"
took_action: "Took action"
@@ -1614,7 +1613,7 @@ ja:
reply_message: "返信する"
no_results: "通報はありません。"
topic_flagged: "この トピック は通報されました。"
- visit_topic: "トピックを閲覧して問題を調査してくさだい"
+ visit_topic: "トピックを確認"
was_edited: "最初の通報後に編集された投稿"
previous_flags_count: "この投稿は既に {{count}} 回通報されています"
summary:
@@ -1684,6 +1683,14 @@ ja:
backups: "バックアップ"
logs: "ログ"
none: "バックアップはありません"
+ read_only:
+ enable:
+ title: "閲覧専用モードを有効にする"
+ label: "閲覧専用モードを有効"
+ confirm: "閲覧専用モードを有効にしてもよろしいですか？"
+ disable:
+ title: "閲覧専用モードを無効にする"
+ label: "閲覧専用モードを無効"
logs:
none: "ログがありません"
columns:
@@ -1705,7 +1712,7 @@ ja:
backup:
label: "バックアップ"
title: "バックアップを作成"
- confirm: "新しいバックアップを行ってもよろしいですか？"
+ confirm: "新しくバックアップを行ってもよろしいですか？"
without_uploads: "はい(ファイルは含まない)"
download:
label: "ダウンロード"
@@ -1770,6 +1777,8 @@ ja:
color: "色"
opacity: "透明度"
copy: "コピー"
+ email_templates:
+ title: "メールのテンプレート"
css_html:
title: "CSS, HTML"
long_title: "CSS と HTML のカスタマイズ"
@@ -1815,6 +1824,7 @@ ja:
name: 'love'
description: "ライクボタンの色"
email:
+ title: "メール"
settings: "設定"
preview_digest: "ダイジェストのプレビュー"
sending_test: "テストメールを送信中..."
@@ -1875,7 +1885,7 @@ ja:
staff_user: "スタッフユーザ"
target_user: "対象ユーザ"
subject: "対象"
- when: "いつ"
+ when: "日時"
context: "コンテンツ"
details: "詳細"
previous_value: "変更前"
@@ -1962,7 +1972,7 @@ ja:
staff: 'スタッフ'
suspended: '凍結中'
blocked: 'ブロック中'
- suspect: 'サスペクト'
+ suspect: 'マーク中'
approved: "承認?"
approved_selected:
other: "承認ユーザ ({{count}})"
@@ -1979,7 +1989,7 @@ ja:
moderators: 'モデレータ'
blocked: 'ブロック中のユーザ'
suspended: '凍結中のユーザ'
- suspect: 'サスペクトユーザ'
+ suspect: 'マーク中のユーザ'
reject_successful:
other: "%{count}人のユーザの拒否に成功しました。"
reject_failures:
@@ -2004,7 +2014,7 @@ ja:
moderator: "モデレータ?"
admin: "管理者?"
blocked: "ブロック中?"
- show_admin_profile: "管理者"
+ show_admin_profile: "アカウントの管理"
edit_title: "タイトルを編集"
save_title: "タイトルを保存"
refresh_browsers: "ブラウザを強制リフレッシュ"
@@ -2090,7 +2100,7 @@ ja:
posts_read: "閲覧した投稿数"
posts_read_all_time: "閲覧した投稿数"
flagged_posts: "通報されている投稿"
- flagged_by_users: "フラグを立ったユーザ"
+ flagged_by_users: "通報されたユーザ"
likes_given: "与えた「いいね！」"
likes_received: "もらった「いいね！」"
likes_received_days: "「いいね！」数：日別"
@@ -2170,8 +2180,9 @@ ja:
legal: "法律に基づく情報"
uncategorized: 'その他'
backups: "バックアップ"
- login: "ログインする"
+ login: "ログイン"
plugins: "プラグイン"
+ user_preferences: "ユーザ設定"
badges:
title: バッジ
new_badge: 新しいバッジ
@@ -2183,9 +2194,9 @@ ja:
badge_type: バッジの種類
badge_grouping: グループ
badge_groupings:
- modal_title: バッジグルーピング
- granted_by: バッジ付与者
- granted_at: バッジ付与日
+ modal_title: バッジの振り分け
+ granted_by: 'バッジをつけた人: '
+ granted_at: 'バッジをつけた日: '
reason_help: (投稿かトピックへのリンク)
save: バッジを保存する
delete: バッジを削除する
@@ -2243,8 +2254,11 @@ ja:
image: "画像"
delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
embedding:
+ title: "埋め込み"
edit: "編集"
category: "カテゴリへ投稿"
+ settings: "埋め込みの設定"
+ save: "埋め込みの設定を保存"
permalink:
title: "パーマリンク"
url: "URL"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 452b8630ec..b7d38e32d8 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -2388,7 +2388,6 @@ nb_NO:
delete_confirm: "Er du sikker påat du ønsker å slette dette emneordet?"
rename_tag: "Endre emneord"
rename_instructions: "Velg et nytt navn på dette emneordet:"
-
notifications:
watching:
title: "Følger"
@@ -2402,4 +2401,3 @@ nb_NO:
muted:
title: "Dempet"
description: "Du vil ikke bli varslet om noe vedrørende disse emneneordene og de vil ikke vises i din ulest-liste."
-
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index b6ddc76de0..154463c440 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -2646,7 +2646,6 @@ pt_BR:
sort_by: "Ordenar por:"
sort_by_count: "número"
sort_by_name: "nome"
-
notifications:
watching:
title: "Observando"
@@ -2660,7 +2659,6 @@ pt_BR:
muted:
title: "Silenciado"
description: "Você nunca será notificado sobre novos tópicos nessa tag, e eles não aparecerão na sua aba não lidas."
-
topics:
none:
unread: "Você não possui tópicos não lidos."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 5447634ab4..61f124d3c3 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -942,7 +942,7 @@ ro:
one: "Un rezultat pentru \"{{term}}\""
few: "{{count}} rezultate pentru \"{{term}}\""
other: "{{count}} de rezultate pentru \"{{term}}\""
- title: "caută discuții ,postări sau categorii"
+ title: "caută discuții, postări, utilizatori sau categorii"
no_results: "Fără rezultat."
search_help: Ajutor căutare
searching: "Caută..."
@@ -1278,9 +1278,7 @@ ro:
create: "Ne pare rău, a apărut o eroare în creerea postării. Te rugăm să încerci iar."
edit: "Ne pare rău, a apărut o eroare în editarea postării. Te rugăm să încerci iar."
upload: "Ne pare rău, a apărut o eroare în încărcarea acelui fișier. Te rugăm să încerci iar."
- file_too_large: "Ne pare rău, fişierul pe care încercaţi să îl încărcaţi este prea mare (mărimea maximă este de {{max_size_kb}}kb)"
too_many_uploads: "Ne pare rău, poți încarca doar câte un fișier."
- too_many_dragged_and_dropped_files: "Ne pare rău, dar nu poți trage mai mult de 10 fişiere în acelaşi timp."
upload_not_authorized: "Ne pare rău, fișierul pe care-l încarci nu este autorizat (extensia pentru autorizare: {{authorized_extensions}})."
image_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încarca imagini."
attachment_upload_not_allowed_for_new_user: "Ne pare rău, un utilizator nou nu poate încarca atașamnete."
@@ -1707,7 +1705,6 @@ ro:
30_days_ago: "Acum 30 de zile"
all: "Toate"
view_table: "Arată ca tabel"
- view_chart: "Diagramă cu bare"
refresh_report: "Reactualizează Raportul"
start_date: "Data de început "
end_date: "Data de sfârşit"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 0a268b9ebb..d72c0a1fae 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -149,6 +149,8 @@ ru:
google+: 'Поделиться ссылкой через Google+'
email: 'Поделиться ссылкой по электронной почте'
action_codes:
+ public_topic: "сделать тему публичной %{when}"
+ private_topic: "сделать тему приватной %{when}"
split_topic: "Разделил эту тему %{when}"
invited_user: "Пригласил %{who} %{when}"
removed_user: "Исключил %{who} %{when}"
@@ -653,6 +655,11 @@ ru:
email_always: "Присылать почтовое уведомление, даже если я присутствую на сайте"
other_settings: "Прочее"
categories_settings: "Разделы"
+ enable_mailing_list:
+ one: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?"
+ few: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?
Это будет в среднем {{count}} письма в день, а иногда больше."
+ many: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?
Это будет в среднем {{count}} писем в день, а иногда больше."
+ other: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?
Это будет в среднем {{count}} писем в день, а иногда больше."
new_topic_duration:
label: "Считать темы новыми, если"
not_viewed: "ещё не просмотрены"
@@ -731,16 +738,6 @@ ru:
few: "сообщения написал"
many: "сообщений написал"
other: "сообщений написал"
- likes_given:
- one: "симпатию выразил"
- few: "симпатии выразил"
- many: "симпатий выразил"
- other: "симпатий выразил"
- likes_received:
- one: "симпатию получил"
- few: "симпатии получил"
- many: "симпатий получил"
- other: "симпатий получил"
days_visited:
one: "день заходил"
few: "дня заходил"
@@ -751,6 +748,11 @@ ru:
few: "сообщения прочел"
many: "сообщений прочел"
other: "сообщений прочел"
+ bookmark_count:
+ one: "закладка"
+ few: "закладок"
+ many: "закладки"
+ other: "закладки"
top_replies: "Лучшие сообщения"
no_replies: "Пока не написал ни одного сообщения."
more_replies: "... другие сообщения"
@@ -969,6 +971,7 @@ ru:
link_description: "введите описание ссылки"
link_dialog_title: "Вставить ссылку"
link_optional_text: "текст ссылки"
+ link_url_placeholder: "http://example.com"
quote_title: "Цитата"
quote_text: "Впишите текст цитаты сюда"
code_title: "Текст \"как есть\" (без применения форматирования)"
@@ -1027,6 +1030,7 @@ ru:
liked: "Понравилось ваше сообщение"
private_message: "Личное сообщение от"
invitee_accepted: "Приглашение принято"
+ moved_post: "Ваша тема перенесена участником "
linked: "Ссылка на ваше сообщение"
granted_badge: "Награда получена от"
popup:
@@ -1103,9 +1107,8 @@ ru:
few: "Вы выбрали {{count}} темы."
many: "Вы выбрали {{count}} тем."
other: "Вы выбрали {{count}} тем."
- change_tags: "Изменить теги"
- choose_new_tags: "Выберите новые теги для этих тем:"
- changed_tags: "Теги изменены."
+ change_tags: "Изменить тэги"
+ choose_new_tags: "Выбрать новые тэги для выбранных тем:"
none:
unread: "У вас нет непрочитанных тем."
new: "У вас нет новых тем."
@@ -1435,9 +1438,7 @@ ru:
create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте еще раз."
edit: "К сожалению, не удалось изменить сообщение. Попробуйте еще раз."
upload: "К сожалению, не удалось загрузить файл. Попробуйте еще раз."
- file_too_large: "К сожалению, файл, который вы пытаетесь загрузить, слишком большой (максимально допустимый размер {{max_size_kb}}kb)"
too_many_uploads: "К сожалению, за один раз можно загрузить только одно изображение."
- too_many_dragged_and_dropped_files: "За один раз можно перетянуть не более 10 файлов."
upload_not_authorized: "К сожалению, вы не можете загрузить файл данного типа (список разрешенных типов файлов: {{authorized_extensions}})."
image_upload_not_allowed_for_new_user: "К сожалению, загрузка изображений недоступна новым пользователям."
attachment_upload_not_allowed_for_new_user: "К сожалению, загрузка файлов недоступна новым пользователям."
@@ -1918,7 +1919,6 @@ ru:
30_days_ago: "30 дней назад"
all: "Всего"
view_table: "Таблица"
- view_chart: "Диаграмма"
refresh_report: "Обновить отчет"
start_date: "Дата от"
end_date: "Дата до"
@@ -2311,8 +2311,6 @@ ru:
revoke_admin: "отозваны права администратора"
grant_moderation: "выданы права модератора"
revoke_moderation: "отозваны права модератора"
- deleted_tag: "удалить тег"
- renamed_tag: "переименовать тег"
screened_emails:
title: "Почтовые адреса"
description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия."
@@ -2814,29 +2812,8 @@ ru:
tagging:
- all_tags: "Все теги"
- selector_all_tags: "все теги"
- changed: "теги изменены:"
- tags: "Теги"
- choose_for_topic: "выберите теги для темы"
- delete_tag: "Удалить тег"
- delete_confirm: "Удалить тег?"
- rename_tag: "Переименовать тег"
- rename_instructions: "Выберите новое имя для тега:"
- sort_by: "Сортировать по:"
- sort_by_count: "количеству"
- sort_by_name: "имени"
-
+ sort_by: "Сортировать:"
+ sort_by_count: "количество"
notifications:
- watching:
- title: "Наблюдать"
- description: "Уведомлять о каждой новой теме с этим тегом и показывать счетчик новых непрочитанных ответов."
- tracking:
- title: "Следить"
- description: "Количество непрочитанных сообщений появится рядом с названием новых тем с этим тегом."
- regular:
- title: "Уведомлять"
- description: "Вам придет уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение."
muted:
- title: "Без уведомлений"
- description: "Не уведомлять об изменениях в новых темах с этим тегом и скрыть их из непрочитанных."
+ title: "Игнорируется"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index a73b446348..293571f464 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -111,8 +111,10 @@ sq:
google+: 'shpërndaje këtë lidhje në Google+'
email: 'dërgoje këtë lidhje me email'
action_codes:
+ public_topic: "e bëri këtë temë publike %{when}"
+ private_topic: "e bëri këtë temë private %{when}"
split_topic: "ndaje këtë teme %{when}"
- invited_user: "ftuar %{who} %{when}"
+ invited_user: "ka ftuar %{who} %{when}"
removed_user: "hequr %{who} %{when}"
autoclosed:
enabled: 'mbylli %{when}'
@@ -347,13 +349,13 @@ sq:
title: "Në vëzhgim"
description: "Ju do të njoftoheni për çdo postim të ri në çdo mesazh, dhe numri i ri i përgjigjeve të reja do të tregohet."
tracking:
- title: "Ndjekje"
+ title: "Në gjurmim"
description: "Ju do të njoftoheni në qoftë se dikush ju pëmend me @emri ose ju përgjigjet, gjithashtu numri i përgjigjeve të reja do të tregohet."
regular:
- title: "Normale"
+ title: "Normal"
description: "Ju do të njoftoheni në qoftë se dikush ju përmend @emrin ose ju përgjigjet."
muted:
- title: "Heshtur"
+ title: "Pa njoftime"
description: "Ju nuk do të njoftoheni asnjëherë për asgjë mbi temat e reja të këtij grupi."
user_action_groups:
'1': "Pëlqime të dhëna"
@@ -461,7 +463,7 @@ sq:
watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic."
tracked_categories: "Gjurmuar"
tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of new posts will appear next to the topic."
- muted_categories: "Heshtur"
+ muted_categories: "Pa njoftime"
muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear in latest."
delete_account: "Fshi llogarinë time"
delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!"
@@ -595,7 +597,7 @@ sq:
every_two_weeks: "çdo 2 javë"
include_tl0_in_digests: "Përfshi postimet nga anëtarët e rinj të faqes në emailat përmbledhës. "
email_in_reply_to: "Përfshi një copëz të përgjigjeve ndaj postimit në email"
- email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic"
+ email_direct: "Më dërgo një email kur dikush më citon, i përgjigjet një postimi tim, më përmend me @username, ose më fton në një temë"
email_private_messages: "Send me an email when someone messages me"
email_always: "Send me email notifications even when I am active on the site"
other_settings: "Tjetër"
@@ -624,13 +626,13 @@ sq:
after_10_minutes: "pas 10 minutash"
invited:
search: "shkruaj për të kërkuar ftesat..."
- title: "Ftesa"
+ title: "Ftesat"
user: "Anëtari i ftuar"
sent: "Dërguar"
- none: "There are no pending invites to display."
+ none: "Nuk keni asnjë ftesë në pritje. "
truncated:
- one: "Showing the first invite."
- other: "Showing the first {{count}} invites."
+ one: "Po afishohet ftesa e parë."
+ other: "Po afishohen {{count}} ftesat e para."
redeemed: "Ridërgo ftesat"
redeemed_tab: "Redeemed"
redeemed_tab_with_count: "Redeemed ({{count}})"
@@ -650,6 +652,7 @@ sq:
account_age_days: "Jetëgjatësia e llogarisë (ditë)"
create: "Dërgo një ftesë"
generate_link: "Kopjo lidhjen e ftesës"
+ generated_link_message: '
Lidhja e ftesës u krijua!
Kjo ftesë është e vlefshme veto për adresën email: %{invitedEmail}
'
bulk_invite:
none: "Ju nuk keni ftuar askënd deri tani. Mund të dërgoni ftesa individuale ose mund të ftoni një grup personash duke ngarkuar skedarin."
text: "Skedari për ftesat në grup"
@@ -700,7 +703,7 @@ sq:
more_badges: "More Badges"
top_links: "Lidhjet Top"
no_links: "Nuk ka ende lidhje."
- most_liked_by: "Më e pëlqyer nga"
+ most_liked_by: "Pëlqyer më shumë nga"
no_likes: "Nuk ka ende asnjë pëlqim."
associated_accounts: "Identifikime"
ip_address:
@@ -830,7 +833,7 @@ sq:
authenticating: "Duke u autorizuar..."
awaiting_confirmation: "Llogaria juaj është në pritje të aktivizimit, përdorni butonin e fjalëkalimit të humbur që të merrni një email të ri me kodin e aktivizimit."
awaiting_approval: "Llogaria juaj nuk është aprovuar ende nga një admin. Do t'ju dërgojmë një email kur të aprovohet. "
- requires_invite: "Sorry, access to this forum is by invite only."
+ requires_invite: "Na vjen keq, ky forum është vetëm për anëtarë të ftuar. "
not_activated: "You can't log in yet. We previously sent an activation email to you at {{sentTo}}. Please follow the instructions in that email to activate your account."
not_allowed_from_ip_address: "You can't login from that IP address."
admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
@@ -880,12 +883,12 @@ sq:
saved_draft_tip: "ruajtur"
saved_local_draft_tip: "ruajtur lokalisht"
similar_topics: "Tema juaj është e ngjashme me..."
- drafts_offline: "drafts offline"
- group_mentioned: "By using {{group}}, you are about to notify {{count}} people."
+ drafts_offline: "draftet offline"
+ group_mentioned: "Duke qënë se po përdorni {{group}}, jeni duke njoftuar {{count}} anëtarë."
error:
title_missing: "Titulli është i nevojshëm"
title_too_short: "Titulli duhet të ketë të paktën {{min} shkronja."
- title_too_long: "Title can't be more than {{max}} characters"
+ title_too_long: "Titulli nuk mund të ketë më shumë se {{max}} shkronja"
post_missing: "Postimi s'mund të jetë bosh"
post_length: "Postimi duhet të ketë të paktën {{min} shkronja."
try_like: 'A e keni provuar butonin ?'
@@ -921,35 +924,35 @@ sq:
link_optional_text: "titull fakultativ"
link_url_placeholder: "http://shembull.com"
quote_title: "Citim"
- quote_text: "Blockquote"
- code_title: "Preformatted text"
- code_text: "indent preformatted text by 4 spaces"
+ quote_text: "Citim"
+ code_title: "Tekst i paraformatuar"
+ code_text: "shkruani 4 hapësira (space) për të filluar tekstin e paraformatuar"
upload_title: "Ngarko"
- upload_description: "enter upload description here"
+ upload_description: "shkruaj përshkrimin e skedarit të ngarkuar këtu"
olist_title: "Listë e numëruar"
- ulist_title: "Bulleted List"
- list_item: "List item"
- heading_title: "Heading"
- heading_text: "Heading"
- hr_title: "Horizontal Rule"
- help: "Markdown Editing Help"
- toggler: "hide or show the composer panel"
+ ulist_title: "Listë me pika"
+ list_item: "Element liste"
+ heading_title: "Titull"
+ heading_text: "Titull"
+ hr_title: "Vizë ndarëse horizontale"
+ help: "Ndihmë mbi Markdown"
+ toggler: "trego ose fshih panelin e shkrimit"
modal_ok: "OK"
modal_cancel: "Anulo"
- cant_send_pm: "Sorry, you can't send a message to %{username}."
+ cant_send_pm: "Na vjen keq, nuk mund t'i dërgoni mesazh privat anëtarit %{username}."
admin_options_title: "Rregullime opsionale të stafit për këtë temë"
auto_close:
- label: "Auto-close topic time:"
- error: "Please enter a valid value."
- based_on_last_post: "Don't close until the last post in the topic is at least this old."
+ label: "Data e mbylljes automatike të temës:"
+ error: "Ju lutem shkruani një vlerë të vlefshme."
+ based_on_last_post: "Mos e mbyll derisa postimi i fundit brenda temës të jetë të paktën kaq i vjetër. "
all:
- examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).'
+ examples: 'Vendosni numrin e orëve (24), orën absolute (17:30) ose një "timestamp" (2013-11-22 14:00).'
limited:
units: "(# i orëve)"
- examples: 'Enter number of hours (24).'
+ examples: 'Vendosni numrin e orëve (24).'
notifications:
- title: "notifications of @name mentions, replies to your posts and topics, messages, etc"
- none: "Unable to load notifications at this time."
+ title: "njoftimet për përmendjet @emri, përgjigjet ndaj postime dhe temave, mesazhet, etj."
+ none: "Nuk i hapëm dot njoftimet."
more: "shiko njoftimet e kaluara"
total_flagged: "totali i postimeve të sinjalizuar"
mentioned: "
{{username}} {{description}}
"
@@ -966,13 +969,13 @@ sq:
private_message: "
{{username}} {{description}}
"
invited_to_private_message: "
{{username}} {{description}}
"
invited_to_topic: "
{{username}} {{description}}
"
- invitee_accepted: "
{{username}} accepted your invitation
"
- moved_post: "
{{username}} moved {{description}}
"
+ invitee_accepted: "
{{username}} pranoi ftesën tuaj
"
+ moved_post: "
{{username}} transferoi {{description}}
"
linked: "
{{username}} {{description}}
"
granted_badge: "
Earned '{{description}}'
"
group_message_summary:
one: "
{{count}} message in your {{group_name}} inbox
"
- other: "
{{count}} mesazhe në {{group_name}} inbox
"
+ other: "
{{count}} mesazhe në inboxin e {{group_name}}
"
alt:
mentioned: "Përmendur nga"
quoted: "Cituar nga"
@@ -980,22 +983,22 @@ sq:
posted: "Postim nga"
edited: "Redakto postimin tuaj"
liked: "Pëlqeu postimin tuaj"
- private_message: "Private message from"
- invited_to_private_message: "Invited to a private message from"
- invited_to_topic: "Invited to a topic from"
- invitee_accepted: "Invite accepted by"
- moved_post: "Your post was moved by"
- linked: "Link to your post"
+ private_message: "Mesazh privat nga"
+ invited_to_private_message: "I/e ftuar në një mesazh privat nga"
+ invited_to_topic: "I/e ftuar në temë nga"
+ invitee_accepted: "Ftesa u pranua nga"
+ moved_post: "Postimi juaj u transferua nga"
+ linked: "Lidhja drejt postimit tuaj"
granted_badge: "Badge granted"
- group_message_summary: "Messages in group inbox"
+ group_message_summary: "Mesazhet në inboxin e grupit"
popup:
- mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
- group_mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
- quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}'
- replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}'
- posted: '{{username}} posted in "{{topic}}" - {{site_title}}'
- private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}'
- linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}'
+ mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
+ group_mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
+ quoted: '{{username}} ju ka cituar në "{{topic}}" - {{site_title}}'
+ replied: '{{username}} ju u përgjigj në "{{topic}}" - {{site_title}}'
+ posted: '{{username}} postoi në "{{topic}}" - {{site_title}}'
+ private_message: '{{username}} ju dërgoi një mesazh privat nga "{{topic}}" - {{site_title}}'
+ linked: '{{username}} vendosi një lidhje për postimin tuaj nga "{{topic}}" - {{site_title}}'
upload_selector:
title: "Shto një imazh"
title_with_attachments: "Shto një imazh ose një skedar"
@@ -1040,8 +1043,8 @@ sq:
topics:
bulk:
unlist_topics: "Unlist Topics"
- reset_read: "Reseto Leximet"
- delete: "Delete Topics"
+ reset_read: "Reseto leximet"
+ delete: "Fshi temat"
dismiss: "Dismiss"
dismiss_read: "Dismiss all unread"
dismiss_button: "Dismiss…"
@@ -1049,10 +1052,10 @@ sq:
also_dismiss_topics: "Stop tracking these topics so they never show up as unread for me again"
dismiss_new: "Dismiss New"
toggle: "toggle bulk selection of topics"
- actions: "Bulk Actions"
+ actions: "Veprime në masë"
change_category: "Ndrysho kategori"
close_topics: "Mbyll temat"
- archive_topics: "Archive Topics"
+ archive_topics: "Arkivo temat"
notification_level: "Ndrysho nivelin e njoftimeve"
choose_new_category: "Choose the new category for the topics:"
selected:
@@ -1104,11 +1107,11 @@ sq:
new: 'temë e re'
unread: 'unread'
new_topics:
- one: '1 new topic'
- other: '{{count}} new topics'
+ one: '1 temë e re'
+ other: '{{count}} tema të reja'
unread_topics:
- one: '1 unread topic'
- other: '{{count}} unread topics'
+ one: '1 temë e palexuar'
+ other: '{{count}} tema të palexuara'
title: 'Tema'
invalid_access:
title: "Tema është private"
@@ -1135,7 +1138,7 @@ sq:
back_to_list: "Kthehu tek lista e temave"
options: "Opsionet e temës"
show_links: "show links within this topic"
- toggle_information: "toggle topic details"
+ toggle_information: "më shumë mbi temën"
read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në {{catLink}} ose {{latestLink}}."
read_more: "Dëshironi të lexoni më shumë? {{catLink}} ose {{latestLink}}."
read_more_MF: "There { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
@@ -1164,31 +1167,31 @@ sq:
notifications:
reasons:
'3_6': 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
- '3_5': 'You will receive notifications because you started watching this topic automatically.'
- '3_2': 'You will receive notifications because you are watching this topic.'
- '3_1': 'You will receive notifications because you created this topic.'
- '3': 'You will receive notifications because you are watching this topic.'
- '2_8': 'You will receive notifications because you are tracking this category.'
- '2_4': 'You will receive notifications because you posted a reply to this topic.'
- '2_2': 'You will receive notifications because you are tracking this topic.'
+ '3_5': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
+ '3_2': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+ '3_1': 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
+ '3': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+ '2_8': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë kategori. '
+ '2_4': 'Ju do të njoftoheni duke qënë se keni dërguar një përgjigje në këtë temë. '
+ '2_2': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë. '
'2': 'Ju do të merrni njoftime sepse e keni lexuar këtë temë.'
'1_2': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
'1': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
- '0_7': 'You are ignoring all notifications in this category.'
- '0_2': 'You are ignoring all notifications on this topic.'
- '0': 'You are ignoring all notifications on this topic.'
+ '0_7': 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
+ '0_2': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
+ '0': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
watching_pm:
- title: "Watching"
+ title: "Në vëzhgim"
description: "Ju do të njoftoheni për çdo përgjigje të re në këtë mesazh, dhe numri i përgjigjeve të reja do të shfaqet. "
watching:
title: "Në vëzhgim"
- description: "You will be notified of every new reply in this topic, and a count of new replies will be shown."
+ description: "Ju do të njoftoheni për çdo postim të ri në këtë temë, dhe numri i ri i përgjigjeve të reja do të tregohet."
tracking_pm:
- title: "Tracking"
- description: "A count of new replies will be shown for this message. You will be notified if someone mentions your @name or replies to you."
+ title: "Në gjurmim"
+ description: "Numri i përgjigjeve të reja do të afishohet për këtë mesazh. Do të njoftoheni vetëm nëse dikush ju përmend @emrin apo nëse dikush ju përgjigjet juve. "
tracking:
- title: "Tracking"
- description: "A count of new replies will be shown for this topic. You will be notified if someone mentions your @name or replies to you. "
+ title: "Në gjurmim"
+ description: "Numri i përgjigjeve të reja në këtë temë do të afishohet në listat e faqes. Do të njoftoheni nëse dikush ju përmend @emrin ose ju përgjigjet. "
regular:
title: "Normal"
description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
@@ -1196,10 +1199,10 @@ sq:
title: "Normal"
description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
muted_pm:
- title: "Muted"
+ title: "Pa njoftime"
description: "Ju nuk do të njoftoheni kurrë mbi këtë mesazh. "
muted:
- title: "Muted"
+ title: "Pa njoftime"
description: "Ju nuk do të njoftoheni për asgjë mbi këtë temë, dhe tema nuk do të shfaqet në listën e temave më të fundit. "
actions:
recover: "Un-Delete Topic"
@@ -1215,6 +1218,8 @@ sq:
invisible: "Make Unlisted"
visible: "Make Listed"
reset_read: "Reset Read Data"
+ make_public: "Bëje temën publike"
+ make_private: "Bëje mesazh privat"
feature:
pin: "Pin Topic"
unpin: "Un-Pin Topic"
@@ -1229,10 +1234,10 @@ sq:
help: "Clear the pinned status of this topic so it no longer appears at the top of your topic list"
share:
title: 'Shpërndaje'
- help: 'share a link to this topic'
+ help: 'shpërndani një lidhje mbi temën'
flag_topic:
- title: 'Flag'
- help: 'privately flag this topic for attention or send a private notification about it'
+ title: 'Sinjalizo'
+ help: 'sinjalizo privatisht këtë temë ose dërgo një njoftim privat'
success_message: 'You successfully flagged this topic.'
feature_topic:
title: "Feature this topic"
@@ -1255,22 +1260,22 @@ sq:
no_banner_exists: "There is no banner topic."
banner_exists: "There is currently a banner topic."
inviting: "Inviting..."
- automatically_add_to_groups_optional: "This invite also includes access to these groups: (optional, admin only)"
- automatically_add_to_groups_required: "This invite also includes access to these groups: (Required, admin only)"
+ automatically_add_to_groups_optional: "Kjo ftesë përfshin edhe akses për këto grupe: (fakultative, vetëm për adminët)"
+ automatically_add_to_groups_required: "Kjo ftesë përfshin edhe akses për këto grupe: (e detyrueshme, vetëm për adminët)"
invite_private:
- title: 'Invite to Message'
- email_or_username: "Invitee's Email or Username"
+ title: 'Ftoje në këtë mesazh'
+ email_or_username: "Emaili ose emri i përdoruesit të të ftuarit"
email_or_username_placeholder: "email address or username"
- action: "Fto"
- success: "We've invited that user to participate in this message."
+ action: "Ftoni"
+ success: "Anëtari u ftua të marrë pjesë në këtë mesazh. "
error: "Sorry, there was an error inviting that user."
group_name: "emri grupit"
controls: "Topic Controls"
invite_reply:
- title: 'Ftesa'
+ title: 'Ftoni'
username_placeholder: "emri i përdoruesit"
- action: 'Dërgo një ftesë'
- help: 'invite others to this topic via email or notifications'
+ action: 'Dërgoni ftesën'
+ help: 'ftoni të tjerë në këtë temë nëpërmjet emailit ose njoftimeve'
to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link, no login required."
sso_enabled: "Vendosni emrin e përdoruesit që dëshironi të ftoni në këtë temë"
to_topic_blank: "Vendosni emrin e përdoruesit ose adresën email të personit që dëshironi të ftoni në këtë temë"
@@ -1278,9 +1283,9 @@ sq:
to_topic_username: "You've entered a username. We'll send a notification with a link inviting them to this topic."
to_username: "Vendosni emrin e përdoruesit që dëshironi të ftoni. Sistemi do i dërgojë një njoftim me një lidhje drejt kësaj teme. "
email_placeholder: 'emri@adresa.com'
- success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
- success_username: "We've invited that user to participate in this topic."
- error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)"
+ success_email: "Sistemi dërgoi një ftesë për {{emailOrUsername}}. Do t'ju njoftojmë kur ftesa të jetë pranuar. Shikoni edhe faqen Ftesat nën profilin tuaj të anëtarit për të parë statusin e ftesave. "
+ success_username: "Ky anëtar u ftua të marrë pjesë në këtë temë. "
+ error: "Nuk e ftuam dot këtë person. A ka mundësi që të jetë ftuar më parë?"
login_reply: 'Identifikohu për t''u përgjigjur'
filters:
n_posts:
@@ -1333,7 +1338,7 @@ sq:
reply: " {{replyAvatar}} {{usernameLink}}"
reply_topic: " {{link}}"
quote_reply: "cito përgjigjen"
- edit: "Editing {{link}} {{replyAvatar}} {{username}}"
+ edit: "Duke modifikuar {{link}} {{replyAvatar}} {{username}}"
edit_reason: "Arsyeja:"
post_number: "postimi {{number}}"
last_edited_on: "redaktimi i fundit u krye më"
@@ -1344,7 +1349,7 @@ sq:
show_hidden: 'Shfaq materialin e fshehur.'
deleted_by_author:
one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
- other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+ other: "(postim i tërhequr nga autori, do të fshihet automatikisht në %{count} orë nëse nuk sinjalizohet)"
expand_collapse: "expand/collapse"
gap:
one: "shiko 1 përgjigje të fshehur"
@@ -1368,6 +1373,7 @@ sq:
create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri."
edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri."
upload: "Sorry, there was an error uploading that file. Please try again."
+ file_too_large: "Na vjen keq, skedari është shumë i madh (maksimumi i lejuar është {{max_size_kb}}kb). Mund t'a vendosni këtë skedar të madh në një faqe tjetër dhe të vendosni këtu vetëm lidhjen."
too_many_uploads: "Na vjen keq, por duhet t'i ngarkoni skedarët një nga një."
too_many_dragged_and_dropped_files: "Na vjen keq, por ju lejohet të ngarkoni vetëm 10 skedarë njëkohësisht."
upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extension: {{authorized_extensions}})."
@@ -1392,26 +1398,26 @@ sq:
has_liked: "ju pëlqeni këtë postim"
undo_like: "anulo pëlqimin"
edit: "redakto këtë postim"
- edit_anonymous: "Sorry, but you need to be logged in to edit this post."
- flag: "privately flag this post for attention or send a private notification about it"
+ edit_anonymous: "Na vjen keq, ju duhet të jeni të identifikuar për të redaktuar këtë postim. "
+ flag: "sinjalizojeni privatisht këtë postim për të tërhequr vëmendjen e adminëve"
delete: "fshini këtë postim"
undelete: "anuloni fshirjen e postimit"
share: "shpërndani një link tek ky postim"
more: "Më shumë"
delete_replies:
confirm:
- one: "Do you also want to delete the direct reply to this post?"
- other: "Do you also want to delete the {{count}} direct replies to this post?"
- yes_value: "Yes, delete the replies too"
+ one: "A doni të fshini edhe 1 përgjigje direkte ndaj këtij postimi?"
+ other: "A doni të fshini edhe {{count}} përgjigjet direkte ndaj këtij postimi?"
+ yes_value: "Po, fshi edhe përgjigjet"
no_value: "Jo, vetëm këtë postim"
- admin: "post admin actions"
+ admin: "veprimet administrative mbi postimin"
wiki: "Bëje Wiki"
unwiki: "Hiqe Wiki"
- convert_to_moderator: "Add Staff Color"
- revert_to_regular: "Remove Staff Color"
+ convert_to_moderator: "Shto ngjyrë stafi"
+ revert_to_regular: "Hiq ngjyrën e stafit"
rebake: "Rindërtoni HTML"
unhide: "Unhide"
- change_owner: "Change Ownership"
+ change_owner: "Ndrysho zotëruesin"
actions:
flag: 'Sinjalizoni'
defer_flags:
@@ -1422,6 +1428,7 @@ sq:
spam: "Flag it too"
inappropriate: "Flag it too"
custom_flag: "Flag it too"
+ bookmark: "Shtoje edhe tek Të preferuarat"
like: "E pëlqejnë"
vote: "Vote for it too"
undo:
@@ -1579,42 +1586,42 @@ sq:
parent: "Parent Category"
notifications:
watching:
- title: "Watching"
- description: "You will automatically watch all new topics in these categories. You will be notified of every new post in every topic, and a count of new replies will be shown."
+ title: "Në vëzhgim"
+ description: "Ju do të vëzhgoni automatikisht të gjitha temat e reja nën këto kategori. Do të njoftoheni për çdo postim të ri, dhe numri i përgjigjeve të reja të palexuara do të afishohet ngjitur me titullin e temës përgjatë listave të faqes. "
tracking:
- title: "Tracking"
- description: "You will automatically track all new topics in these categories. You will be notified if someone mentions your @name or replies to you, and a count of new replies will be shown."
+ title: "Në gjurmim"
+ description: "Ju do të gjurmoni automatikisht çdo temë të re nën këto kategori. Do të njoftoheni nëse dikush ju përmend @emrin apo ju përgjigjet. Numri i përgjigjeve të palexuara do të afishohet ngjitur me titullin e temës në listat e faqes. "
regular:
title: "Normal"
description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. "
muted:
- title: "Muted"
- description: "You will never be notified of anything about new topics in these categories, and they will not appear in latest."
+ title: "Pa njoftime"
+ description: "Ju nuk do të njoftoheni për asgjë nga temat e reja të këtyre kategorive, dhe këto tema nuk do të afishohen në faqen \"Më të fundit\" për ju. "
flagging:
title: 'Faleminderit për ndihmën që i jepni këtij komuniteti!'
- action: 'Flag Post'
- take_action: "Take Action"
+ action: 'Sinjalizo postimin'
+ take_action: "Vepro"
notify_action: 'Mesazh'
official_warning: 'Paralajmërim zyrtar'
delete_spammer: "Elimino Spammer"
- delete_confirm: "You are about to delete %{posts} posts and %{topics} topics from this user, remove their account, block signups from their IP address %{ip_address}, and add their email address %{email} to a permanent block list. Are you sure this user is really a spammer?"
+ delete_confirm: "Jeni duke fshirë %{posts} postime dhe %{topics} tema nga ky anëtar. Gjithashtu, po fshini llogarinë e tij/saj, po bllokoni regjistrime të reja nga adresa IP %{ip_address}, dhe po shtoni adresën email %{email} në një listë adresash të bllokuara. A jeni të sigurtë që ky anëtar është spammer?"
yes_delete_spammer: "Po, Elimino Spammer"
ip_address_missing: "(N/A)"
hidden_email_address: "(fshehur)"
- submit_tooltip: "Submit the private flag"
- take_action_tooltip: "Reach the flag threshold immediately, rather than waiting for more community flags"
- cant: "Sorry, you can't flag this post at this time."
- notify_staff: 'Notify staff privately'
+ submit_tooltip: "Dërgoni sinjalizimin privatisht"
+ take_action_tooltip: "Kaloni direkt tek pragu i sinjalizimeve (dmth, mos prisni për sinjalizime të tjera nga komuniteti)"
+ cant: "Na vjen keq, nuk mund të sinjalizoni këtë postim tani. "
+ notify_staff: 'Njoftoni stafin privatisht'
formatted_name:
- off_topic: "Është Jashtë teme"
+ off_topic: "Është jashtë teme"
inappropriate: "Është e papërshtatshme"
spam: "Është Spam"
- custom_placeholder_notify_user: "Të jeni specifik, konstruktiv dhe gjithmonë të sjellshëm."
- custom_placeholder_notify_moderators: "Let us know specifically what you are concerned about, and provide relevant links and examples where possible."
+ custom_placeholder_notify_user: "Jini specifikë, konstruktiv dhe gjithmonë të sjellshëm."
+ custom_placeholder_notify_moderators: "Na thoni specifikisht se çfarë ju shqetëson dhe na jepni lidhje dhe shembuj konkretë brenda mundësive. "
custom_message:
at_least: "shkruaj të pakën {{n}} karaktere "
more: "{{n}} shko tek..."
- left: "{{n}} remaining"
+ left: "mund të shkruani edhe {{n}} shkronja"
flagging_topic:
title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
action: "Raporto Temën"
@@ -1829,20 +1836,20 @@ sq:
agree_flag_restore_post: "Agree (restore post)"
agree_flag_restore_post_title: "Rikthe këtë postim"
agree_flag: "Agree with flag"
- agree_flag_title: "Agree with flag and keep the post unchanged"
+ agree_flag_title: "Dakord me sinjalizimin dhe lini postimin të pandryshuar"
defer_flag: "Defer"
defer_flag_title: "Remove this flag; it requires no action at this time."
delete: "Fshij"
- delete_title: "Delete the post this flag refers to."
- delete_post_defer_flag: "Delete post and Defer flag"
+ delete_title: "Fshini postimin e sinjalizuar."
+ delete_post_defer_flag: "Fshini postimin dhe shtyni për më vonë sinjalizimin"
delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
- delete_post_agree_flag: "Delete post and Agree with flag"
+ delete_post_agree_flag: "Fshini postimin dhe bini dakord me sinjalizimin"
delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
delete_flag_modal_title: "Delete and..."
delete_spammer: "Elimino Spammer"
delete_spammer_title: "Remove the user and all posts and topics by this user."
disagree_flag_unhide_post: "Disagree (unhide post)"
- disagree_flag_unhide_post_title: "Remove any flags from this post and make the post visible again"
+ disagree_flag_unhide_post_title: "Hiqni të gjitha sinjalizimet mbi këtë postim dhe ripublikojeni postimin"
disagree_flag: "Disagree"
disagree_flag_title: "Deny this flag as invalid or incorrect"
clear_topic_flags: "U krye"
@@ -1861,8 +1868,8 @@ sq:
no_results: "Nuk ka sinjalizime."
topic_flagged: "This topic has been flagged."
visit_topic: "Visit the topic to take action"
- was_edited: "Post was edited after the first flag"
- previous_flags_count: "This post has already been flagged {{count}} times."
+ was_edited: "Postimi është redaktuar pas sinjalizimit të parë"
+ previous_flags_count: "Ky postim është sinjalizuar {{count}} herë."
summary:
action_type_3:
one: "off-topic"
@@ -2045,7 +2052,7 @@ sq:
subject: "Subject"
multiple_subjects: "This email template has multiple subjects."
body: "Body"
- none_selected: "Select an email template to begin editing."
+ none_selected: "Zgjidhni një shabllon emaili për të filluar redaktimin. "
revert: "Revert Changes"
revert_confirm: "Are you sure you want to revert your changes?"
css_html:
@@ -2397,7 +2404,7 @@ sq:
topics_viewed_all_time: "Topics Viewed (all time)"
posts_read: "Posts Read"
posts_read_all_time: "Posts Read (all time)"
- flagged_posts: "Flagged Posts"
+ flagged_posts: "Postimet e sinjalizuara"
flagged_by_users: "Users Who Flagged"
likes_given: "Pëlqime të dhëna"
likes_received: "Pëlqime të marra"
@@ -2594,6 +2601,8 @@ sq:
categories: 'g, c Kategoritë'
top: 'g, t Top'
bookmarks: 'g, b Bookmarks'
+ profile: 'g, p Profili'
+ messages: 'g, m Mesazhet'
navigation:
title: 'Shfletimi'
jump: '# Shko tek postimi #'
@@ -2604,13 +2613,15 @@ sq:
application:
title: 'Aplikacion'
create: 'c Filloni një diskutim të ri'
- notifications: 'n Open notifications'
+ notifications: 'n Hap njoftimet'
+ hamburger_menu: '= Hap menunë hamburger'
user_profile_menu: 'p Open user menu'
show_incoming_updated_topics: '. Show updated topics'
search: '/ Kërko'
help: '? Open keyboard help'
dismiss_new_posts: 'x, r Dismiss New/Posts'
dismiss_topics: 'x, t Dismiss Topics'
+ log_out: 'shift+zshift+z Shkëputu'
actions:
title: 'Actions'
bookmark_topic: 'f Toggle bookmark topic'
@@ -2622,7 +2633,7 @@ sq:
reply_post: 'r Reply to post'
quote_post: 'q Quote post'
like: 'l Like post'
- flag: '! Flag post'
+ flag: '! Sinjalizo postimin'
bookmark: 'b Bookmark post'
edit: 'e Edit post'
delete: 'd Delete post'
@@ -2674,9 +2685,23 @@ sq:
rename_tag: "Riemëro etiketën"
rename_instructions: "Zgjidhni një emër të ri për këtë etiketë"
sort_by: "Rendit sipas:"
+ sort_by_name: "emër"
filters:
without_category: "%{filter} %{tag} temat"
with_category: "%{filter} %{tag} temat në %{category}"
+ notifications:
+ watching:
+ title: "Në vëzhgim"
+ description: "Ju do të vëzhgoni automatikisht të gjitha temat e reja nën këtë etiketë. Do të njoftoheni për çdo postim e temë të re, dhe numri i postimeve të reja të palexuara do të afishohet ngjitur me titullin e temës përgjatë listave të faqes. "
+ tracking:
+ title: "Në gjurmim"
+ description: "Ju do të gjurmoni automatikisht çdo temë të re nën këtë etiketë. Numri i përgjigjeve të palexuara do të afishohet ngjitur me titullin e temës në listat e faqes. "
+ regular:
+ title: "Normal"
+ description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose i përgjigjet postimeve tuaja. "
+ muted:
+ title: "Pa njoftime"
+ description: "Ju nuk do të njoftoheni për asgjë nga temat e reja të kësaj etikete, dhe këto tema nuk do të afishohen në faqen \"Të palexuara\" për ju. "
topics:
none:
unread: "Nuk keni tema të palexuara."
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index fc20d6ceda..1aec4f7e34 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -2572,7 +2572,6 @@ tr_TR:
delete_confirm: "Bu etiketi kaldırmak istediğinize emin misiniz?"
rename_tag: "Etiketi yeniden adlandır"
rename_instructions: "Etiket için yeni bir ad girin:"
-
notifications:
watching:
title: "Gözleniyor"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index d5f127fe06..268a19e197 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -92,6 +92,8 @@ zh_CN:
google+: '分享这个链接到 Google+'
email: '用电子邮件发送这个链接'
action_codes:
+ public_topic: "于 %{when} 设置为公共主题"
+ private_topic: "于 %{when} 设置为私有主题"
split_topic: "于%{when}分割了该主题"
invited_user: "于%{when}邀请%{who}"
removed_user: "于%{when}移除%{who}"
@@ -115,6 +117,7 @@ zh_CN:
disabled: '于%{when}移除出列表'
topic_admin_menu: "主题管理操作"
emails_are_disabled: "所有的出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
+ bootstrap_mode_disabled: "Bootstrap模式将会在24小时后关闭"
s3:
regions:
us_east_1: "美国东部（N. Virginia）"
@@ -469,6 +472,7 @@ zh_CN:
set_password: "设置密码"
change_about:
title: "更改个人简介"
+ error: "修改该值是发生了错误"
change_username:
title: "修改用户名"
confirm: "如果你修改用户名，所有引用你的帖子和@你的链接都将失效。你真的确定要这么做么？"
@@ -639,14 +643,12 @@ zh_CN:
other: "创建的主题"
post_count:
other: "发表的帖子"
- likes_given:
- other: "给赞"
- likes_received:
- other: "被赞"
days_visited:
other: "访问天数"
posts_read:
other: "阅读过的帖子"
+ bookmark_count:
+ other: "书签"
top_replies: "热门回复"
no_replies: "暂无回复。"
more_replies: "更多回复"
@@ -656,6 +658,10 @@ zh_CN:
top_badges: "热门勋章"
no_badges: "暂无徽章。"
more_badges: "更多徽章"
+ top_links: "热门链接"
+ no_links: "暂无链接"
+ most_liked_by: "被最多赞"
+ no_likes: "暂无赞"
associated_accounts: "登录"
ip_address:
title: "最后使用的 IP 地址"
@@ -871,6 +877,7 @@ zh_CN:
link_description: "在此输入链接描述"
link_dialog_title: "插入链接"
link_optional_text: "可选标题"
+ link_url_placeholder: "http://example.com"
quote_title: "引用"
quote_text: "引用"
code_title: "预格式化文本"
@@ -1005,9 +1012,9 @@ zh_CN:
choose_new_category: "为主题选择新分类："
selected:
other: "你已经选择了 {{count}}个主题"
- change_tags: "更改标签"
- choose_new_tags: "为这些主题选择新标签："
- changed_tags: "这些主题的标签已被修改。"
+ change_tags: "修改标签"
+ choose_new_tags: "为主题选择新标签："
+ changed_tags: "主题的标签被修改"
none:
unread: "你没有未读主题。"
new: "你没有新主题可读。"
@@ -1156,6 +1163,8 @@ zh_CN:
invisible: "使其不列于主题列表"
visible: "使其列于主题列表"
reset_read: "重置阅读数据"
+ make_public: "设置为公共主题"
+ make_private: "设置为私有帖子"
feature:
pin: "置顶主题"
unpin: "解除主题置顶"
@@ -1302,9 +1311,8 @@ zh_CN:
create: "抱歉，在创建你的帖子时发生了错误。请重试。"
edit: "抱歉，在编辑你的帖子时发生了错误。请重试。"
upload: "抱歉，在上传文件时发生了错误。请重试。"
- file_too_large: "抱歉，你上传的附件太大了（最大限制 {{max_size_kb}}kb）。"
too_many_uploads: "抱歉，你只能一次上传一张图片。"
- too_many_dragged_and_dropped_files: "抱歉，你一次只能拖放最多 10 个文件。"
+ too_many_dragged_and_dropped_files: "抱歉，你只能一次上传10个文件。"
upload_not_authorized: "抱歉，你不能上传此类型文件（可上传的文件类型有: {{authorized_extensions}}）。"
image_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传图片。"
attachment_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传附件。"
@@ -1511,6 +1519,7 @@ zh_CN:
action: '标记帖子'
take_action: "立即执行"
notify_action: '消息'
+ official_warning: '正式警告'
delete_spammer: "删除垃圾发布者"
delete_confirm: "你将删除该用户的 %{posts} 个帖子和 %{topics} 个主题，删除该账户，阻止其IP地址 %{ip_address} 再次注册，并将其邮件地址 %{email} 加入黑名单。确定吗？"
yes_delete_spammer: "确定"
@@ -1714,7 +1723,6 @@ zh_CN:
30_days_ago: "30 天之前"
all: "全部"
view_table: "表格"
- view_chart: "柱状图"
refresh_report: "刷新报告"
start_date: "开始日期"
end_date: "结束日期"
@@ -1844,6 +1852,14 @@ zh_CN:
backups: "备份"
logs: "日志"
none: "无可用备份"
+ read_only:
+ enable:
+ title: "开启只读模式"
+ label: "开启只读模式"
+ confirm: "你确定要开启只读模式么？"
+ disable:
+ title: "关闭只读模式"
+ label: "关闭只读模式"
logs:
none: "暂无日志"
columns:
@@ -1994,6 +2010,7 @@ zh_CN:
test_error: "发送测试邮件时遇到问题。请再检查一遍邮件设置，确认你的主机没有封锁邮件链接，然后重试。"
sent: "已发送"
skipped: "跳过"
+ bounced: "退回"
received: "收到"
rejected: "拒绝"
sent_at: "发送时间"
@@ -2103,8 +2120,8 @@ zh_CN:
grant_moderation: "授予版主权限"
revoke_moderation: "撤销版主权限"
backup_operation: "备份操作"
- deleted_tag: "deleted tag"
- renamed_tag: "renamed tag"
+ deleted_tag: "删除的标签"
+ renamed_tag: "重命名的标签"
screened_emails:
title: "被屏蔽的邮件地址"
description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。"
@@ -2381,6 +2398,7 @@ zh_CN:
login: "登录"
plugins: "插件"
user_preferences: "用户设置"
+ tags: "标签"
badges:
title: 徽章
new_badge: 新徽章
@@ -2584,51 +2602,52 @@ zh_CN:
tagging:
- all_tags: "全部标签"
- selector_all_tags: "所有标签"
- changed: "标签更改："
+ all_tags: "所以标签"
+ selector_all_tags: "所以标签"
+ changed: "标签被修改"
tags: "标签"
choose_for_topic: "为主题选择可选标签"
delete_tag: "删除标签"
- delete_confirm: "你确定要删除该标签？"
+ delete_confirm: "你确定要删除这个标签吗？"
rename_tag: "重命名标签"
- rename_instructions: "为标签选择一个新的名字："
- sort_by: "排列顺序："
- sort_by_count: "数量"
- sort_by_name: "名字"
-
+ rename_instructions: "为该标签选择一个新名字"
+ sort_by: "排序按"
+ sort_by_count: "计数"
+ sort_by_name: "名称"
+ filters:
+ without_category: "%{filter} %{tag} 主题"
+ with_category: "%{category}的%{filter} %{tag}主题"
notifications:
watching:
title: "关注"
- description: "你能自动关注该标签下的所有主题。一旦与这个标签有关的新主题和新帖子发表，你都会收到通知。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。"
+ description: "你将会自动监视包含这些标签的所有新主题。你会收到新帖子或新主题的通知，未读和新帖数量将出现在每个主题后。"
tracking:
title: "追踪"
- description: "你能自动追踪这个标签下的所有新主题。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。"
+ description: "你将会自动追踪这些标签的所有新主题。未读和新帖子数量将出现在每个主题后。"
regular:
title: "常规"
description: "当有人@你或者回复你的帖子时，你才会收到通知。"
muted:
- title: "防打扰"
- description: "你不会收到该标签下的新主题的任何通知，也不会在你的未阅选项卡中显示。"
-
+ title: "免打扰"
+ description: "你不会收到这些标签的任何新主题通知，并且他们将不会出现在你的未读列表中。"
topics:
none:
unread: "你没有未读主题。"
- new: "你没有近期主题。"
- read: "你还未阅读任何主题。"
- posted: "你还未在任何主题中回复。"
+ new: "你没有新主题可读"
+ read: "你尚未阅读任何主题。"
+ posted: "你尚未在任何主题中发帖。"
latest: "没有最新主题。"
hot: "没有热门主题。"
- bookmarks: "你还没有加上书签的主题。"
- top: "没有热门主题。"
- search: "搜索无结果。"
+ bookmarks: "你没有收藏任何主题。"
+ top: "没有最佳主题。"
+ search: "没有搜索结果。"
bottom:
- latest: "没有更多最新主题了。"
- hot: "没有更多热门主题了。"
- posted: "没有更多发表的主题了。"
- read: "没有更多读过的主题了。"
- new: "没有更多近期主题了。"
+ latest: "没有更多主题可看了"
+ hot: "没有更多热门主题可看了"
+ posted: "没有更多已发布主题可看了"
+ read: "没有更多已阅主题可看了"
+ new: "没有更多新主题可看了。"
unread: "没有更多未读主题了。"
- top: "没有更多热门主题了。"
- bookmarks: "没有更多加上书签的主题了。"
- search: "没有更多搜索结果了。"
+ top: "没有更多最佳主题了。"
+ bookmarks: "没有更多书签主题了。"
+ search: "没有更多搜索结果"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a054bc5163..e67d48fff2 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -64,7 +64,7 @@ en:
reply_user_not_matching_error: "Happens when a reply came in from a different email address the notification was sent to."
topic_not_found_error: "Happens when a reply came in but the related topic has been deleted."
topic_closed_error: "Happens when a reply came in but the related topic has been closed."
- bounced_email_report: "Email is a bounced email report."
+ bounced_email_error: "Email is a bounced email report."
auto_generated_email_reply: "Email contains a reply to an auto generated email."
screened_email_error: "Happens when the sender's email address was already screened."
@@ -1606,11 +1606,11 @@ en:
Your version: %{installed_version}
New version: **%{new_version}**
- - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
+ - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
- - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
+ - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master)
- - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
+ - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse
new_version_mailer_with_notes:
subject_template: "[%{site_name}] update available"
@@ -1620,11 +1620,11 @@ en:
Your version: %{installed_version}
New version: **%{new_version}**
- - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master).
+ - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
- - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
+ - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master)
- - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse.
+ - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse
### Release notes
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index cafceea669..aecd86c1a2 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -24,7 +24,7 @@ es:
loading: "Cargando"
powered_by_html: 'Funciona gracias a Discourse, se ve mejor con JavaScript activado'
log_in: "Iniciar sesión"
- purge_reason: "Eliminada automáticamente como cuenta abandonada, sin activar"
+ purge_reason: "Cuenta eliminada automáticamente al detectarse como abandonada, desactivada"
disable_remote_images_download_reason: "La descarga de imágenes remotas se desactivó porque no había suficiente espacio disponible en disco."
anonymous: "Anónimos"
emails:
@@ -44,6 +44,9 @@ es:
reply_user_not_matching_error: "Sucede cuando una respuesta vino de una dirección de email diferente a la que fue enviada la notificación."
topic_not_found_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido eliminado."
topic_closed_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido cerrado. "
+ bounced_email_report: "El email es un reporte que ha rebotado."
+ auto_generated_email_reply: "El email contiene una respuesta a un correo autogenerado."
+ screened_email_error: "Sucede cuando la dirección de email del remitente ya ha sido filtrada."
errors: &errors
format: '%{attribute} %{message}'
messages:
@@ -182,7 +185,7 @@ es:
delete_reason: "Eliminado vía moderación"
groups:
errors:
- can_not_modify_automatic: "No puedes modificar un grupo automático"
+ can_not_modify_automatic: "No se puede modificar un grupo automático"
member_already_exist: "'%{username}' ya es miembro de este grupo."
invalid_domain: "'%{domain}' no es un dominio válido."
invalid_incoming_email: "'%{email}' no es una dirección de email válida."
@@ -355,6 +358,7 @@ es:
create_like: "Has llegado al límite de Me gusta de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
create_bookmark: "Has llegado al límite de marcadores de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
edit_post: "Has llegado al límite de ediciones de hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
+ live_post_counts: "Estás solicitando actualizaciones de posts demasiado rápido. Por favor, espera %{time_left} antes de intentarlo de nuevo."
unsubscribe_via_email: "Has alcanzado el máximo de bajas de suscripción vía email por hoy. Por favor espera %{time_left} antes de intentarlo de nuevo."
topic_invitations_per_day: "Has alcanzado el máximo de invitaciones a temas por hoy. Por favor, espera %{time_left} antes de intentarlo de nuevo."
hours:
@@ -709,6 +713,9 @@ es:
email_polling_errored_recently:
one: "El email polling ha generado un error en las pasadas 24 horas. Mira en los logs para más detalles."
other: "El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en los logs para más detalles."
+ bad_favicon_url: "El favicon está dando fallos en su carga. Revisa la opción favicon_url en Ajustes del sitio."
+ poll_pop3_timeout: "La conexión al servidor POP3 está rebasando el tiempo de espera. Los emails entrantes no han podido ser recogidos. Por favor revisa los ajustes de POP3 y tu proveedor de servicio."
+ poll_pop3_auth_error: "La conexión al servidor POP3 está fallando debido a un error de autenticación. Por favor revisa los ajustes POP3."
site_settings:
censored_words: "Las palabras serán reemplazadas con ■■■■"
delete_old_hidden_posts: "Auto-borrar cualquier post que se quede oculto por mas de 30 días."
@@ -753,6 +760,7 @@ es:
post_onebox_maxlength: "Extensión máxima en caracteres de un post de Discourse en formato Onebox."
onebox_domains_whitelist: "Una lista de dominios a los que permitir el formato Onebox; estos dominios deberán soportar OpenGraph u oEmbed. Pruébalos en http://iframely.com/debug"
logo_url: "El logo situado en la esquina superior izquierda de tu sitio, debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se mostrará un texto con el título del sitio."
+ digest_logo_url: "El logo alternativo que irá arriba en los emails de resumen de tu sitio. Debería encajar en las dimensiones de un rectángulo ancho. Si se deja en blanco, se utilizará `logo_url`."
logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, debería encajar en las dimensiones de un cuadrado y se muestra cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita."
favicon_url: "Un favicon para tu sitio, mira más info en http://es.wikipedia.org/wiki/Favicon - para que funcione correctamente sobre un CDN debe ser un png"
mobile_logo_url: "El logo con posición fija utilizado en la esquina superior izquierda de la versión móvil de tu sitio. Debería encajar en las dimensiones de un cuadrado. Si se deja en blanco, se mostrará el campo introducido en `logo_url`. Ejemplo: http://example.com/uploads/default/logo.png"
@@ -773,6 +781,7 @@ es:
polling_interval: "Cuando no este en 'long polling', ¿Qué tan frecuente debe los clientes con sesión iniciada hacer 'poll' en milisegundos?"
anon_polling_interval: "¿Cuán a menudo deben hacer poll los usuarios anónimos en milisegundos"
background_polling_interval: "Cada cuántos milisegundos debería hacerse cargarse información (mientras que la ventana esté en segundo plano)"
+ flags_required_to_hide_post: "Número de reportes que causan que un post se oculte auomáticamente y le sea enviado un mensaje privado al usuario (0 para nunca)"
cooldown_minutes_after_hiding_posts: "Número de minutos que un usuario debe esperar para poder editar un post oculto por los reportes de la comunidad"
max_topics_in_first_day: "El número máximo de temas que un usuario puede crear en su primer día en el sitio"
max_replies_in_first_day: "El máximo número de respuestas que un usuario puede publicar en su primer día en el sitio"
@@ -792,7 +801,7 @@ es:
ga_domain_name: "El nombre de dominio especificado en Google Analytics (ga.js). Ejemplo: misitio.com; ver en http://google.com/analytics"
ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita http://google.com/analytics"
ga_universal_domain_name: "Nombre del dominio establecido en Google Universal Analytics (analytics.js), ejemplo: misitio.com; visita http://google.com/analytics"
- enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Mira https://support.google.com/webmasters/answer/174992?hl=en"
+ enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Mira https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
enable_noscript_support: "Habilitar el soporte de motor de búsqueda estándar webcrawler mediante la etiqueta noscript"
allow_moderators_to_create_categories: "Permitir a los moderadores crear nuevas categorías"
cors_origins: "Orígenes permitidos para las cross-origin requests (CORS). Cada origen debe incluir http:// or https://. La variable env DISCOURSE_ENABLE_CORS debe establecerse a verdadero para activar CORS."
@@ -980,7 +989,6 @@ es:
faq_url: "Si tienes un documento de Preguntas Frecuentes alojado que quieras utilizar, introduce la URL completa aquí."
tos_url: "Si tienes un documento de Condiciones de Servicio alojado en algún sitio quieras utilizar, facilita la URL aquí."
privacy_policy_url: "Si tienes un documento de Preguntas Frecuentes alojado en algún sitio quieras utilizar, facilita la URL aquí."
- newuser_spam_host_threshold: "Cuántas veces un nuevo usuario puede publicar un enlace hacia mismo sitio dentro de `` newuser_spam_host_posts posts antes de ser considerado spam."
white_listed_spam_host_domains: "Una lista de dominios a excluir de las pruebas de spam. A los nuevos usuarios no se les restringirá la posibilidad de crear posts con enlaces a estos dominios."
staff_like_weight: "Qué ponderación extra otorgan los me gusta provenientes de los miembros del Staff."
topic_view_duration_hours: "Contar una visita a un nuevo tema por IP/Usuario cada N horas"
@@ -1111,19 +1119,7 @@ es:
default_categories_watching: "Lista de categorías que están vigiladas por defecto."
default_categories_tracking: "Lista de categorías que están seguidas por defecto"
default_categories_muted: "Lista de categorías que están silenciadas por defecto."
- tagging_enabled: "¿Permitir a los usuarios etiquetar temas?"
- min_trust_to_create_tag: "Mínimo nivel de confianza requerido para crear una etiqueta."
- max_tags_per_topic: "Número máximo de etiquetas que pueden añadirse a un tema."
- max_tag_length: "Longitud máxima de caracteres que puede tener el nombre de una etiqueta."
- max_tag_search_results: "Máximo número de resultados a mostrar al buscar etiquetas."
- show_filter_by_tag: "Mostrar un desplegable para filtrar la lista de temas por etiqueta."
- max_tags_in_filter_list: "Máximo número de etiquetas a mostrar en el desplegable. Se mostrarán las más usadas."
- tags_sort_alphabetically: "Mostrar etiquetas en orden alfabético. Por defecto se muestran por popularidad."
- tag_style: "Estilo visual de los distintivos de etiqueta."
- staff_tags: "Una lista de etiquetas que sólo podrá ser aplicada por administradores o moderadores"
- min_trust_level_to_tag_topics: "Mínimo nivel de confianza requerido para etiquetar temas"
- suppress_overlapping_tags_in_list: "Ocultar etiquetas de la vista de listado si se solapan con el título"
- remove_muted_tags_from_latest: "No mostrar temas etiquetados con etiquetas silenciadas en la lista de temas recientes."
+ tagging_enabled: "¿Activar etiquetas para los temas?"
errors:
invalid_email: "Dirección de correo electrónico inválida. "
invalid_username: "No existe ningún usuario con ese nombre de usuario. "
@@ -1471,18 +1467,6 @@ es:
subject_template: "[%{site_name}] Problema con el correo electrónico -- Respuesta Auto Generada"
email_error_notification:
subject_template: "[%{site_name}] Problema con el correo electrónico -- Error de autenticación POP"
- too_many_spam_flags:
- subject_template: "Cuenta nueva bloqueada"
- text_body_template: |
- Hola,
-
- Esto es un mensaje automatizado de %{site_name} para informarte que tus posts han sido automáticamente ocultados porque fueron reportados por la comunidad.
-
- Como medida precautoria, tu nueva cuenta ha sido bloqueada para crear nuevas respuestas o temas hasta que un miembro del staff pueda revisar tu cuenta.
-
- Para orientación adicional, por favor revisa nuestras [reglas de comunidad](%{base_url}/guidelines).
- blocked_by_staff:
- subject_template: "Cuenta bloqueada"
user_automatically_blocked:
subject_template: "El nuevo usuario %{username} ha sido bloqueado tras ser reportado por la comunidad"
text_body_template: |
@@ -1505,12 +1489,6 @@ es:
Esto puede ser modificado con los ajustes`newuser_spam_host_threshold` y`white_listed_spam_host_domains`.
unblocked:
subject_template: "Cuenta desbloqueada"
- text_body_template: |
- Hola,
-
- Esto es un mensaje automático desde %{site_name} para informarte de que tu cuenta ha sido desbloqueada después de la revisión de un moderador.
-
- A partir de ahora, de nuevo podrás crear nuevas respuestas o temas.
pending_users_reminder:
subject_template:
one: "1 usuario esperando aprobación"
@@ -1542,10 +1520,28 @@ es:
posted_by: "Publicado por %{username} el %{post_date}"
user_invited_to_private_message_pm:
subject_template: "[%{site_name}] %{username} te ha invitado a un hilo de mensajes '%{topic_title}'"
+ text_body_template: |
+ %{header_instructions}
+
+ %{message}
+
+ %{respond_instructions}
user_invited_to_private_message_pm_staged:
subject_template: "[%{site_name}] %{username} te ha invitado a un mensaje '%{topic_title}'"
+ text_body_template: |
+ %{header_instructions}
+
+ %{message}
+
+ %{respond_instructions}
user_invited_to_topic:
subject_template: "[%{site_name}] %{username} te invitó a '%{topic_title}'"
+ text_body_template: |
+ %{header_instructions}
+
+ %{message}
+
+ %{respond_instructions}
user_replied:
subject_template: "[%{site_name}] %{topic_title}"
text_body_template: |
@@ -1555,7 +1551,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_replied_pm:
subject_template: "[%{site_name}] [MP] %{topic_title}"
@@ -1566,7 +1561,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_quoted:
subject_template: "[%{site_name}] %{topic_title}"
@@ -1577,7 +1571,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_linked:
subject_template: "[%{site_name}] %{topic_title}"
@@ -1588,7 +1581,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_mentioned:
subject_template: "[%{site_name}] %{topic_title}"
@@ -1599,7 +1591,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_group_mentioned:
subject_template: "[%{site_name}] %{topic_title}"
@@ -1610,7 +1601,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_posted:
subject_template: "[%{site_name}] %{subject_prefix}%{username} publicó en '%{topic_title}'"
@@ -1621,7 +1611,6 @@ es:
%{context}
- ---
%{respond_instructions}
user_posted_pm:
subject_template: "[%{site_name}] [MP] %{topic_title}"
@@ -1632,16 +1621,12 @@ es:
%{context}
- ---
%{respond_instructions}
user_posted_pm_staged:
subject_template: "%{optional_re}%{topic_title}"
text_body_template: |2
%{message}
-
- ---
- %{respond_instructions}
digest:
why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
subject_template: "Resumen de [%{site_name}]"
@@ -1696,6 +1681,8 @@ es:
%{base_url}/users/authorize-email/%{email_token}
confirm_old_email:
subject_template: "[%{site_name}] Confirma tu dirección actual de email"
+ notify_old_email:
+ subject_template: "[%{site_name}] Tu dirección de email ha sido cambiada"
signup_after_approval:
subject_template: "¡Tu solicitud ha sido aprobada en %{site_name}!"
text_body_template: |
@@ -1750,9 +1737,6 @@ es:
images:
too_large: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB). Por favor, modifica sus dimensiones y prueba otra vez."
size_not_found: "Lo sentimos, pero no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?"
- flag_reason:
- sockpuppet: "Un nuevo usuario ha creado un tema, y otro nuevo usuario con la misma dirección IP le ha respondido. Mira la opción flag_sockpuppets del sitio."
- spam_hosts: "Este nuevo usuario intentó crear varios posts con enlaces al mismo dominio. Mira la opción newuser_spam_host_threshold."
email_log:
no_user: "No se puede encontrar al usuario con id %{user_id}"
anonymous_user: "El usuario es anónimo"
@@ -2145,7 +2129,7 @@ es:
name: Primera Cita
description: Citó un post
long_description: |
- Este distintivo se otorga la primera vez que citas un post en una respuesta. Citar secciones relevantes de posts anteriores en tus respuestas ayuda a mantener los debates centrados en el tema central. Y es fácil: puedes citar tan solo seleccionando un trozo de cualquier post y utilizando el botón Citar que aparece al lado. ¡Sé generoso citando!
+ Este distintivo se otorga la primera vez que citas un post en tu respuesta. Citar secciones relevantes de posts anteriores ayuda a mantener los debates conectados y centrados en el tema. La forma más fácil de citar es seleccionando un trozo de cualquier post y utilizando el botón Citar que aparece al lado. ¡Cita generosamente!
read_guidelines:
name: Directrices leídas
description: Leyó las directrices de la comunidad
@@ -2241,12 +2225,13 @@ es:
initial_topic_title: Informe sobre el rendimiento del sitio
topic_invite:
user_exists: "Lo sentimos, ese usuario ya ha sido invitado. Solo se puede invitar una vez a un usuario a un tema."
+ tags:
+ title: "Etiquetas"
+ staff_tag_disallowed: "La etiqueta \"%{tag}\" solo puede ser insertada por moderadores."
+ staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" solo puede ser eliminada por moderadores."
+ rss_by_tag: "Temas con la etiqueta %{tag}"
time:
<<: *datetime_formats
activemodel:
errors:
<<: *errors
- tags:
- staff_tag_disallowed: "La etiqueta \"%{tag}\" sólo puede ser aplicada por los administradores."
- staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" sólo puede ser eliminada por los administradores."
- rss_by_tag: "Temas con la etiqueta %{tag}"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index cc2d66a914..0bd2d5b1ce 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -91,7 +91,7 @@ ja:
spamming_host: "申し訳ありませんが、このホストへのリンクを貼ることはできません。"
user_is_suspended: "アカウントが凍結中のユーザーは投稿ができません。"
topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。"
- just_posted_that: "はあなたが最近投稿したポストと内容がほぼ一緒です"
+ just_posted_that: "はあなたの最近の投稿と内容がほぼ一緒です"
has_already_been_used: "は既に使用中です"
invalid_characters: "は不正なキャラクターを含んでいます"
is_invalid: "は不正です。もう少し説明を追加してください"
@@ -103,7 +103,7 @@ ja:
rss_posts_in_topic: "'%{topic}' の RSS フィード"
rss_topics_in_category: "'%{category}' カテゴリ内のトピックの RSS フィード"
author_wrote: "%{author} の投稿:"
- num_posts: "ポスト:"
+ num_posts: "投稿:"
num_participants: "参加者:"
read_full_topic: "完全なトピックを読む"
private_message_abbrev: "メッセージ"
@@ -114,10 +114,9 @@ ja:
too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。"
excerpt_image: "画像"
queue:
- delete_reason: "ポスト承認待ちで削除"
+ delete_reason: "投稿の承認機能を用いて削除されました"
groups:
errors:
- can_not_modify_automatic: "自動作成グループの変更はできません"
member_already_exist: "'%{username}'はすでにこのグループのメンバーです。"
default_names:
everyone: "みなさん"
@@ -142,13 +141,13 @@ ja:
- トピックに適切な検索用ワードを含めると、他の人がトピックを *発見* しやすくなります。詳細は [コミュニティガイドライン](/guidelines) を参照してください。このパネルは最初から %{education_posts_text} 回目までの投稿のときにだけ表示されます。
new-reply: "%{site_name} へようこそ — **コミュニティへの貢献ありがとうございます!** \n- あなたの回答は議論に何らかの形で貢献していますか?\n - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。\n - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。 \n詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。\n"
sequential_replies: |
- ### 一度に複数のポストに回答する
+ ### 一度に複数の投稿に返信する
- トピックに数多くの回答を投稿する代わりに、以前のポストへの @name 参照や引用などを活用して回答を一つのポストにまとめられないか検討してください。
+ トピックにたくさん返信する代わりに、以前の投稿への @name メンションや引用などを活用して返信を一つの投稿にまとめましょう。
- テキストをハイライトし、表示された引用返信ボタンを選択することで、前回の回答を引用を追加するために編集することができます。
+ テキストをハイライトし、表示された引用返信ボタンを選択することで、前の返信を引用を追加し、編集することができます。
- 細かい回答を数多く投稿するより、掘り下げた内容をカバーした数少ない回答を投稿した方がトピックの議論を追いやすくなります。
+ 細かく返信するより、しっかりとした内容で少ない返信をした方が見やすさも話しやすさも良くなります。
dominating_topic: |
### 他のユーザも議論に参加させてあげましょう
@@ -291,8 +290,8 @@ ja:
update: 'パスワード更新'
save: 'パスワードを設定する'
title: 'パスワードリセット'
- success: "パスワードは無事更新され、ログインに成功しました。"
- success_unapproved: "パスワードは無事更新されました。"
+ success: "パスワードを更新し、ログインしました。"
+ success_unapproved: "パスワードを更新しました。"
continue: "%{site_name} に進む"
change_email:
confirmed: "メールアドレスが更新されました。"
@@ -308,7 +307,7 @@ ja:
post_action_types:
off_topic:
title: '関係ない話題'
- description: 'このポストはタイトルと投稿で定義される現在の議論に関連しておらず、どこかに移動させる必要があります'
+ description: 'この投稿はタイトルと投稿で定義される現在の内容に関連しておらず、どこかに移動させる必要があります'
long_form: '「関係ない話題」として通報'
spam:
title: 'スパム'
@@ -330,16 +329,16 @@ ja:
email_body: "%{link}\n\n%{message}"
bookmark:
title: 'ブックマーク'
- description: 'このポストをブックマークする'
- long_form: 'このポストをブックマーク'
+ description: 'この投稿をブックマークする'
+ long_form: 'この投稿をブックマーク'
like:
title: 'いいね！'
- description: 'このポストを「いいね！」する'
+ description: 'この投稿を「いいね！」する'
long_form: '「いいね！」する'
vote:
title: '投票'
- description: 'このポストに投票する'
- long_form: 'このポストに投票'
+ description: 'この投稿に投票する'
+ long_form: 'この投稿に投票'
topic_flag_types:
spam:
title: 'スパム'
@@ -351,6 +350,7 @@ ja:
long_form: '不適切として通報する'
notify_moderators:
title: "その他"
+ description: 'このトピックは ガイドライン, 利用規約の違反や、その他不適切な理由がある。'
long_form: 'モデレーターへ知らせるために通報する'
email_title: 'トピック"%{title}" は不適切な可能性があるため、管理人による確認を必要とする。'
email_body: "%{link}\n\n%{message}"
@@ -391,9 +391,9 @@ ja:
xaxis: "日"
yaxis: "新規トピック数"
posts:
- title: "ポスト"
+ title: "投稿"
xaxis: "日"
- yaxis: "新規ポスト数"
+ yaxis: "新規投稿数"
likes:
title: "いいね"
xaxis: "日"
@@ -538,7 +538,7 @@ ja:
notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\nサイトの設定で更新してください"
site_settings:
censored_words: "自動的に ■■■■ で置換されます"
- delete_old_hidden_posts: "30日以上非表示になっているポストを自動で削除します"
+ delete_old_hidden_posts: "30日以上非表示になっている投稿を自動で削除します"
default_locale: "この Discourse インスタンスのデフォルト言語 (ISO 639-1 Code)"
allow_user_locale: "ユーザーが各自の言語設定を選択できるようにする"
min_post_length: "投稿を許可する最少の文字数"
@@ -551,10 +551,10 @@ ja:
min_search_term_length: "検索ワードとして有効にする最小の文字数"
allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。"
allow_duplicate_topic_titles: "トピックタイトルの重複を許可"
- unique_posts_mins: "同じ内容のポストを再投稿可能にする時間 (分)"
+ unique_posts_mins: "同じ内容の投稿を再投稿可能にする時間 (分)"
educate_until_posts: "最初(または複数)の投稿でタイピングを開始したら、ポップアップでガイダンスを表示させるか"
title: "サイトの名前です。titleタグで使用されます"
- site_description: "１文でこのサイトを説明してください。descriptionタグで使用されます"
+ site_description: "このサイトについて簡単に説明してください。 descriptionタグで使用されます。"
contact_email: "このサイトへのお問い合わせを行うメールアドレス。お問い合わせフォームからの緊急事項、対応されていない通報など、緊急の通知に使用します"
contact_url: "このサイトの問い合わせURL。緊急連絡用問い合わせフォームに使用されます"
queue_jobs: "開発者ONLY! 警告! デフォルトでキューは sidekiq により処理されます。これを無効にするとサイトが動作不能になります。"
@@ -563,10 +563,10 @@ ja:
download_remote_images_threshold: "リモート画像をダウンロードするために必要なディスクスペースの最低残容量 (パーセント)"
disabled_image_download_domains: "これらのドメインからは、リモート画像のダウンロードを行いません。パイプ区切りのリスト"
post_edit_time_limit: "作者は投稿から(N)分間、編集と削除が可能。0を設定すると無期限です"
- edit_history_visible_to_public: "すべてのユーザに対してポストの編集履歴を許可する。無効の場合はスタッフメンバーのみが確認できます"
+ edit_history_visible_to_public: "すべてのユーザに対して投稿の編集履歴を許可する。無効の場合はスタッフメンバーのみが確認できます"
delete_removed_posts_after: "投稿は作者が削除してから(N)時間後に削除されます。0を設定すると、すぐに削除されます"
- max_image_width: "ポスト内画像サムネイルの最大の幅"
- max_image_height: "ポスト内画像サムネイルの最大の高さ"
+ max_image_width: "投稿内での画像サムネイルの最大の幅"
+ max_image_height: "投稿内での画像サムネイルの最大の高さ"
category_featured_topics: "/categories ページに表示されるカテゴリ毎のトピック数"
show_subcategory_list: "カテゴリを表示する際にトピック一覧の代わりにサブカテゴリ一覧を表示"
fixed_category_positions: "チェックすると、カテゴリの表示順をコントロールできます。チェックしない場合、アクティビティ順に表示されます"
@@ -574,9 +574,9 @@ ja:
add_rel_nofollow_to_user_content: " 内部リンク(親ドメインを含む)を除き、投稿されたすべてのユーザコンテンツに rel nofollow を追加する。この設定を反映するには \"rake posts:rebake\" を実行して baked markdown をすべて更新する必要があります"
exclude_rel_nofollow_domains: "nofollowを付与すべきではないドメインのリスト。tld.comは、sub.tld.com も許可します。最低でもクローラーが全てのコンテンツを見つけるために、このサイトのトップレベルドメインを追加する必要があります。このサイトの他の部分が別ドメインに存在している場合、それも追加します"
post_excerpt_maxlength: "投稿の引用/サマリの最大文字数"
- post_onebox_maxlength: "Discourse OneBoxポストの最大文字数"
+ post_onebox_maxlength: "Discourse OneBox投稿の最大文字数"
onebox_domains_whitelist: "OneBoxを許可するドメインのリスト。これらのドメインはOpenGraphかoEmbedをサポートしている必要があります。http://iframely.com/debug でテストできます"
- logo_url: "あなとのサイトの左上に表示されるロゴ画像です。横幅の大きい長方形にする必要があります。空欄の場合、サイトタイトルが表示されます"
+ logo_url: "サイトの左上に表示されるロゴ画像です。横幅の大きい長方形にする必要があります。空欄の場合、サイトタイトルが表示されます"
logo_small_url: "サイトの左上に表示される小さいロゴ画像です。正方形である必要があります。下にスクロールすると表示されます。空欄の場合、ホームアイコンが表示されます"
mobile_logo_url: "モバイルサイトの左上に固定で表示されるロゴ画像です。正方形である必要があります。空欄の場合 `logo_url` が利用されます 例: http://example.com/uploads/default/logo.png"
apple_touch_icon_url: "Apple のタッチデバイス用のアイコン。推奨サイズは 144px x 144px"
@@ -584,8 +584,8 @@ ja:
email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)"
email_subject: "標準のメールタイトルをカスタマイズできます。https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801 を参照してください"
use_https: "サイトのURL(Discourse.base_url)をhttpかhttpsにしますか？ \"既に設定が完了し、動作していない限り、HTTPSは選択しないでください!\""
- summary_score_threshold: "'トピックサマリー'にポストが含まれるために必要な最低スコア"
- summary_posts_required: "'トピックサマリー'が有効になるために必要な最小ポスト数"
+ summary_score_threshold: "'トピックサマリー'に投稿が含まれるために必要な最低スコア"
+ summary_posts_required: "'トピックサマリー'が有効になるために必要な最小投稿数"
summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数"
summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか"
summary_max_results: "'トピックサマリー'として返却される最大ポスト数"
@@ -606,19 +606,18 @@ ja:
notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。"
flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか"
traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う"
- post_undo_action_window_mins: "ポストに対するアクション (「いいね!」、フラグ等) 取り消しを許可する時間 (秒)"
+ post_undo_action_window_mins: "投稿に対するアクション (「いいね!」、通報等) 取り消しを許可する時間 (秒)"
must_approve_users: "スタッフはサイトへのアクセスが許可される前のすべての新規ユーザを承認する必要があります。警告：公開中のサイトでこれを有効にすると、既存の非スタッフユーザのアクセスを取り消すことになります！"
ga_tracking_code: "Google analytics のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics"
ga_domain_name: "Google analytics のドメイン名。例: mysite.com; 参考 http://google.com/analytics"
ga_universal_tracking_code: "Google Universal Analytics(analytics.js) のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics"
ga_universal_domain_name: "Google Universal Analytics (analytics.js) のドメイン名。例: mysite.com; 参考 http://google.com/analytics"
- enable_escaped_fragments: "古いサーチエンジンクローラがあなたのサイトのインデックスを構築するのをサポートするワークアラウンドを有効にする。詳細はhttps://support.google.com/webmasters/answer/174992?hl=ja"
enable_noscript_support: "noscript タグ経由でアクセスしてきた標準サーチエンジンクローラのサポートを有効にする"
allow_moderators_to_create_categories: "モデレータのカテゴリ作成を許可"
cors_origins: "CORSを許可。オリジンはhttp://かhttps://を含む必要があります。CORSを有効にするには、環境変数 DISCOURSE_ENABLE_CORSにtrueをセットする必要があります"
top_menu: "ホームナビゲーゲションに表示する項目、表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks"
- post_menu: "ポストメニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply"
- post_menu_hidden_items: "展開記号がクリックされない限り、ポストのメニュー項目を隠します"
+ post_menu: "投稿メニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply"
+ post_menu_hidden_items: "開くボタンをクリックするまで投稿のメニュー項目を隠します"
share_links: "シェアダイアログに表示する項目、表示順を指定"
track_external_right_clicks: "右クリックされた外部リンクをトラックする (例: 新しいタブで開く)。URL のリライトを要するためデフォルトでは無効化されています"
site_contact_username: "自動送信メールのfromに使用される有効なスタッフのユーザー名。空欄の場合デフォルトのシステムアカウントが使用される"
@@ -626,7 +625,7 @@ ja:
suppress_reply_directly_below: "ポストに回答が１つしかない場合、ポストの回答数を表示しない"
suppress_reply_directly_above: "ポストに回答が１つしかない場合、ポストのin-reply-toを表示しない"
suppress_reply_when_quoting: "ポストが引用返信だった場合、ポストのin-reply-toを表示しない"
- max_reply_history: "回答のin-reply-toを展開する最大数"
+ max_reply_history: "返信のin-reply-toを展開する最大数"
topics_per_period_in_top_summary: "デフォルトのトピックサマリに表示されるトップトピックの数"
topics_per_period_in_top_page: "'もっと見る'を展開したときに表示するトップトピックの数"
redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトさせる"
@@ -649,7 +648,7 @@ ja:
login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する"
reserved_usernames: "サインアップが許可されていないユーザ名。"
min_password_length: "パスワードの最小の長さ"
- block_common_passwords: "最もよく使われている10,000個のパスワードはパスワードとして許可しない"
+ block_common_passwords: "最もよく使われている10,000個のパスワードを許可しない"
enable_sso: "外部サイトを経由したシングルサインオンを有効にします(警告：ユーザーのメールアドレスは必ず外部サイトで認証されなければなりません)"
enable_sso_provider: "Discourse SSO provider プロトコルを /session/sso_provider エンドポイントに実装し、sso_secretの設定が必須です"
sso_secret: "SSO認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります"
@@ -764,7 +763,6 @@ ja:
faq_url: "他サイトに FAQ をホストしている場合は、フル URL をここに指定。"
tos_url: "他サイトに利用規約をホストしている場合は、フル URL をここに指定。"
privacy_policy_url: "他サイトにプライバシーポリシーをホストしている場合は、フル URL を個々に指定。"
- newuser_spam_host_threshold: "新規ユーザが、スパム認定されることなく `newuser_spam_host_posts` ポスト内にに同一ホストへのリンクを貼ることができる数。"
white_listed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザはこれらのドメインでポスト内にリンクを作成することを制限されません"
staff_like_weight: "スタッフにより「いいね!」された場合、どのくらい重み付けをするか"
levenshtein_distance_spammer_emails: "スパマーのメールアドレスとマッチさせるとき、数文字違いの曖昧な一致でも許可する"
@@ -844,7 +842,7 @@ ja:
embed_post_limit: "embedで表示する投稿の最大数"
embed_whitelist_selector: "embedを許可するエレメントのCSS Selector"
embed_blacklist_selector: "embedから削除するエレメントのCSS Selector"
- notify_about_flags_after: "この数時間後に処理されていないフラグがある場合は、contact_emailにメールを送信する。0を設定すると無効になります"
+ notify_about_flags_after: "この数時間後に処理されていない通報がある場合は、contact_emailにメールを送信する。0を設定すると無効になります"
enable_cdn_js_debugging: "全てのJSにcrossorigin権限を追加することで、/logsに適切なエラーを表示することを許可する"
show_create_topics_notice: "サイトにpublicなトピックが5よりも少ない場合、トピックを作成するための通知が管理者に表示される"
delete_drafts_older_than_n_days: (n) 日間経過したドラフトを削除
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 7d4f3d4452..d44a17e714 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -16,7 +16,6 @@ ro:
loading: "Încarcă"
powered_by_html: 'Prin intermediul Discourse, Vizualizare optimă cu JavaScript activat'
log_in: "Autentificare"
- purge_reason: "Cont automat şters ca abandonat, neactivat"
disable_remote_images_download_reason: "Descărcarea de imagini la distanţă a fost dezactivată deoarece nu mai era spaţiu pe disc suficient."
anonymous: "Anonim"
errors: &errors
@@ -116,7 +115,6 @@ ro:
delete_reason: "Şters via coadă de moderare"
groups:
errors:
- can_not_modify_automatic: "Nu puteți modifica un grup automat"
member_already_exist: "'%{username}' este deja membru al acestui grup"
default_names:
everyone: "toată lumea"
@@ -583,7 +581,6 @@ ro:
ga_domain_name: "Numele de domeniu al Google analytics (ga.js), ex: mysite.com; see http://google.com/analytics"
ga_universal_tracking_code: "Codul de urmarie al Google Universal Analytics (analytics.js), ex: UA-12345678-9; see http://google.com/analytics"
ga_universal_domain_name: "Numele de domeniu al Google Universal Analytics (analytics.js) , ex: mysite.com; see http://google.com/analytics"
- enable_escaped_fragments: "Întoarce-te la Google's Ajax-Crawling API dacă nu e detectat webcrawler-ul. See https://support.google.com/webmasters/answer/174992?hl=en"
enable_noscript_support: "Activează căutarea standardă a webcrawler-ului prin tagul noscript"
allow_moderators_to_create_categories: "Permite moderatorilor să creeze noi categorii"
post_menu: "Determină ce elemente apar în meniul de postare și în ce ordine . Exemple apreciere|editează|marchează|șterge|distribuie|semne de carte|răspunde"
@@ -678,7 +675,6 @@ ro:
faq_url: "Dacă aveți un FAQ găzduit în altă parte pe care doriți să-l folosiți, postați întregul URL aici."
tos_url: "Dacă aveți un document Termeni și condiții găzduit în altă parte pe care doriți să-l folosiți, postați întregul URL aici."
privacy_policy_url: "Dacă aveți un document de Politica de Confidențialitate găzduit în altă parte, pe care a-ți dorii să-l folosiți, postați întregul URL aici."
- newuser_spam_host_threshold: "De câte ori un utilizator poate posta o adresă către aceiași gazdă cu postarea `newuser_spam_host_posts` înainte de a fi considerat spam."
white_listed_spam_host_domains: "O listă de domenii exclusă pentru testarea spam. Utilizatorii nu vor fi niciodată restricționați în a crea postări cu adrese către aceste domenii."
staff_like_weight: "Cat de mare este factorul de adaos pentru a trimite aprecieri personalului."
levenshtein_distance_spammer_emails: "Când se face potrivirea email-urilor spam, numărul de caractere diferite care permit o potrivire aproximată."
@@ -710,7 +706,7 @@ ro:
autohighlight_all_code: "Forțează aplicarea de iluminat cod către toate preformatările de blocări de cod chiar când este explicit specificată limba."
feed_polling_enabled: "DOAR ÎNCORPOREAZĂ: Să încorporeze un RSS/ATOM ca postare."
feed_polling_url: "DOAR ÎNCORPOREAZĂ: URL de RSS/ATOM să încorporeze."
- embed_by_username: "Numele de utilizator Discourse al utilizatorului ce creează discuții încorporate."
+ embed_by_username: "Utilizatorul care creează subiecte embedded."
embed_username_key_from_feed: "Discourse username of the user who creates the embedded topics.."
embed_truncate: "Truncate the embedded posts."
embed_post_limit: "Numărul maxim de postări de încorporat."
@@ -858,30 +854,12 @@ ro:
```
%{logs}
```
- too_many_spam_flags:
- subject_template: "Cont nou blocat"
- text_body_template: |
- Salut,
-
- Acesta e un mesaj automat din partea %{site_name} pentru a vă informa că postările dvs. au fos automat ascunse, fiindcă au fost marcate de către comunitate.
-
- Ca măsură de precauție, noul dvs cont a fost blocat în a crea răspunsuri noi sau discuții până când un membru al personalului revizuiește contul dvs.
-
- Pentru ajutor adițional, faceți referie la [regulile de comunitate](%{base_url}/).
- blocked_by_staff:
- subject_template: "Cont blocat"
user_automatically_blocked:
subject_template: "Noul utilizator %{username} a fost blocat datorită marcajelor date de comunitate"
spam_post_blocked:
subject_template: "Utilizatorul nou %{username} are postările blocate datorită adreselor repetate"
unblocked:
subject_template: "Cont deblocat"
- text_body_template: |
- Salut,
-
- Acesta este un mesaj automat din partea %{site_name} pentru a vă informa cu privire la deblocarea contului dumneavoastră după o revizie a personalului.
-
- Acum puteți crea discuții și răspunsuri noi.
pending_users_reminder:
text_body_template: |
Exista înscrieri de noi utilizatori ce așteaptă să fie aprobate (sau respinse) înainte de a putea accesa forumul.
@@ -971,9 +949,6 @@ ro:
store_failure: "Încercare de încărcare eșuată #%{upload_id} pentru utilizatorul #%{user_id}."
images:
size_not_found: "Ne pare rău, nu am putut determina mărimea imaginii. Poate este coruptă?"
- flag_reason:
- sockpuppet: "Un utilizator nou a creat o discuție, iar un alt utilizator cu același IP a răspuns. Vedeți setarea flag_sockpuppets în site."
- spam_hosts: "Acest utilizator a încercat să creeze postări multiple ce conțin adrese către același domeniu. Vedeți setarea newuser_spam_host_threshold în site."
email_log:
no_user: "Nu pot găsii utilizatorul cu id-ul %{user_id}"
anonymous_user: "Utilizatorul este anonim"
diff --git a/config/routes.rb b/config/routes.rb
index 31682f385e..21459fc9c3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -108,6 +108,7 @@ Discourse::Application.routes.draw do
get "leader_requirements" => "users#tl3_requirements"
get "tl3_requirements"
put "anonymize"
+ post "reset_bounce_score"
end
get "users/:id.json" => 'users#show', defaults: {format: 'json'}
get 'users/:id/:username' => 'users#show'
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ca5299c68a..937752b5f3 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -572,6 +572,7 @@ email:
type: list
block_auto_generated_emails: true
bounce_score_threshold:
+ client: true
default: 4
min: 1
@@ -756,7 +757,7 @@ spam:
num_flags_to_block_new_user: 3
num_users_to_block_new_user: 3
notify_mods_when_user_blocked: false
- flag_sockpuppets: true
+ flag_sockpuppets: false
newuser_spam_host_threshold: 3
white_listed_spam_host_domains:
default: ''
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index e12f6beebf..a3db90c6ff 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -128,9 +128,7 @@ Do you want...
- Automatic daily backups? [Configure backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855).
-- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709).
-
-- Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847).
+- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709). Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847).
- Multiple Discourse sites on the same server? [Configure multisite](https://meta.discourse.org/t/multisite-configuration-with-docker/14084).
diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index 60bdd3f064..91e4115fed 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -261,8 +261,7 @@ class DiscourseDiff
end
def characters(string)
- string = CGI::escapeHTML(string)
- @tokens.concat string.scan(/(\W|\w+[ \t]*)/).flatten
+ @tokens.concat string.scan(/\W|\w+[ \t]*/).map { |x| CGI::escapeHTML(x) }
end
end
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 944f8bfeb7..16d2625c0b 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -27,7 +27,7 @@ module DiscourseTagging
return [] unless guardian.can_tag_topics?
- return unless tags
+ return unless tags.present?
tags.map! {|t| clean_tag(t) }
tags.delete_if {|t| t.blank? }
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 83543fe36a..e766554a3c 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -156,7 +156,7 @@ module Email
end
def verp
- @verp ||= @mail.destinations.select { |to| to[/\+verp-\h{32}@/] }.first
+ @verp ||= all_destinations.select { |to| to[/\+verp-\h{32}@/] }.first
end
def update_bounce_score(email, score)
@@ -171,10 +171,8 @@ module Email
user.user_stat.reset_bounce_score_after = 30.days.from_now
user.user_stat.save
- if user.active && user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold
- user.deactivate
+ if user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold
StaffActionLogger.new(Discourse.system_user).log_revoke_email(user)
- EmailToken.where(email: user.email, confirmed: true).update_all(confirmed: false)
end
end
@@ -292,16 +290,18 @@ module Email
user
end
- def destinations
- [ @mail.destinations,
+ def all_destinations
+ @all_destinations ||= [
+ @mail.destinations,
[@mail[:x_forwarded_to]].flatten.compact.map(&:decoded),
[@mail[:delivered_to]].flatten.compact.map(&:decoded),
- ].flatten
- .select(&:present?)
- .uniq
- .lazy
- .map { |d| check_address(d) }
- .drop_while(&:blank?)
+ ].flatten.select(&:present?).uniq.lazy
+ end
+
+ def destinations
+ all_destinations
+ .map { |d| check_address(d) }
+ .drop_while(&:blank?)
end
def check_address(address)
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index e1d0b320b0..a83d012e1e 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -135,8 +135,8 @@ module Email
# Suppress images from short emails
if SiteSetting.strip_images_from_short_emails &&
- @message.html_part.body.to_s.bytesize <= SiteSetting.short_email_length &&
- @message.html_part.body =~ /]+>/
+ @message.html_part.body.to_s.bytesize <= SiteSetting.short_email_length &&
+ @message.html_part.body =~ /]+>/
style = Email::Styles.new(@message.html_part.body.to_s)
@message.html_part.body = style.strip_avatars_and_emojis
end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 1a6c9d1375..2e68f24630 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -271,6 +271,7 @@ class Guardian
end
def can_export_entity?(entity_type)
+ return false unless @user
return true if is_staff?
return false if entity_type == "admin"
UserExport.where(user_id: @user.id, created_at: (Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)).count == 0
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index f67f494108..3eca04f589 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -51,6 +51,10 @@ module UserGuardian
is_staff? && !user.nil? && !user.staff?
end
+ def can_reset_bounce_score?(user)
+ user && is_staff?
+ end
+
def can_check_emails?(user)
is_admin? || (is_staff? && SiteSetting.show_email_on_profile)
end
diff --git a/lib/has_errors.rb b/lib/has_errors.rb
index 9aae07e05c..ddf213e486 100644
--- a/lib/has_errors.rb
+++ b/lib/has_errors.rb
@@ -13,7 +13,7 @@ module HasErrors
end
def rollback_with!(obj, error)
- obj.errors[:base] << error
+ obj.errors.add(:base, error)
rollback_from_errors!(obj)
end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index bd0d67295a..03204b02d5 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -317,8 +317,7 @@ class PostCreator
topic_creator = TopicCreator.new(@user, guardian, @opts)
@topic = topic_creator.create
rescue ActiveRecord::Rollback
- add_errors_from(topic_creator)
- return
+ rollback_from_errors!(topic_creator)
end
@post.topic_id = @topic.id
@post.topic = @topic
@@ -439,11 +438,13 @@ class PostCreator
end
def auto_notify_for_tags
- tags = DiscourseTagging.tags_for_saving(@opts[:tags], @guardian)
- if tags.present?
- @topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags)
- @topic.save
- DiscourseTagging.auto_notify_for(tags, @topic)
+ if SiteSetting.tagging_enabled
+ tags = DiscourseTagging.tags_for_saving(@opts[:tags], @guardian)
+ if tags.present?
+ @topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags)
+ @topic.save
+ DiscourseTagging.auto_notify_for(tags, @topic)
+ end
end
end
diff --git a/lib/search.rb b/lib/search.rb
index 224c14c35c..d66bfa9391 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -481,7 +481,7 @@ class Search
if @term.present?
if is_topic_search
posts = posts.joins('JOIN users u ON u.id = posts.user_id')
- posts = posts.where("posts.raw || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%")
+ posts = posts.where("posts.raw || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{@term}%")
else
posts = posts.where("post_search_data.search_data @@ #{ts_query}")
exact_terms = @term.scan(/"([^"]+)"/).flatten
diff --git a/lib/text_cleaner.rb b/lib/text_cleaner.rb
index 6d621ec9fb..bf10cdbc55 100644
--- a/lib/text_cleaner.rb
+++ b/lib/text_cleaner.rb
@@ -1,6 +1,10 @@
#
# Clean up a text
#
+
+# Whe use ActiveSupport mb_chars from here to properly support non ascii downcase
+require 'active_support/core_ext/string/multibyte'
+
class TextCleaner
def self.title_options
@@ -27,9 +31,12 @@ class TextCleaner
# Replace ????? with a single ?
text.gsub!(/\?+/, '?') if opts[:deduplicate_question_marks]
# Replace all-caps text with regular case letters
- text.tr!('A-Z', 'a-z') if opts[:replace_all_upper_case] && (text =~ /[A-Z]+/) && (text == text.upcase)
+ text = text.mb_chars.downcase.to_s if opts[:replace_all_upper_case] && (text =~ /[A-Z]+/) && (text == text.upcase)
# Capitalize first letter, but only when entire first word is lowercase
- text.sub!(/\A([a-z]*)\b/) { |first| first.capitalize } if opts[:capitalize_first_letter]
+ first, rest = text.split(' ', 2)
+ if first && opts[:capitalize_first_letter] && first == first.mb_chars.downcase
+ text = "#{first.mb_chars.capitalize}#{rest ? ' ' + rest : ''}"
+ end
# Remove unnecessary periods at the end
text.sub!(/([^.])\.+(\s*)\z/, '\1\2') if opts[:remove_all_periods_from_the_end]
# Remove extraneous space before the end punctuation
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f14c3dca42..d43ffd3cbd 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -374,7 +374,11 @@ class TopicQuery
result = result.limit(options[:per_page]) unless options[:limit] == false
result = result.visible if options[:visible] || @user.nil? || @user.regular?
- result = result.offset(options[:page].to_i * options[:per_page]) if options[:page]
+
+ if options[:page]
+ offset = options[:page].to_i * options[:per_page]
+ result = result.offset(offset) if offset > 0
+ end
result
end
@@ -463,7 +467,11 @@ class TopicQuery
result = result.visible if options[:visible]
result = result.where.not(topics: {id: options[:except_topic_ids]}).references(:topics) if options[:except_topic_ids]
- result = result.offset(options[:page].to_i * options[:per_page]) if options[:page]
+
+ if options[:page]
+ offset = options[:page].to_i * options[:per_page]
+ result.offset(offset) if offset > 0
+ end
if options[:topic_ids]
result = result.where('topics.id in (?)', options[:topic_ids]).references(:topics)
diff --git a/lib/version.rb b/lib/version.rb
index c991f58695..5d31671366 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
MAJOR = 1
MINOR = 6
TINY = 0
- PRE = 'beta3'
+ PRE = 'beta4'
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs
index eed5772446..d625b76cd2 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs
@@ -1,4 +1,4 @@
-{{#each option in options}}
+{{#each options as |option|}}
- {{#each option in poll.options}}
+ {{#each poll.options as |option|}}
{{poll-option option=option toggle="toggleOption"}}
{{/each}}
diff --git a/plugins/poll/config/locales/server.ro.yml b/plugins/poll/config/locales/server.ro.yml
index e0ca3634c7..3a1e3d429f 100644
--- a/plugins/poll/config/locales/server.ro.yml
+++ b/plugins/poll/config/locales/server.ro.yml
@@ -26,7 +26,7 @@ ro:
named_poll_must_have_different_options: "Sondajul numit %{name} trebuie să aibă opțiuni diferite."
default_poll_with_multiple_choices_has_invalid_parameters: "Sondajul cu opțiuni multiple are parametri invalizi."
named_poll_with_multiple_choices_has_invalid_parameters: "Sondajul numit %{name} cu opțiuni multiple are parametri invalizi."
- requires_at_least_1_valid_option: "Trebuie să selectezi cel puțin 1 valoare validă."
+ requires_at_least_1_valid_option: "Trebuie să selectezi cel puțin o opțiune validă."
cannot_change_polls_after_5_minutes: "Nu poți adăuga, elimina sau redenumi sondaje după primele 5 minute."
op_cannot_edit_options_after_5_minutes: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele 5 minute. Te rugăm contactează un moderator pentru a edita o opțiune din sondaj."
staff_cannot_add_or_remove_options_after_5_minutes: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele 5 minute. Ar trebui să închizi discuția și să creezi alta în loc."
diff --git a/script/import_scripts/phpbb3/database/database_3_1.rb b/script/import_scripts/phpbb3/database/database_3_1.rb
index c9368edf33..2d18880ab5 100644
--- a/script/import_scripts/phpbb3/database/database_3_1.rb
+++ b/script/import_scripts/phpbb3/database/database_3_1.rb
@@ -4,7 +4,7 @@ require_relative '../support/constants'
module ImportScripts::PhpBB3
class Database_3_1 < Database_3_0
def fetch_users(last_user_id)
- query(<<-SQL)
+ query(<<-SQL, :user_id)
SELECT u.user_id, u.user_email, u.username,
CASE WHEN u.user_password LIKE '$2y$%'
THEN CONCAT('$2a$', SUBSTRING(u.user_password, 5))
@@ -21,7 +21,7 @@ module ImportScripts::PhpBB3
(b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP())
)
WHERE u.user_id > #{last_user_id} AND u.user_type != #{Constants::USER_TYPE_IGNORE}
- ORDER BY u.user_id ASC
+ ORDER BY u.user_id
LIMIT #{@batch_size}
SQL
end
diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index c21737ad85..53150a5dfb 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -49,6 +49,12 @@ describe DiscourseDiff do
expect(DiscourseDiff.new(before, after).inline_html).to eq("
this is the first paragraph
this is the second paragraph
")
end
+ it "does not break diff on character references" do
+ before = "
'
"
+ after = ""
+ expect(DiscourseDiff.new(before, after).inline_html).to eq("
'
")
+ end
+
end
describe "side_by_side_html" do
@@ -86,6 +92,12 @@ describe DiscourseDiff do
expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("
this is the first paragraph
this is the second paragraph
this is the second paragraph
")
end
+ it "does not break diff on character references" do
+ before = "
'
"
+ after = ""
+ expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("
'
")
+ end
+
end
describe "side_by_side_markdown" do
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index b6b33fefd4..f8497dc28b 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -68,7 +68,7 @@ describe Email::Receiver do
let(:bounce_key) { "14b08c855160d67f2e0c2f8ef36e251e" }
let(:bounce_key_2) { "b542fb5a9bacda6d28cc061d18e4eb83" }
- let!(:user) { Fabricate(:user, email: "foo@bar.com", active: true) }
+ let!(:user) { Fabricate(:user, email: "foo@bar.com") }
let!(:email_log) { Fabricate(:email_log, user: user, bounce_key: bounce_key) }
let!(:email_log_2) { Fabricate(:email_log, user: user, bounce_key: bounce_key_2) }
@@ -82,7 +82,6 @@ describe Email::Receiver do
email_log.reload
expect(email_log.bounced).to eq(true)
- expect(email_log.user.active).to eq(true)
expect(email_log.user.user_stat.bounce_score).to eq(1)
end
@@ -91,7 +90,6 @@ describe Email::Receiver do
email_log.reload
expect(email_log.bounced).to eq(true)
- expect(email_log.user.active).to eq(true)
expect(email_log.user.user_stat.bounce_score).to eq(2)
Timecop.freeze(2.days.from_now) do
@@ -99,7 +97,6 @@ describe Email::Receiver do
email_log_2.reload
expect(email_log_2.bounced).to eq(true)
- expect(email_log_2.user.active).to eq(false)
expect(email_log_2.user.user_stat.bounce_score).to eq(4)
end
end
diff --git a/spec/components/has_errors_spec.rb b/spec/components/has_errors_spec.rb
index f9b6876501..1ae0eaef14 100644
--- a/spec/components/has_errors_spec.rb
+++ b/spec/components/has_errors_spec.rb
@@ -45,10 +45,10 @@ describe HasErrors do
it "triggers a rollback" do
expect(-> {
- error_test.rollback_with!(invalid_topic, :custom_error)
+ error_test.rollback_with!(invalid_topic, :too_many_users)
}).to raise_error(ActiveRecord::Rollback)
expect(error_test.errors).to be_present
- expect(error_test.errors[:base]).to include(:custom_error)
+ expect(error_test.errors[:base]).to include("You can only send warnings to one user at a time.")
end
end
diff --git a/spec/components/text_cleaner_spec.rb b/spec/components/text_cleaner_spec.rb
index cf203c709c..a41a1e7c1b 100644
--- a/spec/components/text_cleaner_spec.rb
+++ b/spec/components/text_cleaner_spec.rb
@@ -187,6 +187,14 @@ describe TextCleaner do
expect(TextCleaner.clean_title("Hello there ?")).to eq("Hello there?")
end
+ it "replaces all upper case unicode text with regular unicode case letters" do
+ expect(TextCleaner.clean_title("INVESTIGAÇÃO POLÍTICA NA CÂMARA")).to eq("Investigação política na câmara")
+ end
+
+ it "capitalizes first unicode letter" do
+ expect(TextCleaner.clean_title("épico encontro")).to eq("Épico encontro")
+ end
+
end
end
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index e45b9c7ef2..c07c6ad2f7 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -41,6 +41,11 @@ describe ListController do
expect(parsed["topic_list"]["topics"].length).to eq(1)
end
+
+ it "doesn't throw an error with a negative page" do
+ xhr :get, :top, page: -1024
+ expect(response).to be_success
+ end
end
describe 'RSS feeds' do
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index 488674a93f..3736d1a581 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -86,7 +86,7 @@ describe Jobs::PollMailbox do
incoming_email = IncomingEmail.last
expect(incoming_email.rejection_message).to eq(
- I18n.t("email.incoming.errors.bounced_email_report")
+ I18n.t("email.incoming.errors.bounced_email_error")
)
end
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js.es6
new file mode 100644
index 0000000000..4d0198bffe
--- /dev/null
+++ b/test/javascripts/acceptance/mobile-discovery-test.js.es6
@@ -0,0 +1,15 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Topic Discovery - Mobile", { mobileView: true });
+
+test("Visit Discovery Pages", () => {
+ visit("/");
+ andThen(() => {
+ ok(exists(".topic-list"), "The list of topics was rendered");
+ ok(exists('.topic-list .topic-list-item'), "has topics");
+ });
+
+ visit("/categories");
+ andThen(() => {
+ ok(exists('.category'), "has a list of categories");
+ });
+});
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
new file mode 100644
index 0000000000..8083109131
--- /dev/null
+++ b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
@@ -0,0 +1,11 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Signing In - Mobile", { mobileView: true });
+
+test("sign in", () => {
+ visit("/");
+ click("header .login-button");
+ andThen(() => {
+ ok(exists('#login-form'), "it shows the login modal");
+ });
+});
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js.es6
new file mode 100644
index 0000000000..8cc2cb9da1
--- /dev/null
+++ b/test/javascripts/acceptance/mobile-users-test.js.es6
@@ -0,0 +1,10 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("User Directory - Mobile", { mobileView: true });
+
+test("Visit Page", () => {
+ visit("/users");
+ andThen(() => {
+ ok(exists('.directory .user'), "has a list of users");
+ });
+});
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 63288ef7ab..c0bed4d486 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -3,6 +3,7 @@
import sessionFixtures from 'fixtures/session-fixtures';
import siteFixtures from 'fixtures/site-fixtures';
import HeaderComponent from 'discourse/components/site-header';
+import { forceMobile, resetMobile } from 'discourse/lib/mobile';
function currentUser() {
return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
@@ -36,19 +37,25 @@ var oldAvatar = Discourse.Utilities.avatarImg;
function acceptance(name, options) {
module("Acceptance: " + name, {
- setup: function() {
+ setup() {
+ resetMobile();
+
// Don't render avatars in acceptance tests, it's faster and no 404s
Discourse.Utilities.avatarImg = () => "";
// For now don't do scrolling stuff in Test Mode
HeaderComponent.reopen({examineDockHeader: Ember.K});
- var siteJson = siteFixtures['site.json'].site;
+ const siteJson = siteFixtures['site.json'].site;
if (options) {
if (options.setup) {
options.setup.call(this);
}
+ if (options.mobileView) {
+ forceMobile();
+ }
+
if (options.loggedIn) {
logIn();
}
@@ -65,7 +72,7 @@ function acceptance(name, options) {
Discourse.reset();
},
- teardown: function() {
+ teardown() {
if (options && options.teardown) {
options.teardown.call(this);
}
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index 289ae458ae..68634bafdf 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -4605,4 +4605,4 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ }
/******/ ])
});
-;
\ No newline at end of file
+;