Changeset 1097

Show
Ignore:
Timestamp:
2008-07-07 09:30:26 (6 months ago)
Author:
gaspard
Message:

Fixed bugs/tests after last code change. Should be sane.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/gettext_strings.rb

    r1094 r1097  
    100100    N_('news_date')         # calendar day (event list view) 
    101101     
    102     N_('mon') 
    103     N_('tue') 
    104     N_('wed') 
    105     N_('thu') 
    106     N_('fri') 
    107     N_('sat') 
    108     N_('sun') 
     102    N_('Mon') 
     103    N_('Tue') 
     104    N_('Wed') 
     105    N_('Thu') 
     106    N_('Fri') 
     107    N_('Sat') 
     108    N_('Sun') 
    109109     
    110110    N_('January') 
    …… 
    121121    N_('December') 
    122122     
     123    N_('Jan') 
     124    N_('Feb') 
     125    N_('Mar') 
     126    N_('Apr') 
     127    N_('May') 
     128    N_('Jun') 
     129    N_('Jul') 
     130    N_('Aug') 
     131    N_('Sep') 
     132    N_('Oct') 
     133    N_('Nov') 
     134    N_('Dec') 
     135     
    123136    N_('User name:')  # login form 
    124137    N_('Password:')   # login form 

  • trunk/lib/multiversion.rb

    r1095 r1097  
    356356              # md5 on content 
    357357              res[k] = v unless Digest::MD5.hexdigest(current_value.read) == Digest::MD5.hexdigest(v.read) 
     358              v.rewind 
    358359              errors.clear # 'c_file' does an unparse_assets which can create errors. 
    359360            else 
    …… 
    433434          redaction_attr = false 
    434435          node_attr      = false 
    435  
     436           
    436437          attributes.each do |k,v| 
    437438            next if k.to_s == 'id' # just ignore 'id' (cannot be set but is often around) 
    …… 
    447448            return false unless edit!(nil, publish_after_save) 
    448449          end 
    449  
     450           
    450451          if node_attr 
    451452            # super class call (original rails update_attributes) 
    …… 
    496497          redit = false 
    497498          if new_record? 
     499            @redaction = version 
     500          elsif version.lang == lang && version.status == Zena::Status[:red] && version.user_id == visitor[:id] 
    498501            @redaction = version 
    499502          else 

  • trunk/lib/parser/lib/rules/zena.rb

    r1096 r1097  
    670670      text = @params[:text] ? @params[:text].inspect : "#{node_attribute('v_text')}" 
    671671      limit  = @params[:limit] ? ", :limit=>#{@params[:limit].to_i}" : "" 
    672       out "<div id='v_text#{erb_node_id}' class='zazen'>" 
     672      @html_tag_params[:id] =  "v_text#{erb_node_id}" 
     673      if c = @html_tag_params[:class] || @params[:class] 
     674        @html_tag_params[:class] = "#{c} zazen" 
     675      else 
     676        @html_tag_params[:class] = 'zazen' 
     677      end 
    673678      unless @params[:empty] == 'true' 
    674679        out "<% if #{node}.kind_of?(TextDocument); l = #{node}.content_lang -%>" 
    …… 
    677682        out "<%= zazen(#{text}#{limit}, :node=>#{node}) %>" 
    678683        out "<% end -%>" 
    679       end 
    680       out "</div>" 
     684      else 
     685        out '' 
     686      end 
    681687    end 
    682688     

  • trunk/po/en/zena.po

    r1094 r1097  
    22msgstr "" 
    33"Project-Id-Version: 0.9.0\n" 
    4 "POT-Creation-Date: 2008-07-02 08:12-0000\n" 
     4"POT-Creation-Date: 2008-07-04 18:23-0000\n" 
    55"PO-Revision-Date: 2008-07-02 10:14+0100\n" 
    66"Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n" 
    …… 
    1414"X-Poedit-Basepath: /Users/gaspard/svk/zena\n" 
    1515 
    16 #: app/controllers/application.rb:483 
     16#: app/controllers/application.rb:512 
    1717msgid "Please log in" 
    1818msgstr "Please log in." 
    …… 
    3636msgstr "" 
    3737 
    38 #: app/controllers/nodes_controller.rb:193 
     38#: app/controllers/nodes_controller.rb:194 
    3939msgid "Backup created." 
    4040msgstr "" 
    4141 
    42 #: app/controllers/nodes_controller.rb:195 
     42#: app/controllers/nodes_controller.rb:196 
    4343msgid "Could not create backup." 
    4444msgstr "" 
    4545 
    46 #: app/controllers/nodes_controller.rb:209 
     46#: app/controllers/nodes_controller.rb:216 
    4747msgid "node updated" 
    4848msgstr "Node successfully updated." 
    4949 
    50 #: app/controllers/nodes_controller.rb:211 
     50#: app/controllers/nodes_controller.rb:218 
    5151msgid "could not update" 
    5252msgstr "The node could not be updated." 
    5353 
    54 #: app/controllers/nodes_controller.rb:251 
     54#: app/controllers/nodes_controller.rb:258 
    5555msgid "node not found" 
    5656msgstr "Node not found." 
    5757 
    58 #: app/controllers/nodes_controller.rb:275 
     58#: app/controllers/nodes_controller.rb:282 
    5959msgid "Order updated" 
    6060msgstr "Order updated." 
    6161 
    62 #: app/controllers/nodes_controller.rb:277 
     62#: app/controllers/nodes_controller.rb:284 
    6363msgid "Could not update order." 
    6464msgstr "" 
    6565 
    66 #: app/controllers/nodes_controller.rb:294 
     66#: app/controllers/nodes_controller.rb:301 
    6767#, fuzzy 
    6868msgid "Could not clear order." 
    …… 
    118118msgstr "" 
    119119 
    120 #: app/helpers/application_helper.rb:207 
    121 #: app/views/users/_form.rhtml:17 
     120#: app/helpers/application_helper.rb:211 app/views/users/_form.rhtml:17 
    122121#: app/views/users/preferences.html.erb:13 
    123122msgid "login" 
    124123msgstr "" 
    125124 
    126 #: app/helpers/application_helper.rb:221 
     125#: app/helpers/application_helper.rb:225 
    127126msgid "long_time" 
    128127msgstr "%H:%M:%S" 
    129128 
    130 #: app/helpers/application_helper.rb:226 
     129#: app/helpers/application_helper.rb:230 
    131130msgid "short_time" 
    132131msgstr "%H:%M" 
    133132 
    134 #: app/helpers/application_helper.rb:231 
     133#: app/helpers/application_helper.rb:235 
    135134msgid "full_date" 
    136135msgstr "%A, %B %d %Y" 
    137136 
    138 #: app/helpers/application_helper.rb:236 
     137#: app/helpers/application_helper.rb:240 
    139138msgid "long_date" 
    140139msgstr "%Y-%m-%d" 
    141140 
    142 #: app/helpers/application_helper.rb:241 
     141#: app/helpers/application_helper.rb:245 
    143142msgid "short_date" 
    144143msgstr "%m.%d" 
    145144 
    146 #: app/helpers/application_helper.rb:652 
    147 #: lib/gettext_strings.rb:68 
     145#: app/helpers/application_helper.rb:656 lib/gettext_strings.rb:68 
    148146msgid "%{type} node" 
    149147msgstr "" 
    150148 
    151 #: app/helpers/application_helper.rb:664 
    152 #: lib/gettext_strings.rb:67 
     149#: app/helpers/application_helper.rb:668 lib/gettext_strings.rb:67 
    153150msgid "%{ext} document" 
    154151msgstr "" 
    155152 
    156 #: app/helpers/application_helper.rb:668 
     153#: app/helpers/application_helper.rb:672 
    157154msgid "%{ext} node" 
    158155msgstr "" 
    159156 
    160 #: app/helpers/application_helper.rb:735 
    161 #: app/helpers/application_helper.rb:751 
     157#: app/helpers/application_helper.rb:739 app/helpers/application_helper.rb:755 
    162158msgid "week_start_day" 
    163159msgstr "0" 
    164160 
    165 #: app/helpers/application_helper.rb:943 
    166 #: lib/gettext_strings.rb:41 
     161#: app/helpers/application_helper.rb:947 lib/gettext_strings.rb:41 
    167162msgid "img_private" 
    168163msgstr "<img src='/images/lock.png' alt='private'/>" 
    169164 
    170 #: app/helpers/application_helper.rb:945 
    171 #: lib/gettext_strings.rb:40 
     165#: app/helpers/application_helper.rb:949 lib/gettext_strings.rb:40 
    172166msgid "img_public" 
    173167msgstr "<img src='/images/user_pub.png' alt='public'/>" 
    174168 
    175 #: app/helpers/application_helper.rb:983 
     169#: app/helpers/application_helper.rb:987 
    176170msgid "btn_edit" 
    177171msgstr "<img src='/images/page_edit.png' alt='edit'/>" 
    178172 
    179 #: app/helpers/application_helper.rb:988 
     173#: app/helpers/application_helper.rb:992 
    180174msgid "btn_drive" 
    181175msgstr "<img src='/images/wrench.png' alt='drive'/>" 
    182176 
    183 #: app/helpers/application_helper.rb:1019 
    184 #: app/helpers/application_helper.rb:1031 
     177#: app/helpers/application_helper.rb:1023 
     178#: app/helpers/application_helper.rb:1035 
    185179msgid "btn_view" 
    186180msgstr "<img src='/images/eye.png' alt='view'/>\"" 
    187181 
    188 #: app/helpers/application_helper.rb:1034 
     182#: app/helpers/application_helper.rb:1038 
    189183msgid "img_open" 
    190184msgstr "<img src='/images/lock_open.png' alt='open'/>" 
    191185 
    192 #: app/helpers/application_helper.rb:1034 
     186#: app/helpers/application_helper.rb:1038 
    193187msgid "btn_title_close_discussion" 
    194188msgstr "Close the discussion." 
    195189 
    196 #: app/helpers/application_helper.rb:1036 
     190#: app/helpers/application_helper.rb:1040 
    197191msgid "img_closed" 
    198192msgstr "<img src='/images/lock.png' alt='closed'/>" 
    199193 
    200 #: app/helpers/application_helper.rb:1036 
     194#: app/helpers/application_helper.rb:1040 
    201195msgid "btn_title_open_open_discussion" 
    202196msgstr "Open the discussion." 
    203197 
    204 #: app/helpers/application_helper.rb:1039 
    205 #: app/views/comments/_li.rhtml:3 
     198#: app/helpers/application_helper.rb:1043 app/views/comments/_li.rhtml:3 
    206199msgid "btn_remove" 
    207200msgstr "<img src='/images/delete.png' alt='delete'/>" 
    208201 
    209 #: app/helpers/application_helper.rb:1039 
     202#: app/helpers/application_helper.rb:1043 
    210203msgid "btn_title_destroy_discussion" 
    211204msgstr "Delete all the discussion." 
    212205 
    213 #: app/helpers/application_helper.rb:1150 
     206#: app/helpers/application_helper.rb:1154 
    214207msgid "my home" 
    215208msgstr "management" 
    216209 
    217 #: app/helpers/application_helper.rb:1153 
     210#: app/helpers/application_helper.rb:1157 
    218211#: app/views/users/preferences.html.erb:1 
    219212msgid "preferences" 
    220213msgstr "" 
    221214 
    222 #: app/helpers/application_helper.rb:1156 
    223 #: app/views/comments/index.rhtml:1 
     215#: app/helpers/application_helper.rb:1160 app/views/comments/index.rhtml:1 
    224216msgid "manage comments" 
    225217msgstr "" 
    226218 
    227 #: app/helpers/application_helper.rb:1159 
    228 #: app/views/users/index.rhtml:1 
     219#: app/helpers/application_helper.rb:1163 app/views/users/index.rhtml:1 
    229220msgid "manage users" 
    230221msgstr "" 
    231222 
    232 #: app/helpers/application_helper.rb:1162 
    233 #: app/views/groups/index.rhtml:1 
     223#: app/helpers/application_helper.rb:1166 app/views/groups/index.rhtml:1 
    234224msgid "manage groups" 
    235225msgstr "" 
    236226 
    237 #: app/helpers/application_helper.rb:1165 
    238 #: app/views/relations/index.erb:1 
     227#: app/helpers/application_helper.rb:1169 app/views/relations/index.erb:1 
    239228msgid "manage relations" 
    240229msgstr "" 
    241230 
    242 #: app/helpers/application_helper.rb:1168 
    243 #: app/views/iformats/index.rhtml:1 
     231#: app/helpers/application_helper.rb:1172 app/views/iformats/index.rhtml:1 
    244232#: app/views/virtual_classes/index.erb:1 
    245233msgid "manage classes" 
    246234msgstr "" 
    247235 
    248 #: app/helpers/application_helper.rb:1171 
     236#: app/helpers/application_helper.rb:1175 
    249237msgid "image formats" 
    250238msgstr "" 
    251239 
    252 #: app/helpers/application_helper.rb:1174 
    253 #: app/views/sites/index.erb:1 
     240#: app/helpers/application_helper.rb:1178 app/views/sites/index.erb:1 
    254241msgid "manage sites" 
    255242msgstr "" 
    256243 
    257 #: app/helpers/application_helper.rb:1178 
     244#: app/helpers/application_helper.rb:1182 
    258245msgid "turn dev off" 
    259246msgstr "<img src='/images/bug.png'/> turn dev off" 
    260247 
    261 #: app/helpers/application_helper.rb:1180 
     248#: app/helpers/application_helper.rb:1184 
    262249msgid "turn dev on" 
    263250msgstr "" 
    …… 
    271258msgstr "" 
    272259 
    273 #: app/models/access_hits.rb:- 
    274 #: app/models/cache.rb:- 
    275 #: app/models/cached_page.rb:- 
    276 #: app/models/comment.rb:- 
    277 #: app/models/contact_content.rb:- 
    278 #: app/models/data_entry.rb:- 
    279 #: app/models/discussion.rb:- 
    280 #: app/models/document_content.rb:- 
    281 #: app/models/group.rb:- 
    282 #: app/models/iformat.rb:- 
    283 #: app/models/node.rb:- 
    284 #: app/models/participation.rb:- 
    285 #: app/models/relation.rb:- 
    286 #: app/models/template_content.rb:- 
    287 #: app/models/version.rb:- 
     260#: app/models/access_hits.rb:- app/models/cache.rb:- 
     261#: app/models/cached_page.rb:- app/models/comment.rb:- 
     262#: app/models/contact_content.rb:- app/models/data_entry.rb:- 
     263#: app/models/discussion.rb:- app/models/document_content.rb:- 
     264#: app/models/group.rb:- app/models/iformat.rb:- app/models/node.rb:- 
     265#: app/models/participation.rb:- app/models/relation.rb:- 
     266#: app/models/template_content.rb:- app/models/version.rb:- 
    288267#: app/models/virtual_class.rb:- 
    289268msgid "Site" 
    290269msgstr "" 
    291270 
    292 #: app/models/access_hits.rb:- 
    293 #: app/models/cached_page.rb:- 
    294 #: app/models/discussion.rb:- 
    295 #: app/models/template_content.rb:- 
     271#: app/models/access_hits.rb:- app/models/cached_page.rb:- 
     272#: app/models/discussion.rb:- app/models/template_content.rb:- 
    296273#: app/models/version.rb:- 
    297274msgid "Node" 
    …… 
    310287msgstr "" 
    311288 
    312 #: app/models/access_hits.rb:- 
    313 #: app/models/comment.rb:- 
    314 #: app/models/link.rb:- 
    315 #: app/models/participation.rb:- 
    316 #: app/models/version.rb:- 
     289#: app/models/access_hits.rb:- app/models/comment.rb:- app/models/link.rb:- 
     290#: app/models/participation.rb:- app/models/version.rb:- 
    317291msgid "Status" 
    318292msgstr "" 
    …… 
    342316msgstr "" 
    343317 
    344 #: app/models/access_hits.rb:- 
    345 #: app/models/template_content.rb:- 
     318#: app/models/access_hits.rb:- app/models/template_content.rb:- 
    346319msgid "Mode" 
    347320msgstr "" 
    348321 
    349 #: app/models/access_hits.rb:- 
    350 #: app/models/template_content.rb:- 
     322#: app/models/access_hits.rb:- app/models/template_content.rb:- 
    351323msgid "Format" 
    352324msgstr "" 
    353325 
    354 #: app/models/access_hits.rb:- 
    355 #: app/models/discussion.rb:- 
    356 #: app/models/user.rb:- 
     326#: app/models/access_hits.rb:- app/models/discussion.rb:- app/models/user.rb:- 
    357327#: app/models/version.rb:- 
    358328msgid "Lang" 
    …… 
    367337msgstr "" 
    368338 
    369 #: app/models/cache.rb:- 
    370 #: app/models/comment.rb:- 
    371 #: app/models/contact_content.rb:- 
    372 #: app/models/data_entry.rb:- 
    373 #: app/models/discussion.rb:- 
    374 #: app/models/group.rb:- 
    375 #: app/models/iformat.rb:- 
    376 #: app/models/node.rb:- 
    377 #: app/models/user.rb:- 
    378 #: app/models/version.rb:- 
     339#: app/models/cache.rb:- app/models/comment.rb:- 
     340#: app/models/contact_content.rb:- app/models/data_entry.rb:- 
     341#: app/models/discussion.rb:- app/models/group.rb:- app/models/iformat.rb:- 
     342#: app/models/node.rb:- app/models/user.rb:- app/models/version.rb:- 
    379343msgid "Updated at" 
    380344msgstr "" 
    …… 
    388352msgstr "" 
    389353 
    390 #: app/models/cache.rb:- 
    391 #: app/models/node.rb:- 
    392 #: app/models/virtual_class.rb:- 
     354#: app/models/cache.rb:- app/models/node.rb:- app/models/virtual_class.rb:- 
    393355msgid "Kpath" 
    394356msgstr "" 
    …… 
    398360msgstr "" 
    399361 
    400 #: app/models/cache.rb:- 
    401 #: app/models/version.rb:- 
     362#: app/models/cache.rb:- app/models/version.rb:- 
    402363msgid "Content" 
    403364msgstr "" 
    …… 
    415376msgstr "" 
    416377 
    417 #: app/models/cached_page.rb:- 
    418 #: app/models/comment.rb:- 
    419 #: app/models/contact_content.rb:- 
    420 #: app/models/data_entry.rb:- 
    421 #: app/models/discussion.rb:- 
    422 #: app/models/group.rb:- 
    423 #: app/models/iformat.rb:- 
    424 #: app/models/node.rb:- 
    425 #: app/models/user.rb:- 
    426 #: app/models/version.rb:- 
     378#: app/models/cached_page.rb:- app/models/comment.rb:- 
     379#: app/models/contact_content.rb:- app/models/data_entry.rb:- 
     380#: app/models/discussion.rb:- app/models/group.rb:- app/models/iformat.rb:- 
     381#: app/models/node.rb:- app/models/user.rb:- app/models/version.rb:- 
    427382msgid "Created at" 
    428383msgstr "" 
    429384 
    430 #: app/models/comment.rb:- 
    431 #: app/views/links/_form.rhtml:33 
     385#: app/models/comment.rb:- app/views/links/_form.rhtml:33 
    432386#: app/views/templates/edit_tabs/_title.rhtml:16 
    433387msgid "comment" 
    …… 
    443397msgstr "" 
    444398 
    445 #: app/models/comment.rb:- 
    446 #: app/models/data_entry.rb:- 
    447 #: app/models/node.rb:- 
    448 #: app/models/participation.rb:- 
    449 #: app/models/version.rb:- 
     399#: app/models/comment.rb:- app/models/data_entry.rb:- app/models/node.rb:- 
     400#: app/models/participation.rb:- app/models/version.rb:- 
    450401msgid "User" 
    451402msgstr "" 
    452403 
    453 #: app/models/comment.rb:- 
    454 #: app/models/version.rb:- 
     404#: app/models/comment.rb:- app/models/version.rb:- 
    455405msgid "Title" 
    456406msgstr "" 
    457407 
    458 #: app/models/comment.rb:- 
    459 #: app/models/data_entry.rb:- 
    460 #: app/models/version.rb:- 
     408#: app/models/comment.rb:- app/models/data_entry.rb:- app/models/version.rb:- 
    461409msgid "Text" 
    462410msgstr "" 
    …… 
    478426msgstr "" 
    479427 
    480 #: app/models/contact_content.rb:- 
    481 #: app/models/document_content.rb:- 
     428#: app/models/contact_content.rb:- app/models/document_content.rb:- 
    482429msgid "Version" 
    483430msgstr "" 
    484431 
    485 #: app/models/contact_content.rb:- 
    486 #: app/models/user.rb:- 
     432#: app/models/contact_content.rb:- app/models/user.rb:- 
    487433msgid "First name" 
    488434msgstr "" 
    489435 
    490 #: app/models/contact_content.rb:- 
    491 #: app/models/document_content.rb:- 
    492 #: app/models/group.rb:- 
    493 #: app/models/iformat.rb:- 
    494 #: app/models/node.rb:- 
    495 #: app/models/site.rb:- 
    496 #: app/models/user.rb:- 
    497 #: app/models/virtual_class.rb:- 
     436#: app/models/contact_content.rb:- app/models/document_content.rb:- 
     437#: app/models/group.rb:- app/models/iformat.rb:- app/models/node.rb:- 
     438#: app/models/site.rb:- app/models/user.rb:- app/models/virtual_class.rb:- 
    498439msgid "Name" 
    499440msgstr "" 
    …… 
    503444msgstr "" 
    504445 
    505 #: app/models/contact_content.rb:- 
    506 #: app/models/node.rb:- 
     446#: app/models/contact_content.rb:- app/models/node.rb:- 
    507447msgid "Zip" 
    508448msgstr "" 
    …… 
    520460msgstr "" 
    521461 
    522 #: app/models/contact_content.rb:- 
    523 #: app/models/user.rb:- 
     462#: app/models/contact_content.rb:- app/models/user.rb:- 
    524463msgid "Email" 
    525464msgstr "" 
    …… 
    565504msgstr "" 
    566505 
    567 #: app/models/data_entry.rb:35 
    568 #: app/models/node.rb:628 
     506#: app/models/data_entry.rb:35 app/models/node.rb:643 
    569507#: app/views/data_entries/_li.html.erb:2 
    570508msgid "datetime" 
    …… 
    587525msgstr "" 
    588526 
    589 #: app/models/document_content.rb:- 
    590 #: app/models/node.rb:- 
     527#: app/models/document_content.rb:- app/models/node.rb:- 
    591528#: app/models/version.rb:- 
    592529msgid "Type" 
    …… 
    601538msgstr "" 
    602539 
    603 #: app/models/document_content.rb:- 
    604 #: app/models/iformat.rb:- 
     540#: app/models/document_content.rb:- app/models/iformat.rb:- 
    605541msgid "Size" 
    606542msgstr "" 
    607543 
    608 #: app/models/document_content.rb:- 
    609 #: app/models/iformat.rb:- 
     544#: app/models/document_content.rb:- app/models/iformat.rb:- 
    610545msgid "Width" 
    611546msgstr "" 
    612547 
    613 #: app/models/document_content.rb:- 
    614 #: app/models/iformat.rb:- 
     548#: app/models/document_content.rb:- app/models/iformat.rb:- 
    615549msgid "Height" 
    616550msgstr "" 
    617551 
    618 #: app/models/group.rb:- 
    619 #: app/views/groups/edit.html.erb:1 
     552#: app/models/group.rb:- app/views/groups/edit.html.erb:1 
    620553#: app/views/groups/show.html.erb:1 
    621554msgid "group" 
    622555msgstr "" 
    623556 
    624 #: app/models/iformat.rb:- 
    625 #: app/views/iformats/edit.html.erb:1 
     557#: app/models/iformat.rb:- app/views/iformats/edit.html.erb:1 
    626558#: app/views/iformats/show.html.erb:1 
    627559msgid "iformat" 
    …… 
    648580msgstr "" 
    649581 
    650 #: app/models/link.rb:- 
    651 #: app/models/version.rb:- 
     582#: app/models/link.rb:- app/models/version.rb:- 
    652583msgid "Comment" 
    653584msgstr "" 
    …… 
    689620msgstr "" 
    690621 
    691 #: app/models/node.rb:- 
    692 #: app/models/version.rb:- 
     622#: app/models/node.rb:- app/models/version.rb:- 
    693623msgid "Publish from" 
    694624msgstr "" 
    …… 
    870800msgstr "" 
    871801 
    872 #: app/models/user.rb:- 
    873 #: lib/gettext_strings.rb:61 
     802#: app/models/user.rb:- lib/gettext_strings.rb:61 
    874803msgid "user" 
    875804msgstr "" 
    …… 
    934863 
    935864#: app/views/comments/_bin.rhtml:4 
    936 msgid "Are you sure you want to permanently remove the content of this rubbish bin ?" 
    937 msgstr "" 
    938  
    939 #: app/views/comments/_form.rhtml:8 
    940 #: app/views/comments/_form.rhtml:10 
    941 #: app/views/comments/_form.rhtml:12 
    942 #: app/views/discussions/_form.rhtml:8 
    943 #: app/views/documents/show.rhtml:11 
    944 #: app/views/groups/_form.rhtml:3 
    945 #: app/views/groups/_form.rhtml:5 
    946 #: app/views/iformats/_form.rhtml:3 
    947 #: app/views/iformats/_form.rhtml:5 
    948 #: app/views/links/_form.rhtml:12 
    949 #: app/views/links/_form.rhtml:14 
    950 #: app/views/nodes/_results.rhtml:7 
    951 #: app/views/nodes/import.rhtml:11 
    952 #: app/views/nodes/save.rhtml:8 
    953 #: app/views/users/_form.rhtml:3 
    954 #: app/views/users/_form.rhtml:5 
    955 #: app/views/relations/_form.erb:3 
    956 #: app/views/relations/_form.erb:5 
    957 #: app/views/sites/_form.erb:3 
    958 #: app/views/sites/_form.erb:5 
    959 #: app/views/virtual_classes/_form.erb:3 
    960 #: app/views/virtual_classes/_form.erb:5 
     865msgid "" 
     866"Are you sure you want to permanently remove the content of this rubbish bin ?" 
     867msgstr "" 
     868 
     869#: app/views/comments/_form.rhtml:8 app/views/comments/_form.rhtml:10 
     870#: app/views/comments/_form.rhtml:12 app/views/discussions/_form.rhtml:8 
     871#: app/views/documents/show.rhtml:11 app/views/groups/_form.rhtml:3 
     872#: app/views/groups/_form.rhtml:5 app/views/iformats/_form.rhtml:3 
     873#: app/views/iformats/_form.rhtml:5 app/views/links/_form.rhtml:12 
     874#: app/views/links/_form.rhtml:14 app/views/nodes/_results.rhtml:7 
     875#: app/views/nodes/import.rhtml:11 app/views/nodes/save.rhtml:8 
     876#: app/views/users/_form.rhtml:3 app/views/users/_form.rhtml:5 
     877#: app/views/relations/_form.erb:3 app/views/relations/_form.erb:5 
     878#: app/views/sites/_form.erb:3 app/views/sites/_form.erb:5 
     879#: app/views/virtual_classes/_form.erb:3 app/views/virtual_classes/_form.erb:5 
    961880msgid "btn_x" 
    962881msgstr "<img src='/images/cross.png' alt='cancel'/>" 
    …… 
    972891msgstr "" 
    973892 
    974 #: app/views/comments/_form.rhtml:23 
    975 #: app/views/groups/_form.rhtml:35 
    976 #: app/views/iformats/_form.rhtml:21 
    977 #: app/views/nodes/_edit_attribute.rhtml:10 
     893#: app/views/comments/_form.rhtml:23 app/views/groups/_form.rhtml:35 
     894#: app/views/iformats/_form.rhtml:21 app/views/nodes/_edit_attribute.rhtml:10 
    978895#: app/views/templates/document_create_tabs/_file.rhtml:8 
    979896#: app/views/templates/document_create_tabs/_import.rhtml:2 
    980897#: app/views/templates/document_create_tabs/_template.rhtml:3 
    981898#: app/views/templates/document_create_tabs/_text_doc.rhtml:3 
    982 #: app/views/users/_form.rhtml:46 
    983 #: app/views/versions/edit.rhtml:14 
    984 #: app/views/relations/_form.erb:35 
    985 #: app/views/sites/_form.erb:33 
     899#: app/views/users/_form.rhtml:46 app/views/versions/edit.rhtml:14 
     900#: app/views/relations/_form.erb:35 app/views/sites/_form.erb:33 
    986901#: app/views/users/preferences.html.erb:19 
    987902#: app/views/users/preferences.html.erb:35 
    …… 
    1010925msgstr "<img src='/images/comments_add.png' alt='add a discussion'/>" 
    1011926 
    1012 #: app/views/discussions/_form.rhtml:11 
    1013 #: lib/gettext_strings.rb:53 
     927#: app/views/discussions/_form.rhtml:11 lib/gettext_strings.rb:53 
    1014928msgid "outside" 
    1015929msgstr "" 
    1016930 
    1017 #: app/views/discussions/_form.rhtml:12 
    1018 #: lib/gettext_strings.rb:52 
     931#: app/views/discussions/_form.rhtml:12 lib/gettext_strings.rb:52 
    1019932msgid "inside" 
    1020933msgstr "" 
    …… 
    1028941msgstr "" 
    1029942 
    1030 #: app/views/documents/_crop.rhtml:1 
    1031 #: app/views/users/_form.rhtml:20 
     943#: app/views/documents/_crop.rhtml:1 app/views/users/_form.rhtml:20 
    1032944#: app/views/users/preferences.html.erb:7 
    1033945#: app/views/users/preferences.html.erb:27 
    …… 
    1060972msgstr "<img src='/images/group_add.png' alt='add a group'/>" 
    1061973 
    1062 #: app/views/groups/_form.rhtml:18 
    1063 #: app/views/iformats/_form.rhtml:16 
     974#: app/views/groups/_form.rhtml:18 app/views/iformats/_form.rhtml:16 
    1064975#: app/views/nodes/_parent.rhtml:7 
    1065976#: app/views/templates/document_create_tabs/_template.rhtml:7 
    1066977#: app/views/templates/document_create_tabs/_text_doc.rhtml:8 
    1067 #: app/views/users/_form.rhtml:27 
    1068 #: app/views/users/preferences.html.erb:15 
     978#: app/views/users/_form.rhtml:27 app/views/users/preferences.html.erb:15 
    1069979#: app/views/virtual_classes/_form.erb:16 
    1070980msgid "name" 
    …… 
    1088998msgstr "<img src='/images/group.png' alt='group'/>" 
    1089999 
    1090 #: app/views/groups/_form.rhtml:41 
    1091 #: app/views/iformats/_form.rhtml:26 
    1092 #: app/views/relations/_form.erb:40 
    1093 #: app/views/virtual_classes/_form.erb:27 
     1000#: app/views/groups/_form.rhtml:41 app/views/iformats/_form.rhtml:26 
     1001#: app/views/relations/_form.erb:40 app/views/virtual_classes/_form.erb:27 
    10941002#, fuzzy 
    10951003msgid "destroy" 
    10961004msgstr "<img src='/images/bomb.png' alt='destroy'/>" 
    10971005 
    1098 #: app/views/groups/index.rhtml:4 
    1099 #: app/views/users/index.rhtml:5 
    1100 #: app/views/relations/index.erb:5 
    1101 #: app/views/sites/index.erb:5 
    1102 #: app/views/virtual_classes/index.erb:5 
    1103 #: lib/gettext_strings.rb:58 
     1006#: app/views/groups/index.rhtml:4 app/views/users/index.rhtml:5 
     1007#: app/views/relations/index.erb:5 app/views/sites/index.erb:5 
     1008#: app/views/virtual_classes/index.erb:5 lib/gettext_strings.rb:58 
    11041009msgid "img_next_page" 
    1105 msgstr "<img src='/images/control_fastforward.png' alt='next page' title='next page'/>" 
    1106  
    1107 #: app/views/groups/index.rhtml:5 
    1108 #: app/views/users/index.rhtml:6 
    1109 #: app/views/relations/index.erb:6 
    1110 #: app/views/sites/index.erb:6 
    1111 #: app/views/virtual_classes/index.erb:6 
    1112 #: lib/gettext_strings.rb:57 
     1010msgstr "" 
     1011"<img src='/images/control_fastforward.png' alt='next page' title='next page'/" 
     1012">" 
     1013 
     1014#: app/views/groups/index.rhtml:5 app/views/users/index.rhtml:6 
     1015#: app/views/relations/index.erb:6 app/views/sites/index.erb:6 
     1016#: app/views/virtual_classes/index.erb:6 lib/gettext_strings.rb:57 
    11131017msgid "img_prev_page" 
    1114 msgstr "<img src='/images/control_rewind.png' alt='previous page' title='previous page'/>" 
     1018msgstr "" 
     1019"<img src='/images/control_rewind.png' alt='previous page' title='previous " 
     1020"page'/>" 
    11151021 
    11161022#: app/views/iformats/_add.rhtml:2 
    …… 
    11181024msgstr "<img src='/images/photo_add.png' alt='add an image format'/>" 
    11191025 
    1120 #: app/views/iformats/_form.rhtml:17 
    1121 #: app/views/relations/_form.erb:25 
     1026#: app/views/iformats/_form.rhtml:17 app/views/relations/_form.erb:29 
    11221027msgid "type" 
    11231028msgstr "" 
    …… 
    11601065msgstr "<img src='/images/tag_blue_add.png' alt='add a link'/>" 
    11611066 
    1162 #: app/views/links/_form.rhtml:32 
    1163 #: app/views/users/_form.rhtml:25 
     1067#: app/views/links/_form.rhtml:32 app/views/users/_form.rhtml:25 
    11641068msgid "status" 
    11651069msgstr "status" 
    …… 
    11731077msgstr "<img src='/images/tag_blue.png' alt='link'/>" 
    11741078 
    1175 #: app/views/links/_li.rhtml:6 
    1176 #: lib/parser/lib/rules/zena.rb:1198 
     1079#: app/views/links/_li.rhtml:6 lib/parser/lib/rules/zena.rb:1217 
    11771080msgid "btn_tiny_del" 
    11781081msgstr "<img src='/images/bullet_delete.png' alt='remove'/>" 
    11791082 
    1180 #: app/views/nodes/_dates.rhtml:6 
    1181 #: app/views/templates/edit_tabs/_title.rhtml:8 
     1083#: app/views/nodes/_dates.rhtml:6 app/views/templates/edit_tabs/_title.rhtml:8 
    11821084msgid "event date" 
    11831085msgstr "" 
    …… 
    11951097msgstr "" 
    11961098 
    1197 #: app/views/nodes/_dates.rhtml:10 
    1198 #: app/views/nodes/_groups.rhtml:23 
     1099#: app/views/nodes/_dates.rhtml:10 app/views/nodes/_groups.rhtml:23 
    11991100#: app/views/nodes/_parent.rhtml:11 
    12001101#: app/views/templates/edit_tabs/_image.rhtml:2 
    …… 
    12021103msgstr "" 
    12031104 
    1204 #: app/views/nodes/_groups.rhtml:3 
    1205 #: app/views/nodes/_groups.rhtml:7 
     1105#: app/views/nodes/_groups.rhtml:3 app/views/nodes/_groups.rhtml:7 
    12061106msgid "inherit" 
    12071107msgstr "" 
    …… 
    12111111msgstr "" 
    12121112 
    1213 #: app/views/nodes/_groups.rhtml:4 
    1214 #: app/views/nodes/_groups.rhtml:7 
     1113#: app/views/nodes/_groups.rhtml:4 app/views/nodes/_groups.rhtml:7 
    12151114msgid "private" 
    12161115msgstr "" 
    …… 
    12631162 
    12641163#: app/views/nodes/import.rhtml:19 
     1164#, fuzzy 
     1165msgid "same" 
     1166msgstr " save " 
     1167 
     1168#: app/views/nodes/import.rhtml:22 
    12651169msgid "%{count} versions" 
    12661170msgstr "" 
    …… 
    13251229#: app/views/templates/edit_tabs/_help.rhtml:6 
    13261230msgid "help not found" 
    1327 msgstr "Help node not found. This node should be named 'help'. In the meantime, you can visit the official website: \"zena\":http://zenadmin.org." 
     1231msgstr "" 
     1232"Help node not found. This node should be named 'help'. In the meantime, you " 
     1233"can visit the official website: \"zena\":http://zenadmin.org." 
    13281234 
    13291235#: app/views/templates/edit_tabs/_image.rhtml:8 
    …… 
    13641270msgstr "" 
    13651271 
    1366 #: app/views/templates/edit_tabs/_title.rhtml:4 
    1367 #: app/views/users/_form.rhtml:28 
     1272#: app/views/templates/edit_tabs/_title.rhtml:4 app/views/users/_form.rhtml:28 
    13681273#: app/views/users/preferences.html.erb:16 
    13691274msgid "language" 
    …… 
    13781283msgstr "<img src='/images/user_add.png' alt='add a user'/>" 
    13791284 
    1380 #: app/views/users/_form.rhtml:19 
    1381 #: app/views/users/preferences.html.erb:26 
     1285#: app/views/users/_form.rhtml:19 app/views/users/preferences.html.erb:26 
    13821286msgid "change password" 
    13831287msgstr "" 
    13841288 
    1385 #: app/views/users/_form.rhtml:20 
    1386 #: app/views/users/_form.rhtml:22 
     1289#: app/views/users/_form.rhtml:20 app/views/users/_form.rhtml:22 
    13871290msgid "password" 
    13881291msgstr "" 
    13891292 
    1390 #: app/views/users/_form.rhtml:26 
    1391 #: app/views/users/preferences.html.erb:14 
     1293#: app/views/users/_form.rhtml:26 app/views/users/preferences.html.erb:14 
    13921294msgid "first name" 
    13931295msgstr "" 
    13941296 
    1395 #: app/views/users/_form.rhtml:29 
    1396 #: app/views/users/preferences.html.erb:17 
     1297#: app/views/users/_form.rhtml:29 app/views/users/preferences.html.erb:17 
    13971298msgid "time zone" 
    13981299msgstr "" 
    13991300 
    1400 #: app/views/users/_form.rhtml:31 
    1401 #: app/views/users/preferences.html.erb:18 
     1301#: app/views/users/_form.rhtml:31 app/views/users/preferences.html.erb:18 
    14021302msgid "email" 
    14031303msgstr "" 
    …… 
    14341334msgstr "%Y-%m-%d %H:%M" 
    14351335 
    1436 #: app/views/relations/_add.erb:2 
    1437 #: lib/gettext_strings.rb:32 
     1336#: app/views/relations/_add.erb:2 lib/gettext_strings.rb:32 
    14381337msgid "btn_relation_add" 
    14391338msgstr "<img src='/images/link_add.png' alt='add a role'/>" 
    …… 
    14491348 
    14501349#: app/views/relations/_form.erb:17 
     1350msgid "kpath" 
     1351msgstr "" 
     1352 
     1353#: app/views/relations/_form.erb:21 
    14511354msgid "role" 
    14521355msgstr "" 
    14531356 
    1454 #: app/views/relations/_form.erb:21 
    1455 #: app/views/virtual_classes/_form.erb:17 
     1357#: app/views/relations/_form.erb:25 app/views/virtual_classes/_form.erb:17 
    14561358msgid "icon" 
    14571359msgstr "icon" 
    14581360 
    1459 #: app/views/relations/_form.erb:26 
    1460 #: app/views/relations/_form.erb:28 
    1461 #: app/views/relations/_li.erb:2 
    1462 #: app/views/relations/_li.erb:12 
     1361#: app/views/relations/_form.erb:30 app/views/relations/_form.erb:32 
     1362#: app/views/relations/_li.erb:2 app/views/relations/_li.erb:12 
    14631363#: lib/gettext_strings.rb:25 
    14641364msgid "relation_img" 
    14651365msgstr "<img src='/images/target.png' alt='role'/>" 
    14661366 
    1467 #: app/views/relations/_form.erb:27 
    1468 #: app/views/relations/_form.erb:29 
    1469 #: app/views/relations/_li.erb:2 
    1470 #: app/views/relations/_li.erb:12 
     1367#: app/views/relations/_form.erb:31 app/views/relations/_form.erb:33 
     1368#: app/views/relations/_li.erb:2 app/views/relations/_li.erb:12 
    14711369#: lib/gettext_strings.rb:26 
    14721370msgid "relations_img" 
    14731371msgstr "<img src='/images/collection.png' alt='collection'/>" 
    14741372 
    1475 #: app/views/relations/_form.erb:31 
    1476 msgid "kpath" 
    1477 msgstr "" 
    1478  
    14791373#: app/views/relations/_form.erb:39 
    14801374msgid "Are you sure you want to destroy this relation ?" 
    …… 
    14941388msgstr "%H:%M" 
    14951389 
    1496 #: app/views/sites/_form.erb:21 
    1497 #: lib/gettext_strings.rb:30 
     1390#: app/views/sites/_form.erb:21 lib/gettext_strings.rb:30 
    14981391msgid "public group" 
    14991392msgstr "" 
    15001393 
    1501 #: app/views/sites/_form.erb:22 
    1502 #: lib/gettext_strings.rb:31 
     1394#: app/views/sites/_form.erb:22 lib/gettext_strings.rb:31 
    15031395#, fuzzy 
    15041396msgid "site group" 
    15051397msgstr "<img src='/images/group.png' alt='group'/>" 
    15061398 
    1507 #: app/views/sites/_form.erb:23 
    1508 #: lib/gettext_strings.rb:29 
     1399#: app/views/sites/_form.erb:23 lib/gettext_strings.rb:29 
    15091400msgid "options" 
    15101401msgstr "" 
    15111402 
    1512 #: app/views/sites/_form.erb:29 
     1403#: app/views/sites/_form.erb:29 app/views/sites/_form.erb:30 
     1404msgid "clear cache" 
     1405msgstr "" 
     1406 
    15131407#: app/views/sites/_form.erb:30 
    1514 msgid "clear cache" 
    1515 msgstr "" 
    1516  
    1517 #: app/views/sites/_form.erb:30 
    1518 msgid "Are you sure you want destroy all cache (site may be slow during first reloads) ?" 
    1519 msgstr "" 
    1520  
    1521 #: app/views/sites/_li.erb:2 
    1522 #: lib/gettext_strings.rb:27 
     1408msgid "" 
     1409"Are you sure you want destroy all cache (site may be slow during first " 
     1410"reloads) ?" 
     1411msgstr "" 
     1412 
     1413#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:27 
    15231414msgid "site_img" 
    15241415msgstr "<img src='/images/world.png' alt='site'/>" 
    …… 
    15401431msgstr "" 
    15411432 
    1542 #: app/views/virtual_classes/_add.erb:2 
    1543 #: lib/gettext_strings.rb:34 
     1433#: app/views/virtual_classes/_add.erb:2 lib/gettext_strings.rb:34 
    15441434msgid "btn_virtual_class_add" 
    15451435msgstr "<img src='/images/brick_add.png' alt='add a class'/>" 
    …… 
    15721462msgstr "<img src='/images/brick.png' alt='class'/>" 
    15731463 
    1574 #: app/views/virtual_classes/_li.erb:2 
    1575 #: lib/gettext_strings.rb:33 
     1464#: app/views/virtual_classes/_li.erb:2 lib/gettext_strings.rb:33 
    15761465msgid "virtual_class_img" 
    15771466msgstr "<img src='/images/brick.png' alt='class'/>" 
    …… 
    15871476msgstr "Order updated." 
    15881477 
    1589 #: app/views/nodes/update.rjs:4 
    1590 #: lib/parser/lib/rules/zena.rb:390 
    1591 #: lib/parser/lib/rules/zena.rb:2682 
     1478#: app/views/nodes/update.rjs:4 lib/parser/lib/rules/zena.rb:390 
     1479#: lib/parser/lib/rules/zena.rb:2705 
    15921480msgid "edit" 
    15931481msgstr "" 
    …… 
    18471735 
    18481736#: lib/gettext_strings.rb:102 
    1849 msgid "mon" 
     1737msgid "Mon" 
    18501738msgstr "" 
    18511739 
    18521740#: lib/gettext_strings.rb:103 
    1853 msgid "tue" 
     1741msgid "Tue" 
    18541742msgstr "" 
    18551743 
    18561744#: lib/gettext_strings.rb:104 
    1857 msgid "wed" 
     1745msgid "Wed" 
    18581746msgstr "" 
    18591747 
    18601748#: lib/gettext_strings.rb:105 
    1861 msgid "thu" 
     1749msgid "Thu" 
    18621750msgstr "" 
    18631751 
    18641752#: lib/gettext_strings.rb:106 
    1865 msgid "fri" 
     1753msgid "Fri" 
    18661754msgstr "" 
    18671755 
    18681756#: lib/gettext_strings.rb:107 
    1869 msgid "sat" 
     1757msgid "Sat" 
    18701758msgstr "" 
    18711759 
    18721760#: lib/gettext_strings.rb:108 
    1873 msgid "sun" 
     1761msgid "Sun" 
    18741762msgstr "" 
    18751763 
    …… 
    18901778msgstr "" 
    18911779 
    1892 #: lib/gettext_strings.rb:114 
     1780#: lib/gettext_strings.rb:114 lib/gettext_strings.rb:127 
    18931781msgid "May" 
    18941782msgstr "" 
    …… 
    19231811 
    19241812#: lib/gettext_strings.rb:123 
     1813msgid "Jan" 
     1814msgstr "" 
     1815 
     1816#: lib/gettext_strings.rb:124 
     1817msgid "Feb" 
     1818msgstr "" 
     1819 
     1820#: lib/gettext_strings.rb:125 
     1821msgid "Mar" 
     1822msgstr "" 
     1823 
     1824#: lib/gettext_strings.rb:126 
     1825msgid "Apr" 
     1826msgstr "" 
     1827 
     1828#: lib/gettext_strings.rb:128 
     1829msgid "Jun" 
     1830msgstr "" 
     1831 
     1832#: lib/gettext_strings.rb:129 
     1833msgid "Jul" 
     1834msgstr "" 
     1835 
     1836#: lib/gettext_strings.rb:130 
     1837msgid "Aug" 
     1838msgstr "" 
     1839 
     1840#: lib/gettext_strings.rb:131 
     1841msgid "Sep" 
     1842msgstr "" 
     1843 
     1844#: lib/gettext_strings.rb:132 
     1845msgid "Oct" 
     1846msgstr "" 
     1847 
     1848#: lib/gettext_strings.rb:133 
     1849msgid "Nov" 
     1850msgstr "" 
     1851 
     1852#: lib/gettext_strings.rb:134 
     1853msgid "Dec" 
     1854msgstr "" 
     1855 
     1856#: lib/gettext_strings.rb:136 
    19251857msgid "User name:" 
    19261858msgstr "" 
    19271859 
    1928 #: lib/gettext_strings.rb:124 
     1860#: lib/gettext_strings.rb:137 
    19291861msgid "Password:" 
    19301862msgstr "" 
    19311863 
    1932 #: lib/gettext_strings.rb:127 
     1864#: lib/gettext_strings.rb:140 
    19331865msgid "you are editing the original" 
    19341866msgstr "" 
    19351867 
    1936 #: lib/gettext_strings.rb:128 
     1868#: lib/gettext_strings.rb:141 
    19371869msgid "redaction saved" 
    19381870msgstr "" 
    19391871 
    1940 #: lib/gettext_strings.rb:131 
     1872#: lib/gettext_strings.rb:144 
    19411873msgid "rebuild" 
    19421874msgstr "<img src='/images/arrow_refresh.png' alt='rebuild'/> rebuild zafu" 
    …… 
    19501882msgstr "" 
    19511883 
    1952 #: lib/parser/lib/rules/zena.rb:1099 
     1884#: lib/parser/lib/rules/zena.rb:1119 
    19531885msgid "btn_add" 
    19541886msgstr "<img src='/images/add.png' alt='add'/>" 
    19551887 
    1956 #: lib/parser/lib/rules/zena.rb:1569 
     1888#: lib/parser/lib/rules/zena.rb:1588 
    19571889msgid "riding zena" 
    19581890msgstr "" 
    19591891 
    1960 #: lib/parser/lib/rules/zena.rb:1571 
     1892#: lib/parser/lib/rules/zena.rb:1590 
    19611893msgid "in peace with zena" 
    19621894msgstr "" 
    19631895 
    1964 #: lib/parser/lib/rules/zena.rb:1573 
     1896#: lib/parser/lib/rules/zena.rb:1592 
    19651897msgid "a zen garden" 
    19661898msgstr "" 
    19671899 
    1968 #: lib/parser/lib/rules/zena.rb:1575 
     1900#: lib/parser/lib/rules/zena.rb:1594 
    19691901msgid "made with zena" 
    19701902msgstr "" 
    19711903 
    1972 #: lib/parser/lib/rules/zena.rb:1591 
     1904#: lib/parser/lib/rules/zena.rb:1610 
    19731905msgid "%{skin}, design by %{name}" 
    19741906msgstr "" 
    …… 
    19801912#~ msgid "attributes" 
    19811913#~ msgstr "favorites" 
     1914 
    19821915#~ msgid "role not vali