diff --git a/docs/NEWS b/docs/NEWS index 320a6a61..534351d4 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,6 +1,10 @@ Version 2.3.1-beta1 ------------------------------------------------------------------------ + * Enhance i18n of ML multimove. + + * Fix ML multidelete. + * Change footer_info and prev/next links for archive pages for "stable archives" sort order. diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index 1afe725b..7d56d2da 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -132,7 +132,7 @@ switch ($serendipity['GET']['adminAction']) { break; } // case bulk multimove (leave the fake oldDir being send as an empty dir) - if (isset($serendipity['POST']['newDir'])) { + if (!empty($serendipity['POST']['newDir'])) { $messages = array(); $multiMoveImages = $serendipity['POST']['multiDelete']; // The 'multiDelete' key name should better be renamed to 'multiCheck', but this would need to change 2k11/admin/serendipity_editor.js, images.inc.tpl, media_items.tpl, media_pane.tpl and this file unset($serendipity['POST']['multiDelete']); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 2ec2b152..71bbde74 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1009,7 +1009,7 @@ @define('PUBLISH_ERROR', 'Fehler bei der Veröffentlichung:'); @define('UPDATE_NOTIFICATION', 'Update-Hinweis'); @define('NEW_VERSION_AVAILABLE', 'Neue stabile Serendipity version verfügbar: '); -@define('MOVE', 'Bewegen'); +@define('MOVE', 'Verschieben'); @define('MOVE_UP', 'Nach oben'); @define('MOVE_DOWN', 'Nach unten'); @define('INSTALL_NEW_SIDEBAR_PLUGIN', 'Seitenleisten-Plugin installieren'); @@ -1133,3 +1133,4 @@ @define('PLUGIN_LINK_SPARTACUS', 'Weitere Informationen'); @define('PLUGIN_ALL_UPDATED', 'Alle Plugins aktualisiert'); +@define('MEDIA_DIRECTORY_MOVE', 'Dateien verschieben'); diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index ebf5e7da..198188ea 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -1009,7 +1009,7 @@ @define('PUBLISH_ERROR', 'Fehler bei der Veröffentlichung:'); @define('UPDATE_NOTIFICATION', 'Update-Hinweis'); @define('NEW_VERSION_AVAILABLE', 'Neue stabile Serendipity version verfügbar: '); -@define('MOVE', 'Bewegen'); +@define('MOVE', 'Verschieben'); @define('MOVE_UP', 'Nach oben'); @define('MOVE_DOWN', 'Nach unten'); @define('INSTALL_NEW_SIDEBAR_PLUGIN', 'Seitenleisten-Plugin installieren'); @@ -1133,3 +1133,4 @@ @define('PLUGIN_LINK_SPARTACUS', 'Weitere Informationen'); @define('PLUGIN_ALL_UPDATED', 'Alle Plugins aktualisiert'); +@define('MEDIA_DIRECTORY_MOVE', 'Dateien verschieben'); diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index dd7feebb..49e44fbc 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -1132,3 +1132,4 @@ @define('PLUGIN_LINK_SPARTACUS', 'More information'); @define('PLUGIN_ALL_UPDATED', 'All Plugins updated'); +@define('MEDIA_DIRECTORY_MOVE', 'Move files to another directory'); diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl index 8b18300f..7ecde59d 100644 --- a/templates/2k11/admin/media_pane.tpl +++ b/templates/2k11/admin/media_pane.tpl @@ -287,7 +287,7 @@
-

Move images to directory

+

{$CONST.MEDIA_DIRECTORY_MOVE}