Few language edits for CR2 and a couple of recoding for some lang vars

trunk/english/install/language/lang_english/lang_install.php

@@ -193,8 +193,8 @@
 	'ColorsLegendBlue' => 'Blue: this action is optional and can be performed automatically (may require manual edits on some files though)',
 	'ColorsLegendGreen' => 'Green: this action is suggested and can be performed automatically (if requirements are met)',
 
-	'FixBirthdays' => 'Fix Birthdays',
-	'FixBirthdaysExplain' => 'This feature will allow you to adjust all birthdays for compatibility with new features.',
+	'FixBirthdays' => 'Fix Birthdays (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixBirthdaysExplain' => 'This feature will allow you to adjust all birthdays for compatibility with new features. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
 	'FixingBirthdaysInProgress' => 'Fixing birthdays in progress',
 	'FixingBirthdaysInProgressRedirect' => 'You will be automatically redirected to next step in three seconds',
 	'FixingBirthdaysInProgressRedirectClick' => 'If you are not automatically redirected within three seconds you may click %sHere%s',
@@ -204,8 +204,8 @@
 	'FixingBirthdaysComplete' => 'Fixing birthdays complete',
 	'BirthdaysPerStep' => 'Number of birthdays per step',
 
-	'FixConstantsInFiles' => 'Fix Constants',
-	'FixConstantsInFilesExplain' => 'Fix all files with new Icy Phoenix constants',
+	'FixConstantsInFiles' => 'Fix Constants (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixConstantsInFilesExplain' => 'Fix all files with new Icy Phoenix constants. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
 	'FixingInProgress' => 'Fixing files in progress',
 	'FixingComplete' => 'Fixing files complete',
 	'ClickToFix' => 'Please click on one of the link below to proceed',
@@ -215,13 +215,15 @@
 	'NotFixed' => 'Not Fixed',
 	'FilesProcessed' => 'Files processed',
 
-	'FixForums' => 'Convert Forums',
-	'FixForumsExplain' => 'This feature will convert forums and categories into the new format.',
+	'FixForums' => 'Convert Forums (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixForumsExplain' => 'This feature will convert forums and categories into the new format. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
 	'FixingForumsInProgress' => 'Conversion in progress...',
 	'FixingForumsComplete' => 'Work complete!',
 
-	'FixPosts' => 'Fix Posts',
-	'FixPostsExplain' => 'This feature will allow you to fix all posts in your forums. You can use this feature to: find and replace any text in your posts, remove all BBCode UID, automatically adjust the address of posted images.',
+	'FixPosts' => 'Fix Posts (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixPosts_Explain' => 'This feature will allow you to fix all posts in your forums. You can use this feature to: find and replace any text in your posts, remove all BBCode UID, automatically adjust the address of posted images. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
+	'FixPosts_IP2' => 'Fix Posts (Upgrading from Icy Phoenix 1.3)',
+	'FixPosts_IP2_Explain' => 'This feature will allow you to adjust the path of uploaded images, since the path in Icy Phoenix 2.0 is different from the past versions of Icy Phoenix. You can use this feature also to find and replace any text in your posts (by leaving the search fild empty no replacement will be performed and only images paths will be adjusted).',
 	'FixingPostsInProgress' => 'Fixing posts in progress',
 	'FixingPostsInProgressRedirect' => 'You will be automatically redirected to next step in three seconds',
 	'FixingPostsInProgressRedirectClick' => 'If you are not automatically redirected within three seconds you may click %sHere%s',
@@ -237,8 +239,10 @@
 	'RemoveBBCodeUID_Guess' => 'Try to guess and remove BBCode UID',
 	'FixPostedImagesPaths' => 'Fix all posted images paths (adjust paths to reflect users subfolders)',
 
-	'FixSignatures' => 'Fix Signatures',
-	'FixSignaturesExplain' => 'This feature will allow you to fix all users signatures. You can use this feature to: find and replace any text in signatures, remove all BBCode UID, automatically adjust the address of posted images.',
+	'FixSignatures' => 'Fix Signatures (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixSignatures_Explain' => 'This feature will allow you to fix all users signatures. You can use this feature to: find and replace any text in signatures, remove all BBCode UID, automatically adjust the address of posted images. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
+	'FixSignatures_IP2' => 'Fix Signatures (Upgrading from Icy Phoenix 1.3)',
+	'FixSignatures_IP2_Explain' => 'This feature will allow you to adjust the path of uploaded images, since the path in Icy Phoenix 2.0 is different from the past versions of Icy Phoenix. You can use this feature also to find and replace any text in signatures (by leaving the search fild empty no replacement will be performed and only images paths will be adjusted).',
 	'FixingSignaturesInProgress' => 'Fixing signatures in progress',
 	'FixingSignaturesFrom' => 'Signatures modified this step from %s to %s',
 	'FixingSignaturesTotal' => '%s signatures of %s modified so far',
@@ -247,8 +251,8 @@
 	'SignaturesPerStep' => 'Number of signatures per step',
 	'StartFromSignature' => 'Start from signature',
 
-	'FixPics' => 'Fix Album Pics Paths',
-	'FixPicsExplain' => 'This feature will move all album pics from the main folder into users subfolders and will also update the database with the new paths',
+	'FixPics' => 'Fix Album Pics Paths (Upgrading from Icy Phoenix 1.2 or below)',
+	'FixPicsExplain' => 'This feature will move all album pics from the main folder into users subfolders and will also update the database with the new paths. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
 	'FixingPicsInProgress' => 'Fixing pics in progress',
 	'FixingPicsInProgressRedirect' => 'You will be automatically redirected to next step in three seconds',
 	'FixingPicsInProgressRedirectClick' => 'If you are not automatically redirected within three seconds you may click %sHere%s',
@@ -259,8 +263,11 @@
 	'PicStartFrom' => 'Start from pic',
 	'PicsPerStep' => 'Number of pics per step',
 
-	'RenMovePics' => 'Rename And Move Posted Pics',
-	'RenMovePicsExplain' => 'This feature will rename and move all posted pics from the main folder into users subfolders: you will then need to update posts table using the <i>Fix Posts</i> function to adjust all paths in posts',
+	'RenMovePics' => 'Rename And Move Posted Pics (Upgrading from Icy Phoenix 1.2 or below)',
+	'RenMovePicsExplain' => 'This feature will rename and move all posted pics from the main folder into users subfolders: you will then need to update posts table using the <i>Fix Posts</i> function to adjust all paths in posts. You don\'t need to run this feature if you are upgrading from Icy Phoenix 1.3 or above.',
+
+	'AddPostedPicsDB' => 'Add Uploaded Images To DB (Upgrading from Icy Phoenix 1.3 or above)',
+	'AddPostedPicsDBExplain' => 'This feature will import all uploaded images to DB.',
 
 	'COLLIDING_CLEAN_USERNAME' => '<strong>%s</strong> is the clean username for:',
 	'COLLIDING_USERNAMES_FOUND' => 'Colliding usernames were found on your old board. In order to complete the conversion please delete or rename these users so that there is only one user on your old board for each clean username.',

trunk/english/language/lang_english/lang_admin.php

@@ -1282,9 +1282,9 @@
 	'add_field_view_disclaimer' => 'All of these settings will be treated as "no" if users are not allowed to view this field',
 
 	'add_field_name' => 'Field Name',
-	'add_field_name_explain' => 'Enter the name you want to associate with this field.',
+	'add_field_name_explain' => 'Enter the name you want to associate with this field. You can customize the output for several language by editing <b>language/lang_XXX/lang_profile_fields.php</b>.',
 	'add_field_description' => 'Field Description',
-	'add_field_description_explain' => 'Enter a description you wish to associate with this field. It will be displayed in small text below the field name, just like this text is.',
+	'add_field_description_explain' => 'Enter a description you wish to associate with this field. It will be displayed in small text below the field name, just like this text is. You can customize the output for several language by editing <b>language/lang_XXX/lang_profile_fields.php</b>.',
 	'add_field_type' => 'Field Type',
 	'add_field_type_explain' => 'Select the type of profile field you want to add. Examples of each field type are shown to the far right.',
 	'edit_field_type_explain' => 'Select the type of profile field you want to change this field to. Examples of each field type are shown to the far right.',

trunk/english/language/lang_english/lang_album_admin.php

@@ -62,7 +62,7 @@
 	'Show_Download' => 'Show DOWNLOAD button (which enables the downloading of pictures in ZIP format) only to those who have UPLOAD permission in the Album (if you choose ALWAYS the button will be always available even if the users have no UPLOAD permissions)',
 	'Show_Slideshow' => 'Enable Slideshow feature',
 	'Show_Slideshow_Script' => 'Enable transition effects for Slideshow',
-	'Show_Pic_Size' => 'Show the pic size on thumbnail',
+	'Show_Pic_Size' => 'Show image size on thumbnail',
 	'Show_IMG_No_GD' => 'Show GIF thumbnails without using GD libraries (full images are loaded and then just shown resized).',
 	'Show_GIF_MidThumb' => 'Show full GIF images if Mid Thumb is enabled.',
 	'Show_Pics_Nav' => 'Show Picture Navigation Box in Show Page',

trunk/english/language/lang_english/lang_cms.php

@@ -93,6 +93,7 @@
 	'B_Cachetime' => 'Cache Duration',
 	'B_GROUPS' => 'Usergroups',
 	'B_ALL' => 'All',
+	'B_ALL_NO_BOTS' => 'All But BOTs',
 	'B_GUESTS' => 'Guests Only',
 	'B_REG' => 'Registered Users',
 	'B_MOD' => 'Moderators',

trunk/english/language/lang_english/lang_extend_icy_phoenix.php

@@ -264,7 +264,7 @@
 
 		'IP_no_bump' => 'Forbid bumping within 24 hours',
 		'IP_no_bump_explain' => 'Enabling this option last posters won\'t be able to post within 24 hours from their last post unless someone else has posted a reply (never applies to admins)',
-		'MODS_ALLOWED' => 'Moderators Can Posts',
+		'MODS_ALLOWED' => 'Moderators Can Post',
 
 		'IP_robots_index_topics_no_replies' => 'Enable Robots Indexing Topics No Replies',
 		'IP_robots_index_topics_no_replies_explain' => 'Enabling this option will enable indexing for topics with no replies, otherwise topics with no replies will not be indexed',
@@ -338,7 +338,7 @@
 		'IP_thumbnail_posts' => 'Thumbnails in posts',
 		'IP_thumbnail_posts_explain' => 'With this option a thumbnail will be shown instead of a full picture when an image is posted using IMG BBCode',
 
-		'IP_show_pic_size_on_thumb' => 'Show the pic size on thumbnail',
+		'IP_show_pic_size_on_thumb' => 'Show image size on thumbnail',
 
 		'IP_thumbnail_highslide' => 'Use HighSlide to show images if thumbnails are enabled',
 		'IP_thumbnail_highslide_explain' => 'Opens the image in front of the current page instead of opening it in a new window. More about <a href="http://www.highslide.com/" target="_blank">HighSlide JS...</a><br />Make sure you empty the precompiled posts after changing this setting!',

trunk/english/language/lang_english/lang_main.php

@@ -1723,7 +1723,7 @@
 	'LINK_DOWNLOADS' => 'Downloads',
 	'LINK_BOOKMARKS' => 'Bookmarks',
 	'LINK_DRAFTS' => 'Drafts',
-	'LINK_UPLOADED_IMAGES' => 'Uploaded Images',
+	'LINK_UPLOADED_IMAGES' => 'Personal Images',
 	'LINK_AJAX_SHOUTBOX' => 'Chat',
 	'LINK_LINKS' => 'Links',
 	'LINK_CONTACT_US' => 'Contact Us',
@@ -1978,7 +1978,7 @@
 
 	'Uploading' => 'Uploading...',
 	'Upload_Image_Local' => 'Upload Image',
-	'Uploaded_Images_Local' => 'Uploaded Images',
+	'Uploaded_Images_Local' => 'Personal Images',
 	'Upload_Image_Local_Explain' => 'Select the file to be uploaded',
 	'Uploaded_Image_Success' => 'The image has been uploaded successfully.',
 	'Uploaded_Image_BBC' => 'You can use this BBCode to post this image.',

trunk/english/language/lang_english/lang_profile_fields.php

@@ -22,29 +22,29 @@
  *
  *   Use this field to rename your custom profile fields.
  *   You should use the following syntax:
- *   $lang['ID_Field_Name'] = 'Your Field Name';
- *   $lang['ID_Description'] = 'Your Field Description';
+ *   $lang['UCP_PF_ID_Field_Name'] = 'Your Field Name';
+ *   $lang['UCP_PF_ID_Field_Name_Description'] = 'Your Field Description';
  *
  *   Example: you have a field with ID=1 which is named Phone
- *   $lang['1_Phone'] = 'Phone';
- *   $lang['1_Description'] = 'Phone Number';
+ *   $lang['UCP_PF_1_Phone'] = 'Phone';
+ *   $lang['UCP_PF_1_Phone_Description'] = 'Phone Number';
  *
  ***************************************************************************/
 
 /*
-$lang['_'] = '';
-$lang['_Description'] = '';
+$lang['UCP_PF__'] = '';
+$lang['UCP_PF___Description'] = '';
 */
 
 /*
 //An Australian Example for Profile Fields
-$lang['1_Phone'] = 'Phone';
-$lang['1_Description'] = 'Phone Number';
-$lang['2_Team'] = 'Team';
-$lang['2_Description'] = 'Australian Team';
-$lang['2_Juve'] = 'Wallabies';
-$lang['2_Milan'] = 'Kangaroos';
-$lang['2_Altro'] = 'Other';
+$lang['UCP_PF_1_Phone'] = 'Phone';
+$lang['UCP_PF_1_Description'] = 'Phone Number';
+$lang['UCP_PF_2_Team'] = 'Team';
+$lang['UCP_PF_2_Description'] = 'Australian Team';
+$lang['UCP_PF_2_Juve'] = 'Wallabies';
+$lang['UCP_PF_2_Milan'] = 'Kangaroos';
+$lang['UCP_PF_2_Altro'] = 'Other';
 */
 
 ?>