Changeset 373

Show
Ignore:
Timestamp:
01/04/07 00:23:15 (2 years ago)
Author:
jarmo
Message:
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/app/controllers/report_controller.rb

    r328 r373  
    9999      @report.cause_work_order_id = @cause_work_order_id if @cause_work_order_id 
    100100 
    101       if @report.valid? and @report.validate_fields 
     101      if @report.validate_fields and @report.valid? 
    102102        @report.editable = params[:report][:editable] if params[:report] and @report_type.editable 
    103103        @report.ready = true 
  • trunk/app/helpers/application_helper.rb

    r362 r373  
    1717 
    1818    for error in additional_errors.flatten 
    19       object.errors.add(*error) 
     19      object.errors.add_to_base(*error) 
    2020    end 
    2121 
  • trunk/app/models/report_field_value.rb

    r368 r373  
    1313  def human_attribute_name(attribute) 
    1414    return self.report_field.name 
     15  end 
     16 
     17  # Use this insetead of errors.full_messages 
     18  def error_messages 
     19    result = [] 
     20    self.errors.each { |attribute, message|  
     21      result.push(message.gsub('%{fn}', self.report_field.name)) 
     22    } 
     23    return result 
    1524  end 
    1625 
  • trunk/app/views/report/_creation_form.rhtml

    r258 r373  
    66<% @first_year ||= Time.now.year - 15; @years ||= 30; -%> 
    77 
    8 <% field_error_messages = report.report_field_values.collect { |v| v.errors.full_messages } -%> 
     8<% field_error_messages = report.report_field_values.collect { |v| v.error_messages } -%> 
    99<%= additional_error_messages_for('report', field_error_messages) %> 
    1010 
  • trunk/po/fi_FI/norfello_cmms.po

    r330 r373  
    22msgstr "" 
    33"Project-Id-Version: NorfelloCMMS SVN trunk\n" 
    4 "POT-Creation-Date: 2006-12-08 21:10+0200\n" 
    5 "PO-Revision-Date: 2006-12-08 21:18+0200\n" 
     4"POT-Creation-Date: 2006-12-28 22:20+0200\n" 
     5"PO-Revision-Date: 2006-12-28 22:27+0200\n" 
    66"Last-Translator: \n" 
    77"Language-Team: Norfello Ltd. <contact@norfello.com>\n" 
     
    1515"Plural-Forms: nplurals=2; plural=n != 1;\n" 
    1616 
    17 #: app/helpers/asset_type_helper.rb:25 
    18 msgid "years" 
    19 msgstr "vuotta" 
    20  
    21 #: app/helpers/asset_type_helper.rb:27 
    22 msgid "months" 
    23 msgstr "kuukautta" 
    24  
    25 #: app/helpers/asset_type_helper.rb:29 
    26 msgid "days" 
    27 msgstr "pÀivÀÀ" 
    28  
    29 #: app/helpers/asset_type_helper.rb:31 
    30 #: app/views/work_order/_form.rhtml:58 
    31 #: app/views/work_order/_form.rhtml:60 
    32 #: app/views/work_order/create.rhtml:42 
    33 msgid "hours" 
    34 msgstr "tuntia" 
    35  
    36 #: app/helpers/asset_type_helper.rb:33 
    37 msgid "minutes" 
    38 msgstr "minuuttia" 
    39  
    4017#: app/helpers/asset_helper.rb:12 
    4118msgid "Active data" 
     
    198175msgstr "Tyyppikohtainen liitetiedosto" 
    199176 
     177#: app/helpers/application_helper.rb:695 
     178msgid "years" 
     179msgstr "vuotta" 
     180 
     181#: app/helpers/application_helper.rb:697 
     182msgid "months" 
     183msgstr "kuukautta" 
     184 
     185#: app/helpers/application_helper.rb:699 
     186msgid "days" 
     187msgstr "pÀivÀÀ" 
     188 
     189#: app/helpers/application_helper.rb:701 
     190#: app/views/work_order/_form.rhtml:58 
     191#: app/views/work_order/_form.rhtml:60 
     192#: app/views/work_order/create.rhtml:42 
     193msgid "hours" 
     194msgstr "tuntia" 
     195 
     196#: app/helpers/application_helper.rb:703 
     197msgid "minutes" 
     198msgstr "minuuttia" 
     199 
    200200#: app/models/asset_field_value.rb:- 
    201201msgid "asset field value" 
     
    345345msgid "work order" 
    346346msgstr "työmÀÀrÀin" 
    347  
    348 #: app/models/work_order_template.rb:27 
    349 msgid "User field %s is missing" 
    350 msgstr "KÀyttÀjÀkenttÀ %s puuttuu" 
    351  
    352 #: app/models/work_order_template.rb:29 
    353 msgid "User fields %s are missing" 
    354 msgstr "KÀyttÀjÀkentÀt %s puuttuvat" 
    355347 
    356348#: app/models/message.rb:- 
     
    452444#: app/views/timeline/_display_event.rhtml:20 
    453445#: app/views/timeline/_display_event.rhtml:22 
    454 #: app/views/timeline/_display_event.rhtml:35 
     446#: app/views/timeline/_display_event.rhtml:24 
    455447#: app/views/timeline/_display_event.rhtml:37 
    456 #: app/views/timeline/_display_event.rhtml:50 
    457 #: app/views/work_order/_display_work_order_event.rhtml:5 
     448#: app/views/timeline/_display_event.rhtml:39 
     449#: app/views/timeline/_display_event.rhtml:52 
    458450#: app/views/work_order/_display_work_order_event.rhtml:7 
    459451#: app/views/work_order/_display_work_order_event.rhtml:9 
    460452#: app/views/work_order/_display_work_order_event.rhtml:11 
    461453#: app/views/work_order/_display_work_order_event.rhtml:13 
     454#: app/views/work_order/_display_work_order_event.rhtml:15 
     455#: app/views/work_order/_display_work_order_event.rhtml:17 
    462456msgid "Unknown" 
    463457msgstr "Tuntematon" 
     
    487481msgstr "Valmis" 
    488482 
    489 #: app/models/work_order.rb:31 
     483#: app/models/work_order.rb:46 
    490484msgid "is not a positive number" 
    491485msgstr "ei ole kokonaisluku" 
    492486 
    493 #: app/models/work_order.rb:140 
     487#: app/models/work_order.rb:155 
    494488msgid "cannot be earlier than the starting time" 
    495489msgstr "ei saa olla aikaisempi kuin aloitusaika" 
     
    531525msgstr "ReportField|Validate presence" 
    532526 
    533 #: app/models/report_field.rb:33 
     527#: app/models/report_field.rb:34 
    534528#: app/models/asset_field.rb:32 
    535529#: app/controllers/asset_field_controller.rb:30 
     
    538532msgstr "Kokonaisluku" 
    539533 
    540 #: app/models/report_field.rb:34 
     534#: app/models/report_field.rb:35 
    541535#: app/models/asset_field.rb:34 
    542536#: app/controllers/asset_field_controller.rb:29 
     
    545539msgstr "Merkkijono" 
    546540 
    547 #: app/models/report_field.rb:35 
     541#: app/models/report_field.rb:36 
    548542#: app/models/asset_field.rb:36 
    549543#: app/controllers/asset_field_controller.rb:31 
     
    552546msgstr "Totuusarvo" 
    553547 
    554 #: app/models/report_field.rb:36 
     548#: app/models/report_field.rb:37 
    555549#: app/models/asset_field.rb:38 
    556550#: app/controllers/asset_field_controller.rb:32 
     
    559553msgstr "Desimaaliluku" 
    560554 
    561 #: app/models/report_field.rb:37 
     555#: app/models/report_field.rb:38 
    562556msgid "Long string" 
    563557msgstr "PitkÀ merkkijono" 
    564558 
    565 #: app/models/report_field.rb:38 
     559#: app/models/report_field.rb:39 
    566560#: app/models/asset_field.rb:40 
    567561#: app/controllers/asset_field_controller.rb:33 
     
    572566msgstr "PÀivÀmÀÀrÀ" 
    573567 
    574 #: app/models/report_field.rb:39 
     568#: app/models/report_field.rb:40 
    575569#: app/models/asset_field.rb:42 
    576570#: app/controllers/asset_field_controller.rb:34 
     
    579573msgstr "Aika" 
    580574 
    581 #: app/models/report_field.rb:40 
     575#: app/models/report_field.rb:41 
    582576#: app/models/asset_field.rb:44 
    583577#: app/controllers/asset_field_controller.rb:35 
     
    586580msgstr "PÀivÀmÀÀrÀ ja aika" 
    587581 
    588 #: app/models/report_field.rb:41 
     582#: app/models/report_field.rb:42 
    589583msgid "Enumeration" 
    590584msgstr "Luettelo" 
    591585 
    592 #: app/models/report_field.rb:42 
     586#: app/models/report_field.rb:43 
    593587msgid "Image" 
    594588msgstr "Kuva" 
    595589 
    596 #: app/models/report_field.rb:43 
     590#: app/models/report_field.rb:44 
    597591msgid "Automatic" 
    598592msgstr "Automaattinen" 
    599593 
    600 #: app/models/asset.rb:505 
     594#: app/models/asset.rb:732 
    601595msgid "No changes have been made" 
    602596msgstr "Muutoksia ei ole tehty" 
    603597 
    604 #: app/models/asset.rb:525 
     598#: app/models/asset.rb:752 
    605599#: app/models/protected_data.rb:423 
    606600msgid "Unauthorized to save %s" 
     
    656650 
    657651#: app/models/asset_type.rb:15 
    658 msgid "can't be zero
    659 msgstr "ei voi olla nolla
    660  
    661 #: app/models/asset_type.rb:68 
     652msgid "must be positive
     653msgstr "tÀytyy olla positiivinen
     654 
     655#: app/models/asset_type.rb:75 
    662656msgid "%d year" 
    663657msgid_plural "%d years" 
     
    665659msgstr[1] "%d vuotta" 
    666660 
    667 #: app/models/asset_type.rb:69 
     661#: app/models/asset_type.rb:76 
    668662msgid "%d month" 
    669663msgid_plural "%d months" 
     
    671665msgstr[1] "%d kuukautta" 
    672666 
    673 #: app/models/asset_type.rb:70 
     667#: app/models/asset_type.rb:77 
    674668msgid "%d day" 
    675669msgid_plural "%d days" 
     
    677671msgstr[1] "%d pÀivÀÀ" 
    678672 
    679 #: app/models/asset_type.rb:71 
     673#: app/models/asset_type.rb:78 
    680674msgid "%d hour" 
    681675msgid_plural "%d hours" 
     
    683677msgstr[1] "%d tuntia" 
    684678 
    685 #: app/models/asset_type.rb:72 
     679#: app/models/asset_type.rb:79 
    686680msgid "%d minute" 
    687681msgid_plural "%d minutes" 
     
    689683msgstr[1] "%d minuuttia" 
    690684 
    691 #: app/models/asset_type.rb:79 
     685#: app/models/asset_type.rb:86 
    692686msgid "and" 
    693687msgstr "ja" 
     
    907901#: app/controllers/work_order_type_controller.rb:28 
    908902#: app/controllers/user_controller.rb:75 
     903#: app/controllers/user_controller.rb:87 
    909904#: app/controllers/asset_type_controller.rb:17 
    910905#: app/controllers/asset_controller.rb:107 
    911 #: app/controllers/asset_controller.rb:212 
     906#: app/controllers/asset_controller.rb:213 
    912907#: app/views/asset/online_help__edit.rhtml:13 
    913908#: app/views/asset/_view_table.rhtml:30 
     
    977972msgstr "lue" 
    978973 
    979 #: app/controllers/work_order_controller.rb:107 
     974#: app/controllers/work_order_controller.rb:106 
    980975msgid "Work order %s (%s)" 
    981976msgstr "TyömÀÀrÀin %s (%s)" 
     
    1001996msgstr "Tuntematon työmÀÀrÀintoiminto!" 
    1002997 
    1003 #: app/controllers/work_order_controller.rb:169 
     998#: app/controllers/work_order_controller.rb:170 
    1004999#: app/controllers/report_controller.rb:131 
    10051000#: app/controllers/asset_controller.rb:170 
    1006 #: app/controllers/asset_controller.rb:222 
     1001#: app/controllers/asset_controller.rb:228 
     1002#: app/controllers/asset_controller.rb:278 
    10071003msgid "edit" 
    10081004msgstr "muokkaa" 
    10091005 
    1010 #: app/controllers/work_order_controller.rb:176 
     1006#: app/controllers/work_order_controller.rb:177 
    10111007msgid "Editing work order #%i (%s)" 
    10121008msgstr "Muokataan työmÀÀrÀintÀ #%i (%s)" 
    10131009 
    1014 #: app/controllers/work_order_controller.rb:184 
    1015 #: lib/localization.rb:149 
    1016 msgid "Changes saved." 
    1017 msgstr "Muutokset tallennettu." 
    1018  
    1019 #: app/controllers/work_order_controller.rb:202 
     1010#: app/controllers/work_order_controller.rb:210 
    10201011msgid "create work order" 
    10211012msgstr "luo työmÀÀrÀin" 
    10221013 
    1023 #: app/controllers/work_order_controller.rb:206 
     1014#: app/controllers/work_order_controller.rb:214 
    10241015msgid "Create new work order" 
    10251016msgstr "Luo uusi työmÀÀrÀin" 
    10261017 
    1027 #: app/controllers/work_order_controller.rb:212 
     1018#: app/controllers/work_order_controller.rb:220 
    10281019msgid "No work order types defined." 
    10291020msgstr "YhtÀÀn työmÀÀrÀintyyppiÀ ei ole mÀÀritelty." 
    10301021 
    1031 #: app/controllers/work_order_controller.rb:231 
     1022#: app/controllers/work_order_controller.rb:239 
    10321023msgid "New work order created" 
    10331024msgstr "Uusi työmÀÀrÀin luotu" 
    10341025 
    1035 #: app/controllers/work_order_controller.rb:245 
     1026#: app/controllers/work_order_controller.rb:253 
    10361027#: app/controllers/report_controller.rb:401 
    10371028#: app/controllers/asset_controller.rb:122 
     
    10421033msgstr "poista" 
    10431034 
    1044 #: app/controllers/work_order_controller.rb:253 
     1035#: app/controllers/work_order_controller.rb:261 
    10451036#: app/controllers/attachment_controller.rb:113 
    10461037#: app/controllers/type_attachment_controller.rb:105 
     
    10481039msgstr "kopioi omalle tietokoneelle" 
    10491040 
    1050 #: app/controllers/work_order_controller.rb:260 
     1041#: app/controllers/work_order_controller.rb:268 
    10511042msgid "Template for work orders not found" 
    10521043msgstr "TyömÀÀrÀinpohjaa ei löytynyt" 
     
    11331124#: app/controllers/type_attachment_controller.rb:27 
    11341125#: app/views/attachment/view.rhtml:38 
    1135 #: app/views/shared/_list_items.rhtml:119 
     1126#: app/views/shared/_list_items.rhtml:130 
    11361127#: app/views/report/view.rhtml:25 
    1137 #: app/views/work_order/view.rhtml:57 
     1128#: app/views/work_order/view.rhtml:62 
    11381129msgid "Download" 
    11391130msgstr "Lataa" 
     
    11441135#: app/controllers/user_controller.rb:26 
    11451136#: app/controllers/user_controller.rb:74 
    1146 #: app/controllers/user_controller.rb:176 
    1147 #: app/controllers/user_controller.rb:221 
     1137#: app/controllers/user_controller.rb:86 
     1138#: app/controllers/user_controller.rb:200 
     1139#: app/controllers/user_controller.rb:245 
    11481140#: app/controllers/asset_type_controller.rb:14 
    11491141#: app/controllers/asset_type_controller.rb:24 
    11501142#: app/controllers/asset_controller.rb:105 
    1151 #: app/controllers/asset_controller.rb:210 
     1143#: app/controllers/asset_controller.rb:211 
    11521144#: app/controllers/asset_field_controller.rb:16 
    11531145#: app/controllers/asset_field_controller.rb:26 
     
    11861178#: app/views/online_help/_index.rhtml:47 
    11871179#: app/views/work_order_type/online_help__general.rhtml:1 
    1188 #: config/menu.rb:105 
     1180#: config/menu.rb:122 
    11891181msgid "Work order types" 
    11901182msgstr "TyömÀÀrÀintyypit" 
     
    12091201#: app/views/online_help/_index.rhtml:32 
    12101202#: app/views/report_type/online_help__general.rhtml:1 
    1211 #: config/menu.rb:87 
    1212 #: config/menu.rb:88 
     1203#: config/menu.rb:99 
     1204#: config/menu.rb:100 
    12131205msgid "Report types" 
    12141206msgstr "Raporttityypit" 
     
    12161208#: app/controllers/report_type_controller.rb:21 
    12171209msgid "Category" 
    1218 msgstr "Luokka" 
     1210msgstr "Kategoria" 
    12191211 
    12201212#: app/controllers/report_type_controller.rb:23 
     
    12271219 
    12281220#: app/controllers/report_type_controller.rb:25 
    1229 #: config/menu.rb:108 
     1221#: config/menu.rb:125 
    12301222msgid "Template" 
    12311223msgstr "Pohja" 
     
    12471239#: app/controllers/report_type_controller.rb:58 
    12481240msgid "No report categories" 
    1249 msgstr "Ei raporttiluokkia" 
     1241msgstr "Ei raporttikategorioita" 
    12501242 
    12511243#: app/controllers/report_type_controller.rb:69 
     
    12701262 
    12711263#: app/controllers/report_type_controller.rb:144 
    1272 #: app/views/report_type/create_step4.rhtml:144 
     1264#: app/views/report_type/create_step4.rhtml:152 
    12731265msgid "Finish" 
    12741266msgstr "Valmis" 
    12751267 
    1276 #: app/controllers/report_type_controller.rb:173 
     1268#: app/controllers/report_type_controller.rb:174 
    12771269msgid "New field group added" 
    12781270msgstr "Uusi kenttÀryhmÀ luotu" 
    12791271 
    1280 #: app/controllers/report_type_controller.rb:176 
    1281 #: app/controllers/report_type_controller.rb:180 
     1272#: app/controllers/report_type_controller.rb:177 
     1273#: app/controllers/report_type_controller.rb:181 
    12821274msgid "Unable to create new field group" 
    12831275msgstr "KenttÀryhmÀn luominen epÀonnistui" 
    12841276 
    1285 #: app/controllers/report_type_controller.rb:190 
     1277#: app/controllers/report_type_controller.rb:191 
    12861278msgid "New enumerated value added" 
    12871279msgstr "Uusi luetteloarvo lisÀtty" 
    12881280 
    1289 #: app/controllers/report_type_controller.rb:193 
    1290 #: app/controllers/report_type_controller.rb:197 
     1281#: app/controllers/report_type_controller.rb:194 
     1282#: app/controllers/report_type_controller.rb:198 
    12911283msgid "Unable to create new enumerated value" 
    12921284msgstr "Uuden luetteloarvon luominen epÀonnistui" 
    12931285 
    1294 #: app/controllers/report_type_controller.rb:209 
     1286#: app/controllers/report_type_controller.rb:210 
    12951287msgid "Enumerated value removed" 
    12961288msgstr "Luetteloarvo poistettu" 
    12971289 
    1298 #: app/controllers/report_type_controller.rb:222 
     1290#: app/controllers/report_type_controller.rb:223 
    12991291msgid "Edit report type" 
    13001292msgstr "Muokkaa raporttityyppiÀ" 
    13011293 
    1302 #: app/controllers/report_type_controller.rb:231 
     1294#: app/controllers/report_type_controller.rb:232 
    13031295msgid "Report type %s modified" 
    13041296msgstr "Raporttityypin %s muutokset tallennettu" 
    13051297 
    1306 #: app/controllers/report_type_controller.rb:234 
     1298#: app/controllers/report_type_controller.rb:235 
    13071299msgid "Unable to save report type" 
    13081300msgstr "Raporttityypin tallentaminen epÀonnistui" 
    13091301 
    1310 #: app/controllers/report_type_controller.rb:264 
     1302#: app/controllers/report_type_controller.rb:265 
    13111303msgid "Change the report template" 
    13121304msgstr "Vaihda raporttipohjaa" 
    13131305 
    1314 #: app/controllers/report_type_controller.rb:273 
     1306#: app/controllers/report_type_controller.rb:274 
    13151307msgid "Report template changed." 
    13161308msgstr "Raporttipohja vaihdettu." 
    13171309 
    1318 #: app/controllers/report_type_controller.rb:283 
     1310#: app/controllers/report_type_controller.rb:284 
    13191311msgid "New report type wizard Step 4 of 4 (%s)" 
    13201312msgstr "Raporttityyppivelho, vaihe 4/4 (%s)" 
    13211313 
    1322 #: app/controllers/report_type_controller.rb:287 
     1314#: app/controllers/report_type_controller.rb:288 
    13231315msgid "Not in a group" 
    13241316msgstr "Ei ryhmÀssÀ" 
     
    13261318#: app/controllers/user_controller.rb:24 
    13271319#: app/views/user/online_help__general_admin.rhtml:1 
    1328 #: config/menu.rb:113 
     1320#: config/menu.rb:74 
    13291321msgid "User accounts" 
    13301322msgstr "KÀyttÀjÀtilit" 
     
    13321324#: app/controllers/user_controller.rb:27 
    13331325#: app/controllers/user_controller.rb:46 
    1334 #: app/controllers/user_controller.rb:177 
    1335 #: app/controllers/user_controller.rb:222 
     1326#: app/controllers/user_controller.rb:201 
     1327#: app/controllers/user_controller.rb:246 
    13361328#: app/views/user/view.rhtml:3 
    13371329#: app/views/user/search.rhtml:4 
    1338 #: app/views/user/login.rhtml:2
     1330#: app/views/user/login.rhtml:3
    13391331msgid "Username" 
    13401332msgstr "KÀyttÀjÀnimi" 
     
    13451337 
    13461338#: app/controllers/user_controller.rb:47 
    1347 #: app/views/user/login.rhtml:2
     1339#: app/views/user/login.rhtml:3
    13481340msgid "Password" 
    13491341msgstr "Salasana" 
     
    13671359#: app/controllers/user_controller.rb:51 
    13681360#: app/controllers/user_controller.rb:66 
    1369 #: app/controllers/user_controller.rb:223 
     1361#: app/controllers/user_controller.rb:247 
    13701362#: app/views/user/view.rhtml:11 
    13711363msgid "Job description" 
     
    13741366#: app/controllers/user_controller.rb:52 
    13751367#: app/controllers/user_controller.rb:67 
    1376 #: app/controllers/user_controller.rb:224 
     1368#: app/controllers/user_controller.rb:248 
    13771369#: app/views/user/view.rhtml:15 
    13781370msgid "Email address" 
     
    13811373#: app/controllers/user_controller.rb:53 
    13821374#: app/controllers/user_controller.rb:68 
    1383 #: app/controllers/user_controller.rb:225 
     1375#: app/controllers/user_controller.rb:249 
    13841376#: app/views/user/view.rhtml:19 
    13851377msgid "Phone number" 
     
    13911383 
    13921384#: app/controllers/user_controller.rb:69 
    1393 #: app/controllers/user_controller.rb:226 
     1385#: app/controllers/user_controller.rb:250 
    13941386msgid "Language" 
    13951387msgstr "Kieli" 
    13961388 
    13971389#: app/controllers/user_controller.rb:78 
    1398 #: app/views/attachment/view.rhtml:37 
    1399 #: app/views/attachment/attach.rhtml:18 
    1400 #: app/views/report/view.rhtml:22 
    1401 #: app/views/report/_creation_form.rhtml:37 
    1402 #: app/views/report/_creation_form.rhtml:40 
    1403 #: app/views/work_order/view.rhtml:54 
    1404 #: app/views/work_order/create.rhtml:46 
    1405 #: config/menu.rb:61 
    1406 msgid "Permissions" 
    1407 msgstr "KÀyttöoikeudet" 
     1390#: app/controllers/action_key_controller.rb:22 
     1391#: app/controllers/keyring_controller.rb:37 
     1392#: app/views/action_key/online_help__general.rhtml:1 
     1393#: app/views/online_help/_index.rhtml:26 
     1394#: config/menu.rb:93 
     1395msgid "Keys" 
     1396msgstr "Avaimet" 
    14081397 
    14091398#: app/controllers/user_controller.rb:79 
     1399#: app/controllers/keyring_controller.rb:38 
     1400msgid "Owners" 
     1401msgstr "Omistajat" 
     1402 
     1403#: app/controllers/user_controller.rb:89 
    14101404#: app/controllers/user_group_controller.rb:34 
    14111405#: app/views/online_help/_index.rhtml:44 
    14121406#: app/views/user/online_help__general.rhtml:1 
    1413 #: config/menu.rb:17 
     1407#: config/menu.rb:14 
    14141408msgid "Users" 
    14151409msgstr "KÀyttÀjÀt" 
    14161410 
    1417 #: app/controllers/user_controller.rb:88 
     1411#: app/controllers/user_controller.rb:97 
    14181412msgid "User information changed" 
    14191413msgstr "KÀyttÀjÀn tiedot muutettu" 
    14201414 
    1421 #: app/controllers/user_controller.rb:91 
     1415#: app/controllers/user_controller.rb:100 
    14221416msgid "Unable to change user information" 
    14231417msgstr "KÀyttÀjÀn tietojen muuttaminen epÀonnistui" 
    14241418 
    1425 #: app/controllers/user_controller.rb:108 
     1419#: app/controllers/user_controller.rb:117 
    14261420msgid "User %s removed from keyrings: %s" 
    14271421msgstr "KÀyttÀjÀ %s poistettu avainrenkaista: %s" 
    14281422 
    1429 #: app/controllers/user_controller.rb:114 
     1423#: app/controllers/user_controller.rb:132 
     1424msgid "User %s removed from user groups: %s" 
     1425msgstr "KÀyttÀjÀ %s poistettu kÀyttÀjÀryhmÀstÀ %s" 
     1426 
     1427#: app/controllers/user_controller.rb:138 
    14301428msgid "Unable to remove user %s, because there are work_orders assigned to this user." 
    14311429msgstr "KÀyttÀjÀn %s poistaminen epÀonnistui, koska hÀnen vastuullaan on vielÀ työmÀÀrÀimiÀ." 
    14321430 
    1433 #: app/controllers/user_controller.rb:122 
     1431#: app/controllers/user_controller.rb:146 
    14341432msgid "Reset password for user account %s" 
    14351433msgstr "Vaihda kÀyttÀjÀtilin %s salasana" 
    14361434 
    1437 #: app/controllers/user_controller.rb:127 
     1435#: app/controllers/user_controller.rb:151 
    14381436msgid "Password reseted" 
    14391437msgstr "Salasana vaihdettu" 
    14401438 
    1441 #: app/controllers/user_controller.rb:131 
     1439#: app/controllers/user_controller.rb:155 
    14421440msgid "Unable to reset password" 
    14431441msgstr "Salasanan vaihtaminen epÀonnistui" 
    14441442 
    1445 #: app/controllers/user_controller.rb:150 
     1443#: app/controllers/user_controller.rb:174 
    14461444msgid "Login unsuccessful" 
    14471445msgstr "SisÀÀnkirjautuminen epÀonnistui" 
    14481446 
    1449 #: app/controllers/user_controller.rb:174 
     1447#: app/controllers/user_controller.rb:198 
    14501448msgid "Search users" 
    14511449msgstr "Etsi kÀyttÀjiÀ" 
    14521450 
    1453 #: app/controllers/user_controller.rb:179 
     1451#: app/controllers/user_controller.rb:203 
    14541452msgid "Display" 
    14551453msgstr "NÀytÀ" 
    14561454 
    1457 #: app/controllers/user_controller.rb:200 
     1455#: app/controllers/user_controller.rb:224 
    14581456msgid "%s's user information" 
    14591457msgstr "KÀyttÀjÀn %s tiedot" 
    14601458 
    1461 #: app/controllers/user_controller.rb:207 
     1459#: app/controllers/user_controller.rb:231 
    14621460msgid "Message sent" 
    14631461msgstr "Viesti lÀhetetty" 
    14641462 
    1465 #: app/controllers/user_controller.rb:218 
    1466 #: config/menu.rb:18 
     1463#: app/controllers/user_controller.rb:242 
     1464#: config/menu.rb:15 
    14671465msgid "My information" 
    14681466msgstr "Omat tiedot" 
    14691467 
    1470 #: app/controllers/user_controller.rb:243 
     1468#: app/controllers/user_controller.rb:267 
    14711469msgid "Your information has been updated" 
    14721470msgstr "Tiedot pÀivitetty" 
    14731471 
    1474 #: app/controllers/user_controller.rb:245 
     1472#: app/controllers/user_controller.rb:269 
    14751473msgid "Unable to update your information" 
    14761474msgstr "Tietojen pÀivittÀminen epÀonnistui" 
    14771475 
    1478 #: app/controllers/user_controller.rb:253 
    1479 #: app/controllers/user_controller.rb:258 
     1476#: app/controllers/user_controller.rb:277 
     1477#: app/controllers/user_controller.rb:282 
    14801478msgid "Change password" 
    14811479msgstr "Vaihda salasana" 
    14821480 
    1483 #: app/controllers/user_controller.rb:266 
     1481#: app/controllers/user_controller.rb:290 
    14841482msgid "Your password has been changed" 
    14851483msgstr "Salasana vaihdettu" 
    14861484 
    1487 #: app/controllers/user_controller.rb:269 
     1485#: app/controllers/user_controller.rb:293 
    14881486msgid "Unable to change your password" 
    14891487msgstr "Salasanan vaihtaminen epÀonnistui" 
    14901488 
    1491 #: app/controllers/user_controller.rb:272 
     1489#: app/controllers/user_controller.rb:296 
    14921490msgid "Invalid password" 
    14931491msgstr "VÀÀrÀ salasana" 
     
    15071505 
    15081506#: app/controllers/asset_type_controller.rb:22 
    1509 #: config/menu.rb:73 
    1510 #: config/menu.rb:74 
     1507#: config/menu.rb:129 
     1508#: config/menu.rb:130 
    15111509msgid "Asset types" 
    15121510msgstr "Kohdetyypit" 
     
    15341532msgstr "Luo uusi kohdetyyppi" 
    15351533 
    1536 #: app/controllers/asset_type_controller.rb:58 
     1534#: app/controllers/asset_type_controller.rb:59 
    15371535msgid "Edit asset type" 
    15381536msgstr "Muokkaa kohdetyyppiÀ" 
     
    15561554 
    15571555#: app/controllers/asset_controller.rb:69 
    1558 #: app/controllers/asset_controller.rb:255 
     1556#: app/controllers/asset_controller.rb:311 
    15591557#: app/controllers/asset_field_controller.rb:17 
    15601558#: app/controllers/asset_field_controller.rb:27 
     
    15671565 
    15681566#: app/controllers/asset_controller.rb:69 
    1569 #: app/controllers/asset_controller.rb:255 
     1567#: app/controllers/asset_controller.rb:311 
    15701568msgid "-- No type --" 
    15711569msgstr "-- Ei tyyppiÀ --" 
     
    15761574 
    15771575#: app/controllers/asset_controller.rb:104 
    1578 #: app/controllers/asset_controller.rb:209 
     1576#: app/controllers/asset_controller.rb:210 
    15791577#: app/views/asset/online_help__edit.rhtml:9 
    15801578#: app/views/asset/_view_table.rhtml:16 
     
    16181616msgstr "Muokkaa kohteen tietoja" 
    16191617 
    1620 #: app/controllers/asset_controller.rb:226 
     1618#: app/controllers/asset_controller.rb:228 
     1619msgid "selected assets in branch %s" 
     1620msgstr "Valitut kohteet haarassa %s" 
     1621 
     1622#: app/controllers/asset_controller.rb:232 
     1623msgid "Change type of all %d selected assets" 
     1624msgstr "Muuta kaikkien %d valitun kohteen tyyppiÀ" 
     1625 
     1626#: app/controllers/asset_controller.rb:282 
    16211627#: config/menu.rb:59 
    16221628msgid "Change type" 
     
    16241630 
    16251631#: app/controllers/system_controller.rb:19 
    1626 #: app/views/layouts/mainlevel.rhtml:262 
     1632#: app/views/layouts/mainlevel.rhtml:274 
    16271633msgid "Version information" 
    16281634msgstr "Versiotiedot" 
     
    16861692 
    16871693#: app/controllers/message_controller.rb:23 
    1688 #: app/views/layouts/mainlevel.rhtml:118 
     1694#: app/views/layouts/mainlevel.rhtml:129 
    16891695msgid "View" 
    16901696msgstr "NÀytÀ" 
     
    17161722msgstr "Tiedot" 
    17171723 
    1718 #: app/controllers/action_key_controller.rb:22 
    1719 #: app/controllers/keyring_controller.rb:37 
    1720 #: app/views/action_key/online_help__general.rhtml:1 
    1721 #: app/views/online_help/_index.rhtml:26 
    1722 #: config/menu.rb:132 
    1723 msgid "Keys" 
    1724 msgstr "Avaimet" 
    1725  
    17261724#: app/controllers/action_key_controller.rb:30 
    17271725msgid "Create a new key" 
     
    18811879#: app/views/user_group/online_help__general.rhtml:1 
    18821880#: app/views/online_help/_index.rhtml:41 
    1883 #: config/menu.rb:119 
     1881#: app/views/user/edit.rhtml:36 
     1882#: config/menu.rb:80 
    18841883msgid "User groups" 
    18851884msgstr "KÀyttÀjÀryhmÀt" 
     
    19201919#: app/views/attachment/attach.rhtml:21 
    19211920#: app/views/asset_tree/_asset_tree.rhtml:46 
    1922 #: app/views/shared/_create_or_edit.rhtml:41 
     1921#: app/views/shared/_create_or_edit.rhtml:44 
    19231922#: app/views/shared/_select.rhtml:21 
    19241923#: app/views/report/_creation_form.rhtml:37 
     
    19281927#: app/views/report_type/create_step1.rhtml:15 
    19291928#: app/views/report_type/create_step2.rhtml:18 
    1930 #: app/views/report_type/create_step4.rhtml:144 
     1929#: app/views/report_type/create_step4.rhtml:152 
    19311930#: app/views/report_type/edit.rhtml:51 
    1932 #: app/views/work_order/view.rhtml:36 
     1931#: app/views/work_order/view.rhtml:39 
    19331932#: app/views/work_order/create.rhtml:50 
    19341933#: app/views/work_order/edit.rhtml:6 
     
    20492048#: app/views/online_help/_index.rhtml:29 
    20502049#: app/views/report_category/online_help__general.rhtml:1 
    2051 #: config/menu.rb:98 
     2050#: config/menu.rb:115 
    20522051msgid "Report categories" 
    2053 msgstr "Raporttiluokat" 
     2052msgstr "Raporttikategoriat" 
    20542053 
    20552054#: app/controllers/report_category_controller.rb:27 
     
    20592058#: app/controllers/report_category_controller.rb:35 
    20602059msgid "Create a new report category" 
    2061 msgstr "Luo uusi raporttiluokka" 
     2060msgstr "Luo uusi raporttikategoria" 
    20622061 
    20632062#: app/controllers/report_category_controller.rb:43 
    20642063msgid "Edit report category" 
    2065 msgstr "Muokkaa raporttiluokkaa" 
     2064msgstr "Muokkaa raporttikategoriaa" 
    20662065 
    20672066#: app/controllers/report_category_controller.rb:75 
     
    20772076#: app/views/keyring/online_help__general.rhtml:1 
    20782077#: app/views/user/edit.rhtml:27 
    2079 #: config/menu.rb:125 
     2078#: config/menu.rb:86 
    20802079msgid "Keyrings" 
    20812080msgstr "Avainrenkaat" 
    2082  
    2083 #: app/controllers/keyring_controller.rb:38 
    2084 msgid "Owners" 
    2085 msgstr "Omistajat" 
    20862081 
    20872082#: app/controllers/keyring_controller.rb:46 
     
    21252120msgstr "Avainrengas %s poistettu %d kÀyttÀjÀltÀ" 
    21262121 
    2127 #: app/views/asset/view.rhtml:6 
     2122#: app/views/asset/view.rhtml:7 
    21282123msgid "Condition monitor" 
    21292124msgstr "Tilan valvonta" 
     
    23042299#: app/views/report/_creation_form.rhtml:45 
    23052300#: app/views/report_type/edit.rhtml:51 
    2306 #: app/views/work_order/view.rhtml:36 
     2301#: app/views/work_order/view.rhtml:39 
    23072302#: app/views/work_order/edit.rhtml:5 
    23082303#: app/views/user/reset_password.rhtml:14 
     
    24362431msgstr "SisÀltötyyppi" 
    24372432 
     2433#: app/views/attachment/view.rhtml:37 
     2434#: app/views/attachment/attach.rhtml:18 
     2435#: app/views/report/view.rhtml:22 
     2436#: app/views/report/_creation_form.rhtml:37 
     2437#: app/views/report/_creation_form.rhtml:40 
     2438#: app/views/work_order/view.rhtml:59 
     2439#: app/views/work_order/create.rhtml:46 
     2440#: config/menu.rb:61 
     2441msgid "Permissions" 
     2442msgstr "KÀyttöoikeudet" 
     2443 
    24382444#: app/views/attachment/attach.rhtml:1 
    24392445msgid "The maximum size for an attachment is %3.1f MiB." 
     
    25382544#: app/views/user/search.rhtml:8 
    25392545#: app/views/user/search.rhtml:21 
    2540 #: config/menu.rb:20 
     2546#: config/menu.rb:17 
    25412547#: config/menu.rb:39 
    25422548msgid "Search" 
     
    25612567#: app/views/asset_tree/_asset_tree.rhtml:38 
    25622568#: app/views/report_type/create_step4.rhtml:32 
    2563 #: app/views/report_type/create_step4.rhtml:136 
     2569#: app/views/report_type/create_step4.rhtml:144 
    25642570#: app/views/work_order/list.rhtml:12 
    25652571msgid "Update" 
     
    25742580msgstr "SiirrÀ" 
    25752581 
    2576 #: app/views/asset_tree/_asset_types.rhtml:18 
     2582#: app/views/asset_tree/_asset_types.rhtml:17 
    25772583msgid "No assets selected" 
    25782584msgstr "Ei kohteita valittuna" 
    25792585 
    2580 #: app/views/asset_tree/_asset_types.rhtml:34 
     2586#: app/views/asset_tree/_asset_types.rhtml:33 
    25812587msgid "Typeless assets" 
    25822588msgstr "TyypittömÀt kohteet" 
     
    25902596msgstr "NykyistÀ sivua ei löytynyt valikosta!" 
    25912597 
    2592 #: app/views/layouts/mainlevel.rhtml:69 
     2598#: app/views/layouts/mainlevel.rhtml:80 
    25932599msgid "Logged in as" 
    25942600msgstr "Kirjauduttu tunnuksella" 
    25952601 
    2596 #: app/views/layouts/mainlevel.rhtml:71 
     2602#: app/views/layouts/mainlevel.rhtml:82 
    25972603msgid "logout" 
    25982604msgstr "kirjaudu ulos" 
    25992605 
    2600 #: app/views/layouts/mainlevel.rhtml:101 
     2606#: app/views/layouts/mainlevel.rhtml:112 
    26012607msgid "Selected branch:" 
    26022608msgstr "Valittu haara:" 
    26032609 
    2604 #: app/views/layouts/mainlevel.rhtml:104 
     2610#: app/views/layouts/mainlevel.rhtml:115 
    26052611msgid "Selected asset type:" 
    26062612msgstr "Valittu kohdetyyppi:" 
    26072613 
    2608 #: app/views/layouts/mainlevel.rhtml:108 
     2614#: app/views/layouts/mainlevel.rhtml:119 
    26092615msgid "Selected asset:" 
    26102616msgstr "Valittu kohde:" 
    26112617 
    2612 #: app/views/layouts/mainlevel.rhtml:145 
    2613 #: app/views/layouts/mainlevel.rhtml:149 
     2618#: app/views/layouts/mainlevel.rhtml:157 
     2619#: app/views/layouts/mainlevel.rhtml:161 
    26142620msgid "Show asset tree" 
    26152621msgstr "NÀytÀ kohdepuu" 
    26162622 
    2617 #: app/views/layouts/mainlevel.rhtml:160 
    2618 #: app/views/layouts/mainlevel.rhtml:164 
     2623#: app/views/layouts/mainlevel.rhtml:172 
     2624#: app/views/layouts/mainlevel.rhtml:176 
    26192625msgid "Hide asset tree" 
    26202626msgstr "Piilota kohdepuu" 
    26212627 
    2622 #: app/views/layouts/mainlevel.rhtml:190 
     2628#: app/views/layouts/mainlevel.rhtml:202 
    26232629msgid "Help" 
    26242630msgstr "Ohje" 
    26252631 
    2626 #: app/views/layouts/mainlevel.rhtml:241 
     2632#: app/views/layouts/mainlevel.rhtml:253 
    26272633msgid "You have a new message" 
    26282634msgstr "Sinulle on uusi viesti" 
    26292635 
    2630 #: app/views/layouts/mainlevel.rhtml:243 
     2636#: app/views/layouts/mainlevel.rhtml:255 
    26312637msgid "You have %i new messages" 
    26322638msgstr "Sinulle on %i uutta viestiÀ" 
     
    26512657#: config/menu.rb:46 
    26522658#: config/menu.rb:76 
    2653 #: config/menu.rb:84 
    2654 #: config/menu.rb:90 
    2655 #: config/menu.rb:101 
    2656 #: config/menu.rb:107 
    2657 #: config/menu.rb:115 
    2658 #: config/menu.rb:121 
    2659 #: config/menu.rb:127 
    2660 #: config/menu.rb:134 
     2659#: config/menu.rb:82 
     2660#: config/menu.rb:88 
     2661#: config/menu.rb:95 
     2662#: config/menu.rb:102 
     2663#: config/menu.rb:118 
     2664#: config/menu.rb:124 
     2665#: config/menu.rb:132 
     2666#: config/menu.rb:140 
    26612667msgid "Create" 
    26622668msgstr "Luo" 
    26632669 
    2664 #: app/views/shared/_list_items.rhtml:26 
     2670#: app/views/shared/_list_items.rhtml:37 
    26652671msgid "This list is empty." 
    26662672msgstr "TÀmÀ lista on tyhjÀ." 
    26672673 
    2668 #: app/views/shared/_list_items.rhtml:38 
     2674#: app/views/shared/_list_items.rhtml:49 
    26692675msgid "Page:" 
    26702676msgstr "Sivu:" 
    26712677 
    2672 #: app/views/shared/_list_items.rhtml:63 
     2678#: app/views/shared/_list_items.rhtml:74 
    26732679#: app/views/work_order/view.rhtml:12 
    26742680msgid "Actions" 
    26752681msgstr "Toiminnot" 
    26762682 
    2677 #: app/views/shared/_list_items.rhtml:131 
     2683#: app/views/shared/_list_items.rhtml:142 
    26782684msgid "No" 
    26792685msgstr "Ei" 
    26802686 
    2681 #: app/views/shared/_list_items.rhtml:133 
     2687#: app/views/shared/_list_items.rhtml:144 
    26822688#: app/views/report/remove.rhtml:5 
    26832689msgid "Yes" 
    26842690msgstr "KyllÀ" 
    26852691 
    2686 #: app/views/shared/_list_items.rhtml:180 
     2692#: app/views/shared/_list_items.rhtml:192 
    26872693msgid "%s selected" 
    26882694msgstr "%s valitut" 
     
    27292735 
    27302736#: app/views/timeline/_display_event.rhtml:14 
    2731 #: app/views/timeline/_display_event.rhtml:35 
    2732 #: app/views/work_order/_display_work_order_event.rhtml:5 
     2737#: app/views/timeline/_display_event.rhtml:37 
     2738#: app/views/work_order/_display_work_order_event.rhtml:7 
    27332739msgid "Created by %s" 
    27342740msgstr "Luotu kÀyttÀjÀn %s toimesta" 
    27352741 
    27362742#: app/views/timeline/_display_event.rhtml:16 
    2737 #: app/views/work_order/_display_work_order_event.rhtml:7 
     2743#: app/views/work_order/_display_work_order_event.rhtml:9 
    27382744msgid "Closed by %s" 
    27392745msgstr "Suljettu kÀyttÀjÀn %s toimesta" 
     
    27442750 
    27452751#: app/views/timeline/_display_event.rhtml:20 
    2746 #: app/views/work_order/_display_work_order_event.rhtml:11 
     2752#: app/views/work_order/_display_work_order_event.rhtml:13 
    27472753msgid "Accepted by %s" 
    27482754msgstr "HyvÀksytty kÀyttÀjÀn %s toimesta" 
    27492755 
    27502756#: app/views/timeline/_display_event.rhtml:22 
    2751 #: app/views/work_order/_display_work_order_event.rhtml:13 
     2757#: app/views/work_order/_display_work_order_event.rhtml:15 
    27522758msgid "Reopened by %s" 
    27532759msgstr "Avattu uudestaan kÀyttÀjÀn %s toimesta" 
    27542760 
    2755 #: app/views/timeline/_display_event.rhtml:37 
     2761#: app/views/timeline/_display_event.rhtml:24 
     2762#: app/views/work_order/_display_work_order_event.rhtml:17 
     2763msgid "Comment added by %s" 
     2764msgstr "Kommentti lisÀtty kÀyttÀjÀn %s toimesta" 
     2765 
     2766#: app/views/timeline/_display_event.rhtml:39 
    27562767msgid "Modified by %s" 
    27572768msgstr "Muokattu kÀyttÀjÀn %s toimesta" 
    27582769 
    2759 #: app/views/timeline/_display_event.rhtml:50 
     2770#: app/views/timeline/_display_event.rhtml:52 
    27602771msgid "Uploaded by %s" 
    27612772msgstr "Ladattu kÀyttÀjÀn %s toimesta" 
     
    27752786#: app/views/report_category/view_as_tree.rhtml:2 
    27762787msgid "No report categories defined" 
    2777 msgstr "YhtÀÀn raporttiluokkaa ei ole mÀÀritelty." 
     2788msgstr "YhtÀÀn raporttikategoriaa ei ole mÀÀritelty." 
    27782789 
    27792790#: app/views/report_category/online_help__general.rhtml:5 
     
    28522863#: app/views/report/_creation_form.rhtml:37 
    28532864#: app/views/report/_creation_form.rhtml:43 
    2854 #: app/views/work_order/view.rhtml:64 
     2865#: app/views/work_order/view.rhtml:69 
    28552866msgid "Create report" 
    28562867msgstr "Luo raportti" 
     
    30033014msgstr "Ei voi olla tyhjÀ" 
    30043015 
    3005 #: app/views/report_type/create_step4.rhtml:140 
     3016#: app/views/report_type/create_step4.rhtml:148 
    30063017#: app/views/report_type/edit.rhtml:12 
    30073018msgid "Reports can be edited" 
    30083019msgstr "Raporttien muokkaaminen sallittu" 
    30093020 
    3010 #: app/views/report_type/create_step4.rhtml:143 
     3021#: app/views/report_type/create_step4.rhtml:151 
    30113022msgid "Preview" 
    30123023msgstr "Esikatselu" 
     
    30683079msgstr "Avaa työmÀÀrÀin uudestaan" 
    30693080 
    3070 #: app/views/work_order/view.rhtml:40 
     3081#: app/views/work_order/view.rhtml:36 
     3082msgid "Comments" 
     3083msgstr "Kommentit" 
     3084 
     3085#: app/views/work_order/view.rhtml:44 
    30713086msgid "Change history" 
    30723087msgstr "