summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/no.yml2
-rw-r--r--lang/zh-tw.yml4
-rw-r--r--lang/zh.yml4
-rw-r--r--public/javascripts/jstoolbar/lang/jstoolbar-no.js4
4 files changed, 7 insertions, 7 deletions
diff --git a/lang/no.yml b/lang/no.yml
index e3b88b110..aa9d0396b 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -213,6 +213,7 @@ setting_per_page_options: Alternativer, objekter pr. side
setting_user_format: Visningsformat, brukere
setting_activity_days_default: Dager vist på prosjektaktivitet
setting_display_subprojects_issues: Vis saker fra underprosjekter på hovedprosjekt som standard
+setting_enabled_scm: Aktiviserte SCM
project_module_issue_tracking: Sakssporing
project_module_time_tracking: Tidssporing
@@ -624,4 +625,3 @@ default_activity_development: Utvikling
enumeration_issue_priorities: Sakssprioriteringer
enumeration_doc_categories: Dokument-kategorier
enumeration_activities: Aktiviteter (tidssporing)
-setting_enabled_scm: Enabled SCM
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 2ee595dcd..064004c3a 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -213,6 +213,7 @@ setting_per_page_options: 每頁顯示個數選項
setting_user_format: 使用者顯示格式
setting_activity_days_default: 專案活動顯示天數
setting_display_subprojects_issues: 預設於父專案中顯示子專案的項目
+setting_enabled_scm: 啟用的 SCM
project_module_issue_tracking: 項目追蹤
project_module_time_tracking: 工時追蹤
@@ -429,7 +430,7 @@ label_issue_tracking: 項目追蹤
label_spent_time: 耗用時間
label_f_hour: %.2f 小時
label_f_hour_plural: %.2f 小時
-label_time_tracking: Time tracking
+label_time_tracking: 工時追蹤
label_change_plural: 變更
label_statistics: 統計資訊
label_commits_per_month: 依月份統計送交次數
@@ -624,4 +625,3 @@ default_activity_development: 開發
enumeration_issue_priorities: 項目優先權
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
-setting_enabled_scm: Enabled SCM
diff --git a/lang/zh.yml b/lang/zh.yml
index d82363414..ac650c853 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -213,6 +213,7 @@ setting_per_page_options: 每页显示条目个数的设置
setting_user_format: 用户显示格式
setting_activity_days_default: 在项目活动中显示的天数
setting_display_subprojects_issues: 在项目页面上默认显示子项目的问题
+setting_enabled_scm: 启用 SCM
project_module_issue_tracking: 问题跟踪
project_module_time_tracking: 时间跟踪
@@ -448,6 +449,7 @@ label_relation_new: 新建关联
label_relation_delete: 删除关联
label_relates_to: 关联到
label_duplicates: 重复
+label_duplicated_by: 与其重复
label_blocks: 阻挡
label_blocked_by: 被阻挡
label_precedes: 优先于
@@ -623,5 +625,3 @@ default_activity_development: 开发
enumeration_issue_priorities: 问题优先级
enumeration_doc_categories: 文档类别
enumeration_activities: 活动(时间跟踪)
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index 2fb098a9d..799597343 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -9,8 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Overskrift 2';
jsToolBar.strings['Heading 3'] = 'Overskrift 3';
jsToolBar.strings['Unordered list'] = 'Punktliste';
jsToolBar.strings['Ordered list'] = 'Nummerert liste';
-jsToolBar.strings['Quote'] = 'Quote';
-jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Quote'] = 'Sitat';
+jsToolBar.strings['Unquote'] = 'Avslutt sitat';
jsToolBar.strings['Preformatted text'] = 'Preformatert tekst';
jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
jsToolBar.strings['Image'] = 'Bilde';