Translation updates: (closes #915, #927, #929, #923, #914, #919)

* Japanese (Satoru Kurashiki)
* Simplified Chinese (chaoqun zou)
* Danish (kim madsen)
* Norwegian (Kai Olav Fredriksen)
* Traditional Chinese (shortie lo)
* German (Sven Schuchmann)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1300 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 files changed, 173 insertions, 173 deletions

diff --git a/lang/da.yml b/lang/da.yml
index 939ee5f5c..b0a6764bb 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -135,7 +135,7 @@ field_parent: Underprojekt af
 field_is_in_chlog: Sager vist i ændringer
 field_is_in_roadmap: Sager vist i roadmap
 field_login: Login
-field_mail_notification: Email notifikatiner
+field_mail_notification: Email notifikationer
 field_admin: Administrator
 field_last_login_on: Sidste forbindelse
 field_language: Sprog
@@ -153,7 +153,7 @@ field_attr_login: Login attribut
 field_attr_firstname: Fornavn attribut
 field_attr_lastname: Efternavn attribut
 field_attr_mail: Email attribut
-field_onthefly: On-the-fly bruger oprettelse
+field_onthefly: løbende bruger oprettelse
 field_start_date: Start
 field_done_ratio: %% Færdig
 field_auth_source: Sikkerheds metode
@@ -180,7 +180,7 @@ field_default_value: Standard værdi
 setting_app_title: Applikations titel
 setting_app_subtitle: Applikations undertekst
 setting_welcome_text: Velkomst tekst
-setting_default_language: Standrad sporg
+setting_default_language: Standard sporg
 setting_login_required: Sikkerhed påkrævet
 setting_self_registration: Bruger oprettelse
 setting_attachment_max_size: Vedhæftede filers max størrelse
@@ -198,15 +198,15 @@ setting_commit_fix_keywords: Afslutnings nøgleord
 setting_autologin: Autologin
 setting_date_format: Dato format
 setting_time_format: Tids format
-setting_cross_project_issue_relations: Tillad cross-projekt sags relationer
-setting_issue_list_default_columns: Standrad kolonner på sags listen
+setting_cross_project_issue_relations: Tillad sags relationer på tværs af projekter
+setting_issue_list_default_columns: Standard kolonner på sags listen
 setting_repositories_encodings: Repository tegnsæt
 setting_emails_footer: Email fodnote
 setting_protocol: Protokol
 setting_per_page_options: Objekter pr. side indstillinger
 setting_user_format: Bruger visnings format
 
-project_module_issue_tracking: Sag søgning
+project_module_issue_tracking: Sags søgning
 project_module_time_tracking: Tids styring
 project_module_news: Nyheder
 project_module_documents: Dokumenter
@@ -314,12 +314,12 @@ label_news_view_all: Vis alle nyheder
 label_news_added: Nyhed tilføjet
 label_change_log: Ændringer
 label_settings: Indstillinger
-label_overview: Oversit
+label_overview: Oversigt
 label_version: Version
 label_version_new: Ny version
 label_version_plural: Versioner
 label_confirmation: Bekræftigelser
-label_export_to: Exporter til
+label_export_to: Eksporter til
 label_read: Læs...
 label_public_projects: Offentlige projekter
 label_open_issues: åben
@@ -383,14 +383,14 @@ label_browse: Gennemse
 label_modification: %d ændring
 label_modification_plural: %d ændringer
 label_revision: Revision
-label_revision_plural: Revisions
-label_associated_revisions: Tilnyttede revisions
+label_revision_plural: Revisioner
+label_associated_revisions: Tilnyttede revisioner
 label_added: tilføjet
 label_modified: ændret
 label_deleted: slettet
 label_latest_revision: Seneste revision
-label_latest_revision_plural: Seneste revisions
-label_view_revisions: Se revisions
+label_latest_revision_plural: Seneste revisioner
+label_view_revisions: Se revisioner
 label_max_size: Maximal størrelse
 label_on: 'til'
 label_sort_highest: Flyt til toppen
@@ -427,11 +427,11 @@ label_commits_per_author: Commits pr. bruger
 label_view_diff: Vis forskellighed
 label_diff_inline: inline
 label_diff_side_by_side: side ved side
-label_options: Options
+label_options: Optioner
 label_copy_workflow_from: Kopier arbejdsgang fra
 label_permissions_report: Godkendelses rapport
 label_watched_issues: Overvågede sager
-label_related_issues: Relaterede sage
+label_related_issues: Relaterede sager
 label_applied_status: Anvendte statuser
 label_loading: Indlæser...
 label_relation_new: Ny relation
@@ -452,7 +452,7 @@ label_show_completed_versions: Vis færdige versioner
 label_me: mig
 label_board: Forum
 label_board_new: Nyt forum
-label_board_plural: Forumer
+label_board_plural: Fora
 label_topic_plural: Emner
 label_message_plural: Beskeder
 label_message_last: Sidste besked
@@ -521,7 +521,7 @@ button_back: Tilbage
 button_cancel: Annuller
 button_activate: Aktiver
 button_sort: Sorter
-button_log_time: Log tidspunkt
+button_log_time: Log tid
 button_rollback: Tilbagefør til denne version
 button_watch: Overvåg
 button_unwatch: Stop overvågning
@@ -552,7 +552,7 @@ text_journal_deleted: slettet
 text_tip_task_begin_day: opgaven begynder denne dag
 text_tip_task_end_day: opaven slutter denne dag
 text_tip_task_begin_end_day: opgaven begynder og slutter denne dag
-text_project_identifier_info: 'Minuskler (a-z), numre og bindestreg er tilladt.<br />Når den er gemt, kan indifikatoren ikke rettes.'
+text_project_identifier_info: 'Små bogstaver (a-z), numre og bindestreg er tilladt.<br />Når den er gemt, kan indifikatoren ikke rettes.'
 text_caracters_maximum: max %d karakterer.
 text_caracters_minimum: Skal være mindst %d karakterer lang.
 text_length_between: Længde skal være mellem %d og %d karakterer.
@@ -602,20 +602,20 @@ enumeration_issue_priorities: Sags prioriteter
 enumeration_doc_categories: Dokument kategorier
 enumeration_activities: Aktiviteter (tids styring)
 
-label_add_another_file: Add another file
-label_chronological_order: In chronological order
-setting_activity_days_default: Days displayed on project activity
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_optional_description: Optional description
-text_destroy_time_entries: Delete reported hours
-field_comments_sorting: Display comments
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-label_reverse_chronological_order: In reverse chronological order
+label_add_another_file: Tilføj endnu en fil
+label_chronological_order: I kronologisk rækkefølge
+setting_activity_days_default: Antal dage der vises under projekt aktivitet
+text_destroy_time_entries_question: %.02f timer er reporteret på denne sag, som du er ved at slette. Hvad vil du gøre ?
+error_issue_not_found_in_project: 'Sagen blev ikke fundet eller tilhører ikke dette projekt'
+text_assign_time_entries_to_project: Tildel raporterede timer til projektet
+setting_display_subprojects_issues: Vis sager for underprojekter på hovedprojektet som default
+label_optional_description: Optionel beskrivelse
+text_destroy_time_entries: Slet raportede timer
+field_comments_sorting: Vis kommentar
+text_reassign_time_entries: 'Tildel raportede timer til denne sag igen'
+label_reverse_chronological_order: I omvendt kronologisk rækkefølge
 label_preferences: Preferences
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
+label_overall_activity: Overordnet aktivitet
+setting_default_projects_public: Nye projekter er offentlige som default
 error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_planning: Planlægning
diff --git a/lang/de.yml b/lang/de.yml
index f8c747cac..17c6ac617 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -127,7 +127,7 @@ field_subject: Thema
 field_due_date: Abgabedatum
 field_assigned_to: Zugewiesen an
 field_priority: Priorität
-field_fixed_version: Target version
+field_fixed_version: Zielversion
 field_user: Benutzer
 field_role: Rolle
 field_homepage: Projekt-Homepage
diff --git a/lang/en.yml b/lang/en.yml
index 41e2eaceb..8264ba908 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -67,11 +67,11 @@ notice_successful_update: Successful update.
 notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
-notice_locking_conflict: Data have been updated by another user.
+notice_locking_conflict: Data has been updated by another user.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_feeds_access_key_reseted: Your RSS access key was reset.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
 notice_account_pending: "Your account was created and is now pending administrator approval."
@@ -264,7 +264,7 @@ label_enumerations: Enumerations
 label_enumeration_new: New value
 label_information: Information
 label_information_plural: Information
-label_please_login: Please login
+label_please_login: Please log in
 label_register: Register
 label_password_lost: Lost password
 label_home: Home
@@ -284,7 +284,7 @@ label_registered_on: Registered on
 label_activity: Activity
 label_overall_activity: Overall activity
 label_new: New
-label_logged_as: Logged as
+label_logged_as: Logged in as
 label_environment: Environment
 label_authentication: Authentication
 label_auth_source: Authentication mode
@@ -556,7 +556,7 @@ status_locked: locked
 text_select_mail_notifications: Select actions for which email notifications should be sent.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 means no restriction
-text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
+text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
 text_workflow_edit: Select a role and a tracker to edit the workflow
 text_are_you_sure: Are you sure ?
 text_journal_changed: changed from %s to %s
diff --git a/lang/ja.yml b/lang/ja.yml
index 64b858ccb..44d0c3ebd 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -50,7 +50,7 @@ general_text_yes: 'はい'
 general_lang_name: 'Japanese (日本語)'
 general_csv_separator: ','
 general_csv_encoding: SJIS
-general_pdf_encoding: SJIS
+general_pdf_encoding: UTF-8
 general_day_names: 月曜日,火曜日,水曜日,木曜日,金曜日,土曜日,日曜日
 general_first_day_of_week: '7'
 
@@ -79,7 +79,7 @@ error_scm_command_failed: "リポジトリへアクセスしようとしてエ�
 
 mail_subject_lost_password: %sパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
-mail_subject_register: %sアカウントが有効になりました
+mail_subject_register: %sアカウントのアクティブ化
 mail_body_register: 'アカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
@@ -601,20 +601,20 @@ label_date_range: 日付の範囲
 label_last_week: 先週
 label_yesterday: 昨日
 label_last_month: 先月
-label_add_another_file: Add another file
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-label_optional_description: Optional description
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_add_another_file: 別のファイルを追加
+text_destroy_time_entries_question: チケットに記録された%.02f時間を削除しようとしています。何がしたいのですか？
+error_issue_not_found_in_project: 'チケットが見つかりません、もしくはこのプロジェクトに属していません'
+text_assign_time_entries_to_project: 記録された時間をプロジェクトに割り当て
+label_optional_description: 任意のコメント
+text_destroy_time_entries: 記録された時間を削除
+text_reassign_time_entries: '記録された時間をこのチケットに再割り当て：'
+setting_activity_days_default: プロジェクトの活動ページに表示される日数
+label_chronological_order: 古い順
+field_comments_sorting: コメントを表示
+label_reverse_chronological_order: 新しい順
+label_preferences: 設定
+setting_display_subprojects_issues: デフォルトでサブプロジェクトのチケットをメインプロジェクトに表示する
+label_overall_activity: 全ての活動
+setting_default_projects_public: デフォルトで新しいプロジェクトは公開にする
+error_scm_annotate: "エントリが存在しない、もしくはアノテートできません。"
+label_planning: 計画
diff --git a/lang/no.yml b/lang/no.yml
index 497c4a147..f2d7ac144 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -26,7 +26,7 @@ activerecord_error_confirmation: stemmer ikke med bekreftelsen
 activerecord_error_accepted: må aksepteres
 activerecord_error_empty: kan ikke være tom
 activerecord_error_blank: kan ikke være blank
-activerecord_error_too_long: er for lang
+activerecord_error_too_long: er for langt
 activerecord_error_too_short: er for kort
 activerecord_error_wrong_length: har feil lengde
 activerecord_error_taken: er opptatt
@@ -68,7 +68,6 @@ notice_successful_delete: Slettet.
 notice_successful_connection: Koblet opp.
 notice_file_not_found: Siden du forsøkte å vise eksisterer ikke, eller er slettet.
 notice_locking_conflict: Data har blitt oppdatert av en annen bruker.
-notice_scm_error: Elementet og/eller revisjonen eksisterer ikke i depoet.
 notice_not_authorized: Du har ikke adgang til denne siden.
 notice_email_sent: En e-post er sendt til %s
 notice_email_error: En feil oppstod under sending av e-post (%s)
@@ -76,6 +75,13 @@ notice_feeds_access_key_reseted: Din RSS-tilgangsnøkkel er nullstilt.
 notice_failed_to_save_issues: "Lykkes ikke å lagre %d sak(er) på %d valgt: %s."
 notice_no_issue_selected: "Ingen sak valgt! Vennligst merk sakene du vil endre."
 notice_account_pending: "Din konto ble opprettet og avventer nå administrativ godkjenning."
+notice_default_data_loaded: Standardkonfigurasjonen lastet inn.
+
+error_can_t_load_default_data: "Standardkonfigurasjonen kunne ikke lastes inn: %s"
+error_scm_not_found: "Elementet og/eller revisjonen eksisterer ikke i depoet."
+error_scm_command_failed: "En feil oppstod under tilkobling til depoet: %s"
+error_scm_annotate: "Elementet eksisterer ikke, eller kan ikke annoteres."
+error_issue_not_found_in_project: 'Saken eksisterer ikke, eller hører ikke til dette prosjektet'
 
 mail_subject_lost_password: Ditt %s passord
 mail_body_lost_password: 'Klikk følgende lenke for å endre ditt passord:'
@@ -115,7 +121,7 @@ field_project: Prosjekt
 field_issue: Sak
 field_status: Status
 field_notes: Notater
-field_is_closed: Saken er lukket
+field_is_closed: Lukker saken
 field_is_default: Standardverdi
 field_tracker: Sakstype
 field_subject: Emne
@@ -128,8 +134,8 @@ field_role: Rolle
 field_homepage: Hjemmeside
 field_is_public: Offentlig
 field_parent: Underprosjekt til
-field_is_in_chlog: Saker vist i endringslogg
-field_is_in_roadmap: Saker vist i veikart
+field_is_in_chlog: Vises i endringslogg
+field_is_in_roadmap: Vises i veikart
 field_login: Brukernavn
 field_mail_notification: E-post varsling
 field_admin: Administrator
@@ -140,7 +146,7 @@ field_password: Passord
 field_new_password: Nytt passord
 field_password_confirmation: Bekreft passord
 field_version: Versjon
-field_type: Saksype
+field_type: Type
 field_host: Vert
 field_port: Port
 field_account: Konto
@@ -162,7 +168,7 @@ field_hours: Timer
 field_activity: Activitet
 field_spent_on: Dato
 field_identifier: Identifikasjon
-field_is_filter: Brukt som et filter
+field_is_filter: Brukes som filter
 field_issue_to_id: Relatert saker
 field_delay: Forsinkelse
 field_assignable: Saker kan tildeles denne rollen
@@ -171,13 +177,15 @@ field_estimated_hours: Estimert tid
 field_column_names: Kolonner
 field_time_zone: Tidssone
 field_searchable: Søkbar
+field_default_value: Standardverdi
+field_comments_sorting: Vis kommentarer
 
-setting_app_title: Appliksjonstittel
+setting_app_title: Applikasjonstittel
 setting_app_subtitle: Applikasjonens undertittel
-setting_welcome_text: Velkomstekst
+setting_welcome_text: Velkomsttekst
 setting_default_language: Standardspråk
 setting_login_required: Krever innlogging
-setting_self_registration: Selv-registrering
+setting_self_registration: Selvregistrering
 setting_attachment_max_size: Maks. størrelse vedlegg
 setting_issues_export_limit: Eksportgrense for saker
 setting_mail_from: Avsenders e-post
@@ -186,11 +194,12 @@ setting_host_name: Vertsnavn
 setting_text_formatting: Tekstformattering
 setting_wiki_compression: Komprimering av Wiki-historikk
 setting_feeds_limit: Innholdsgrense for Feed
+setting_default_projects_public: Nye prosjekter er offentlige som standard
 setting_autofetch_changesets: Autohenting av innsendinger
 setting_sys_api_enabled: Aktiver webservice for depot-administrasjon
 setting_commit_ref_keywords: Nøkkelord for referanse
 setting_commit_fix_keywords: Nøkkelord for retting
-setting_autologin: Autoinnloging
+setting_autologin: Autoinnlogging
 setting_date_format: Datoformat
 setting_time_format: Tidsformat
 setting_cross_project_issue_relations: Tillat saksrelasjoner mellom prosjekter
@@ -198,6 +207,19 @@ setting_issue_list_default_columns: Standardkolonner vist i sakslisten
 setting_repositories_encodings: Depot-tegnsett
 setting_emails_footer: E-post-signatur
 setting_protocol: Protokoll
+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
+
+project_module_issue_tracking: Sakssporing
+project_module_time_tracking: Tidssporing
+project_module_news: Nyheter
+project_module_documents: Dokumenter
+project_module_files: Filer
+project_module_wiki: Wiki
+project_module_repository: Depot
+project_module_boards: Forumer
 
 label_user: Bruker
 label_user_plural: Brukere
@@ -212,9 +234,12 @@ label_issue_new: Ny sak
 label_issue_plural: Saker
 label_issue_view_all: Vis alle saker
 label_issues_by: Saker etter %s
+label_issue_added: Sak lagt til
+label_issue_updated: Sak oppdatert
 label_document: Dokument
 label_document_new: Nytt dokument
 label_document_plural: Dokumenter
+label_document_added: Dokument lagt til
 label_role: Rolle
 label_role_plural: Roller
 label_role_new: Ny rolle
@@ -257,6 +282,7 @@ label_last_updates: Sist oppdatert
 label_last_updates_plural: %d siste oppdaterte
 label_registered_on: Registrert
 label_activity: Aktivitet
+label_overall_activity: Total aktivitet
 label_new: Ny
 label_logged_as: Innlogget som
 label_environment: Miljø
@@ -284,6 +310,7 @@ label_attachment: Fil
 label_attachment_new: Ny fil
 label_attachment_delete: Slett fil
 label_attachment_plural: Filer
+label_file_added: Fil lagt til
 label_report: Rapport
 label_report_plural: Rapporter
 label_news: Nyheter
@@ -291,6 +318,7 @@ label_news_new: Legg til nyhet
 label_news_plural: Nyheter
 label_news_latest: Siste nyheter
 label_news_view_all: Vis alle nyheter
+label_news_added: Nyhet lagt til
 label_change_log: Endringslogg
 label_settings: Innstillinger
 label_overview: Oversikt
@@ -308,7 +336,7 @@ label_closed_issues_plural: lukkede
 label_total: Total
 label_permissions: Godkjenninger
 label_current_status: Nåværende status
-label_new_statuses_allowed: Nye statuser tillat
+label_new_statuses_allowed: Tillatte nye statuser
 label_all: alle
 label_none: ingen
 label_nobody: ingen
@@ -324,7 +352,7 @@ label_gantt: Gantt
 label_internal: Intern
 label_last_changes: siste %d endringer
 label_change_view_all: Vis alle endringer
-label_personalize_page: Personaliser denne siden
+label_personalize_page: Tilrettelegg denne siden
 label_comment: Kommentar
 label_comment_plural: Kommentarer
 label_comment_add: Legg til kommentar
@@ -341,7 +369,15 @@ label_in_less_than: er mindre enn
 label_in_more_than: in mer enn
 label_in: i
 label_today: idag
+label_all_time: all tid
+label_yesterday: i går
 label_this_week: denne uken
+label_last_week: sist uke
+label_last_n_days: siste %d dager
+label_this_month: denne måneden
+label_last_month: siste måned
+label_this_year: dette året
+label_date_range: Dato-spenn
 label_less_than_ago: mindre enn dager siden
 label_more_than_ago: mer enn dager siden
 label_ago: dager siden
@@ -349,11 +385,13 @@ label_contains: inneholder
 label_not_contains: ikke inneholder
 label_day_plural: dager
 label_repository: Depot
+label_repository_plural: Depoter
 label_browse: Utforsk
 label_modification: %d endring
 label_modification_plural: %d endringer
 label_revision: Revisjon
 label_revision_plural: Revisjoner
+label_associated_revisions: Assosierte revisjoner
 label_added: lagt til
 label_modified: endret
 label_deleted: slettet
@@ -368,7 +406,7 @@ label_sort_lower: Flytt ned
 label_sort_lowest: Flytt til bunnen
 label_roadmap: Veikart
 label_roadmap_due_in: Frist om
-label_roadmap_overdue: %s forsinket
+label_roadmap_overdue: %s over fristen
 label_roadmap_no_issues: Ingen saker for denne versjonen
 label_search: Søk
 label_result_plural: Resultater
@@ -396,7 +434,7 @@ label_commits_per_author: Innsendinger pr. forfatter
 label_view_diff: Vis forskjeller
 label_diff_inline: i teksten
 label_diff_side_by_side: side ved side
-label_options: Valg
+label_options: Alternativer
 label_copy_workflow_from: Kopier arbeidsflyt fra
 label_permissions_report: Godkjenningsrapport
 label_watched_issues: Overvåkede saker
@@ -415,7 +453,7 @@ label_end_to_start: slutt til start
 label_end_to_end: slutt til slutt
 label_start_to_start: start til start
 label_start_to_end: start til slutt
-label_stay_logged_in: Logg meg inn automatisk
+label_stay_logged_in: Hold meg innlogget
 label_disabled: avslått
 label_show_completed_versions: Vis ferdige versjoner
 label_me: meg
@@ -426,6 +464,7 @@ label_topic_plural: Emner
 label_message_plural: Meldinger
 label_message_last: Siste melding
 label_message_new: Ny melding
+label_message_posted: Melding lagt til
 label_reply_plural: Svar
 label_send_information: Send kontoinformasjon til brukeren
 label_year: År
@@ -456,6 +495,21 @@ label_user_mail_no_self_notified: "Jeg vil ikke bli varslet om endringer jeg sel
 label_registration_activation_by_email: kontoaktivering pr. e-post
 label_registration_manual_activation: manuell kontoaktivering
 label_registration_automatic_activation: automatisk kontoaktivering
+label_display_per_page: 'Pr. side: %s'
+label_age: Alder
+label_change_properties: Endre egenskaper
+label_general: Generell
+label_more: Mer
+label_scm: SCM
+label_plugins: Tillegg
+label_ldap_authentication: LDAP-autentifikasjon
+label_downloads_abbr: Nedl.
+label_optional_description: Valgfri beskrivelse
+label_add_another_file: Legg til en fil til
+label_preferences: Brukerinnstillinger
+label_chronological_order: I kronologisk rekkefølge
+label_reverse_chronological_order: I omvendt kronologisk rekkefølge
+label_planning: Planlegging
 
 button_login: Logg inn
 button_submit: Send
@@ -492,6 +546,8 @@ button_rename: Endre navn
 button_change_password: Endre passord
 button_copy: Kopier
 button_annotate: Annotér
+button_update: Oppdater
+button_configure: Konfigurer
 
 status_active: aktiv
 status_registered: registrert
@@ -511,19 +567,31 @@ text_tip_task_end_day: oppgaven avsluttes denne dagen
 text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen
 text_project_identifier_info: 'Små bokstaver (a-z), nummer og binde-/understrek tillat.<br />Identifikatoren kan ikke endres etter den er lagret.'
 text_caracters_maximum: %d tegn maksimum.
-text_caracters_minimum: Må være minst %d tegn lang.
+text_caracters_minimum: Må være minst %d tegn langt.
 text_length_between: Lengde mellom %d og %d tegn.
 text_tracker_no_workflow: Ingen arbeidsflyt definert for denne sakstypen
 text_unallowed_characters: Ugyldige tegn
 text_comma_separated: Flere verdier tillat (kommaseparert).
-text_issues_ref_in_commit_messages: Refererer og retter saker i innsendingsmeldinger
+text_issues_ref_in_commit_messages: Referering og retting av saker i innsendingsmelding
 text_issue_added: Sak %s er rapportert.
 text_issue_updated: Sak %s er oppdatert.
 text_wiki_destroy_confirmation: Er du sikker på at du vil slette denne wikien og alt innholdet ?
 text_issue_category_destroy_question: Noen saker (%d) er lagt til i denne kategorien. Hva vil du gjøre ?
 text_issue_category_destroy_assignments: Fjern bruk av kategorier
-text_issue_category_reassign_to: Bruk kategorien på sakene på nytt
+text_issue_category_reassign_to: Overfør sakene til denne kategorien
 text_user_mail_option: "For ikke-valgte prosjekter vil du bare motta varsling om ting du overvåker eller er involveret i (eks. saker du er forfatter av eller er tildelt)."
+text_no_configuration_data: "Roller, arbeidsflyt, sakstyper og -statuser er ikke konfigurert enda.\nDet anbefales sterkt å laste inn standardkonfigurasjonen. Du vil kunne endre denne etter den er innlastet."
+text_load_default_configuration: Last inn standardkonfigurasjonen
+text_status_changed_by_changeset: Brukt i endringssett %s.
+text_issues_destroy_confirmation: 'Er du sikker på at du vil slette valgte sak(er) ?'
+text_select_project_modules: 'Velg moduler du vil aktivere for dette prosjektet:'
+text_default_administrator_account_changed: Standard administrator-konto er endret
+text_file_repository_writable: Fil-depotet er skrivbart
+text_rmagick_available: RMagick tilgjengelig (valgfritt)
+text_destroy_time_entries_question: %.02f timer er ført på sakene du er i ferd med å slette. Hva vil du gjøre ?
+text_destroy_time_entries: Slett førte timer
+text_assign_time_entries_to_project: Overfør førte timer til prosjektet
+text_reassign_time_entries: 'Overfør førte timer til denne saken:'
 
 default_role_manager: Leder
 default_role_developper: Utvikler
@@ -550,71 +618,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-
-text_status_changed_by_changeset: Applied in changeset %s.
-label_add_another_file: Add another file
-label_downloads_abbr: D/L
-label_this_month: this month
-label_chronological_order: In chronological order
-label_display_per_page: 'Per page: %s'
-label_issue_added: Issue added
-button_configure: Configure
-project_module_boards: Boards
-setting_activity_days_default: Days displayed on project activity
-project_module_issue_tracking: Issue tracking
-label_issue_updated: Issue updated
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-project_module_wiki: Wiki
-setting_per_page_options: Objects per page options
-label_last_n_days: last %d days
-label_all_time: all time
-notice_default_data_loaded: Default configuration successfully loaded.
-project_module_files: Files
-project_module_documents: Documents
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_file_repository_writable: File repository writable
-label_this_year: this year
-error_scm_not_found: "The entry or revision was not found in the repository."
-text_assign_time_entries_to_project: Assign reported hours to the project
-project_module_repository: Repository
-label_associated_revisions: Associated revisions
-label_date_range: Date range
-label_document_added: Document added
-label_last_week: last week
-label_message_posted: Message added
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
-label_ldap_authentication: LDAP authentication
-setting_default_projects_public: New projects are public by default
-project_module_news: News
-setting_user_format: Users display format
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_age: Age
-label_file_added: File added
-label_yesterday: yesterday
-label_optional_description: Optional description
-label_last_month: last month
-text_destroy_time_entries: Delete reported hours
-label_more: More
-field_default_value: Default value
-project_module_time_tracking: Time tracking
-label_scm: SCM
-label_general: General
-field_comments_sorting: Display comments
-button_update: Update
-error_scm_annotate: "The entry does not exist or can not be annotated."
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-text_default_administrator_account_changed: Default administrator account changed
-text_select_project_modules: 'Select modules to enable for this project:'
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-label_plugins: Plugins
-label_change_properties: Change properties
-label_overall_activity: Overall activity
-text_load_default_configuration: Load the default configuration
-text_rmagick_available: RMagick available (optional)
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-label_news_added: News added
-label_repository_plural: Repositories
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-label_planning: Planning
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index e018f24bb..e16fbe591 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -78,17 +78,18 @@ notice_account_pending: "您的帳號已經建立，正在等待管理員的審�
 notice_default_data_loaded: 預設組態已載入成功。
 
 error_can_t_load_default_data: "無法載入預設組態： %s"
-error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
-error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
+error_scm_not_found: SCM 儲存庫中找不到這個專案或版本。
+error_scm_command_failed: "嘗試存取儲存庫時發生錯誤： %s"
+error_scm_annotate: "SCM 儲存庫中無此項目或此項目無法被加註。"
 error_issue_not_found_in_project: '該項目不存在或不屬於此專案'
 
-mail_subject_lost_password: 您的 %s 網站密碼
-mail_body_lost_password: '欲變更您的 網站密碼, 請點選以下鏈結:'
-mail_subject_register: 啟用您的 %s 帳號
-mail_body_register: '欲啟用您的 帳號, 請點選以下鏈結:'
-mail_body_account_information_external: 您可以使用 "%s" 帳號登入 網站。
-mail_body_account_information: 您的 帳號資訊
-mail_subject_account_activation_request: %s 帳號啟用需求通知
+mail_subject_lost_password: 您的 Redmine 網站密碼
+mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
+mail_subject_register: 啟用您的 Redmine 帳號
+mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
+mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmine 網站。
+mail_body_account_information: 您的 Redmine 帳號資訊
+mail_subject_account_activation_request: Redmine 帳號啟用需求通知
 mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
 
 gui_validation_error: 1 個錯誤
@@ -177,7 +178,7 @@ field_column_names: Columns
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
 field_default_value: 預設值
-field_comments_sorting: 顯示註解
+field_comments_sorting: 註解排序
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
@@ -508,6 +509,7 @@ label_add_another_file: 增加其他檔案
 label_preferences: 偏好選項
 label_chronological_order: 以時間由遠至近排序
 label_reverse_chronological_order: 以時間由近至遠排序
+label_planning: 計劃表
 
 button_login: 登入
 button_submit: 送出
@@ -616,5 +618,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
diff --git a/lang/zh.yml b/lang/zh.yml
index 6ebcb9588..bff45a2ec 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: 成功载入默认设置。
 error_can_t_load_default_data: "无法载入默认设置：%s"
 error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。"
 error_scm_command_failed: "访问版本库时发生错误：%s"
+error_scm_annotate: "该条目不存在或无法追溯。"
 error_issue_not_found_in_project: '问题不存在或不属于此项目'
 
 mail_subject_lost_password: 您的 %s 密码
@@ -193,6 +194,7 @@ setting_host_name: 主机名称
 setting_text_formatting: 文本格式
 setting_wiki_compression: 压缩Wiki历史文档
 setting_feeds_limit: RSS Feed内容条数限制
+setting_default_projects_public: 新建项目默认为公开项目
 setting_autofetch_changesets: 自动获取程序变更
 setting_sys_api_enabled: 启用用于版本库管理的Web Service
 setting_commit_ref_keywords: 用于引用问题的关键字
@@ -507,6 +509,7 @@ label_add_another_file: 添加其它文件
 label_preferences: 首选项
 label_chronological_order: 按时间顺序
 label_reverse_chronological_order: 按时间顺序（倒序）
+label_planning: 计划
 
 button_login: 登录
 button_submit: 提交
@@ -615,6 +618,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
diff --git a/public/javascripts/calendar/lang/calendar-no.js b/public/javascripts/calendar/lang/calendar-no.js
index f6b7f3eca..0506b83e2 100644
--- a/public/javascripts/calendar/lang/calendar-no.js
+++ b/public/javascripts/calendar/lang/calendar-no.js
@@ -72,7 +72,7 @@ Calendar._TT["DAY_FIRST"] = "Vis %s først";
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "6,0";
+Calendar._TT["WEEKEND"] = "0,6";
 
 Calendar._TT["CLOSE"] = "Lukk";
 Calendar._TT["TODAY"] = "Idag";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index cd36a4b55..cf6e19ff9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -1,14 +1,14 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Fet';
+jsToolBar.strings['Italic'] = 'Kursiv';
+jsToolBar.strings['Underline'] = 'Understreking';
+jsToolBar.strings['Deleted'] = 'Slettet';
+jsToolBar.strings['Code'] = 'Kode';
+jsToolBar.strings['Heading 1'] = 'Overskrift 1';
+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['Preformatted text'] = 'Preformatert tekst';
+jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
+jsToolBar.strings['Image'] = 'Bilde';