Dotclear


Ignore:
Timestamp:
08/30/13 10:37:08 (12 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/oc/main.po

    r1592 r1620  
    212212msgstr "" 
    213213 
    214 msgid "That blog Id is already in use." 
     214msgid "This blog ID is already used." 
    215215msgstr "" 
    216216 
     
    455455 
    456456#, php-format 
    457 msgid "You are currently using \"%s\"" 
     457msgid "You are currently using <strong>%s</strong>" 
    458458msgstr "" 
    459459 
     
    757757msgstr "" 
    758758 
    759 msgid "You have one spam comments." 
     759msgid "You have one spam comment." 
    760760msgstr "" 
    761761 
     
    21062106msgstr "" 
    21072107 
    2108 msgid "invert selection" 
     2108msgid "Invert selection" 
    21092109msgstr "" 
    21102110 
  • locales/oc/main.po

    r1615 r1620  
    835835msgstr "" 
    836836 
    837 msgid "information about this version" 
     837msgid "<a href=\"%s\">Information about this version</a>." 
    838838msgstr "" 
    839839 
     
    23792379msgstr "Blòg" 
    23802380 
    2381 msgid "Updates" 
     2381msgid "Update" 
    23822382msgstr "" 
    23832383 
Note: See TracChangeset for help on using the changeset viewer.

Sites map