diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources.properties b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
index 226bb32a4..8354adf18 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
+++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources.properties
@@ -71,3 +71,4 @@ cms.ui.folder.filter.all=All
 cms.ui.folder.filter=Filter for work
 cms.ui.folder.filter_do=Filter
 cms.ui.folder.languages=
+cms.ui.folder.delete_confirmation=Permanently delete this item?
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
index c8f409279..abc15b585 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
+++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_de.properties
@@ -67,3 +67,4 @@ cms.ui.folder.filter.all=Alle
 cms.ui.folder.filter=Nach Begriff filtern
 cms.ui.folder.filter_do=Filtern
 cms.ui.folder.languages=
+cms.ui.folder.delete_confirmation=Wollen Sie dieses Content-Item l\u00f6schen?
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
index 6ebfd1b34..c5ba2b008 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
+++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/CMSFolderResources_fr.properties
@@ -66,3 +66,4 @@ cms.ui.folder.no_permission_for_item=Vous n'avez pas l'autorisation de supprimer
 cms.ui.folder.no_such_item=L'identifiant fourni pour l'\u00e9l\u00e9ment ne correspond pas \u00e0 un contenu existant.
 cms.ui.folder.filter.all=
 cms.ui.folder.languages=
+cms.ui.folder.delete_confirmation=
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
index 1b9847713..9a0d7b181 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
@@ -427,7 +427,7 @@ public class FolderBrowser extends Table {
             final boolean isCurrentKey = sortKey.equals(m_key);
             final String currentSortDirection = (String) state.getValue(
                     m_sortDirection);
-            String imageURLStub = null;
+            String imageURLStub;
 
             if (SORT_ACTION_UP.equals(currentSortDirection)) {
                 imageURLStub = "gray-triangle-up.gif";
@@ -439,7 +439,7 @@ public class FolderBrowser extends Table {
 
                 @Override
                 public void setControlEvent(PageState ps) {
-                    String sortDirectionAction = null;
+                    String sortDirectionAction;
                     // by default, everything sorts "up" unless it
                     // is the current key and it is already pointing up
                     if (SORT_ACTION_UP.equals(currentSortDirection)
@@ -604,8 +604,8 @@ public class FolderBrowser extends Table {
      */
     private static class ActionCellRenderer implements TableCellRenderer {
 
-        private static Label s_noAction;
-        private static ControlLink s_link;
+        private static final Label s_noAction;
+        private static final ControlLink s_link;
         private static final Logger logger = Logger.getLogger(
                 ActionCellRenderer.class);
 
@@ -615,7 +615,7 @@ public class FolderBrowser extends Table {
             s_noAction.lock();
             s_link = new ControlLink(
                     new Label(globalize("cms.ui.folder.delete")));
-            s_link.setConfirmation("Permanently delete this item?"); // XXX G11N ?
+            s_link.setConfirmation(globalize("cms.ui.folder.delete_confirmation"));
             logger.debug("Static initializer finished.");
         }
 
@@ -759,7 +759,7 @@ public class FolderBrowser extends Table {
                     return FormatStandards.formatDate(lastModified);
                 }
                 case DELETABLE:
-                    return new Boolean(isDeletable());
+                    return isDeletable();
                 case IS_INDEX: {
                     if (hideIndexColumn()) {
                         throw new IndexOutOfBoundsException(
@@ -770,9 +770,9 @@ public class FolderBrowser extends Table {
                         return null;
                     }
                     if (m_folIndexID == null) {
-                        return new Boolean(false);
+                        return false;
                     }
-                    return new Boolean(m_folIndexID.compareTo(m_itemColl.getBundleID()) == 0);
+                    return m_folIndexID.compareTo(m_itemColl.getBundleID()) == 0;
                 }
                 default:
                     throw new IndexOutOfBoundsException("Column index "
@@ -828,6 +828,7 @@ public class FolderBrowser extends Table {
 
     private class FolderChanger extends TableActionAdapter {
 
+        @Override
         public void cellSelected(TableActionEvent e) {
             PageState s = e.getPageState();
             int col = e.getColumn().intValue();