Ignore:
Timestamp:
May 29, 2010, 10:57:34 AM (14 years ago)
Author:
rvelices
Message:

merge r6418 from branch 2.1 to trunk

  • removed multiple definitions of language keys
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/language/en_UK/common.lang.php

    r5559 r6419  
    236236$lang['Rate this picture'] = "Rate this picture";
    237237$lang['Next'] = "Next";
    238 $lang['Home'] = "Home";
    239238$lang['no rate'] = "no rate";
    240239$lang['Elements posted within the last %d day.'] = "Elements posted within the last %d day only.";
     
    279278$lang['Search results'] = "Search results";
    280279$lang['Search in subcategories'] = "Search in subcategories";
    281 $lang['Search'] = "Search";
    282280$lang['searched words : %s'] = "searched words : %s";
    283281$lang['Contact'] = "Contact";
     
    304302$lang['Optional, but recommended : choose a thumbnail to associate to'] = "Optional, but recommended : choose a thumbnail to associate to";
    305303$lang['the width of the picture must not exceed :'] = "the width of the picture must not exceed :";
    306 $lang['Author'] = "Author";
    307304$lang['can\'t upload the picture on the server'] = "the picture cannot be uploaded onto the server";
    308305$lang['the username must be given'] = "the username is required";
Note: See TracChangeset for help on using the changeset viewer.