diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 84b9574..ca3309c 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -102,6 +102,7 @@ class IssuesController < ApplicationController @edit_allowed = User.current.allowed_to?(:edit_issues, @project) @activities = Enumeration::get_values('ACTI') @priorities = Enumeration::get_values('IPRI') + @time_entry = TimeEntry.new respond_to do |format| format.html { render :template => 'issues/show.rhtml' } format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' } diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 3e95ce1..bf268de 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -75,7 +75,7 @@ class Changeset < ActiveRecord::Base if ref_keywords.delete('*') # find any issue ID in the comments target_issue_ids = [] - comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] } + comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] } referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids) end diff --git a/app/models/query.rb b/app/models/query.rb index f25b5c4..c19bb8d 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -227,7 +227,7 @@ class Query < ActiveRecord::Base end def label_for(field) - label = @available_filters[field][:name] if @available_filters.has_key?(field) + label = available_filters[field][:name] if available_filters.has_key?(field) label ||= field.gsub(/\_id$/, "") end diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index ddaff2b..4bd2d33 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -29,6 +29,12 @@ class TimeEntry < ActiveRecord::Base validates_numericality_of :hours, :allow_nil => true validates_length_of :comments, :maximum => 255 + def after_initialize + if new_record? + self.activity ||= Enumeration.default('ACTI') + end + end + def before_validation self.project = issue.project if issue && project.nil? end diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index f42f254..04c21ce 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -6,7 +6,7 @@ <%= l(:field_status) %> diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml index d9329d1..7d038d9 100644 --- a/app/views/projects/roadmap.rhtml +++ b/app/views/projects/roadmap.rhtml @@ -43,7 +43,7 @@

<%= l(:label_version_plural) %>

<% @versions.each do |version| %> -<%= link_to version.name, :anchor => version.name %>
+<%= link_to version.name, "##{version.name}" %>
<% end %> <% end %> diff --git a/lang/hu.yml b/lang/hu.yml new file mode 100644 index 0000000..c3feaf1 --- /dev/null +++ b/lang/hu.yml @@ -0,0 +1,622 @@ +_gloc_rule_default: '|n| n==1 ? "" : "_plural" ' + +actionview_datehelper_select_day_prefix: +actionview_datehelper_select_month_names: Január,Február,Március,Április,Május,Június,Július,Augusztus,Szeptember,Október,November,December +actionview_datehelper_select_month_names_abbr: Jan,Feb,Már,Ápr,Máj,Jún,Júl,Aug,Szept,Okt,Nov,Dec +actionview_datehelper_select_month_prefix: +actionview_datehelper_select_year_prefix: +actionview_datehelper_time_in_words_day: 1 nap +actionview_datehelper_time_in_words_day_plural: %d nap +actionview_datehelper_time_in_words_hour_about: kb. 1 óra +actionview_datehelper_time_in_words_hour_about_plural: kb. %d óra +actionview_datehelper_time_in_words_hour_about_single: kb. 1 óra +actionview_datehelper_time_in_words_minute: 1 perc +actionview_datehelper_time_in_words_minute_half: fél perc +actionview_datehelper_time_in_words_minute_less_than: kevesebb, mint 1 perc +actionview_datehelper_time_in_words_minute_plural: %d perc +actionview_datehelper_time_in_words_minute_single: 1 perc +actionview_datehelper_time_in_words_second_less_than: kevesebb, mint 1 másodperc +actionview_datehelper_time_in_words_second_less_than_plural: kevesebb, mint %d másodperc +actionview_instancetag_blank_option: Kérem válasszon + +activerecord_error_inclusion: nem található a listában +activerecord_error_exclusion: foglalt +activerecord_error_invalid: érvénytelen +activerecord_error_confirmation: jóváhagyás szükséges +activerecord_error_accepted: ell kell fogadni +activerecord_error_empty: nem lehet üres +activerecord_error_blank: nem lehet üres +activerecord_error_too_long: túl hosszú +activerecord_error_too_short: túl rövid +activerecord_error_wrong_length: hibás a hossza +activerecord_error_taken: már foglalt +activerecord_error_not_a_number: nem egy szám +activerecord_error_not_a_date: nem érvényes dátum +activerecord_error_greater_than_start_date: nagyobbnak kell lennie, mint az indítás dátuma +activerecord_error_not_same_project: nem azonos projekthez tartozik +activerecord_error_circular_dependency: Ez a kapcsolat egy körkörös függőséget eredményez + +general_fmt_age: %d év +general_fmt_age_plural: %d év +general_fmt_date: %%Y.%%m.%%d +general_fmt_datetime: %%Y.%%m.%%d %%H:%%M:%%S +general_fmt_datetime_short: %%b %%d, %%H:%%M:%%S +general_fmt_time: %%H:%%M:%%S +general_text_No: 'Nem' +general_text_Yes: 'Igen' +general_text_no: 'nem' +general_text_yes: 'igen' +general_lang_name: 'Magyar' +general_csv_separator: ',' +general_csv_encoding: ISO-8859-2 +general_pdf_encoding: ISO-8859-2 +general_day_names: Hétfő,Kedd,Szerda,Csütörtök,Péntek,Szombat,Vasárnap +general_first_day_of_week: '1' + +notice_account_updated: A fiók adatai sikeresen frissítve. +notice_account_invalid_creditentials: Hibás felhasználói név, vagy jelszó +notice_account_password_updated: A jelszó módosítása megtörtént. +notice_account_wrong_password: Hibás jelszó +notice_account_register_done: A fiók sikeresen létrehozva. Aktiválásához kattints az e-mailben kapott linkre +notice_account_unknown_email: Ismeretlen felhasználó. +notice_can_t_change_password: A fiók külső azonosítási forrást használ. A jelszó megváltoztatása nem lehetséges. +notice_account_lost_email_sent: Egy e-mail üzenetben postáztunk Önnek egy leírást az új jelszó beállításáról. +notice_account_activated: Fiókját aktiváltuk. Most már be tud jelentkezni a rendszerbe. +notice_successful_create: Sikeres létrehozás. +notice_successful_update: Sikeres módosítás. +notice_successful_delete: Sikeres törlés. +notice_successful_connection: Sikeres bejelentkezés. +notice_file_not_found: Az oldal, amit meg szeretne nézni nem található, vagy átkerült egy másik helyre. +notice_locking_conflict: Az adatot egy másik felhasználó idő közben módosította. +notice_not_authorized: Nincs hozzáférési engedélye ehhez az oldalhoz. +notice_email_sent: Egy e-mail üzenetet küldtünk a következő címre %s +notice_email_error: Hiba történt a levél küldése közben (%s) +notice_feeds_access_key_reseted: Az RSS hozzáférési kulcsát újra generáltuk. +notice_failed_to_save_issues: "Nem sikerült a %d feladat(ok) mentése a %d -ban kiválasztva: %s." +notice_no_issue_selected: "Nincs feladat kiválasztva! Kérem jelölje meg melyik feladatot szeretné szerkeszteni!" +notice_account_pending: "A fiókja létrejött, és adminisztrátori jóváhagyásra vár." +notice_default_data_loaded: Az alapértelmezett konfiguráció betöltése sikeresen megtörtént. + +error_can_t_load_default_data: "Az alapértelmezett konfiguráció betöltése nem lehetséges: %s" +error_scm_not_found: "A bejegyzés, vagy revízió nem található a tárolóban." +error_scm_command_failed: "A tároló elérése közben hiba lépett fel: %s" +error_scm_annotate: "A bejegyzés nem létezik, vagy nics jegyzetekkel ellátva." +error_issue_not_found_in_project: 'A feladat nem található, vagy nem ehhez a projekthez tartozik' + +mail_subject_lost_password: Az Ön Redmine jelszava +mail_body_lost_password: 'A Redmine jelszó megváltoztatásához, kattintson a következő linkre:' +mail_subject_register: Redmine azonosító aktiválása +mail_body_register: 'A Redmine azonosítója aktiválásához, kattintson a következő linkre:' +mail_body_account_information_external: A "%s" azonosító használatával bejelentkezhet a Redmineba. +mail_body_account_information: Az Ön Redmine azonosítójának információi +mail_subject_account_activation_request: Redmine azonosító aktiválási kérelem +mail_body_account_activation_request: 'Egy új felhasználó (%s) regisztrált, azonosítója jóváhasgyásra várakozik:' + +gui_validation_error: 1 hiba +gui_validation_error_plural: %d hiba + +field_name: Név +field_description: Leírás +field_summary: Összegzés +field_is_required: Kötelező +field_firstname: Keresztnév +field_lastname: Vezetéknév +field_mail: E-mail +field_filename: Fájl +field_filesize: Méret +field_downloads: Letöltések +field_author: Szerző +field_created_on: Létrehozva +field_updated_on: Módosítva +field_field_format: Formátum +field_is_for_all: Minden projekthez +field_possible_values: Lehetséges értékek +field_regexp: Reguláris kifejezés +field_min_length: Minimum hossz +field_max_length: Maximum hossz +field_value: Érték +field_category: Kategória +field_title: Cím +field_project: Projekt +field_issue: Feladat +field_status: Státusz +field_notes: Feljegyzések +field_is_closed: Feladat lezárva +field_is_default: Alapértelmezett érték +field_tracker: Típus +field_subject: Tárgy +field_due_date: Befejezés dátuma +field_assigned_to: Felelős +field_priority: Prioritás +field_fixed_version: Cél verzió +field_user: Felhasználó +field_role: Szerepkör +field_homepage: Weboldal +field_is_public: Nyilvános +field_parent: Szülő projekt +field_is_in_chlog: Feladatok látszanak a változás naplóban +field_is_in_roadmap: Feladatok látszanak az életútban +field_login: Azonosító +field_mail_notification: E-mail értesítések +field_admin: Adminisztrátor +field_last_login_on: Utolsó bejelentkezés +field_language: Nyelv +field_effective_date: Dátum +field_password: Jelszó +field_new_password: Új jelszó +field_password_confirmation: Megerősítés +field_version: Verzió +field_type: Típus +field_host: Kiszolgáló +field_port: Port +field_account: Felhasználói fiók +field_base_dn: Base DN +field_attr_login: Bejelentkezési tulajdonság +field_attr_firstname: Családnév +field_attr_lastname: Utónév +field_attr_mail: E-mail +field_onthefly: On-the-fly felhasználó létrehozás +field_start_date: Kezdés dátuma +field_done_ratio: Elkészült (%%) +field_auth_source: Azonosítási mód +field_hide_mail: Rejtse el az e-mail címem +field_comments: Megjegyzés +field_url: URL +field_start_page: Kezdőlap +field_subproject: Alprojekt +field_hours: Óra +field_activity: Aktivitás +field_spent_on: Dátum +field_identifier: Azonosító +field_is_filter: Szűrőként használható +field_issue_to_id: Kapcsolódó feladat +field_delay: Késés +field_assignable: Feladat rendelhető ehhez a szerepkörhöz +field_redirect_existing_links: Létező linkek átirányítása +field_estimated_hours: Becsült idő +field_column_names: Oszlopok +field_time_zone: Időzóna +field_searchable: Kereshető +field_default_value: Alapértelmezett érték +field_comments_sorting: Feljegyzések megjelenítése + +setting_app_title: Alkalmazás címe +setting_app_subtitle: Alkalmazás alcíme +setting_welcome_text: Üdvözlő üzenet +setting_default_language: Alapértelmezett nyelv +setting_login_required: Azonosítás szükséges +setting_self_registration: Regisztráció +setting_attachment_max_size: Melléklet max. mérete +setting_issues_export_limit: Feladatok exportálásának korlátja +setting_mail_from: Kibocsátó e-mail címe +setting_bcc_recipients: Titkos másolat címzet (bcc) +setting_host_name: Kiszolgáló neve +setting_text_formatting: Szöveg formázás +setting_wiki_compression: Wiki történet tömörítés +setting_feeds_limit: RSS tartalom korlát +setting_default_projects_public: Az új projektek alapértelmezés szerint nyilvánosak +setting_autofetch_changesets: Commitok automatikus lehúzása +setting_sys_api_enabled: WS engedélyezése a tárolók kezeléséhez +setting_commit_ref_keywords: Hivatkozó kulcsszavak +setting_commit_fix_keywords: Javítások kulcsszavai +setting_autologin: Automatikus bejelentkezés +setting_date_format: Dátum formátum +setting_time_format: Idő formátum +setting_cross_project_issue_relations: Kereszt-projekt feladat hivatkozások engedélyezése +setting_issue_list_default_columns: Az alapértelmezésként megjelenített oszlopok a feladat listában +setting_repositories_encodings: Tárolók kódolása +setting_emails_footer: E-mail lábléc +setting_protocol: Protokol +setting_per_page_options: Objektum / oldal opciók +setting_user_format: Felhasználók megjelenítésének formája +setting_activity_days_default: Napok megjelenítése a project aktivitásnál +setting_display_subprojects_issues: Alapértelmezettként mutassa az alprojektek feladatait is a projekteken + +project_module_issue_tracking: Feladat követés +project_module_time_tracking: Idő rögzítés +project_module_news: Hírek +project_module_documents: Dokumentumok +project_module_files: Fájlok +project_module_wiki: Wiki +project_module_repository: Tároló +project_module_boards: Fórumok + +label_user: Felhasználó +label_user_plural: Felhasználók +label_user_new: Új felhasználó +label_project: Projekt +label_project_new: Új projekt +label_project_plural: Projektek +label_project_all: Az összes projekt +label_project_latest: Legutóbbi projektek +label_issue: Feladat +label_issue_new: Új feladat +label_issue_plural: Feladatok +label_issue_view_all: Minden feladat megtekintése +label_issues_by: %s feladatai +label_issue_added: Feladat hozzáadva +label_issue_updated: Feladat frissítve +label_document: Dokumentum +label_document_new: Új dokumentum +label_document_plural: Dokumentumok +label_document_added: Dokumentum hozzáadva +label_role: Szerepkör +label_role_plural: Szerepkörök +label_role_new: Új szerepkör +label_role_and_permissions: Szerepkörök, és jogosultságok +label_member: Résztvevő +label_member_new: Új résztvevő +label_member_plural: Résztvevők +label_tracker: Feladat típus +label_tracker_plural: Feladat típusok +label_tracker_new: Új feladat típus +label_workflow: Workflow +label_issue_status: Feladat státusz +label_issue_status_plural: Feladat státuszok +label_issue_status_new: Új státusz +label_issue_category: Feladat kategória +label_issue_category_plural: Feladat kategóriák +label_issue_category_new: Új kategória +label_custom_field: Egyéni mező +label_custom_field_plural: Egyéni mezők +label_custom_field_new: Új egyéni mező +label_enumerations: Felsorolások +label_enumeration_new: Új érték +label_information: Információ +label_information_plural: Információk +label_please_login: Jelentkezzen be +label_register: Regisztráljon +label_password_lost: Elfelejtett jelszó +label_home: Kezdőlap +label_my_page: Saját kezdőlapom +label_my_account: Fiókom adatai +label_my_projects: Saját projektem +label_administration: Adminisztráció +label_login: Bejelentkezés +label_logout: Kijelentkezés +label_help: Súgó +label_reported_issues: Bejelentett feladatok +label_assigned_to_me_issues: A nekem kiosztott feladatok +label_last_login: Utolsó bejelentkezés +label_last_updates: Utoljára frissítve +label_last_updates_plural: Utoljára módosítva %d +label_registered_on: Regisztrált +label_activity: Tevékenységek +label_overall_activity: Teljes aktivitás +label_new: Új +label_logged_as: Bejelentkezve, mint +label_environment: Környezet +label_authentication: Azonosítás +label_auth_source: Azonosítás módja +label_auth_source_new: Új azonosítási mód +label_auth_source_plural: Azonosítási módok +label_subproject_plural: Alprojektek +label_and_its_subprojects: %s és alprojektjei +label_min_max_length: Min - Max hossz +label_list: Lista +label_date: Dátum +label_integer: Egész +label_float: Lebegőpontos +label_boolean: Logikai +label_string: Szöveg +label_text: Hosszú szöveg +label_attribute: Tulajdonság +label_attribute_plural: Tulajdonságok +label_download: %d Letöltés +label_download_plural: %d Letöltések +label_no_data: Nincs megjeleníthető adat +label_change_status: Státusz módosítása +label_history: Történet +label_attachment: Fájl +label_attachment_new: Új fájl +label_attachment_delete: Fájl törlése +label_attachment_plural: Fájlok +label_file_added: Fájl hozzáadva +label_report: Jelentés +label_report_plural: Jelentések +label_news: Hírek +label_news_new: Hír hozzáadása +label_news_plural: Hírek +label_news_latest: Legutóbbi hírek +label_news_view_all: Minden hír megtekintése +label_news_added: Hír hozzáadva +label_change_log: Változás napló +label_settings: Beállítások +label_overview: Áttekintés +label_version: Verzió +label_version_new: Új verzió +label_version_plural: Verziók +label_confirmation: Jóváhagyás +label_export_to: Exportálás +label_read: Olvas... +label_public_projects: Nyilvános projektek +label_open_issues: nyitott +label_open_issues_plural: nyitott +label_closed_issues: lezárt +label_closed_issues_plural: lezárt +label_total: Összesen +label_permissions: Jogosultságok +label_current_status: Jelenlegi státusz +label_new_statuses_allowed: Státusz változtatások engedélyei +label_all: mind +label_none: nincs +label_nobody: senki +label_next: Következő +label_previous: Előző +label_used_by: Használja +label_details: Részletek +label_add_note: Jegyzet hozzáadása +label_per_page: Oldalanként +label_calendar: Naptár +label_months_from: hónap, kezdve +label_gantt: Gantt +label_internal: Belső +label_last_changes: utolsó %d változás +label_change_view_all: Minden változás megtekintése +label_personalize_page: Az oldal testreszabása +label_comment: Megjegyzés +label_comment_plural: Megjegyzések +label_comment_add: Megjegyzés hozzáadása +label_comment_added: Megjegyzés hozzáadva +label_comment_delete: Megjegyzések törlése +label_query: Egyéni lekérdezés +label_query_plural: Egyéni lekérdezések +label_query_new: Új lekérdezés +label_filter_add: Szűrő hozzáadása +label_filter_plural: Szűrők +label_equals: egyenlő +label_not_equals: nem egyenlő +label_in_less_than: kevesebb, mint +label_in_more_than: több, mint +label_in: in +label_today: ma +label_all_time: mindenkor +label_yesterday: tegnap +label_this_week: aktuális hét +label_last_week: múlt hét +label_last_n_days: az elmúlt %d nap +label_this_month: aktuális hónap +label_last_month: múlt hónap +label_this_year: aktuális év +label_date_range: Dátum intervallum +label_less_than_ago: kevesebb, mint nappal ezelőtt +label_more_than_ago: több, mint nappal ezelőtt +label_ago: nappal ezelőtt +label_contains: tartalmazza +label_not_contains: nem tartalmazza +label_day_plural: nap +label_repository: Tároló +label_repository_plural: Tárolók +label_browse: Tallóz +label_modification: %d változás +label_modification_plural: %d változások +label_revision: Revízió +label_revision_plural: Revíziók +label_associated_revisions: Kapcsolt revíziók +label_added: hozzáadva +label_modified: módosítva +label_deleted: törölve +label_latest_revision: Legutolsó revízió +label_latest_revision_plural: Legutolsó revíziók +label_view_revisions: Revíziók megtekintése +label_max_size: Maximális méret +label_on: 'összesen' +label_sort_highest: Az elejére +label_sort_higher: Eggyel feljebb +label_sort_lower: Eggyel lejjebb +label_sort_lowest: Az aljára +label_roadmap: Életút +label_roadmap_due_in: Elkészültéig várhatóan még +label_roadmap_overdue: %s késésben +label_roadmap_no_issues: Nincsenek feladatok ehhez a verzióhoz +label_search: Keresés +label_result_plural: Találatok +label_all_words: Minden szó +label_wiki: Wiki +label_wiki_edit: Wiki szerkesztés +label_wiki_edit_plural: Wiki szerkesztések +label_wiki_page: Wiki oldal +label_wiki_page_plural: Wiki oldalak +label_index_by_title: Cím szerint indexelve +label_index_by_date: Dátum szerint indexelve +label_current_version: Jelenlegi verzió +label_preview: Előnézet +label_feed_plural: Visszajelzések +label_changes_details: Változások részletei +label_issue_tracking: Feladat követés +label_spent_time: Ráfordított idő +label_f_hour: %.2f óra +label_f_hour_plural: %.2f óra +label_time_tracking: Idő követés +label_change_plural: Változások +label_statistics: Statisztikák +label_commits_per_month: Commits havonta +label_commits_per_author: Commits szerzőnként +label_view_diff: Különbségek megtekintése +label_diff_inline: inline +label_diff_side_by_side: side by side +label_options: Opciók +label_copy_workflow_from: Workflow másolása innen +label_permissions_report: Jogosultsági riport +label_watched_issues: Megfigyelt feladatok +label_related_issues: Kapcsolódó feladatok +label_applied_status: Alkalmazandó státusz +label_loading: Betöltés... +label_relation_new: Új kapcsolat +label_relation_delete: Kapcsolat törlése +label_relates_to: kapcsolódik +label_duplicates: duplikálja +label_blocks: zárolja +label_blocked_by: zárolta +label_precedes: megelőzi +label_follows: követi +label_end_to_start: végétől indulásig +label_end_to_end: végétől végéig +label_start_to_start: indulástól indulásig +label_start_to_end: indulástól végéig +label_stay_logged_in: Emlékezzen rám +label_disabled: kikapcsolva +label_show_completed_versions: A kész verziók mutatása +label_me: én +label_board: Fórum +label_board_new: Új fórum +label_board_plural: Fórumok +label_topic_plural: Témák +label_message_plural: Üzenetek +label_message_last: Utolsó üzenet +label_message_new: Új üzenet +label_message_posted: Üzenet hozzáadva +label_reply_plural: Válaszok +label_send_information: Fiók infomációk küldése a felhasználónak +label_year: Év +label_month: Hónap +label_week: Hét +label_date_from: 'Kezdet:' +label_date_to: 'Vége:' +label_language_based: A felhasználó nyelve alapján +label_sort_by: %s szerint rendezve +label_send_test_email: Teszt e-mail küldése +label_feeds_access_key_created_on: 'RSS hozzáférési kulcs létrehozva ennyivel ezelőtt: %s' +label_module_plural: Modulok +label_added_time_by: '%s adta hozzá ennyivel ezelőtt: %s' +label_updated_time: 'Utolsó módosítás ennyivel ezelőtt: %s' +label_jump_to_a_project: Ugrás projekthez... +label_file_plural: Fájlok +label_changeset_plural: Changesets +label_default_columns: Alapértelmezett oszlopok +label_no_change_option: (Nincs változás) +label_bulk_edit_selected_issues: A kiválasztott feladatok kötegelt szerkesztése +label_theme: Téma +label_default: Alapértelmezett +label_search_titles_only: Keresés csak a címekben +label_user_mail_option_all: "Minden eseményről minden saját projektemben" +label_user_mail_option_selected: "Minden eseményről a kiválasztott projektekben..." +label_user_mail_option_none: "Csak a megfigyelt dolgokról, vagy, amiben részt veszek" +label_user_mail_no_self_notified: "Nem kérek értesítést az általam végzett módosításokról" +label_registration_activation_by_email: Fiók aktiválása e-mailben +label_registration_manual_activation: Manuális fiók aktiválás +label_registration_automatic_activation: Automatikus fiók aktiválás +label_display_per_page: 'Oldalanként: %s' +label_age: Kor +label_change_properties: Tulajdonságok változtatása +label_general: Általános +label_more: továbbiak +label_scm: SCM +label_plugins: Pluginek +label_ldap_authentication: LDAP azonosítás +label_downloads_abbr: D/L +label_optional_description: Opcionális leírás +label_add_another_file: Újabb fájl hozzáadása +label_preferences: Tulajdonságok +label_chronological_order: Időrendben +label_reverse_chronological_order: Fordított időrendben +label_planning: Tervezés + +button_login: Bejelentkezés +button_submit: Elfogad +button_save: Mentés +button_check_all: Mindent kijelöl +button_uncheck_all: Kijelölés törlése +button_delete: Töröl +button_create: Létrehoz +button_test: Teszt +button_edit: Szerkeszt +button_add: Hozzáad +button_change: Változtat +button_apply: Alkalmaz +button_clear: Töröl +button_lock: Zárol +button_unlock: Felold +button_download: Letöltés +button_list: Lista +button_view: Megnéz +button_move: Mozgat +button_back: Vissza +button_cancel: Mégse +button_activate: Aktivál +button_sort: Rendezés +button_log_time: Idő rögzítés +button_rollback: Visszaáll erre a verzióra +button_watch: Megfigyel +button_unwatch: Megfigyelés törlése +button_reply: Válasz +button_archive: Archivál +button_unarchive: Dearchivál +button_reset: Reset +button_rename: Átnevez +button_change_password: Jelszó megváltoztatása +button_copy: Másol +button_annotate: Jegyzetel +button_update: Módosít +button_configure: Konfigurál + +status_active: aktív +status_registered: regisztrált +status_locked: zárolt + +text_select_mail_notifications: Válasszon eseményeket, amelyekről e-mail értesítést kell küldeni. +text_regexp_info: eg. ^[A-Z0-9]+$ +text_min_max_length_info: 0 = nincs korlátozás +text_project_destroy_confirmation: Biztosan törölni szeretné a projektet és vele együtt minden kapcsolódó adatot ? +text_subprojects_destroy_warning: 'Az alprojekt(ek): %s szintén törlésre kerülnek.' +text_workflow_edit: Válasszon egy szerepkört, és egy trackert a workflow szerkesztéséhez +text_are_you_sure: Biztos benne ? +text_journal_changed: "változás: %s volt, %s lett" +text_journal_set_to: "beállítva: %s" +text_journal_deleted: törölve +text_tip_task_begin_day: a feladat ezen a napon kezdődik +text_tip_task_end_day: a feladat ezen a napon ér véget +text_tip_task_begin_end_day: a feladat ezen a napon kezdődik és ér véget +text_project_identifier_info: 'Kis betűk (a-z), számok és kötőjel megengedett.
Mentés után az azonosítót megváltoztatni nem lehet.' +text_caracters_maximum: maximum %d karakter. +text_caracters_minimum: Legkevesebb %d karakter hosszúnek kell lennie. +text_length_between: Legalább %d és legfeljebb %d hosszú karakter. +text_tracker_no_workflow: Nincs workflow definiálva ehhez a tracker-hez +text_unallowed_characters: Tiltott karakterek +text_comma_separated: Több érték megengedett (vesszővel elválasztva) +text_issues_ref_in_commit_messages: Hivatkozás feladatokra, feladatok javítása a commit üzenetekben +text_issue_added: %s feladat bejelentve. +text_issue_updated: %s feladat frissítve. +text_wiki_destroy_confirmation: Biztosan törölni szeretné ezt a wiki-t minden tartalmával együtt ? +text_issue_category_destroy_question: Néhány feladat (%d) hozzá van rendelve ehhez a kategóriához. Mit szeretne tenni ? +text_issue_category_destroy_assignments: Kategória hozzárendelés megszűntetése +text_issue_category_reassign_to: Feladatok újra hozzárendelése a kategóriához +text_user_mail_option: "A nem kiválasztott projektekről csak akkor kap értesítést, ha figyelést kér rá, vagy részt vesz benne (pl. Ön a létrehozó, vagy a hozzárendelő)" +text_no_configuration_data: "Szerepkörök, trackerek, feladat státuszok, és workflow adatok még nincsenek konfigurálva.\nErősen ajánlott, az alapértelmezett konfiguráció betöltése, és utána módosíthatja azt." +text_load_default_configuration: Alapértelmezett konfiguráció betöltése +text_status_changed_by_changeset: Applied in changeset %s. +text_issues_destroy_confirmation: 'Biztos benne, hogy törölni szeretné a kijelölt feladato(ka)t ?' +text_select_project_modules: 'Válassza ki az engedélyezett modulokat ehhez a projekthez:' +text_default_administrator_account_changed: Alapértelmezett adminisztrátor fiók megváltoztatva +text_file_repository_writable: Fájl tároló írható +text_rmagick_available: RMagick elérhető (opcionális) +text_destroy_time_entries_question: %.02f órányi munka van rögzítve a feladatokon, amiket törölni szeretne. Mit szeretne tenni ? +text_destroy_time_entries: A rögzített órák törlése +text_assign_time_entries_to_project: A rögzített órák hozzárendelése a projekthez +text_reassign_time_entries: 'A rögzített órák újra hozzárendelése ehhez a feladathoz:' + +default_role_manager: Vezető +default_role_developper: Fejlesztő +default_role_reporter: Bejelentő +default_tracker_bug: Hiba +default_tracker_feature: Fejlesztés +default_tracker_support: Support +default_issue_status_new: Új +default_issue_status_assigned: Kiosztva +default_issue_status_resolved: Megoldva +default_issue_status_feedback: Visszajelzés +default_issue_status_closed: Lezárt +default_issue_status_rejected: Elutasított +default_doc_category_user: Felhasználói dokumentáció +default_doc_category_tech: Technikai dokumentáció +default_priority_low: Alacsony +default_priority_normal: Normál +default_priority_high: Magas +default_priority_urgent: Sürgős +default_priority_immediate: Azonnal +default_activity_design: Tervezés +default_activity_development: Fejlesztés + +enumeration_issue_priorities: Feladat prioritások +enumeration_doc_categories: Dokumentum kategóriák +enumeration_activities: Tevékenységek (idő rögzítés) diff --git a/lang/lt.yml b/lang/lt.yml index df7cd96..bc2faaa 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -554,7 +554,7 @@ enumeration_issue_priorities: Darbo prioritetai enumeration_doc_categories: Dokumento kategorijos enumeration_activities: Veiklos (laiko sekimas) label_display_per_page: '%s įrašų puslapyje' -setting_per_page_options: Objects per page options +setting_per_page_options: Įrašų puslapyje nustatimas notice_default_data_loaded: Numatytoji konfiguracija sėkmingai užkrauta. label_age: Amžius label_general: Bendri @@ -578,44 +578,46 @@ label_document_added: Dokumentas pridėtas label_message_posted: Pranešimas pridėtas label_file_added: Byla pridėta label_news_added: Naujiena pridėta -project_module_boards: Boards -project_module_issue_tracking: Issue tracking +project_module_boards: Forumai +project_module_issue_tracking: Darbu pėdsekys project_module_wiki: Wiki -project_module_files: Files -project_module_documents: Documents -project_module_repository: Repository -project_module_news: News -project_module_time_tracking: Time tracking -text_file_repository_writable: File repository writable -text_default_administrator_account_changed: Default administrator account changed -text_rmagick_available: RMagick available (optional) -button_configure: Configure +project_module_files: Rinkmenos +project_module_documents: Dokumentai +project_module_repository: Saugykla +project_module_news: Žinios +project_module_time_tracking: Laiko pėdsekys +text_file_repository_writable: Į rinkmenu saugyklą galima saugoti (RW) +text_default_administrator_account_changed: Administratoriaus numatyta paskyra pakeista +text_rmagick_available: RMagick pasiekiamas (pasirinktinai) +button_configure: Konfiguruoti label_plugins: Plugins -label_ldap_authentication: LDAP authentication -label_downloads_abbr: D/L -label_this_month: this month -label_last_n_days: last %d days -label_all_time: all time -label_this_year: this year -label_date_range: Date range -label_last_week: last week -label_yesterday: yesterday -label_last_month: last month -label_add_another_file: Add another file -label_optional_description: Optional description -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 -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 -text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' +label_ldap_authentication: LDAP autentifikacija +label_downloads_abbr: siunt. +label_this_month: šis menuo +label_last_n_days: paskutinių %d dienų +label_all_time: visas laikas +label_this_year: šiemet +label_date_range: Dienų diapazonas +label_last_week: paskutinė savaitė +label_yesterday: vakar +label_last_month: paskutinis menuo +label_add_another_file: Pridėti kitą bylą +label_optional_description: Apibūdinimas (laisvai pasirenkamas) +text_destroy_time_entries_question: Naikinamam darbui paskelbta %.02f valandų. Ką jūs noryte su jomis daryti? +error_issue_not_found_in_project: 'Darbas nerastas arba nesurištas su šiuo projektu' +text_assign_time_entries_to_project: Priskirti valandas prie projekto +text_destroy_time_entries: Ištrinti paskelbtas valandas +text_reassign_time_entries: 'Priskirti paskelbtas valandas šiam darbui:' +setting_activity_days_default: Atvaizduojamos dienos projekto veikloje +label_chronological_order: Chronologine tvarka +field_comments_sorting: rodyti komentarus +label_reverse_chronological_order: Atbuline chronologine tvarka +label_preferences: Savybės +setting_display_subprojects_issues: Pagal nutylėjimą rodyti subprojektų darbus pagrindiniame projekte +label_overall_activity: Visa veikla +setting_default_projects_public: Naujas projektas viešas pagal nutylėjimą +error_scm_annotate: "Įrašas neegzituoja arba negalima jo atvaizduoti." +label_planning: Planavimas +text_subprojects_destroy_warning: 'Šis(ie) subprojektas(ai): %s taip pat bus ištrintas(i).' +label_and_its_subprojects: %s projektas ir jo subprojektai + diff --git a/lang/no.yml b/lang/no.yml index ccfa5c9..13fcd24 100644 --- a/lang/no.yml +++ b/lang/no.yml @@ -291,6 +291,7 @@ label_auth_source: Autentifikasjonsmodus label_auth_source_new: Ny autentifikasjonmodus label_auth_source_plural: Autentifikasjonsmoduser label_subproject_plural: Underprosjekter +label_and_its_subprojects: %s og dets underprosjekter label_min_max_length: Min.-maks. lengde label_list: Liste label_date: Dato diff --git a/lang/pl.yml b/lang/pl.yml index cf10181..6f5a0f1 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -70,7 +70,7 @@ notice_file_not_found: Strona do której próbujesz się dostać nie istnieje lu notice_locking_conflict: Dane poprawione przez innego użytkownika. notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę. -error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium." +error_scm_not_found: "Obiekt lub wersja nie zostały znalezione w repozytorium." error_scm_command_failed: "An error occurred when trying to access the repository: %s" mail_subject_lost_password: Twoje hasło do %s @@ -119,7 +119,7 @@ field_user: Użytkownik field_role: Rola field_homepage: Strona www field_is_public: Publiczny -field_parent: Podprojekt +field_parent: Nadprojekt field_is_in_chlog: Zagadnienie pokazywane w zapisie zmian field_is_in_roadmap: Zagadnienie pokazywane na mapie field_login: Login @@ -172,10 +172,10 @@ setting_host_name: Nazwa hosta setting_text_formatting: Formatowanie tekstu setting_wiki_compression: Kompresja historii Wiki setting_feeds_limit: Limit danych RSS -setting_autofetch_changesets: Auto-odświeżanie CVS +setting_autofetch_changesets: Automatyczne pobieranie zmian setting_sys_api_enabled: Włączenie WS do zarządzania repozytorium -setting_commit_ref_keywords: Terminy odnoszące (CVS) -setting_commit_fix_keywords: Terminy ustalające (CVS) +setting_commit_ref_keywords: Słowa tworzące powiązania +setting_commit_fix_keywords: Słowa zmieniające status setting_autologin: Auto logowanie setting_date_format: Format daty @@ -328,14 +328,14 @@ label_repository: Repozytorium label_browse: Przegląd label_modification: %d modyfikacja label_modification_plural: %d modyfikacja -label_revision: Zmiana -label_revision_plural: Zmiany +label_revision: Rewizja +label_revision_plural: Rewizje label_added: dodane label_modified: zmodyfikowane label_deleted: usunięte -label_latest_revision: Ostatnia zmiana -label_latest_revision_plural: Ostatnie zmiany -label_view_revisions: Pokaż zmiany +label_latest_revision: Najnowsza rewizja +label_latest_revision_plural: Najnowsze rewizje +label_view_revisions: Pokaż rewizje label_max_size: Maksymalny rozmiar label_on: 'z' label_sort_highest: Przesuń na górę @@ -366,8 +366,8 @@ label_f_hour_plural: %.2f godzin label_time_tracking: Śledzenie czasu label_change_plural: Zmiany label_statistics: Statystyki -label_commits_per_month: Wrzutek CVS w miesiącu -label_commits_per_author: Wrzutek CVS przez autora +label_commits_per_month: Zatwierdzenia według miesięcy +label_commits_per_author: Zatwierdzenia według autorów label_view_diff: Pokaż różnice label_diff_inline: w linii label_diff_side_by_side: obok siebie @@ -463,7 +463,7 @@ text_length_between: Długość pomiędzy %d i %d znaków. text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zagadnienia text_unallowed_characters: Niedozwolone znaki text_comma_separated: Wielokrotne wartości dozwolone (rozdzielone przecinkami). -text_issues_ref_in_commit_messages: Zagadnienia odnoszące i ustalające we wrzutkach CVS +text_issues_ref_in_commit_messages: Odwołania do zagadnień w komentarzach zatwierdzeń default_role_manager: Kierownik default_role_developper: Programista diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 9facd8d..aced3e2 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -1,140 +1,140 @@ _gloc_rule_default: '|n| n==1 ? "" : "_plural" ' actionview_datehelper_select_day_prefix: -actionview_datehelper_select_month_names: Janeiro,Fevereiro,Marco,Abrill,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro +actionview_datehelper_select_month_names: Janeiro,Fevereiro,Março,Abrill,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro actionview_datehelper_select_month_names_abbr: Jan,Fev,Mar,Abr,Mai,Jun,Jul,Ago,Set,Out,Nov,Dez actionview_datehelper_select_month_prefix: actionview_datehelper_select_year_prefix: actionview_datehelper_time_in_words_day: 1 dia actionview_datehelper_time_in_words_day_plural: %d dias -actionview_datehelper_time_in_words_hour_about: sobre uma hora -actionview_datehelper_time_in_words_hour_about_plural: sobra %d horas -actionview_datehelper_time_in_words_hour_about_single: sobre uma hora +actionview_datehelper_time_in_words_hour_about: aproximadamente uma hora +actionview_datehelper_time_in_words_hour_about_plural: aproximadamente %d horas +actionview_datehelper_time_in_words_hour_about_single: aproximadamente uma hora actionview_datehelper_time_in_words_minute: 1 minuto actionview_datehelper_time_in_words_minute_half: meio minuto -actionview_datehelper_time_in_words_minute_less_than: menos que um minuto +actionview_datehelper_time_in_words_minute_less_than: menos de um minuto actionview_datehelper_time_in_words_minute_plural: %d minutos actionview_datehelper_time_in_words_minute_single: 1 minuto -actionview_datehelper_time_in_words_second_less_than: menos que um segundo -actionview_datehelper_time_in_words_second_less_than_plural: menos que %d segundos +actionview_datehelper_time_in_words_second_less_than: menos de um segundo +actionview_datehelper_time_in_words_second_less_than_plural: menos de %d segundos actionview_instancetag_blank_option: Selecione -activerecord_error_inclusion: nao esta incluido na lista -activerecord_error_exclusion: esta reservado -activerecord_error_invalid: e invalido -activerecord_error_confirmation: confirmacao nao confere +activerecord_error_inclusion: não está incluso na lista +activerecord_error_exclusion: está reservado +activerecord_error_invalid: é inválido +activerecord_error_confirmation: confirmação não confere activerecord_error_accepted: deve ser aceito -activerecord_error_empty: nao pode ser vazio -activerecord_error_blank: nao pode estar em branco -activerecord_error_too_long: e muito longo -activerecord_error_too_short: e muito comprido -activerecord_error_wrong_length: esta com o comprimento errado -activerecord_error_taken: ja esta examinado -activerecord_error_not_a_number: nao e um numero -activerecord_error_not_a_date: nao e uma data valida +activerecord_error_empty: não pode ser vazio +activerecord_error_blank: não pode estar em branco +activerecord_error_too_long: é muito longo +activerecord_error_too_short: é muito curto +activerecord_error_wrong_length: esta com o tamanho errado +activerecord_error_taken: já foi obtido +activerecord_error_not_a_number: não é um numero +activerecord_error_not_a_date: não é uma data valida activerecord_error_greater_than_start_date: deve ser maior que a data inicial -activerecord_error_not_same_project: doesn't belong to the same project -activerecord_error_circular_dependency: This relation would create a circular dependency +activerecord_error_not_same_project: não pode pertencer ao mesmo projeto +activerecord_error_circular_dependency: Esta relação geraria uma dependência circular -general_fmt_age: %d yr -general_fmt_age_plural: %d yrs -general_fmt_date: %%m/%%d/%%Y -general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p +general_fmt_age: %d ano +general_fmt_age_plural: %d anos +general_fmt_date: %%d/%%m/%%Y +general_fmt_datetime: %%d/%%m/%%Y %%I:%%M %%p general_fmt_datetime_short: %%b %%d, %%I:%%M %%p general_fmt_time: %%I:%%M %%p -general_text_No: 'Nao' +general_text_No: 'Não' general_text_Yes: 'Sim' -general_text_no: 'nao' +general_text_no: 'não' general_text_yes: 'sim' -general_lang_name: 'Portugues Brasileiro' +general_lang_name: 'Português(Brasil)' general_csv_separator: ',' general_csv_encoding: ISO-8859-1 general_pdf_encoding: ISO-8859-1 -general_day_names: Segunda,Terca,Quarta,Quinta,Sexta,Sabado,Domingo +general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sabado,Domingo general_first_day_of_week: '1' notice_account_updated: Conta foi alterada com sucesso. -notice_account_invalid_creditentials: Usuario ou senha invalido. -notice_account_password_updated: Senha foi alterada com sucesso. -notice_account_wrong_password: Senha errada. -notice_account_register_done: Conta foi criada com sucesso. -notice_account_unknown_email: Usuario desconhecido. -notice_can_t_change_password: Esta conta usa autenticacao externa. E impossivel trocar a senha. -notice_account_lost_email_sent: Um email com instrucoes para escolher uma nova senha foi enviado para voce. -notice_account_activated: Sua conta foi ativada. Voce pode logar agora +notice_account_invalid_creditentials: Usuário ou senha inválido. +notice_account_password_updated: Senha alterada com sucesso. +notice_account_wrong_password: Senha inválida. +notice_account_register_done: Conta criada com sucesso. +notice_account_unknown_email: Usuário desconhecido. +notice_can_t_change_password: Esta conta usa autenticação externa. E impossível alterar a senha. +notice_account_lost_email_sent: Um email com instruções para escolher uma nova senha foi enviado para você. +notice_account_activated: Sua conta foi ativada. Você pode acessá-la agora. notice_successful_create: Criado com sucesso. notice_successful_update: Alterado com sucesso. -notice_successful_delete: Apagado com sucesso. +notice_successful_delete: Excluído com sucesso. notice_successful_connection: Conectado com sucesso. -notice_file_not_found: A pagina que voce esta tentando acessar nao existe ou foi excluida. -notice_locking_conflict: Os dados foram atualizados por um outro usuario. -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_file_not_found: A página que você está tentando acessar não existe ou foi excluída. +notice_locking_conflict: Os dados foram atualizados por outro usuário. +notice_not_authorized: Você não está autorizado a acessar esta página. +notice_email_sent: Um email foi enviado para %s +notice_email_error: Um erro ocorreu ao enviar o email (%s) +notice_feeds_access_key_reseted: Sua chave RSS foi reconfigurada. -error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio." -error_scm_command_failed: "An error occurred when trying to access the repository: %s" +error_scm_not_found: "A entrada e/ou a revisão não existe no repositório." +error_scm_command_failed: "Ocorreu um erro ao tentar acessar o repositório: %s" mail_subject_lost_password: Sua senha do %s. mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:' -mail_subject_register: Ativacao de conta do %s. +mail_subject_register: Ativação de conta do %s. mail_body_register: 'Para ativar sua conta, clique no link abaixo:' gui_validation_error: 1 erro gui_validation_error_plural: %d erros field_name: Nome -field_description: Descricao -field_summary: Sumario -field_is_required: Obrigatorio +field_description: Descrição +field_summary: Resumo +field_is_required: Obrigatório field_firstname: Primeiro nome -field_lastname: Ultimo nome +field_lastname: Último nome field_mail: Email field_filename: Arquivo field_filesize: Tamanho field_downloads: Downloads field_author: Autor -field_created_on: Criado -field_updated_on: Alterado +field_created_on: Criado em +field_updated_on: Alterado em field_field_format: Formato field_is_for_all: Para todos os projetos -field_possible_values: Possiveis valores -field_regexp: Expressao regular -field_min_length: Tamanho minimo -field_max_length: Tamanho maximo +field_possible_values: Possíveis valores +field_regexp: Expressão regular +field_min_length: Tamanho mínimo +field_max_length: Tamanho máximo field_value: Valor field_category: Categoria -field_title: Titulo +field_title: Título field_project: Projeto -field_issue: Tarefa +field_issue: Ticket field_status: Status field_notes: Notas -field_is_closed: Tarefa fechada -field_is_default: Status padrao +field_is_closed: Ticket fechado +field_is_default: Status padrão field_tracker: Tipo -field_subject: Titulo -field_due_date: Data devida -field_assigned_to: Atribuido para +field_subject: Título +field_due_date: Data prevista +field_assigned_to: Atribuído para field_priority: Prioridade -field_fixed_version: Target version -field_user: Usuario -field_role: Regra -field_homepage: Pagina inicial -field_is_public: Publico +field_fixed_version: Versão +field_user: Usuário +field_role: Papel +field_homepage: Página inicial +field_is_public: Público field_parent: Sub-projeto de -field_is_in_chlog: Tarefas mostradas no changelog -field_is_in_roadmap: Tarefas mostradas no roadmap +field_is_in_chlog: Tarefas exibidas no registro de alterações +field_is_in_roadmap: Tarefas exibidas no planejamento field_login: Login -field_mail_notification: Notificacoes por email +field_mail_notification: Notificações por email field_admin: Administrador -field_last_login_on: Ultima conexao -field_language: Lingua +field_last_login_on: Última conexão +field_language: Idioma field_effective_date: Data field_password: Senha field_new_password: Nova senha -field_password_confirmation: Confirmacao -field_version: Versao +field_password_confirmation: Confirmação +field_version: Versão field_type: Tipo field_host: Servidor field_port: Porta @@ -142,116 +142,116 @@ field_account: Conta field_base_dn: Base DN field_attr_login: Atributo login field_attr_firstname: Atributo primeiro nome -field_attr_lastname: Atributo ultimo nome +field_attr_lastname: Atributo último nome field_attr_mail: Atributo email -field_onthefly: Criacao de usuario on-the-fly -field_start_date: Inicio +field_onthefly: Criação automática de usuário +field_start_date: Início field_done_ratio: %% Terminado -field_auth_source: Modo de autenticacao -field_hide_mail: Esconder meu email -field_comments: Comentario +field_auth_source: Modo de autenticação +field_hide_mail: Ocultar meu email +field_comments: Comentário field_url: URL -field_start_page: Pagina inicial +field_start_page: Página inicial field_subproject: Sub-projeto field_hours: Horas field_activity: Atividade field_spent_on: Data field_identifier: Identificador -field_is_filter: Used as a filter -field_issue_to_id: Related issue -field_delay: Delay -field_assignable: Issues can be assigned to this role -field_redirect_existing_links: Redirect existing links -field_estimated_hours: Estimated time -field_default_value: Padrao +field_is_filter: É um filtro +field_issue_to_id: Ticket relacionado +field_delay: Espera +field_assignable: Tickets podem ser atribuídos para este papel +field_redirect_existing_links: Redirecionar links existentes +field_estimated_hours: Tempo estimado +field_default_value: Padrão -setting_app_title: Titulo da aplicacao -setting_app_subtitle: Sub-titulo da aplicacao -setting_welcome_text: Texto de boa-vinda -setting_default_language: Lingua padrao -setting_login_required: Autenticacao obrigatoria -setting_self_registration: Registro de si mesmo permitido -setting_attachment_max_size: Tamanho maximo do anexo -setting_issues_export_limit: Limite de exportacao das tarefas +setting_app_title: Título da aplicação +setting_app_subtitle: Sub-título da aplicação +setting_welcome_text: Texto de boas-vindas +setting_default_language: Idioma padrão +setting_login_required: Autenticação obrigatória +setting_self_registration: Permitido Auto-registro +setting_attachment_max_size: Tamanho máximo do anexo +setting_issues_export_limit: Limite de exportação das tarefas setting_mail_from: Email enviado de setting_host_name: Servidor setting_text_formatting: Formato do texto -setting_wiki_compression: Compactacao do historio do Wiki +setting_wiki_compression: Compactação de histórico do Wiki setting_feeds_limit: Limite do Feed -setting_autofetch_changesets: Autofetch commits -setting_sys_api_enabled: Ativa WS para gerenciamento do repositorio -setting_commit_ref_keywords: Referencing keywords -setting_commit_fix_keywords: Fixing keywords -setting_autologin: Autologin -setting_date_format: Date format -setting_cross_project_issue_relations: Allow cross-project issue relations +setting_autofetch_changesets: Auto-obter commits +setting_sys_api_enabled: Ativa WS para gerenciamento do repositório +setting_commit_ref_keywords: Palavras de referência +setting_commit_fix_keywords: Palavras de fechamento +setting_autologin: Auto-login +setting_date_format: Formato da data +setting_cross_project_issue_relations: Permitir relacionar tickets entre projetos -label_user: Usuario -label_user_plural: Usuarios -label_user_new: Novo usuario +label_user: Usuário +label_user_plural: Usuários +label_user_new: Novo usuário label_project: Projeto label_project_new: Novo projeto label_project_plural: Projetos -label_project_all: All Projects -label_project_latest: Ultimos projetos -label_issue: Tarefa -label_issue_new: Nova tarefa -label_issue_plural: Tarefas -label_issue_view_all: Ver todas as tarefas +label_project_all: Todos os projetos +label_project_latest: Últimos projetos +label_issue: Ticket +label_issue_new: Novo ticket +label_issue_plural: Tickets +label_issue_view_all: Ver todos os tickets label_document: Documento label_document_new: Novo documento label_document_plural: Documentos -label_role: Regra -label_role_plural: Regras -label_role_new: Nova regra -label_role_and_permissions: Regras e permissoes +label_role: Papel +label_role_plural: Papéis +label_role_new: Novo papel +label_role_and_permissions: Papéis e permissões label_member: Membro label_member_new: Novo membro label_member_plural: Membros -label_tracker: Tipo -label_tracker_plural: Tipos +label_tracker: Tipo de ticket +label_tracker_plural: Tipos de ticket label_tracker_new: Novo tipo label_workflow: Workflow -label_issue_status: Status da tarefa -label_issue_status_plural: Status das tarefas +label_issue_status: Status do ticket +label_issue_status_plural: Status dos tickets label_issue_status_new: Novo status -label_issue_category: Categoria de tarefa -label_issue_category_plural: Categorias de tarefa +label_issue_category: Categoria de ticket +label_issue_category_plural: Categorias de tickets label_issue_category_new: Nova categoria label_custom_field: Campo personalizado -label_custom_field_plural: Campos personalizado +label_custom_field_plural: Campos personalizados label_custom_field_new: Novo campo personalizado -label_enumerations: Enumeracao -label_enumeration_new: Novo valor -label_information: Informacao -label_information_plural: Informacoes -label_please_login: Efetue login +label_enumerations: 'Tipos & Categorias' +label_enumeration_new: Novo +label_information: Informação +label_information_plural: Informações +label_please_login: Efetue o login label_register: Registre-se -label_password_lost: Perdi a senha -label_home: Pagina inicial -label_my_page: Minha pagina +label_password_lost: Perdi minha senha +label_home: Página inicial +label_my_page: Minha página label_my_account: Minha conta label_my_projects: Meus projetos -label_administration: Administracao -label_login: Login -label_logout: Logout +label_administration: Administração +label_login: Entrar +label_logout: Sair label_help: Ajuda -label_reported_issues: Tarefas reportadas -label_assigned_to_me_issues: Tarefas atribuidas a mim -label_last_login: Utima conexao -label_last_updates: Ultima alteracao -label_last_updates_plural: %d Ultimas alteracoes +label_reported_issues: Tickets reportados +label_assigned_to_me_issues: Meus tickets +label_last_login: Última conexao +label_last_updates: Última alteração +label_last_updates_plural: %d Últimas alterações label_registered_on: Registrado em label_activity: Atividade label_new: Novo -label_logged_as: Logado como +label_logged_as: "Acessando como:" label_environment: Ambiente -label_authentication: Autenticacao -label_auth_source: Modo de autenticacao -label_auth_source_new: Novo modo de autenticacao -label_auth_source_plural: Modos de autenticacao +label_authentication: Autenticação +label_auth_source: Modo de autenticação +label_auth_source_new: Novo modo de autenticação +label_auth_source_plural: Modos de autenticação label_subproject_plural: Sub-projetos -label_min_max_length: Tamanho min-max +label_min_max_length: Tamanho mín-máx label_list: Lista label_date: Data label_integer: Inteiro @@ -262,169 +262,169 @@ label_attribute: Atributo label_attribute_plural: Atributos label_download: %d Download label_download_plural: %d Downloads -label_no_data: Sem dados para mostrar -label_change_status: Mudar status -label_history: Historico +label_no_data: Nenhuma informação disponível +label_change_status: Alterar status +label_history: Histórico label_attachment: Arquivo label_attachment_new: Novo arquivo label_attachment_delete: Apagar arquivo label_attachment_plural: Arquivos -label_report: Relatorio -label_report_plural: Relatorio -label_news: Noticias -label_news_new: Adicionar noticias -label_news_plural: Noticias -label_news_latest: Ultimas noticias -label_news_view_all: Ver todas as noticias -label_change_log: Change log -label_settings: Ajustes -label_overview: Visao geral -label_version: Versao -label_version_new: Nova versao -label_version_plural: Versoes -label_confirmation: Confirmacao +label_report: Relatório +label_report_plural: Relatório +label_news: Notícia +label_news_new: Adicionar notícias +label_news_plural: Notícias +label_news_latest: Últimas notícias +label_news_view_all: Ver todas as notícias +label_change_log: Registro de alterações +label_settings: Configurações +label_overview: Visão geral +label_version: Versão +label_version_new: Nova versão +label_version_plural: Versões +label_confirmation: Confirmação label_export_to: Exportar para label_read: Ler... -label_public_projects: Projetos publicos +label_public_projects: Projetos públicos label_open_issues: Aberto -label_open_issues_plural: Abertos +label_open_issues_plural: Abertos label_closed_issues: Fechado label_closed_issues_plural: Fechados label_total: Total -label_permissions: Permissoes +label_permissions: Permissões label_current_status: Status atual label_new_statuses_allowed: Novo status permitido label_all: todos label_none: nenhum -label_next: Proximo +label_next: Próximo label_previous: Anterior label_used_by: Usado por label_details: Detalhes label_add_note: Adicionar nota -label_per_page: Por pagina -label_calendar: Calendario -label_months_from: Meses de +label_per_page: Por página +label_calendar: Calendário +label_months_from: meses a partir de label_gantt: Gantt label_internal: Interno -label_last_changes: utlimas %d mudancas -label_change_view_all: Mostrar todas as mudancas -label_personalize_page: Personalizar esta pagina -label_comment: Comentario -label_comment_plural: Comentarios -label_comment_add: Adicionar comentario -label_comment_added: Comentario adicionado -label_comment_delete: Apagar comentario +label_last_changes: últimas %d alteraçoes +label_change_view_all: Mostrar todas as alteraçoes +label_personalize_page: Personalizar esta página +label_comment: Comentário +label_comment_plural: Comentários +label_comment_add: Adicionar comentário +label_comment_added: Comentário adicionado +label_comment_delete: Apagar comentário label_query: Consulta personalizada label_query_plural: Consultas personalizadas label_query_new: Nova consulta label_filter_add: Adicionar filtro label_filter_plural: Filtros -label_equals: e -label_not_equals: nao e -label_in_less_than: e maior que -label_in_more_than: e menor que +label_equals: é +label_not_equals: não é +label_in_less_than: é maior que +label_in_more_than: é menor que label_in: em label_today: hoje -label_this_week: this week +label_this_week: esta semana label_less_than_ago: faz menos de label_more_than_ago: faz mais de -label_ago: dias atras -label_contains: contem -label_not_contains: nao contem +label_ago: dias atrás +label_contains: contém +label_not_contains: não contem label_day_plural: dias -label_repository: Repository -label_browse: Browse -label_modification: %d change -label_modification_plural: %d changes -label_revision: Revision -label_revision_plural: Revisions -label_added: added -label_modified: modified -label_deleted: deleted -label_latest_revision: Latest revision -label_latest_revision_plural: Latest revisions -label_view_revisions: View revisions -label_max_size: Maximum size +label_repository: Repositório +label_browse: Procurar +label_modification: %d alteração +label_modification_plural: %d alterações +label_revision: Revisão +label_revision_plural: Revisões +label_added: adicionado +label_modified: modificado +label_deleted: excluído +label_latest_revision: Última revisão +label_latest_revision_plural: Últimas revisões +label_view_revisions: Visualizar revisões +label_max_size: Tamanho máximo label_on: 'em' -label_sort_highest: Mover para o inicio +label_sort_highest: Mover para o início label_sort_higher: Mover para cima label_sort_lower: Mover para baixo label_sort_lowest: Mover para o fim -label_roadmap: Roadmap -label_roadmap_due_in: Due in -label_roadmap_overdue: %s late -label_roadmap_no_issues: Sem tarefas para essa versao +label_roadmap: Planejamento +label_roadmap_due_in: Previsão em +label_roadmap_overdue: %s atrasado +label_roadmap_no_issues: Sem tickets para esta versão label_search: Busca label_result_plural: Resultados label_all_words: Todas as palavras label_wiki: Wiki -label_wiki_edit: Wiki edit -label_wiki_edit_plural: Wiki edits -label_wiki_page: Wiki page -label_wiki_page_plural: Wiki pages -label_index_by_title: Index by title -label_index_by_date: Index by date -label_current_version: Versao atual -label_preview: Previa +label_wiki_edit: Editar Wiki +label_wiki_edit_plural: Edições Wiki +label_wiki_page: Página Wiki +label_wiki_page_plural: Páginas Wiki +label_index_by_title: Índice por título +label_index_by_date: Índice por data +label_current_version: Versão atual +label_preview: Pré-visualizar label_feed_plural: Feeds -label_changes_details: Detalhes de todas as mudancas -label_issue_tracking: Tarefas +label_changes_details: Detalhes de todas as alterações +label_issue_tracking: Tickets label_spent_time: Tempo gasto label_f_hour: %.2f hora label_f_hour_plural: %.2f horas label_time_tracking: Tempo trabalhado -label_change_plural: Mudancas -label_statistics: Estatisticas -label_commits_per_month: Commits por mes +label_change_plural: Mudanças +label_statistics: Estatísticas +label_commits_per_month: Commits por mês label_commits_per_author: Commits por autor -label_view_diff: Ver diferencas +label_view_diff: Ver diferenças label_diff_inline: inline -label_diff_side_by_side: side by side -label_options: Opcoes +label_diff_side_by_side: lado a lado +label_options: Opções label_copy_workflow_from: Copiar workflow de -label_permissions_report: Relatorio de permissoes -label_watched_issues: Watched issues -label_related_issues: Related issues -label_applied_status: Applied status -label_loading: Loading... -label_relation_new: New relation -label_relation_delete: Delete relation -label_relates_to: related to -label_duplicates: duplicates -label_blocks: blocks -label_blocked_by: blocked by -label_precedes: precedes -label_follows: follows -label_end_to_start: end to start -label_end_to_end: end to end -label_start_to_start: start to start -label_start_to_end: start to end -label_stay_logged_in: Stay logged in -label_disabled: disabled -label_show_completed_versions: Show completed versions -label_me: me -label_board: Forum -label_board_new: New forum -label_board_plural: Forums -label_topic_plural: Topics -label_message_plural: Messages -label_message_last: Last message -label_message_new: New message -label_reply_plural: Replies -label_send_information: Send account information to the user -label_year: Year -label_month: Month -label_week: Week -label_date_from: From -label_date_to: To -label_language_based: Language based -label_sort_by: Sort by %s -label_send_test_email: Send a test email -label_feeds_access_key_created_on: RSS access key created %s ago -label_module_plural: Modules -label_added_time_by: Added by %s %s ago -label_updated_time: Updated %s ago -label_jump_to_a_project: Jump to a project... +label_permissions_report: Relatório de permissões +label_watched_issues: Tickes acompanhados +label_related_issues: Tickets relacionados +label_applied_status: Status aplicado +label_loading: Carregando... +label_relation_new: Nova relação +label_relation_delete: Excluir relação +label_relates_to: relacionado a +label_duplicates: duplicado de +label_blocks: bloqueia +label_blocked_by: bloqueado por +label_precedes: precede +label_follows: segue +label_end_to_start: fim para o início +label_end_to_end: fim para fim +label_start_to_start: início para início +label_start_to_end: início para fim +label_stay_logged_in: Permanecer logado +label_disabled: desabilitado +label_show_completed_versions: Exibir versões completas +label_me: eu +label_board: Fórum +label_board_new: Novo fórum +label_board_plural: Fóruns +label_topic_plural: Tópicos +label_message_plural: Mensagens +label_message_last: Última mensagem +label_message_new: Nova mensagem +label_reply_plural: Respostas +label_send_information: Enviar informação de conta para o usuário +label_year: Ano +label_month: Mês +label_week: Semana +label_date_from: De +label_date_to: Para +label_language_based: Com base no idioma +label_sort_by: Ordenar por %s +label_send_test_email: Enviar um email de teste +label_feeds_access_key_created_on: chave de acesso RSS criada %s atrás +label_module_plural: Módulos +label_added_time_by: Adicionado por %s %s atrás +label_updated_time: Atualizado %s atrás +label_jump_to_a_project: Ir para o projeto... button_login: Login button_submit: Enviar @@ -436,7 +436,7 @@ button_create: Criar button_test: Testar button_edit: Editar button_add: Adicionar -button_change: Mudar +button_change: Alterar button_apply: Aplicar button_clear: Limpar button_lock: Bloquear @@ -450,59 +450,59 @@ button_cancel: Cancelar button_activate: Ativar button_sort: Ordenar button_log_time: Tempo de trabalho -button_rollback: Voltar para esta versao -button_watch: Watch -button_unwatch: Unwatch -button_reply: Reply -button_archive: Archive -button_unarchive: Unarchive -button_reset: Reset -button_rename: Rename +button_rollback: Voltar para esta versão +button_watch: Acompanhar +button_unwatch: Não Acompanhar +button_reply: Responder +button_archive: Arquivar +button_unarchive: Desarquivar +button_reset: Redefinir +button_rename: Renomear status_active: ativo status_registered: registrado status_locked: bloqueado -text_select_mail_notifications: Selecionar acoes para ser enviado uma notificacao por email -text_regexp_info: eg. ^[A-Z0-9]+$ -text_min_max_length_info: 0 siginifica sem restricao -text_project_destroy_confirmation: Voce tem certeza que deseja deletar este projeto e todas os dados relacionados? +text_select_mail_notifications: Selecionar ações para ser enviado uma notificação por email +text_regexp_info: ex. ^[A-Z0-9]+$ +text_min_max_length_info: 0 siginifica sem restrição +text_project_destroy_confirmation: Você tem certeza que deseja excluir este projeto e todos os dados relacionados? text_workflow_edit: Selecione uma regra e um tipo de tarefa para editar o workflow -text_are_you_sure: Voce tem certeza ? +text_are_you_sure: Você tem certeza? text_journal_changed: alterado de %s para %s text_journal_set_to: setar para %s text_journal_deleted: apagado -text_tip_task_begin_day: tarefa comeca neste dia +text_tip_task_begin_day: tarefa inicia neste dia text_tip_task_end_day: tarefa termina neste dia -text_tip_task_begin_end_day: tarefa comeca e termina neste dia -text_project_identifier_info: 'Letras minusculas (a-z), numeros e tracos permitido.
Uma vez salvo, o identificador nao pode ser mudado.' -text_caracters_maximum: %d maximo de caracteres +text_tip_task_begin_end_day: tarefa inicia e termina neste dia +text_project_identifier_info: 'Letras minúsculas (a-z), números e traços permitidos.
Uma vez salvo, o identificador não pode ser alterado.' +text_caracters_maximum: máximo %d caracteres text_length_between: Tamanho entre %d e %d caracteres. text_tracker_no_workflow: Sem workflow definido para este tipo. -text_unallowed_characters: Unallowed characters -text_comma_separated: Multiple values allowed (comma separated). -text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages -text_issue_added: Tarefa %s foi incluída (by %s). -text_issue_updated: Tarefa %s foi alterada (by %s). -text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ? -text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ? -text_issue_category_destroy_assignments: Remove category assignments -text_issue_category_reassign_to: Reassing issues to this category +text_unallowed_characters: Caracteres não permitidos +text_comma_separated: Múltiplos valores são permitidos (separados por vírgula). +text_issues_ref_in_commit_messages: Referenciando e fixando tickets nas mensagens de commit +text_issue_added: Tarefa %s foi incluída (por %s). +text_issue_updated: Tarefa %s foi alterada (por %s). +text_wiki_destroy_confirmation: Você tem certeza que deseja excluir este wiki e todo o seu conteúdo? +text_issue_category_destroy_question: Alguns tickets (%d) estão atribuídos a esta categoria. O que você deseja fazer? +text_issue_category_destroy_assignments: Remover atribuições da categoria +text_issue_category_reassign_to: Redefinir tickets para esta categoria -default_role_manager: Analista de Negocio ou Gerente de Projeto +default_role_manager: Gerente default_role_developper: Desenvolvedor -default_role_reporter: Analista de Suporte -default_tracker_bug: Bug -default_tracker_feature: Implementacao +default_role_reporter: Informante +default_tracker_bug: Problema +default_tracker_feature: Implementação default_tracker_support: Suporte default_issue_status_new: Novo -default_issue_status_assigned: Atribuido +default_issue_status_assigned: Atribuído default_issue_status_resolved: Resolvido default_issue_status_feedback: Feedback default_issue_status_closed: Fechado default_issue_status_rejected: Rejeitado -default_doc_category_user: Documentacao do usuario -default_doc_category_tech: Documentacao do tecnica +default_doc_category_user: Documentação do usuário +default_doc_category_tech: Documentação técnica default_priority_low: Baixo default_priority_normal: Normal default_priority_high: Alto @@ -514,107 +514,107 @@ default_activity_development: Desenvolvimento enumeration_issue_priorities: Prioridade das tarefas enumeration_doc_categories: Categorias de documento enumeration_activities: Atividades (time tracking) -label_file_plural: Files +label_file_plural: Arquivos label_changeset_plural: Changesets -field_column_names: Columns -label_default_columns: Default columns -setting_issue_list_default_columns: Default columns displayed on the issue list -setting_repositories_encodings: Repositories encodings -notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit." -label_bulk_edit_selected_issues: Bulk edit selected issues -label_no_change_option: (No change) -notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s." -label_theme: Theme -label_default: Default -label_search_titles_only: Search titles only -label_nobody: nobody -button_change_password: Change password -text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)." -label_user_mail_option_selected: "For any event on the selected projects only..." -label_user_mail_option_all: "For any event on all my projects" -label_user_mail_option_none: "Only for things I watch or I'm involved in" -setting_emails_footer: Emails footer -label_float: Float -button_copy: Copy -mail_body_account_information_external: You can use your "%s" account to log in. -mail_body_account_information: Your account information -setting_protocol: Protocol -label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself" -setting_time_format: Time format -label_registration_activation_by_email: account activation by email -mail_subject_account_activation_request: %s account activation request -mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:' -label_registration_automatic_activation: automatic account activation -label_registration_manual_activation: manual account activation -notice_account_pending: "Your account was created and is now pending administrator approval." -field_time_zone: Time zone -text_caracters_minimum: Must be at least %d characters long. -setting_bcc_recipients: Blind carbon copy recipients (bcc) -button_annotate: Annotate -label_issues_by: Issues by %s -field_searchable: Searchable -label_display_per_page: 'Per page: %s' -setting_per_page_options: Objects per page options -label_age: Age -notice_default_data_loaded: Default configuration successfully loaded. -text_load_default_configuration: Load the default configuration -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." -error_can_t_load_default_data: "Default configuration could not be loaded: %s" -button_update: Update -label_change_properties: Change properties -label_general: General -label_repository_plural: Repositories -label_associated_revisions: Associated revisions -setting_user_format: Users display format -text_status_changed_by_changeset: Applied in changeset %s. -label_more: More -text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +field_column_names: Colunas +label_default_columns: Colunas padrão +setting_issue_list_default_columns: Colunas padrão visíveis na lista de tickets +setting_repositories_encodings: Codificação dos repositórios +notice_no_issue_selected: "Nenhum ticket está selecionado! Por favor, marque os tickets que você deseja alterar." +label_bulk_edit_selected_issues: Edição em massa dos tickets selecionados. +label_no_change_option: (Sem alteração) +notice_failed_to_save_issues: "Problema ao salvar %d ticket(s) no %d selecionado: %s." +label_theme: Tema +label_default: Padrão +label_search_titles_only: Pesquisar somente títulos +label_nobody: ninguém +button_change_password: Alterar senha +text_user_mail_option: "Para projetos não selecionados, você somente receberá notificações sobre o que você acompanha ou está envolvido (ex. tickets que você é autor ou está atribuído)" +label_user_mail_option_selected: "Para qualquer evento somente no(s) projeto(s) selecionado(s)..." +label_user_mail_option_all: "Para qualquer evento em todos os meus projetos" +label_user_mail_option_none: "Somente eventos que eu acompanho ou estou envolvido" +setting_emails_footer: Rodapé dos emails +label_float: Flutuante +button_copy: Copiar +mail_body_account_information_external: Você pode usar sua conta "%s" para entrar. +mail_body_account_information: Informações de sua conta +setting_protocol: Protocolo +label_user_mail_no_self_notified: "Eu não desejo ser notificado de minhas próprias modificações" +setting_time_format: Formato de data +label_registration_activation_by_email: ativação de conta por email +mail_subject_account_activation_request: %s requisição de ativação de conta +mail_body_account_activation_request: 'Um novo usuário (%s) se registrou. A conta está aguardando sua aprovação:' +label_registration_automatic_activation: ativação automática de conta +label_registration_manual_activation: ativação manual de conta +notice_account_pending: "Sua conta foi criada e está aguardando aprovação do administrador." +field_time_zone: Fuso-horário +text_caracters_minimum: Precisa ter ao menos %d caracteres. +setting_bcc_recipients: Destinatários com cópia oculta (cco) +button_annotate: Anotar +label_issues_by: Tickets por %s +field_searchable: Pesquisável +label_display_per_page: 'Por página: %s' +setting_per_page_options: Opções de itens por página +notice_default_data_loaded: Configuração padrão carregada com sucesso. +text_load_default_configuration: Carregar a configuração padrão +text_no_configuration_data: "Os Papéis, tipos de tickets, status de tickets e workflows não foram configurados ainda.\nÉ altamente recomendado carregar as configurações padrão. Você poderá modificar estas configurações assim que carregadas." +error_can_t_load_default_data: "Configuração padrão não pôde ser carregada: %s" +button_update: Atualizar +label_change_properties: Alterar propriedades +label_general: Geral +label_repository_plural: Repositórios +label_associated_revisions: Revisões associadas +setting_user_format: Formato de visualização dos usuários +text_status_changed_by_changeset: Aplicado no changeset %s. +label_more: Mais +text_issues_destroy_confirmation: 'Você tem certeza que deseja excluir o(s) ticket(s) selecionado(s)?' label_scm: SCM -text_select_project_modules: 'Select modules to enable for this project:' -label_issue_added: Issue added -label_issue_updated: Issue updated -label_document_added: Document added -label_message_posted: Message added -label_file_added: File added -label_news_added: News added -project_module_boards: Boards -project_module_issue_tracking: Issue tracking +text_select_project_modules: 'Selecione módulos para habilitar para este projeto:' +label_issue_added: Ticket adicionado +label_issue_updated: Ticket atualizado +label_document_added: Documento adicionado +label_message_posted: Mensagem enviada +label_file_added: Arquivo adicionado +label_news_added: Notícia adicionada +project_module_boards: Fóruns +project_module_issue_tracking: Gerenciamento de Tickets project_module_wiki: Wiki -project_module_files: Files -project_module_documents: Documents -project_module_repository: Repository -project_module_news: News -project_module_time_tracking: Time tracking -text_file_repository_writable: File repository writable -text_default_administrator_account_changed: Default administrator account changed -text_rmagick_available: RMagick available (optional) -button_configure: Configure +project_module_files: Arquivos +project_module_documents: Documentos +project_module_repository: Repositório +project_module_news: Notícias +project_module_time_tracking: Gerenciamento de tempo +text_file_repository_writable: Repositório de arquivos gravável +text_default_administrator_account_changed: Conta de administrador padrão modificada +text_rmagick_available: RMagick disponível (opcional) +button_configure: Configuração label_plugins: Plugins -label_ldap_authentication: LDAP authentication +label_ldap_authentication: autenticação LDAP label_downloads_abbr: D/L -label_this_month: this month -label_last_n_days: last %d days -label_all_time: all time -label_this_year: this year -label_date_range: Date range -label_last_week: last week -label_yesterday: yesterday -label_last_month: last month -label_add_another_file: Add another file -label_optional_description: Optional description -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 -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 -text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.' +label_this_month: este mês +label_last_n_days: últimos %d dias +label_all_time: todo o tempo +label_this_year: este ano +label_date_range: Intervalo de datas +label_last_week: última semana +label_yesterday: ontem +label_last_month: último mês +label_add_another_file: Adicionar outro arquivo +label_optional_description: Descrição opcional +text_destroy_time_entries_question: %.02f horas foram reportadas neste ticket que você está excluindo. O que você deseja fazer? +error_issue_not_found_in_project: 'O ticket não foi encontrado ou não pertence a este projeto' +text_assign_time_entries_to_project: Atribuir horas reportadas para o projeto +text_destroy_time_entries: Excluir horas reportadas +text_reassign_time_entries: 'Redefinir horas reportadas para este ticket:' +setting_activity_days_default: Dias visualizados na atividade do projeto +label_chronological_order: Em ordem cronológica +field_comments_sorting: Visualizar comentários +label_reverse_chronological_order: Em order cronológica reversa +label_preferences: Preferências +setting_display_subprojects_issues: Visualizar tickets dos subprojetos nos projetos principais por padrão +label_overall_activity: Atividade geral +setting_default_projects_public: Novos projetos são públicos por padrão +error_scm_annotate: "Esta entrada não existe ou não pode ser anotada." +label_planning: Planejamento +text_subprojects_destroy_warning: 'Seu(s) subprojeto(s): %s também serão excluídos.' +label_age: Age diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index d91c970..1bdc7d7 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -291,6 +291,7 @@ label_auth_source: 認證模式 label_auth_source_new: 建立新認證模式 label_auth_source_plural: 認證模式清單 label_subproject_plural: 子專案 +label_and_its_subprojects: %s 與其子專案 label_min_max_length: 最小 - 最大 長度 label_list: 清單 label_date: 日期 diff --git a/lang/zh.yml b/lang/zh.yml index c8b8097..55516e0 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -198,7 +198,7 @@ setting_default_projects_public: 新建项目默认为公开项目 setting_autofetch_changesets: 自动获取程序变更 setting_sys_api_enabled: 启用用于版本库管理的Web Service setting_commit_ref_keywords: 用于引用问题的关键字 -setting_commit_fix_keywords: 用于修订问题的关键字 +setting_commit_fix_keywords: 用于解决问题的关键字 setting_autologin: 自动登录 setting_date_format: 日期格式 setting_time_format: 时间格式 @@ -257,9 +257,9 @@ label_issue_status_new: 新建问题状态 label_issue_category: 问题类别 label_issue_category_plural: 问题类别 label_issue_category_new: 新建问题类别 -label_custom_field: 自定义字段 -label_custom_field_plural: 自定义字段 -label_custom_field_new: 新建自定义字段 +label_custom_field: 自定义属性 +label_custom_field_plural: 自定义属性 +label_custom_field_new: 新建自定义属性 label_enumerations: 枚举值 label_enumeration_new: 新建枚举值 label_information: 信息 @@ -291,6 +291,7 @@ label_auth_source: 认证模式 label_auth_source_new: 新建认证模式 label_auth_source_plural: 认证模式 label_subproject_plural: 子项目 +label_and_its_subprojects: %s 及其子项目 label_min_max_length: 最小 - 最大 长度 label_list: 列表 label_date: 日期 @@ -573,7 +574,7 @@ text_length_between: 长度必须在 %d 到 %d 个字符之间。 text_tracker_no_workflow: 此跟踪标签未定义工作流程 text_unallowed_characters: 非法字符 text_comma_separated: 可以使用多个值(用逗号,分开)。 -text_issues_ref_in_commit_messages: 在提交信息中引用和修订问题 +text_issues_ref_in_commit_messages: 在提交信息中引用和解决问题 text_issue_added: 问题 %s 已由 %s 提交。 text_issue_updated: 问题 %s 已由 %s 更新。 text_wiki_destroy_confirmation: 您确定要删除这个 wiki 及其所有内容吗? @@ -619,3 +620,5 @@ default_activity_development: 开发 enumeration_issue_priorities: 问题优先级 enumeration_doc_categories: 文档类别 enumeration_activities: 活动(时间跟踪) +mail_subject_reminder: "%d issue(s) due in the next days" +mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:" diff --git a/lib/redcloth.rb b/lib/redcloth.rb index f94c957..fb6a053 100644 --- a/lib/redcloth.rb +++ b/lib/redcloth.rb @@ -764,7 +764,7 @@ class RedCloth < String ([\s\[{(]|[#{PUNCT}])? # $pre " # start (#{C}) # $atts - ([^"]+?) # $text + ([^"\n]+?) # $text \s? (?:\(([^)]+?)\)(?="))? # $title ": diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 8866e8c..3c1eac0 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -45,7 +45,7 @@ module Redmine # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet. # http://code.whytheluckystiff.net/redcloth/changeset/128 def hard_break( text ) - text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1
" ) if hard_breaks + text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1
\n" ) if hard_breaks end # Patch to add code highlighting support to RedCloth diff --git a/public/javascripts/calendar/lang/calendar-hu.js b/public/javascripts/calendar/lang/calendar-hu.js new file mode 100644 index 0000000..0e219c1 --- /dev/null +++ b/public/javascripts/calendar/lang/calendar-hu.js @@ -0,0 +1,127 @@ +// ** I18N + +// Calendar HU language +// Author: Takács Gábor +// Encoding: UTF-8 +// Distributed under the same terms as the calendar itself. + +// For translators: please use UTF-8 if possible. We strongly believe that +// Unicode is the answer to a real internationalized world. Also please +// include your contact information in the header, as can be seen above. + +// full day names +Calendar._DN = new Array +("Vasárnap", + "Hétfő", + "Kedd", + "Szerda", + "Csütörtök", + "Péntek", + "Szombat", + "Vasárnap"); + +// Please note that the following array of short day names (and the same goes +// for short month names, _SMN) isn't absolutely necessary. We give it here +// for exemplification on how one can customize the short day names, but if +// they are simply the first N letters of the full name you can simply say: +// +// Calendar._SDN_len = N; // short day name length +// Calendar._SMN_len = N; // short month name length +// +// If N = 3 then this is not needed either since we assume a value of 3 if not +// present, to be compatible with translation files that were written before +// this feature. + +// short day names +Calendar._SDN = new Array +("Vas", + "Hét", + "Ked", + "Sze", + "Csü", + "Pén", + "Szo", + "Vas"); + +// First day of the week. "0" means display Sunday first, "1" means display +// Monday first, etc. +Calendar._FD = 1; + +// full month names +Calendar._MN = new Array +("Január", + "Február", + "Március", + "Április", + "Május", + "Június", + "Július", + "Augusztus", + "Szeptember", + "Október", + "November", + "December"); + +// short month names +Calendar._SMN = new Array +("Jan", + "Feb", + "Már", + "Ápr", + "Máj", + "Jún", + "Júl", + "Aug", + "Szep", + "Okt", + "Nov", + "Dec"); + +// tooltips +Calendar._TT = {}; +Calendar._TT["INFO"] = "A naptár leírása"; + +Calendar._TT["ABOUT"] = +"DHTML Date/Time Selector\n" + +"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) +"For latest version visit: http://www.dynarch.com/projects/calendar/\n" + +"Distributed under GNU LGPL. See http://gnu.org/licenses/lgpl.html for details." + +"\n\n" + +"Date selection:\n" + +"- Use the \xab, \xbb buttons to select year\n" + +"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" + +"- Hold mouse button on any of the above buttons for faster selection."; +Calendar._TT["ABOUT_TIME"] = "\n\n" + +"Time selection:\n" + +"- Click on any of the time parts to increase it\n" + +"- or Shift-click to decrease it\n" + +"- or click and drag for faster selection."; + +Calendar._TT["PREV_YEAR"] = "Előző év (nyomvatart = menü)"; +Calendar._TT["PREV_MONTH"] = "Előző hónap (nyomvatart = menü)"; +Calendar._TT["GO_TODAY"] = "Irány a Ma"; +Calendar._TT["NEXT_MONTH"] = "Következő hónap (nyomvatart = menü)"; +Calendar._TT["NEXT_YEAR"] = "Következő év (nyomvatart = menü)"; +Calendar._TT["SEL_DATE"] = "Válasszon dátumot"; +Calendar._TT["DRAG_TO_MOVE"] = "Fogd és vidd"; +Calendar._TT["PART_TODAY"] = " (ma)"; + +// the following is to inform that "%s" is to be the first day of week +// %s will be replaced with the day name. +Calendar._TT["DAY_FIRST"] = "%s megjelenítése elsőként"; + +// 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"] = "0,6"; + +Calendar._TT["CLOSE"] = "Bezár"; +Calendar._TT["TODAY"] = "Ma"; +Calendar._TT["TIME_PART"] = "(Shift-)Click vagy húzd az érték változtatásához"; + +// date formats +Calendar._TT["DEF_DATE_FORMAT"] = "%Y.%m.%d"; +Calendar._TT["TT_DATE_FORMAT"] = "%B %e, %A"; + +Calendar._TT["WK"] = "hét"; +Calendar._TT["TIME"] = "Idő:"; diff --git a/public/javascripts/calendar/lang/calendar-pt-br.js b/public/javascripts/calendar/lang/calendar-pt-br.js index 5d4d014..bf7734a 100644 --- a/public/javascripts/calendar/lang/calendar-pt-br.js +++ b/public/javascripts/calendar/lang/calendar-pt-br.js @@ -2,7 +2,8 @@ // Calendar pt_BR language // Author: Adalberto Machado, -// Encoding: any +// Review: Alexandre da Silva, +// Encoding: UTF-8 // Distributed under the same terms as the calendar itself. // For translators: please use UTF-8 if possible. We strongly believe that @@ -13,7 +14,7 @@ Calendar._DN = new Array ("Domingo", "Segunda", - "Terca", + "Terça", "Quarta", "Quinta", "Sexta", @@ -45,13 +46,13 @@ Calendar._SDN = new Array // First day of the week. "0" means display Sunday first, "1" means display // Monday first, etc. -Calendar._FD = 1; +Calendar._FD = 0; // full month names Calendar._MN = new Array ("Janeiro", "Fevereiro", - "Marco", + "Março", "Abril", "Maio", "Junho", @@ -79,29 +80,30 @@ Calendar._SMN = new Array // tooltips Calendar._TT = {}; -Calendar._TT["INFO"] = "Sobre o calendario"; +Calendar._TT["INFO"] = "Sobre o calendário"; Calendar._TT["ABOUT"] = "DHTML Date/Time Selector\n" + "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) -"Ultima versao visite: http://www.dynarch.com/projects/calendar/\n" + -"Distribuido sobre GNU LGPL. Veja http://gnu.org/licenses/lgpl.html para detalhes." + +"Última versão visite: http://www.dynarch.com/projects/calendar/\n" + +"Distribuído sobre GNU LGPL. Veja http://gnu.org/licenses/lgpl.html para detalhes." + "\n\n" + -"Selecao de data:\n" + -"- Use os botoes \xab, \xbb para selecionar o ano\n" + -"- Use os botoes " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mes\n" + -"- Segure o botao do mouse em qualquer um desses botoes para selecao rapida."; +"Seleção de data:\n" + +"- Use os botões \xab, \xbb para selecionar o ano\n" + +"- Use os botões " + String.fromCharCode(0x2039) + ", " + +String.fromCharCode(0x203a) + " para selecionar o mês\n" + +"- Segure o botão do mouse em qualquer um desses botões para seleção rápida."; Calendar._TT["ABOUT_TIME"] = "\n\n" + -"Selecao de hora:\n" + +"Seleção de hora:\n" + "- Clique em qualquer parte da hora para incrementar\n" + "- ou Shift-click para decrementar\n" + -"- ou clique e segure para selecao rapida."; +"- ou clique e segure para seleção rápida."; Calendar._TT["PREV_YEAR"] = "Ant. ano (segure para menu)"; -Calendar._TT["PREV_MONTH"] = "Ant. mes (segure para menu)"; +Calendar._TT["PREV_MONTH"] = "Ant. mês (segure para menu)"; Calendar._TT["GO_TODAY"] = "Hoje"; -Calendar._TT["NEXT_MONTH"] = "Prox. mes (segure para menu)"; -Calendar._TT["NEXT_YEAR"] = "Prox. ano (segure para menu)"; +Calendar._TT["NEXT_MONTH"] = "Próx. mes (segure para menu)"; +Calendar._TT["NEXT_YEAR"] = "Próx. ano (segure para menu)"; Calendar._TT["SEL_DATE"] = "Selecione a data"; Calendar._TT["DRAG_TO_MOVE"] = "Arraste para mover"; Calendar._TT["PART_TODAY"] = " (hoje)"; diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js new file mode 100644 index 0000000..e586a12 --- /dev/null +++ b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js @@ -0,0 +1,14 @@ +jsToolBar.strings = {}; +jsToolBar.strings['Strong'] = 'Félkövér'; +jsToolBar.strings['Italic'] = 'Dőlt'; +jsToolBar.strings['Underline'] = 'Aláhúzott'; +jsToolBar.strings['Deleted'] = 'Törölt'; +jsToolBar.strings['Code'] = 'Kód sorok'; +jsToolBar.strings['Heading 1'] = 'Fejléc 1'; +jsToolBar.strings['Heading 2'] = 'Fejléc 2'; +jsToolBar.strings['Heading 3'] = 'Fejléc 3'; +jsToolBar.strings['Unordered list'] = 'Felsorolás'; +jsToolBar.strings['Ordered list'] = 'Számozott lista'; +jsToolBar.strings['Preformatted text'] = 'Előreformázott szöveg'; +jsToolBar.strings['Wiki link'] = 'Link egy Wiki oldalra'; +jsToolBar.strings['Image'] = 'Kép'; diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js index cd36a4b..8fc58ba 100644 --- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js +++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js @@ -1,14 +1,16 @@ +// Translated by: Alexandre da Silva + 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'] = 'Negrito'; +jsToolBar.strings['Italic'] = 'Itálico'; +jsToolBar.strings['Underline'] = 'Sublinhado'; +jsToolBar.strings['Deleted'] = 'Excluído'; +jsToolBar.strings['Code'] = 'Código Inline'; +jsToolBar.strings['Heading 1'] = 'Cabeçalho 1'; +jsToolBar.strings['Heading 2'] = 'Cabeçalho 2'; +jsToolBar.strings['Heading 3'] = 'Cabeçalho 3'; +jsToolBar.strings['Unordered list'] = 'Lista não ordenada'; +jsToolBar.strings['Ordered list'] = 'Lista ordenada'; +jsToolBar.strings['Preformatted text'] = 'Texto pré-formatado'; +jsToolBar.strings['Wiki link'] = 'Link para uma página Wiki'; +jsToolBar.strings['Image'] = 'Imagem'; diff --git a/test/fixtures/enumerations.yml b/test/fixtures/enumerations.yml index c90a997..5e26154 100644 --- a/test/fixtures/enumerations.yml +++ b/test/fixtures/enumerations.yml @@ -39,4 +39,9 @@ enumerations_010: name: Development id: 10 opt: ACTI + is_default: true +enumerations_011: + name: QA + id: 11 + opt: ACTI \ No newline at end of file diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index e80a677..479f4f4 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -30,7 +30,17 @@ class TimelogControllerTest < Test::Unit::TestCase @response = ActionController::TestResponse.new end - def test_create + def test_get_edit + @request.session[:user_id] = 3 + get :edit, :project_id => 1 + assert_response :success + assert_template 'edit' + # Default activity selected + assert_tag :tag => 'option', :attributes => { :selected => 'selected' }, + :content => 'Development' + end + + def test_post_edit @request.session[:user_id] = 3 post :edit, :project_id => 1, :time_entry => {:comments => 'Some work on TimelogControllerTest', diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb index bbfe695..6cc53d8 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -39,6 +39,17 @@ class ChangesetTest < Test::Unit::TestCase assert fixed.closed? assert_equal 90, fixed.done_ratio end + + def test_ref_keywords_any_line_start + Setting.commit_ref_keywords = '*' + + c = Changeset.new(:repository => Project.find(1).repository, + :committed_on => Time.now, + :comments => '#1 is the reason of this commit') + c.scan_comment_for_issue_ids + + assert_equal [1], c.issue_ids.sort + end def test_previous changeset = Changeset.find_by_revision('3') diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 8bd7451..d98a33c 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -58,7 +58,9 @@ class ApplicationHelperTest < HelperTestCase to_test = { 'This is a "link":http://foo.bar' => 'This is a link', 'This is an intern "link":/foo/bar' => 'This is an intern link', - '"link (Link title)":http://foo.bar' => 'link' + '"link (Link title)":http://foo.bar' => 'link', + # no multiline link text + "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line
\nand another on a second line\":test" } to_test.each { |text, result| assert_equal "

#{result}

", textilizable(text) } end diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index e143e6f..147bfbe 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -116,6 +116,11 @@ class QueryTest < Test::Unit::TestCase assert q.has_column?(c) end + def test_label_for + q = Query.new + assert_equal 'assigned_to', q.label_for('assigned_to_id') + end + def test_editable_by admin = User.find(1) manager = User.find(2)