Changeset 6348 for trunk/admin

Timestamp:

05/25/10 00:19:41 (3 years ago)

Author:

plg

Message:

merge r6347 from branch 2.1 to trunk

bug 1672: replace the language key where it's used.

Location:

trunk

Files:

• . (modified) (1 prop)
• admin (modified) (1 prop)
• admin/cat_list.php (modified) (1 prop)
• admin/cat_modify.php (modified) (1 prop)
• admin/cat_move.php (modified) (1 prop)
• admin/cat_options.php (modified) (1 prop)
• admin/cat_perm.php (modified) (1 prop)
• admin/comments.php (modified) (1 prop)
• admin/configuration.php (modified) (1 prop)
• admin/element_set.php (modified) (1 prop)
• admin/element_set_global.php (modified) (1 prop)
• admin/element_set_ranks.php (modified) (1 prop)
• admin/element_set_unit.php (modified) (1 prop)
• admin/extend_for_templates.php (modified) (1 prop)
• admin/group_list.php (modified) (1 prop)
• admin/group_perm.php (modified) (1 prop)
• admin/help.php (modified) (1 prop)
• admin/history.php (modified) (1 prop)
• admin/index.php (modified) (1 prop)
• admin/intro.php (modified) (1 prop)
• admin/languages_installed.php (modified) (1 prop)
• admin/languages_new.php (modified) (1 prop)
• admin/maintenance.php (modified) (1 prop)
• admin/menubar.php (modified) (1 prop)
• admin/notification_by_mail.php (modified) (1 prop)
• admin/permalinks.php (modified) (1 prop)
• admin/photos_add.php (modified) (1 prop)
• admin/photos_add_direct.php (modified) (1 prop)
• admin/photos_add_ftp.php (modified) (1 prop)
• admin/photos_add_ploader.php (modified) (1 prop)
• admin/photos_add_settings.php (modified) (1 prop)
• admin/picture_modify.php (modified) (1 prop)
• admin/plugin.php (modified) (1 prop)
• admin/plugins_list.php (modified) (1 prop)
• admin/plugins_new.php (modified) (1 prop)
• admin/plugins_update.php (modified) (1 prop)
• admin/popuphelp.php (modified) (1 prop)
• admin/profile.php (modified) (1 prop)
• admin/rating.php (modified) (1 prop)
• admin/site_manager.php (modified) (1 prop)
• admin/site_reader_local.php (modified) (1 prop)
• admin/site_reader_remote.php (modified) (1 prop)
• admin/site_update.php (modified) (1 prop)
• admin/stats.php (modified) (1 prop)
• admin/tags.php (modified) (1 prop)
• admin/theme.php (modified) (1 prop)
• admin/themes (modified) (1 prop)
• admin/themes/default (modified) (1 prop)
• admin/themes/default/content.css (modified) (1 prop)
• admin/themes/default/default-colors.css (modified) (1 prop)
• admin/themes/default/default-layout.css (modified) (1 prop)
• admin/themes/default/fix-ie5-ie6.css (modified) (1 prop)
• admin/themes/default/index.php (modified) (1 prop)
• admin/themes/default/layout.css (modified) (1 prop)
• admin/themes/default/local-layout.css (modified) (1 prop)
• admin/themes/default/local_head.tpl (modified) (1 prop)
• admin/themes/default/menubar.css (modified) (1 prop)
• admin/themes/default/picture.css (modified) (1 prop)
• admin/themes/default/print.css (modified) (1 prop)
• admin/themes/default/template (modified) (1 prop)
• admin/themes/default/template/admin.tpl (modified) (1 prop)
• admin/themes/default/template/cat_list.tpl (modified) (1 prop)
• admin/themes/default/template/cat_modify.tpl (modified) (1 prop)
• admin/themes/default/template/cat_move.tpl (modified) (1 prop)
• admin/themes/default/template/cat_options.tpl (modified) (1 prop)
• admin/themes/default/template/cat_perm.tpl (modified) (1 prop)
• admin/themes/default/template/check_integrity.tpl (modified) (1 prop)
• admin/themes/default/template/comments.tpl (modified) (1 prop)
• admin/themes/default/template/configuration.tpl (modified) (1 prop)
• admin/themes/default/template/double_select.tpl (modified) (1 prop)
• admin/themes/default/template/element_set_global.tpl (modified) (1 diff, 1 prop)
• admin/themes/default/template/element_set_ranks.tpl (modified) (1 prop)
• admin/themes/default/template/element_set_unit.tpl (modified) (1 prop)
• admin/themes/default/template/extend_for_templates.tpl (modified) (1 prop)
• admin/themes/default/template/footer.tpl (modified) (1 prop)
• admin/themes/default/template/group_list.tpl (modified) (1 prop)
• admin/themes/default/template/group_perm.tpl (modified) (1 prop)
• admin/themes/default/template/header.tpl (modified) (1 prop)
• admin/themes/default/template/help.tpl (modified) (1 prop)
• admin/themes/default/template/history.tpl (modified) (1 prop)
• admin/themes/default/template/install.tpl (modified) (1 prop)
• admin/themes/default/template/intro.tpl (modified) (1 prop)
• admin/themes/default/template/languages_installed.tpl (modified) (1 prop)
• admin/themes/default/template/languages_new.tpl (modified) (1 prop)
• admin/themes/default/template/maintenance.tpl (modified) (1 prop)
• admin/themes/default/template/menubar.tpl (modified) (1 prop)
• admin/themes/default/template/navigation_bar.tpl (modified) (1 prop)
• admin/themes/default/template/notification_by_mail.tpl (modified) (1 prop)
• admin/themes/default/template/permalinks.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_direct.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_ftp.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_ploader.tpl (modified) (1 prop)
• admin/themes/default/template/photos_add_settings.tpl (modified) (1 prop)
• admin/themes/default/template/picture_modify.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_list.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_new.tpl (modified) (1 prop)
• admin/themes/default/template/plugins_update.tpl (modified) (1 prop)
• admin/themes/default/template/popuphelp.tpl (modified) (1 prop)
• admin/themes/default/template/profile.tpl (modified) (1 prop)
• admin/themes/default/template/profile_content.tpl (modified) (1 prop)
• admin/themes/default/template/rating.tpl (modified) (1 prop)
• admin/themes/default/template/site_manager.tpl (modified) (1 prop)
• admin/themes/default/template/site_update.tpl (modified) (1 prop)
• admin/themes/default/template/stats.tpl (modified) (1 prop)
• admin/themes/default/template/tabsheet.tpl (modified) (1 prop)
• admin/themes/default/template/tags.tpl (modified) (1 prop)
• admin/themes/default/template/themes_installed.tpl (modified) (1 prop)
• admin/themes/default/template/themes_new.tpl (modified) (1 prop)
• admin/themes/default/template/thumbnail.tpl (modified) (1 prop)
• admin/themes/default/template/upgrade.tpl (modified) (1 prop)
• admin/themes/default/template/upload.tpl (modified) (1 prop)
• admin/themes/default/template/user_list.tpl (modified) (1 prop)
• admin/themes/default/template/user_perm.tpl (modified) (1 prop)
• admin/themes/default/theme.css (modified) (1 prop)
• admin/themes/default/themeconf.inc.php (modified) (1 prop)
• admin/themes/default/thumbnails.css (modified) (1 prop)
• admin/themes/default/uploadify.jGrowl.css (modified) (1 prop)
• admin/themes_installed.php (modified) (1 prop)
• admin/themes_new.php (modified) (1 prop)
• admin/thumbnail.php (modified) (1 prop)
• admin/upload.php (modified) (1 prop)
• admin/user_list.php (modified) (1 prop)
• admin/user_perm.php (modified) (1 prop)

trunk

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/branches/2.1:6311-6313*,6321*,6338*
+/branches/2.1:6311-6313*,6321*,6338*,6347*

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/branches/2.1:6311-6313*,6321*,6338*
+/branches/2.1:6311-6313*,6321*,6338*,6347*

trunk/admin/themes/default/template/element_set_global.tpl

@@ -86 +86 @@
   <fieldset>
     <legend>{'Deletions'|@translate}</legend>
-    <p style="font-style:italic">{'Note: Only deletes photos added with pLoader'|@translate}</p>
+    <p style="font-style:italic">{'Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'|@translate}</p>
     <p>
       {'target'|@translate}

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/branches/2.1:6311-6313*,6321*,6338*
+/branches/2.1:6311-6313*,6321*,6338*,6347*