[DRE-commits] r4246 - trunk/redmine/debian/patches

Jérémy Lal kapouer-guest at alioth.debian.org
Sun Oct 11 19:00:53 UTC 2009


Author: kapouer-guest
Date: 2009-10-11 19:00:47 +0000 (Sun, 11 Oct 2009)
New Revision: 4246

Added:
   trunk/redmine/debian/patches/changeset_r2924_r2915.diff
Modified:
   trunk/redmine/debian/patches/series
Log:
New patches from upstream, fixes a bunch a minor bugs.

Added: trunk/redmine/debian/patches/changeset_r2924_r2915.diff
===================================================================
--- trunk/redmine/debian/patches/changeset_r2924_r2915.diff	                        (rev 0)
+++ trunk/redmine/debian/patches/changeset_r2924_r2915.diff	2009-10-11 19:00:47 UTC (rev 4246)
@@ -0,0 +1,668 @@
+Upstream update, without rails 1.9 patches.
+diff -Nur redmine-0.9.0~svn2907/app/helpers/application_helper.rb redmine-0.9.0~svn2907.new/app/helpers/application_helper.rb
+--- redmine-0.9.0~svn2907/app/helpers/application_helper.rb	2009-09-12 11:13:13.000000000 +0200
++++ redmine-0.9.0~svn2907.new/app/helpers/application_helper.rb	2009-10-11 20:52:45.476944086 +0200
+@@ -147,8 +147,8 @@
+     projects = User.current.projects.all
+     if projects.any?
+       s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
+-            "<option selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
+-            '<option disabled="disabled">---</option>'
++            "<option value='' selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
++            '<option value="" disabled="disabled">---</option>'
+       s << project_tree_options_for_select(projects) do |p|
+         { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
+       end
+diff -Nur redmine-0.9.0~svn2907/app/views/journals/_notes_form.rhtml redmine-0.9.0~svn2907.new/app/views/journals/_notes_form.rhtml
+--- redmine-0.9.0~svn2907/app/views/journals/_notes_form.rhtml	2008-12-19 09:10:35.000000000 +0100
++++ redmine-0.9.0~svn2907.new/app/views/journals/_notes_form.rhtml	2009-10-11 20:52:45.476944086 +0200
+@@ -1,6 +1,6 @@
+ <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+-    <%= text_area_tag :notes, h(@journal.notes), :class => 'wiki-edit', 
+-                                                 :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
++    <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', 
++                                              :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+     <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
+     <p><%= submit_tag l(:button_save) %>
+     <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
+diff -Nur redmine-0.9.0~svn2907/config/locales/da.yml redmine-0.9.0~svn2907.new/config/locales/da.yml
+--- redmine-0.9.0~svn2907/config/locales/da.yml	2009-10-11 20:52:29.981943379 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/da.yml	2009-10-11 20:52:45.484942682 +0200
+@@ -102,8 +102,8 @@
+         accepted: "skal accepteres"
+         empty: "må ikke udelades"
+         blank: "skal udfyldes"
+-        too_long: "er for lang (maksimum {{count}} tegn)"
+-        too_short: "er for kort (minimum {{count}} tegn)"
++        too_long: "er for lang (højst {{count}} tegn)"
++        too_short: "er for kort (mindst {{count}} tegn)"
+         wrong_length: "har forkert længde (skulle være {{count}} tegn)"
+         taken: "er allerede anvendt"
+         not_a_number: "er ikke et tal"
+@@ -270,7 +270,7 @@
+   setting_issues_export_limit: Sagseksporteringsbegrænsning
+   setting_mail_from: Afsender-email
+   setting_bcc_recipients: Skjult modtager (bcc)
+-  setting_host_name: Værts navn
++  setting_host_name: Værtsnavn
+   setting_text_formatting: Tekstformatering
+   setting_wiki_compression: Komprimering af wiki-historik
+   setting_feeds_limit: Feed indholdsbegrænsning
+@@ -278,7 +278,7 @@
+   setting_sys_api_enabled: Aktiver webservice for automatisk administration af repository
+   setting_commit_ref_keywords: Referencenøgleord
+   setting_commit_fix_keywords: Afslutningsnøgleord
+-  setting_autologin: Autologin
++  setting_autologin: Automatisk login
+   setting_date_format: Datoformat
+   setting_time_format: Tidsformat
+   setting_cross_project_issue_relations: Tillad sagsrelationer på tværs af projekter
+@@ -338,7 +338,7 @@
+   label_issue_category_plural: Sagskategorier
+   label_issue_category_new: Ny kategori
+   label_custom_field: Brugerdefineret felt
+-  label_custom_field_plural: Brugerdefineret felt
++  label_custom_field_plural: Brugerdefinerede felter
+   label_custom_field_new: Nyt brugerdefineret felt
+   label_enumerations: Værdier
+   label_enumeration_new: Ny værdi
+@@ -399,9 +399,9 @@
+   label_change_log: Ændringer
+   label_settings: Indstillinger
+   label_overview: Oversigt
+-  label_version: Version
+-  label_version_new: Ny version
+-  label_version_plural: Versioner
++  label_version: Udgave
++  label_version_new: Ny udgave
++  label_version_plural: Udgaver
+   label_confirmation: Bekræftelser
+   label_export_to: Eksporter til
+   label_read: Læs...
+@@ -491,7 +491,7 @@
+   label_latest_revision: Seneste revision
+   label_latest_revision_plural: Seneste revisioner
+   label_view_revisions: Se revisioner
+-  label_max_size: Maximal størrelse
++  label_max_size: Maksimal størrelse
+   label_sort_highest: Flyt til toppen
+   label_sort_higher: Flyt op
+   label_sort_lower: Flyt ned
+@@ -590,7 +590,7 @@
+   label_display_per_page: "Per side: {{value}}"
+   label_age: Alder
+   label_change_properties: Ændre indstillinger
+-  label_general: Generalt
++  label_general: Generelt
+   label_more: Mere
+   label_scm: SCM
+   label_plugins: Plugins
+@@ -713,11 +713,11 @@
+   label_preferences: Preferences
+   label_overall_activity: Overordnet aktivitet
+   setting_default_projects_public: Nye projekter er offentlige som standard
+-  error_scm_annotate: "The entry does not exist or can not be annotated."
++  error_scm_annotate: "Filen findes ikke, eller kunne ikke annoteres."
+   label_planning: Planlægning
+   text_subprojects_destroy_warning: "Dets underprojekter(er): {{value}} vil også blive slettet."
+   permission_edit_issues: Redigér sager
+-  setting_diff_max_lines_displayed: Maksimalt antal forskelle der vises
++  setting_diff_max_lines_displayed: Højeste antal forskelle der vises
+   permission_edit_own_issue_notes: Redigér egne noter
+   setting_enabled_scm: Aktiveret SCM
+   button_quote: Citér
+@@ -727,7 +727,7 @@
+   permission_delete_own_messages: Slet egne beskeder
+   permission_manage_public_queries: Administrér offentlig forespørgsler
+   permission_log_time: Registrér anvendt tid
+-  label_renamed: omdømt
++  label_renamed: omdøbt
+   label_incoming_emails: Indkommende emails
+   permission_view_changesets: Se ændringer
+   permission_manage_versions: Administrér versioner
+@@ -744,9 +744,9 @@
+   permission_add_issue_watchers: Tilføj overvågere
+   warning_attachments_not_saved: "der var {{count}} fil(er), som ikke kunne gemmes."
+   permission_comment_news: Kommentér nyheder
+-  text_enumeration_category_reassign_to: 'Reassign them to this value:'
+-  permission_select_project_modules: Vælg projekt moduler
+-  permission_view_gantt: Se gantt diagram
++  text_enumeration_category_reassign_to: 'FLyt dem til denne værdi:'
++  permission_select_project_modules: Vælg projektmoduler
++  permission_view_gantt: Se Gantt diagram
+   permission_delete_messages: Slet beskeder
+   permission_move_issues: Flyt sager
+   permission_edit_wiki_pages: Redigér wiki sider
+@@ -757,7 +757,7 @@
+   notice_unable_delete_version: Kan ikke slette versionen.
+   permission_view_wiki_edits: Se wiki historik
+   field_editable: Redigérbar
+-  label_duplicated_by: duplikeret af
++  label_duplicated_by: dubleret af
+   permission_manage_boards: Administrér fora
+   permission_delete_wiki_pages_attachments: Slet filer vedhæftet wiki sider
+   permission_view_messages: Se beskeder
+@@ -773,7 +773,7 @@
+   button_create_and_continue: Opret og fortsæt
+   setting_gravatar_enabled: Anvend Gravatar bruger ikoner
+   label_updated_time_by: "Opdateret af {{author}} for {{age}} siden"
+-  text_diff_truncated: '... Listen over forskelle er bleve afkortet fordi den overstiger den maksimale størrelse der kan vises.'
++  text_diff_truncated: '... Listen over forskelle er bleve afkortet da den overstiger den maksimale størrelse der kan vises.'
+   text_user_wrote: "{{value}} skrev:"
+   setting_mail_handler_api_enabled: Aktiver webservice for indkomne emails
+   permission_delete_issues: Slet sager
+@@ -799,45 +799,45 @@
+   permission_edit_time_entries: Redigér tidsregistreringer
+   general_csv_decimal_separator: ','
+   permission_edit_own_time_entries: Redigér egne tidsregistreringer
+-  setting_repository_log_display_limit: Maksimalt antal revisioner vist i fil-log
+-  setting_file_max_size_displayed: Maksimal størrelse på tekstfiler vist inline
++  setting_repository_log_display_limit: Højeste antal revisioner vist i fil-log
++  setting_file_max_size_displayed: Maksimale størrelse på tekstfiler vist inline
+   field_watcher: Overvåger
+   setting_openid: Tillad OpenID login og registrering
+   field_identity_url: OpenID URL
+   label_login_with_open_id_option: eller login med OpenID
+-  setting_per_page_options: Objects per page options
+-  mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
+-  field_content: Content
+-  label_descending: Descending
+-  label_sort: Sort
+-  label_ascending: Ascending
+-  label_date_from_to: From {{start}} to {{end}}
++  setting_per_page_options: Enheder per side muligheder
++  mail_body_reminder: "{{count}} sage(er) som er tildelt dig har deadline indenfor de næste {{days}} dage:"
++  field_content: Indhold
++  label_descending: Aftagende
++  label_sort: Sortér
++  label_ascending: Tiltagende
++  label_date_from_to: Fra {{start}} til {{end}}
+   label_greater_or_equal: ">="
+   label_less_or_equal: <=
+-  text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do?
+-  text_wiki_page_reassign_children: Reassign child pages to this parent page
+-  text_wiki_page_nullify_children: Keep child pages as root pages
+-  text_wiki_page_destroy_children: Delete child pages and all their descendants
+-  setting_password_min_length: Minimum password length
+-  field_group_by: Group results by
+-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+-  label_wiki_content_added: Wiki page added
+-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
+-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+-  label_wiki_content_updated: Wiki page updated
+-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+-  permission_add_project: Create project
+-  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+-  label_view_all_revisions: View all revisions
++  text_wiki_page_destroy_question: Denne side har {{descendants}} underside(r) og afledte. Hvad vil du gøre?
++  text_wiki_page_reassign_children: Flyt undersider til denne side
++  text_wiki_page_nullify_children: Behold undersider som rod-sider
++  text_wiki_page_destroy_children: Slet undersider ogalle deres afledte sider.
++  setting_password_min_length: Mindste længde på kodeord
++  field_group_by: Gruppér resultater efter
++  mail_subject_wiki_content_updated: "'{{page}}' wikisiden er blevet opdateret"
++  label_wiki_content_added: Wiki side tilføjet
++  mail_subject_wiki_content_added: "'{{page}}' wikisiden er blevet tilføjet"
++  mail_body_wiki_content_added: The '{{page}}' wikiside er blevet tilføjet af {{author}}.
++  label_wiki_content_updated: Wikiside opdateret
++  mail_body_wiki_content_updated: Wikisiden '{{page}}' er blevet opdateret af {{author}}.
++  permission_add_project: Opret projekt
++  setting_new_project_user_role_id: Denne rolle gives til en bruger, som ikke er administrator, og som opretter et projekt
++  label_view_all_revisions: Se alle revisioner
+   label_tag: Tag
+   label_branch: Branch
+-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
+-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
+-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
+-  text_journal_set_to: "{{label}} set to {{value}}"
+-  text_journal_deleted: "{{label}} deleted ({{old}})"
+-  label_group_plural: Groups
+-  label_group: Group
+-  label_group_new: New group
+-  label_time_entry_plural: Spent time
++  error_no_tracker_in_project: Der er ingen sagshåndtering for dette projekt. Kontrollér venligst projektindstillingerne.
++  error_no_default_issue_status: Der er ikek defineret en standardstatus. Kontrollér venligst indstillingernen (Gå til "Administration -> Sagsstatuser").
++  text_journal_changed: "{{label}} ændret fra {{old}} til {{new}}"
++  text_journal_set_to: "{{label}} sat til {{value}}"
++  text_journal_deleted: "{{label}} slettet ({{old}})"
++  label_group_plural: Grupper
++  label_group: Grupper
++  label_group_new: Ny gruppe
++  label_time_entry_plural: Anvendt tid
+   text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/config/locales/el.yml redmine-0.9.0~svn2907.new/config/locales/el.yml
+--- redmine-0.9.0~svn2907/config/locales/el.yml	2009-10-11 20:52:29.981943379 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/el.yml	2009-10-11 20:52:45.480940974 +0200
+@@ -77,7 +77,7 @@
+         invalid: "είναι άκυρο"
+         confirmation: "δεν αντιστοιχεί με την επιβεβαίωση"
+         accepted: "πρέπει να γίνει αποδοχή"
+-        empty: "δε μπορεί να είναι κενό"
++        empty: "δε μπορεί να είναι άδειο"
+         blank: "δε μπορεί να είναι κενό"
+         too_long: "έχει πολλούς (μέγ.επιτρ. {{count}} χαρακτήρες)"
+         too_short: "έχει λίγους (ελάχ.επιτρ. {{count}} χαρακτήρες)"
+@@ -105,8 +105,8 @@
+   general_lang_name: 'Ελληνικά'
+   general_csv_separator: ','
+   general_csv_decimal_separator: '.'
+-  general_csv_encoding: ISO-8859-7
+-  general_pdf_encoding: ISO-8859-7
++  general_csv_encoding: UTF-8
++  general_pdf_encoding: UTF-8
+   general_first_day_of_week: '7'
+   
+   notice_account_updated: Ο λογαριασμός ενημερώθηκε επιτυχώς.
+@@ -318,8 +318,8 @@
+   permission_view_calendar: Προβολή ημερολογίου
+   permission_view_issue_watchers: Προβολή λίστας παρατηρητών
+   permission_add_issue_watchers: Προσθήκη παρατηρητών
+-  permission_log_time: Ιστορικό δαπανημένου χρόνου
+-  permission_view_time_entries: Προβολή δαπανημένου χρόνου
++  permission_log_time: Ιστορικό χρόνου που δαπανήθηκε
++  permission_view_time_entries: Προβολή χρόνου που δαπανήθηκε
+   permission_edit_time_entries: Επεξεργασία ιστορικού χρόνου 
+   permission_edit_own_time_entries: Επεξεργασία δικού μου ιστορικού χρόνου
+   permission_manage_news: Διαχείριση νέων
+@@ -345,8 +345,8 @@
+   permission_add_messages: Αποστολή μηνυμάτων
+   permission_edit_messages: Επεξεργασία μηνυμάτων
+   permission_edit_own_messages: Επεξεργασία δικών μου μηνυμάτων
+-  permission_delete_messages: Delete messages
+-  permission_delete_own_messages: Διαγραφή μηνυμάτων
++  permission_delete_messages: Διαγραφή μηνυμάτων
++  permission_delete_own_messages: Διαγραφή δικών μου μηνυμάτων
+   
+   project_module_issue_tracking: Ανίχνευση θεμάτων
+   project_module_time_tracking: Ανίχνευση χρόνου
+@@ -488,7 +488,7 @@
+     other: "{{count}} κλειστά"
+   label_total: Σύνολο
+   label_permissions: Άδειες
+-  label_current_status: Current status
++  label_current_status: Τρέχουσα κατάσταση
+   label_new_statuses_allowed: Νέες καταστάσεις επιτρέπονται
+   label_all: όλα
+   label_none: κανένα
+@@ -806,11 +806,11 @@
+   enumeration_issue_priorities: Προτεραιότητα θέματος
+   enumeration_doc_categories: Κατηγορία εγγράφων
+   enumeration_activities: Δραστηριότητες (κατακερματισμός χρόνου)
+-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
+-  text_journal_set_to: "{{label}} set to {{value}}"
+-  text_journal_deleted: "{{label}} deleted ({{old}})"
+-  label_group_plural: Groups
+-  label_group: Group
+-  label_group_new: New group
+-  label_time_entry_plural: Spent time
++  text_journal_changed: "{{label}} άλλαξε από {{old}} σε {{new}}"
++  text_journal_set_to: "{{label}} ορίζεται σε {{value}}"
++  text_journal_deleted: "{{label}} διαγράφηκε ({{old}})"
++  label_group_plural: Ομάδες
++  label_group: Ομάδα
++  label_group_new: Νέα ομάδα
++  label_time_entry_plural: Χρόνος που δαπανήθηκε
+   text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/config/locales/ko.yml redmine-0.9.0~svn2907.new/config/locales/ko.yml
+--- redmine-0.9.0~svn2907/config/locales/ko.yml	2009-10-11 20:52:29.989942953 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/ko.yml	2009-10-11 20:52:45.480940974 +0200
+@@ -1,7 +1,8 @@
+ # Korean translations for Ruby on Rails 
+-# by Kihyun Yoon(ddumbugie at gmail.com)
++# by Kihyun Yoon(ddumbugie at gmail.com),http://plenum.textcube.com/
+ # by John Hwang (jhwang at tavon.org),http://github.com/tavon
+-# last update at 2009-09-11 by Yonghwan SO
++# by Yonghwan SO(please insert your email), last update at 2009-09-11
++# last update at 2009-09-11 by Kihyun Yoon
+ ko:
+   date:
+     formats:
+@@ -471,9 +472,9 @@
+   label_login_with_open_id_option: 또는 OpenID로 로그인
+   label_password_lost: 비밀번호 찾기
+   label_home: 초기화면
+-  label_my_page: 내페이지
+-  label_my_account: 내계정
+-  label_my_projects: 나의 프로젝트
++  label_my_page: 내 페이지
++  label_my_account: 내 계정
++  label_my_projects: 내 프로젝트
+   label_administration: 관리
+   label_login: 로그인
+   label_logout: 로그아웃
+@@ -504,8 +505,8 @@
+   label_text: 텍스트
+   label_attribute: 속성
+   label_attribute_plural: 속성
+-  label_download: "{{count}} 다운로드"
+-  label_download_plural: "{{count}} 다운로드"
++  label_download: "{{count}}회 다운로드"
++  label_download_plural: "{{count}}회 다운로드"
+   label_no_data: 표시할 데이터가 없습니다.
+   label_change_status: 상태 변경
+   label_history: 이력
+@@ -538,8 +539,8 @@
+   label_closed_issues_plural: 완료됨
+   label_x_open_issues_abbr_on_total:
+     zero:  "총 {{total}} 건 모두 완료"
+-    one:   "총 {{total}} 건 중 한 건 진행 중"
+-    other: "총 {{total}} 건 중 {{count}} 건 진행 중"
++    one:   "한 건 진행 중 / 총 {{total}} 건 중 "
++    other: "{{count}} 건 진행 중 / 총 {{total}} 건"
+   label_x_open_issues_abbr:
+     zero:  모두 완료
+     one:   한 건 진행 중
+@@ -556,7 +557,7 @@
+   label_none: 없음
+   label_nobody: 미지정
+   label_next: 다음
+-  label_previous: 이전
++  label_previous: 뒤로
+   label_used_by: 사용됨
+   label_details: 자세히
+   label_add_note: 일감덧글 추가
+@@ -689,7 +690,7 @@
+   label_message_new: 새글쓰기
+   label_message_posted: 글 추가
+   label_reply_plural: 답글
+-  label_send_information: 사용자에게 계정정보를 보냄
++  label_send_information: 사용자에게 계정정보를 보내기
+   label_year: 년
+   label_month: 월
+   label_week: 주
+@@ -759,7 +760,7 @@
+   button_add: 추가
+   button_change: 변경
+   button_apply: 적용
+-  button_clear: 초기화
++  button_clear: 지우기
+   button_lock: 잠금
+   button_unlock: 잠금해제
+   button_download: 다운로드
+@@ -771,15 +772,15 @@
+   button_activate: 활성화
+   button_sort: 정렬
+   button_log_time: 작업시간 기록
+-  button_rollback: 이 버전으로 롤백
++  button_rollback: 이 버전으로 되돌리기
+   button_watch: 지켜보기
+   button_unwatch: 관심끄기
+   button_reply: 답글
+   button_archive: 잠금보관
+   button_unarchive: 잠금보관해제
+-  button_reset: 리셋
+-  button_rename: 이름변경
+-  button_change_password: 비밀번호 변경
++  button_reset: 초기화
++  button_rename: 이름바꾸기
++  button_change_password: 비밀번호 바꾸기
+   button_copy: 복사
+   button_annotate: 이력해설
+   button_update: 수정
+@@ -806,7 +807,7 @@
+   text_length_between: "{{min}} 에서 {{max}} 글자"
+   text_tracker_no_workflow: 이 일감 유형에는 업무흐름이 정의되지 않았습니다.
+   text_unallowed_characters: 허용되지 않는 문자열
+-  text_comma_separated: 복수의 값들이 허용됩니다.(구분자 ,)
++  text_comma_separated: "구분자','를 이용해서 여러 개의 값을 입력할 수 있습니다."
+   text_issues_ref_in_commit_messages: 제출 메시지에서 일감을 참조하거나 해결하기
+   text_issue_added: "{{author}}이(가) 일감 {{id}}을(를) 보고하였습니다."
+   text_issue_updated: "{{author}}이(가) 일감 {{id}}을(를) 수정하였습니다."
+@@ -814,8 +815,8 @@
+   text_issue_category_destroy_question: "일부 일감들({{count}}개)이 이 범주에 지정되어 있습니다. 어떻게 하시겠습니까?"
+   text_issue_category_destroy_assignments: 범주 지정 지우기
+   text_issue_category_reassign_to: 일감을 이 범주에 다시 지정하기
+-  text_user_mail_option: "선택하지 않은 프로젝트에서도, 모니터링 중이거나 속해있는 사항(일감을 발행했거나 할당된 경우)이 있으면 알림메일을 받게 됩니다."
+-  text_no_configuration_data: "역할, 일감 유형, 일감 상태들과 업무흐름이 아직 설정되지 않았습니다.\n기본 설정을 읽어드리는 것을 권장합니다. 읽어들인 후에 수정할 수 있습니다."
++  text_user_mail_option: "선택하지 않은 프로젝트에서도, 지켜보는 중이거나 속해있는 사항(일감을 발행했거나 할당된 경우)이 있으면 알림메일을 받게 됩니다."
++  text_no_configuration_data: "역할, 일감 유형, 일감 상태들과 업무흐름이 아직 설정되지 않았습니다.\n기본 설정을 읽어들이는 것을 권장합니다. 읽어들인 후에 수정할 수 있습니다."
+   text_load_default_configuration: 기본 설정을 읽어들이기
+   text_status_changed_by_changeset: "변경묶음 {{value}}에 의하여 변경됨"
+   text_issues_destroy_confirmation: '선택한 일감을 정말로 삭제하시겠습니까?'
+@@ -834,21 +835,21 @@
+   text_email_delivery_not_configured: "이메일 전달이 설정되지 않았습니다. 그래서 알림이 비활성화되었습니다.\n SMTP서버를 config/email.yml에서 설정하고 어플리케이션을 다시 시작하십시오. 그러면 동작합니다."
+   text_repository_usernames_mapping: "저장소 로그에서 발견된 각 사용자에 레드마인 사용자를 업데이트할때 선택합니다.\n레드마인과 저장소의 이름이나 이메일이 같은 사용자가 자동으로 연결됩니다."
+   text_diff_truncated: '... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.'
+-  text_custom_field_possible_values_info: '각 값당 한 줄'
++  text_custom_field_possible_values_info: '각 값 당 한 줄'
+   text_wiki_page_destroy_question: 이 페이지는 {{descendants}} 개의 하위 페이지와 관련 내용이 있습니다. 이 내용을 어떻게 하시겠습니까?
+-  text_wiki_page_nullify_children: 하위 페이지를 루트 페이지 아래로 지정
++  text_wiki_page_nullify_children: 하위 페이지를 최상위 페이지 아래로 지정
+   text_wiki_page_destroy_children: 모든 하위 페이지와 관련 내용을 삭제
+   text_wiki_page_reassign_children: 하위 페이지를 이 페이지 아래로 지정
+   
+   default_role_manager: 관리자
+   default_role_developper: 개발자
+   default_role_reporter: 보고자
+-  default_tracker_bug: 버그
+-  default_tracker_feature: 기능
++  default_tracker_bug: 결함
++  default_tracker_feature: 새기능
+   default_tracker_support: 지원
+-  default_issue_status_new: 새로움
+-  default_issue_status_assigned: 할당됨
+-  default_issue_status_resolved: 해결됨
++  default_issue_status_new: 신규
++  default_issue_status_assigned: 할당
++  default_issue_status_resolved: 해결
+   default_issue_status_feedback: 의견
+   default_issue_status_closed: 완료
+   default_issue_status_rejected: 거절
+@@ -868,8 +869,8 @@
+ 
+   field_issue_to: Related issue
+   label_view_all_revisions: 모든 개정판 표시
+-  label_tag: 태그
+-  label_branch: 브랜치
++  label_tag: 표지(票識)저장소
++  label_branch: 분기(分岐)저장소
+   error_no_tracker_in_project: 사용할 수 있도록 설정된 일감 유형이 없습니다. 프로젝트 설정을 확인하십시오.
+   error_no_default_issue_status: '기본 상태가 정해져 있지 않습니다. 설정을 확인하십시오. (주 메뉴의 "관리" -> "일감 상태")'
+   text_journal_changed: "{{label}}을(를) {{old}}에서 {{new}}(으)로 변경함"
+@@ -878,5 +879,5 @@
+   label_group_plural: 그룹
+   label_group: 그룹
+   label_group_new: 새 그룹
+-  label_time_entry_plural: Spent time
++  label_time_entry_plural: 작업시간
+   text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/config/locales/ro.yml redmine-0.9.0~svn2907.new/config/locales/ro.yml
+--- redmine-0.9.0~svn2907/config/locales/ro.yml	2009-10-11 20:52:29.997941758 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/ro.yml	2009-10-11 20:52:45.476944086 +0200
+@@ -784,30 +784,30 @@
+   enumeration_activities: Activități (timp de lucru)
+   label_greater_or_equal: ">="
+   label_less_or_equal: <=
+-  text_wiki_page_destroy_question: This page has {{descendants}} child page(s) and descendant(s). What do you want to do?
+-  text_wiki_page_reassign_children: Reassign child pages to this parent page
+-  text_wiki_page_nullify_children: Keep child pages as root pages
+-  text_wiki_page_destroy_children: Delete child pages and all their descendants
+-  setting_password_min_length: Minimum password length
+-  field_group_by: Group results by
+-  mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
+-  label_wiki_content_added: Wiki page added
+-  mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
+-  mail_body_wiki_content_added: The '{{page}}' wiki page has been added by {{author}}.
+-  label_wiki_content_updated: Wiki page updated
+-  mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+-  permission_add_project: Create project
+-  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+-  label_view_all_revisions: View all revisions
++  text_wiki_page_destroy_question: Această pagină are {{descendants}} pagini anterioare și descendenți. Ce doriți să faceți?
++  text_wiki_page_reassign_children: Atribuie paginile la această pagină
++  text_wiki_page_nullify_children: Menține paginile ca și pagini inițiale (root)
++  text_wiki_page_destroy_children: Șterge paginile și descendenții
++  setting_password_min_length: Lungime minimă parolă
++  field_group_by: Grupează după
++  mail_subject_wiki_content_updated: "Pagina wiki '{{page}}' a fost actualizată"
++  label_wiki_content_added: Adăugat
++  mail_subject_wiki_content_added: "Pagina wiki '{{page}}' a fost adăugată"
++  mail_body_wiki_content_added: Pagina wiki '{{page}}' a fost adăugată de {{author}}.
++  label_wiki_content_updated: Actualizat
++  mail_body_wiki_content_updated: Pagina wiki '{{page}}' a fost actualizată de {{author}}.
++  permission_add_project: Crează proiect
++  setting_new_project_user_role_id: Rol atribuit utilizatorului non-admin care crează un proiect.
++  label_view_all_revisions: Arată toate reviziile
+   label_tag: Tag
+   label_branch: Branch
+-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
+-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
+-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
+-  text_journal_set_to: "{{label}} set to {{value}}"
+-  text_journal_deleted: "{{label}} deleted ({{old}})"
+-  label_group_plural: Groups
+-  label_group: Group
+-  label_group_new: New group
+-  label_time_entry_plural: Spent time
++  error_no_tracker_in_project: Nu există un tracker asociat cu proiectul. Verificați vă rog setările proiectului.
++  error_no_default_issue_status: Nu există un status implicit al tichetelor. Verificați vă rog configurația (Mergeți la "Administrare -> Stări tichete").
++  text_journal_changed: "{{label}} schimbat din {{old}} în {{new}}"
++  text_journal_set_to: "{{label}} setat ca {{value}}"
++  text_journal_deleted: "{{label}} șters ({{old}})"
++  label_group_plural: Grupuri
++  label_group: Grup
++  label_group_new: Grup nou
++  label_time_entry_plural: Timp alocat
+   text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/config/locales/zh-TW.yml redmine-0.9.0~svn2907.new/config/locales/zh-TW.yml
+--- redmine-0.9.0~svn2907/config/locales/zh-TW.yml	2009-10-11 20:52:30.001942139 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/zh-TW.yml	2009-10-11 20:52:45.484942682 +0200
+@@ -849,6 +849,7 @@
+   text_journal_changed: "{{label}} 從 {{old}} 變更為 {{new}}"
+   text_journal_set_to: "{{label}} 設定為 {{value}}"
+   text_journal_deleted: "{{label}} 已刪除 ({{old}})"
++  text_journal_added: "{{label}} {{value}} 已新增"
+   text_tip_task_begin_day: 今天起始的工作
+   text_tip_task_end_day: 今天截止的的工作
+   text_tip_task_begin_end_day: 今天起始與截止的工作
+@@ -917,4 +918,3 @@
+   enumeration_issue_priorities: 項目優先權
+   enumeration_doc_categories: 文件分類
+   enumeration_activities: 活動 (時間追蹤)
+-  text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/config/locales/zh.yml redmine-0.9.0~svn2907.new/config/locales/zh.yml
+--- redmine-0.9.0~svn2907/config/locales/zh.yml	2009-10-11 20:52:30.005941751 +0200
++++ redmine-0.9.0~svn2907.new/config/locales/zh.yml	2009-10-11 20:52:45.476944086 +0200
+@@ -168,7 +168,9 @@
+   error_scm_command_failed: "访问版本库时发生错误:{{value}}"
+   error_scm_annotate: "该条目不存在或无法追溯。"
+   error_issue_not_found_in_project: '问题不存在或不属于此项目'
+-  
++  error_no_tracker_in_project: 该项目未设定跟踪标签,请检查项目配置。
++  error_no_default_issue_status: 未设置默认的问题状态。请检查系统设置("管理" -> "问题状态")。
++
+   warning_attachments_not_saved: "{{count}} 个文件保存失败。"
+   
+   mail_subject_lost_password: "您的 {{value}} 密码"
+@@ -575,6 +577,8 @@
+   label_browse: 浏览
+   label_modification: "{{count}} 个更新"
+   label_modification_plural: "{{count}} 个更新"
++  label_branch: 分支
++  label_tag: 标签
+   label_revision: 修订
+   label_revision_plural: 修订
+   label_associated_revisions: 相关修订版本
+@@ -586,6 +590,7 @@
+   label_latest_revision: 最近的修订版本
+   label_latest_revision_plural: 最近的修订版本
+   label_view_revisions: 查看修订
++  label_view_all_revisions: 查看所有修订
+   label_max_size: 最大尺寸
+   label_sort_highest: 置顶
+   label_sort_higher: 上移
+@@ -710,6 +715,10 @@
+   label_date_from_to: 从 {{start}} 到 {{end}}
+   label_wiki_content_added: Wiki 页面已添加
+   label_wiki_content_updated: Wiki 页面已更新
++  label_group: 组
++  label_group_plural: 组
++  label_group_new: 新建组
++  label_time_entry_plural: 耗时
+ 
+   button_login: 登录
+   button_submit: 提交
+@@ -762,6 +771,10 @@
+   text_subprojects_destroy_warning: "以下子项目也将被同时删除:{{value}}"
+   text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
+   text_are_you_sure: 您确定?
++  text_journal_changed: "{{label}} 从 {{old}} 变更为 {{new}}"
++  text_journal_set_to: "{{label}} 被设置为 {{value}}"
++  text_journal_deleted: "{{label}} 已删除 ({{old}})"
++  text_journal_added: "{{label}} {{value}} 已添加"
+   text_tip_task_begin_day: 今天开始的任务
+   text_tip_task_end_day: 今天结束的任务
+   text_tip_task_begin_end_day: 今天开始并结束的任务
+@@ -830,16 +843,3 @@
+   enumeration_issue_priorities: 问题优先级
+   enumeration_doc_categories: 文档类别
+   enumeration_activities: 活动(时间跟踪)
+-  label_view_all_revisions: View all revisions
+-  label_tag: Tag
+-  label_branch: Branch
+-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
+-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
+-  text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
+-  text_journal_set_to: "{{label}} set to {{value}}"
+-  text_journal_deleted: "{{label}} deleted ({{old}})"
+-  label_group_plural: Groups
+-  label_group: Group
+-  label_group_new: New group
+-  label_time_entry_plural: Spent time
+-  text_journal_added: "{{label}} {{value}} added"
+diff -Nur redmine-0.9.0~svn2907/lib/tasks/migrate_from_mantis.rake redmine-0.9.0~svn2907.new/lib/tasks/migrate_from_mantis.rake
+--- redmine-0.9.0~svn2907/lib/tasks/migrate_from_mantis.rake	2009-05-04 19:41:52.000000000 +0200
++++ redmine-0.9.0~svn2907.new/lib/tasks/migrate_from_mantis.rake	2009-10-11 20:52:45.484942682 +0200
+@@ -284,7 +284,7 @@
+     	# Project members
+     	project.members.each do |member|
+           m = Member.new :user => User.find_by_id(users_map[member.user_id]),
+-    	                 :role => ROLE_MAPPING[member.access_level] || DEFAULT_ROLE
++    	                   :roles => [ROLE_MAPPING[member.access_level] || DEFAULT_ROLE]
+     	  m.project = p
+     	  m.save
+     	end	
+@@ -314,7 +314,7 @@
+       Issue.destroy_all
+       issues_map = {}
+       keep_bug_ids = (Issue.count == 0)
+-      MantisBug.find(:all, :order => 'id ASC').each do |bug|
++      MantisBug.find_each(:batch_size => 200) do |bug|
+         next unless projects_map[bug.project_id] && users_map[bug.reporter_id]
+     	i = Issue.new :project_id => projects_map[bug.project_id], 
+                       :subject => encode(bug.summary),
+diff -Nur redmine-0.9.0~svn2907/lib/tasks/migrate_from_trac.rake redmine-0.9.0~svn2907.new/lib/tasks/migrate_from_trac.rake
+--- redmine-0.9.0~svn2907/lib/tasks/migrate_from_trac.rake	2009-05-10 10:39:23.000000000 +0200
++++ redmine-0.9.0~svn2907.new/lib/tasks/migrate_from_trac.rake	2009-10-11 20:52:45.484942682 +0200
+@@ -263,7 +263,7 @@
+           elsif TracPermission.find_by_username_and_action(username, 'developer')
+             role = ROLE_MAPPING['developer']
+           end
+-          Member.create(:user => u, :project => @target_project, :role => role)
++          Member.create(:user => u, :project => @target_project, :roles => [role])
+           u.reload
+         end
+         u
+@@ -458,7 +458,7 @@
+ 
+         # Tickets
+         print "Migrating tickets"
+-          TracTicket.find(:all, :order => 'id ASC').each do |ticket|
++          TracTicket.find_each(:batch_size => 200) do |ticket|
+           print '.'
+           STDOUT.flush
+           i = Issue.new :project => @target_project,
+diff -Nur redmine-0.9.0~svn2907/public/javascripts/jstoolbar/lang/jstoolbar-da.js redmine-0.9.0~svn2907.new/public/javascripts/jstoolbar/lang/jstoolbar-da.js
+--- redmine-0.9.0~svn2907/public/javascripts/jstoolbar/lang/jstoolbar-da.js	2009-01-20 17:09:07.000000000 +0100
++++ redmine-0.9.0~svn2907.new/public/javascripts/jstoolbar/lang/jstoolbar-da.js	2009-10-11 20:52:45.484942682 +0200
+@@ -9,8 +9,8 @@
+ jsToolBar.strings['Heading 3'] = 'Overskrift 3';
+ jsToolBar.strings['Unordered list'] = 'Unummereret liste';
+ jsToolBar.strings['Ordered list'] = 'Nummereret liste';
+-jsToolBar.strings['Quote'] = 'Quote';
+-jsToolBar.strings['Unquote'] = 'Remove Quote';
++jsToolBar.strings['Quote'] = 'Citér';
++jsToolBar.strings['Unquote'] = 'Fjern citér';
+ jsToolBar.strings['Preformatted text'] = 'Præformateret tekst';
+ jsToolBar.strings['Wiki link'] = 'Link til en wiki-side';
+ jsToolBar.strings['Image'] = 'Billede';

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2009-10-10 17:47:15 UTC (rev 4245)
+++ trunk/redmine/debian/patches/series	2009-10-11 19:00:47 UTC (rev 4246)
@@ -1,3 +1,4 @@
 changeset_r2886_r2887.diff
+changeset_r2924_r2915.diff
 01_paths.patch
 02_session_path.patch




More information about the Pkg-ruby-extras-commits mailing list