Last steps to make the conversion remove the obsolete language keys.

git-svn-id: http://piwigo.org/svn/trunk@5563 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 10 insertions, 6 deletions

diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 9003f7275..6c8b39f1d 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -66,8 +66,6 @@ $lang['Caddie management'] = 'Caddie management';
 $lang['Caddie'] = 'Caddie';
 $lang['Categories authorized thanks to group associations'] = 'Categories authorized thanks to group associations';
 $lang['Categories manual order was saved'] = 'Categories manual order was saved';
-$lang['Categories ordered alphanumerically'] = 'Categories ascending alphanumerically ordered';
-$lang['Categories ordered alphanumerically reverse'] = 'Categories descending alphanumerically ordered';
 $lang['Category elements associated to the following categories: %s'] = 'Category elements associated to the following categories: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
 $lang['Check for upgrade'] = 'Check for upgrade';
@@ -132,8 +130,6 @@ $lang['Number of thumbnails to create'] = 'Number of thumbnails to create';
 $lang['Only private categories are listed'] = 'Only private categories are listed';
 $lang['Operating system'] = 'Operating system';
 $lang['Options'] = 'Options';
-$lang['Order alphanumerically'] = 'Categories sorted in ascending order ⇓';
-$lang['Order alphanumerically reverse'] = 'Categories sorted in descending order ⇑';
 $lang['Other private categories'] = 'Other private categories';
 $lang['Page banner'] = 'Page banner';
 $lang['Parent category'] = 'Parent category';
diff --git a/tools/convert_language_to_2.1.pl b/tools/convert_language_to_2.1.pl
index 353e801e4..b78547a33 100644
--- a/tools/convert_language_to_2.1.pl
+++ b/tools/convert_language_to_2.1.pl
@@ -43,11 +43,13 @@ my %ignore_keys = (
 
 my %remove_keys = (
     common => {
-        'You can\'t upload pictures in this category' => '',
+        "You can\\'t upload pictures in this category" => '',
         'display pictures added on' => '',
         'Email address is missing' => '',
         'Delete: %s' => '',
         'All tags must match' => '',
+        'Validate: %s' => '',
+        'Upgrade from %s to %s' => '',
     },
     admin => {
         'nbm_content_goto_2' => '',
@@ -77,6 +79,9 @@ my %remove_keys = (
         'Categories sorted in descending order ⇑' => '',
         'Bugs' => '',
         'Automatic installation' => '',
+        'Upgrade from version %s to %s' => '',
+        'Upgrade from %s to %s' => '',
+        'Upload Form' => '',
     },
     upgrade => {
         'Are you sure?' => '',
@@ -85,6 +90,8 @@ my %remove_keys = (
     install => {
         'Parameters are correct' => '',
         'Installation finished' => '',
+        'The next step of the installation is now possible' => '',
+        'next step' => '',
     }
 );
 
diff --git a/tools/translation_analysis.php b/tools/translation_analysis.php
index 18e943020..da7a82463 100644
--- a/tools/translation_analysis.php
+++ b/tools/translation_analysis.php
@@ -113,6 +113,8 @@ foreach ($languages as $language)
         }
       }
 
+      echo '<h3>'.$file.'.lang.php</h3>';
+      
       if ('' != $output_missing or '' != $output_duplicated)
       {
         $output = '';
@@ -124,7 +126,6 @@ foreach ($languages as $language)
         {
           $output.= "\n// untranslated yet\n".$output_duplicated;
         }
-        echo '<h3>'.$file.'.lang.php</h3>';
         echo '<textarea style="width:100%;height:250px;">'.$output.'</textarea>';
       }