Changeset 5559


Ignore:
Timestamp:
04/01/10 23:11:14 (10 years ago)
Author:
plg
Message:

Fix missing keys: some keys have been removed by mistake during the massive
key conversion.

Remove some language keys that are really obsolete. I've updated the script
to convert language files to 2.1, I will apply "obsolete keys removal" process
in a 2nd step on other languages.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/c13y_internal.class.php

    r5215 r5559  
    104104    $c13y_users[$conf['guest_id']] = array( 
    105105      'status' => 'guest', 
    106       'l10n_non_existent' => 'c13y_guest_non_existent', 
    107       'l10n_bad_status' => 'c13y_bad_guest_status'); 
     106      'l10n_non_existent' => 'Main "guest" user does not exist', 
     107      'l10n_bad_status' => 'Main "guest" user status is incorrect'); 
    108108 
    109109    if ($conf['guest_id'] != $conf['default_user_id']) 
     
    111111      $c13y_users[$conf['default_user_id']] = array( 
    112112        'password' => null, 
    113         'l10n_non_existent' => 'c13y_default_non_existent'); 
     113        'l10n_non_existent' => 'Default user does not exist'); 
    114114    } 
    115115 
    116116    $c13y_users[$conf['webmaster_id']] = array( 
    117117      'status' => 'webmaster', 
    118       'l10n_non_existent' => 'c13y_webmaster_non_existent', 
    119       'l10n_bad_status' => 'c13y_bad_webmaster_status'); 
     118      'l10n_non_existent' => 'Main "webmaster" user does not exist', 
     119      'l10n_bad_status' => 'Main "webmaster" user status is incorrect'); 
    120120 
    121121      $query = ' 
  • trunk/admin/include/functions_notification_by_mail.inc.php

    r5196 r5559  
    406406        set_user_on_env_nbm($nbm_user, true); 
    407407 
    408         $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail')); 
     408        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Subscribe to notification by mail'): l10n('Unsubscribe from notification by mail')); 
    409409 
    410410        // Assign current var for nbm mail 
  • trunk/language/en_UK/admin.lang.php

    r5535 r5559  
    6868$lang['Categories authorized thanks to group associations'] = "Categories authorized thanks to group associations"; 
    6969$lang['Categories manual order was saved'] = "Categories manual order has been saved"; 
    70 $lang['Categories ascending alphanumerically ordered'] = "Categories ascending alphanumerically ordered"; 
    71 $lang['Categories descending alphanumerically ordered'] = "Categories descending alphanumerically ordered"; 
    7270$lang['Category elements associated to the following categories: %s'] = "Category elements associated to the following categories: %s"; 
    7371$lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons."; 
     
    10098$lang['Form'] = "Form"; 
    10199$lang['Gallery URL'] = "Gallery URL"; 
    102 $lang['Gallery description'] = "Gallery description"; 
    103100$lang['Gallery title'] = "Gallery title"; 
    104101$lang['Grant selected groups'] = "Grant selected groups"; 
     
    133130$lang['Operating system'] = "Operating system"; 
    134131$lang['Options'] = "Options"; 
    135 $lang['Categories sorted in ascending order ⇓'] = "Categories sorted in ascending order ⇓"; 
    136 $lang['Categories sorted in descending order ⇑'] = "Categories sorted in descending order ⇑"; 
    137132$lang['Other private categories'] = "Other private categories"; 
    138133$lang['Page banner'] = "Page banner"; 
     
    178173$lang['Tag selection'] = "Tags selection"; 
    179174$lang['Take selected elements out of caddie'] = "Take selected elements out of the caddie"; 
    180 $lang['The following tag were deleted'] = "The following tag has been deleted"; 
    181175$lang['The %d following tags were deleted'] = "The following %d tags have been deleted"; 
    182176$lang['Unable to check for upgrade.'] = "Unable to check for upgrade."; 
     
    239233$lang['first element added on %s'] = "first element added on %s"; 
    240234$lang['Forbidden'] = "Forbidden"; 
    241 $lang['General'] = "General"; 
    242235$lang['global mode'] = "global mode"; 
    243236$lang['group "%s" added'] = "group \"%s\" added"; 
     
    248241$lang['This name is already used by another group.'] = "This name is already used by another group."; 
    249242$lang['Groups'] = "Groups"; 
    250 $lang['Instructions'] = "Instructions"; 
    251243$lang[''] = ""; 
    252244$lang['High definition'] = "High definition"; 
     
    343335$lang['randomly represented'] = "random representative"; 
    344336$lang['registration date'] = "registration date"; 
    345 $lang['Remote site'] = "Remote site"; 
    346337$lang['clean'] = "clean up"; 
    347338$lang['remove remote listing.xml file'] = "remove remote listing.xml file"; 
     
    409400$lang['Unlocked'] = "Unlocked"; 
    410401$lang['unset'] = "unset"; 
    411 $lang['Move up'] = "Move up"; 
    412402$lang['Update categories informations'] = "Update categories information"; 
    413403$lang['Update images informations'] = "Update images information"; 
     
    564554$lang['Available<br>version'] = "Available<br>version"; 
    565555$lang['Automatic upgrade'] = "Automatic upgrade"; 
    566 $lang['Automatic installation'] = "Automatic installation"; 
    567556$lang['Download file'] = "Download file"; 
    568557$lang['Plugin list'] = "Plugins list"; 
     
    594583$lang['ACCESS_4'] = "Access to webmasters"; 
    595584$lang['ACCESS_5'] = "No access"; 
    596 $lang['Demo'] = "Demo"; 
    597 $lang['Piwigo home'] = "Piwigo home"; 
    598585$lang['Support'] = "Support"; 
    599 $lang['Bugs'] = "Bugs"; 
    600 $lang['Extensions'] = "Extensions"; 
    601586$lang['Documentation'] = "Documentation"; 
    602587$lang['A new version of Piwigo is available.'] = "A new version of Piwigo is available."; 
     
    608593$lang['Deleted on'] = "Deleted on"; 
    609594$lang['Last hit'] = "Last hit"; 
    610 $lang['Hits'] = "Hits"; 
    611595$lang['GD library is missing'] = "GD library is missing"; 
    612596$lang['Templates'] = "Templates"; 
     
    630614$lang['ranks'] = "ranks"; 
    631615$lang['Drag to re-order'] = "Click-and-drag to re-order"; 
    632 $lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = "Unable to retrieve server information since allow_url_fopen is disabled."; 
    633616$lang['Quick Local Synchronization'] = "Quick Local Synchronization"; 
    634617$lang['No photo can be deleted'] = "No photo can be deleted"; 
  • trunk/language/en_UK/common.lang.php

    r5535 r5559  
    4848$lang['%d waiting elements'] = "%d waiting elements"; 
    4949$lang['About'] = "About"; 
    50 $lang['All tags must match'] = "All tags must match"; 
    5150$lang['All tags'] = "All tags"; 
    5251$lang['Any tag'] = "Any tag"; 
     
    7069$lang['Display'] = "Display"; 
    7170$lang['Each listed rule must be satisfied.'] = "Each listed criterion must be satisfied."; 
    72 $lang['Email address is missing'] = "Email address is missing"; 
    7371$lang['Email address'] = "Email address"; 
    7472$lang['Enter your personnal informations'] = "Enter your personnal data"; 
     
    322320$lang['Author: %s'] = "Author: %s"; 
    323321$lang['Comment: %s'] = "Comment: %s"; 
    324 $lang['Delete: %s'] = "Delete: %s"; 
    325322$lang['Comment by %s'] = "Comment by %s"; 
    326323$lang['User: %s'] = "User: %s"; 
  • trunk/language/en_UK/install.lang.php

    r5535 r5559  
    3333$lang['Webmaster login'] = "Webmaster login"; 
    3434$lang['It will be shown to the visitors. It is necessary for website administration'] = "It will be shown to the visitors. It is necessary for website administration"; 
    35 $lang['Parameters are correct'] = "Parameters are correct"; 
    3635$lang['Connection to server succeed, but it was impossible to connect to database'] = "Connection to server successful, but the connection to the database is impossible"; 
    3736$lang['Can\'t connect to server'] = "Cannot connect to server"; 
    38 $lang['The next step of the installation is now possible'] = "The next step of the installation is now possible"; 
    3937$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copy the text in pink between hyphens and paste it into the file \"local/config/database.inc.php\". (Warning: database.inc.php must only contain the pink text, without additional line return or space character)"; 
    4038$lang['Database type'] = "Database type"; 
     
    5351$lang['webmaster login can\'t contain characters \' or "'] = "webmaster login can't contain characters ' or \""; 
    5452$lang['please enter your password again'] = "please enter your password again"; 
    55 $lang['Installation finished'] = "Installation finished"; 
    5653$lang['Webmaster password'] = "Webmaster password"; 
    5754$lang['Keep it confidential, it enables you to access administration panel'] = "Keep it confidential, it enables you to access administration panel"; 
  • trunk/language/en_UK/upgrade.lang.php

    r5369 r5559  
    3838$lang['Only administrator can run upgrade: please sign in below.'] = "Only an administrator can run upgrade: please sign in below."; 
    3939$lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade"; 
    40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:"; 
    4140$lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private"; 
    4241$lang['User permissions and group permissions have been erased'] = "Users and groups permissions have been erased"; 
  • trunk/themes/default/template/identification.tpl

    r5252 r5559  
    33  <div class="titrePage"> 
    44    <ul class="categoryActions"> 
    5       <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
     5      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
    66    </ul> 
    77    <h2>{'Identification'|@translate}</h2> 
  • trunk/themes/default/template/nbm.tpl

    r5164 r5559  
    33  <div class="titrePage"> 
    44    <ul class="categoryActions"> 
    5       <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
     5      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
    66    </ul> 
    77    <h2>{'Notification'|@translate}</h2> 
  • trunk/themes/default/template/password.tpl

    r5164 r5559  
    33  <div class="titrePage"> 
    44    <ul class="categoryActions"> 
    5       <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
     5      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li> 
    66    </ul> 
    77    <h2>{'Password forgotten'|@translate}</h2> 
  • trunk/themes/default/template/picture.tpl

    r5535 r5559  
    6060    {/if} 
    6161    {if isset($U_ADMIN) } 
    62       <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a> 
     62      <a href="{$U_ADMIN}" title="{'Modify information'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a> 
    6363    {/if} 
    6464    {if isset($U_CADDIE) }{*caddie management BEGIN*} 
  • trunk/tools/convert_language_to_2.1.pl

    r5535 r5559  
    4646        'You can\'t upload pictures in this category' => '', 
    4747        'display pictures added on' => '', 
     48        'Email address is missing' => '', 
     49        'Delete: %s' => '', 
     50        'All tags must match' => '', 
    4851    }, 
    4952    admin => { 
     
    5659        'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"' => '', 
    5760        'path' => '', 
     61        'Unable to retrieve server informations since allow_url_fopen is disabled.' => '', 
     62        'The following tag were deleted' => '', 
     63        'Remote site' => '', 
     64        'Piwigo home' => '', 
     65        'Move up' => '', 
     66        'Instructions' => '', 
     67        'Hits' => '', 
     68        'General' => '', 
     69        'Gallery description' => '', 
     70        'Extensions' => '', 
     71        'Demo' => '', 
     72        'Categories ascending alphanumerically ordered' => '', 
     73        'Categories descending alphanumerically ordered' => '', 
     74        'Categories sorted in ascending order ⇓' => '', 
     75        'Categories sorted in ascending order &dArr;' => '', 
     76        'Categories sorted in descending order ⇑' => '', 
     77        'Categories sorted in descending order &uArr;' => '', 
     78        'Bugs' => '', 
     79        'Automatic installation' => '', 
    5880    }, 
    5981    upgrade => { 
    6082        'Are you sure?' => '', 
     83        'In <i>%s</i>, before <b>?></b>, insert:' => '', 
    6184    }, 
     85    install => { 
     86        'Parameters are correct' => '', 
     87        'Installation finished' => '', 
     88    } 
    6289); 
    6390 
  • trunk/tools/missing_keys.pl

    r5535 r5559  
    6464    'high' => '', 
    6565    'Waiting page: %s' => '', 
     66    'Admin: %s' => '', 
     67    'Manage this user comment: %s' => '', 
     68    'Main "guest" user does not exist' => '', 
     69    'Main "guest" user status is incorrect' => '', 
     70    'Main "webmaster" user does not exist' => '', 
     71    'Main "webmaster" user status is incorrect' => '', 
     72    'Default user does not exist' => '', 
     73    '(!) This comment requires validation' => '', 
    6674); 
    6775 
Note: See TracChangeset for help on using the changeset viewer.