Dotclear


Ignore:
Timestamp:
08/30/13 10:37:08 (11 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
1619:5d925866b5b3 (diff), 1593:0c884219a872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge 2.5 into default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • locales/en/main.po

    r1592 r1620  
    211211msgstr "" 
    212212 
    213 msgid "That blog Id is already in use." 
     213msgid "This blog ID is already used." 
    214214msgstr "" 
    215215 
     
    453453 
    454454#, php-format 
    455 msgid "You are currently using \"%s\"" 
     455msgid "You are currently using <strong>%s</strong>" 
    456456msgstr "" 
    457457 
     
    753753msgstr "" 
    754754 
    755 msgid "You have one spam comments." 
     755msgid "You have one spam comment." 
    756756msgstr "" 
    757757 
     
    20742074msgstr "" 
    20752075 
     2076msgid "Select:" 
     2077msgstr "" 
     2078 
    20762079msgid "no selection" 
    20772080msgstr "" 
     
    20802083msgstr "" 
    20812084 
    2082 msgid "invert selection" 
     2085msgid "Invert selection" 
    20832086msgstr "" 
    20842087 
     
    21592162 
    21602163msgid "You have unsaved changes. Switch post format will loose these changes. Proceed anyway?" 
    2161 msgstr "" 
    2162  
    2163 msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?" 
    21642164msgstr "" 
    21652165 
  • locales/en/main.po

    r1615 r1620  
    829829msgstr "" 
    830830 
    831 msgid "information about this version" 
     831#, php-format 
     832msgid "<a href=\"%s\">Information about this version</a>." 
    832833msgstr "" 
    833834 
     
    23582359msgstr "" 
    23592360 
    2360 msgid "Updates" 
     2361msgid "Update" 
    23612362msgstr "" 
    23622363 
Note: See TracChangeset for help on using the changeset viewer.

Sites map