jro_apps/redmine Commit - r1396:d7e3c4df2604

Merged r1409 and r1410 from trunk....

Jean-Philippe Lang -

r1396:d7e3c4df2604

parent child

Context file:

r1396:d7e3c4df2604

app/helpers/sort_helper.rb +1 -1

               # Use this to sort the controller's table items collection.
               #
               def sort_clause()
-                session[@sort_name][:key] + ' ' + session[@sort_name][:order]
+                session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
               end
               # Returns a link which sorts by the named column.

lang/fi.yml +3 -3

             label_export_to: Vie
             label_read: Lukee...
             label_public_projects: Julkiset projektit
-            label_open_issues: avoin
+            label_open_issues: avoin, yhteensä
-            label_open_issues_plural: avointa
+            label_open_issues_plural: avointa, yhteensä
             label_closed_issues: suljettu
             label_closed_issues_plural: suljettua
             label_total: Yhteensä
             label_overall_activity: Kokonaishistoria
             error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
             label_planning: Suunnittelu
-            text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+            text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös poistamaan.'

lang/no.yml +1 -1

             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 betyr ingen begrensning
             text_project_destroy_confirmation: Er du sikker på at du vil slette dette prosjekter og alle relatert data ?
-            text_subprojects_destroy_warning: 'Underprojekt(ene): %s vil ogsÃ¥ bli slettet.'
+            text_subprojects_destroy_warning: 'Underprojekt(ene): %s vil også bli slettet.'
             text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten
             text_are_you_sure: Er du sikker ?
             text_journal_changed: endret fra %s til %s

lang/pl.yml +4 -4

             field_due_date: Data oddania
             field_assigned_to: Przydzielony do
             field_priority: Priorytet
-            field_fixed_version: Target version
+            field_fixed_version: Wersja docelowa
             field_user: Użytkownik
             field_role: Rola
             field_homepage: Strona www
             label_revision: Zmiana
             label_revision_plural: Zmiany
             label_added: dodane
-            label_modified: zmodufikowane
+            label_modified: zmodyfikowane
             label_deleted: usunięte
             label_latest_revision: Ostatnia zmiana
             label_latest_revision_plural: Ostatnie zmiany
             default_role_developper: Programista
             default_role_reporter: Wprowadzajacy
             default_tracker_bug: Błąd
-            default_tracker_feature: Cecha
+            default_tracker_feature: Zadanie
             default_tracker_support: Wsparcie
             default_issue_status_new: Nowy
             default_issue_status_assigned: Przypisany
             default_priority_normal: Normalny
             default_priority_high: Wysoki
             default_priority_urgent: Pilny
-            default_priority_immediate: Natyczmiastowy
+            default_priority_immediate: Natychmiastowy
             default_activity_design: Projektowanie
             default_activity_development: Rozwój

lang/zh-tw.yml +2 -2

             setting_per_page_options: 每頁顯示個數選項
             setting_user_format: 使用者顯示格式
             setting_activity_days_default: 專案活動顯示天數
-            setting_display_subprojects_issues: 預設於主控專案中顯示從屬專案的項目
+            setting_display_subprojects_issues: 預設於父專案中顯示子專案的項目
             project_module_issue_tracking: 項目追蹤
             project_module_time_tracking: 工時追蹤
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 代表「不限制」
             text_project_destroy_confirmation: 您確定要刪除這個專案和其他相關資料？
+            text_subprojects_destroy_warning: '下列子專案： %s 將一併被刪除。'
             text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程
             text_are_you_sure: 確定執行？
             text_journal_changed: 從 %s 變更為 %s
             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
-            text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'

lang/zh.yml +2 -2

             status_locked: 已锁定
             text_select_mail_notifications: 选择需要发送邮件通知的动作
-            text_regexp_info: eg. ^[A-Z0-9]+$
+            text_regexp_info: 例如：^[A-Z0-9]+$
             text_min_max_length_info: 0 表示没有限制
             text_project_destroy_confirmation: 您确信要删除这个项目以及所有相关的数据吗？
+            text_subprojects_destroy_warning: '以下子项目也将被同时删除：%s'
             text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
             text_are_you_sure: 您确定？
             text_journal_changed: 从 %s 变更为 %s
             enumeration_issue_priorities: 问题优先级
             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
-            text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages