Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java	(revision 3030)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedMessages.java	(revision 3031)
@@ -50,10 +50,10 @@
 
 	private static Map<Locale, LocalizedMessages> prototypes = new HashMap<Locale, LocalizedMessages>();
-	private static final String DEFAULT_FILENAME = "default_messages.properties";
-	private static final String LOCAL_PROPERTIES = "fckeditor_messages";
+	private static final String DEFAULT_FILENAME = "default_messages.properties"; //$NON-NLS-1$
+	private static final String LOCAL_PROPERTIES = "fckeditor_messages"; //$NON-NLS-1$
 	private static Properties defaultProperties = new Properties();
 	private Properties properties;
 	private static LocaleResolver localeResolver;
-	private static final Locale NEUTRAL = new Locale("");
+	private static final Locale NEUTRAL = new Locale(""); //$NON-NLS-1$
 	private static final Logger logger = LoggerFactory
 			.getLogger(LocalizedMessages.class);
@@ -65,6 +65,6 @@
 
 		if (in == null) {
-			logger.error("{} not found", DEFAULT_FILENAME);
-			throw new RuntimeException(DEFAULT_FILENAME + " not found");
+			logger.error("{} not found", DEFAULT_FILENAME); //$NON-NLS-1$
+			throw new RuntimeException(DEFAULT_FILENAME + " not found"); //$NON-NLS-1$
 		} else {
 			if (!(in instanceof BufferedInputStream))
@@ -74,8 +74,8 @@
 				defaultProperties.load(in);
 				in.close();
-				logger.debug("{} loaded", DEFAULT_FILENAME);
+				logger.debug("{} loaded", DEFAULT_FILENAME); //$NON-NLS-1$
 			} catch (Exception e) {
-				logger.error("Error while processing {}", DEFAULT_FILENAME);
-				throw new RuntimeException("Error while processing " + DEFAULT_FILENAME, e);
+				logger.error("Error while loading {}", DEFAULT_FILENAME); //$NON-NLS-1$
+				throw new RuntimeException("Error while loading " + DEFAULT_FILENAME, e); //$NON-NLS-1$
 			}
 		}
@@ -120,12 +120,12 @@
 
 			if (Utils.isEmpty(className))
-				logger.error("Empty LocaleResolver implementation class name provided");
+				logger.error("Empty LocaleResolver implementation class name provided"); //$NON-NLS-1$
 			else
 				try {
 					Class<?> clazz = Class.forName(className);
 					localeResolver = (LocaleResolver) clazz.newInstance();
-					logger.info("LocaleResolver initialized to {}", className);
+					logger.info("LocaleResolver initialized to {}", className); //$NON-NLS-1$
 				} catch (Exception e) {
-					logger.error("LocaleResolver implementation {} could not be instantiated", className);
+					logger.error("LocaleResolver implementation {} could not be instantiated", className); //$NON-NLS-1$
 					// TODO should be throw a RuntimeException here
 				}
@@ -149,5 +149,5 @@
 					.currentThread().getContextClassLoader());
 		} catch (Exception e) {
-			logger.debug("No resource bundle found for locale {}", locale);
+			logger.debug("No resource bundle found for locale {}", locale); //$NON-NLS-1$
 		}
 
@@ -163,7 +163,7 @@
 			}
 			
-			logger.debug("Resource bundle for locale {} loaded", locale);
+			logger.debug("Resource bundle for locale {} loaded", locale); //$NON-NLS-1$
 		} else
-			logger.debug("No resource bundle for locale {} found, loading default bundle", locale);
+			logger.debug("No resource bundle for locale {} found, loading default bundle", locale); //$NON-NLS-1$
 		
 		
@@ -181,5 +181,5 @@
 	 */
 	public String getCompatibleBrowserYes() {
-		return getString("editor.compatibleBrowser.yes");
+		return getString("editor.compatibleBrowser.yes"); //$NON-NLS-1$
 	}
 
@@ -190,5 +190,5 @@
 	 */
 	public String getCompatibleBrowserNo() {
-		return getString("editor.compatibleBrowser.no");
+		return getString("editor.compatibleBrowser.no"); //$NON-NLS-1$
 	}
 
@@ -200,5 +200,5 @@
 	 */
 	public String getFileUploadEnabled() {
-		return getString("connector.fileUpload.enabled");
+		return getString("connector.fileUpload.enabled"); //$NON-NLS-1$
 	}
 
@@ -210,5 +210,5 @@
 	 */
 	public String getFileUploadDisabled() {
-		return getString("connector.fileUpload.disabled");
+		return getString("connector.fileUpload.disabled"); //$NON-NLS-1$
 	}
 	
@@ -221,7 +221,5 @@
 	 */
 	public String getFileRenamedWarning(String newFileName) {
-		return MessageFormat.format(
-				getString("connector.fileUpload.file_renamed_warning"),
-				newFileName);
+		return MessageFormat.format(getString("connector.fileUpload.file_renamed_warning"), newFileName); //$NON-NLS-1$
 	}
 	
@@ -233,5 +231,5 @@
 	 */
 	public String getInvalidFileTypeSpecified() {
-		return getString("connector.fileUpload.invalid_file_type_specified");
+		return getString("connector.fileUpload.invalid_file_type_specified"); //$NON-NLS-1$
 	}
 	
@@ -243,5 +241,5 @@
 	 */
 	public String getFileUploadWriteError() {
-		return getString("connector.fileUpload.write_error");
+		return getString("connector.fileUpload.write_error"); //$NON-NLS-1$
 	}
 
@@ -253,5 +251,5 @@
 	 */
 	public String getGetResourcesEnabled() {
-		return getString("connector.getResources.enabled");
+		return getString("connector.getResources.enabled"); //$NON-NLS-1$
 	}
 
@@ -263,5 +261,5 @@
 	 */
 	public String getGetResourcesDisabled() {
-		return getString("connector.getResources.disabled");
+		return getString("connector.getResources.disabled"); //$NON-NLS-1$
 	}
 	
@@ -273,5 +271,5 @@
 	 */
 	public String getGetResourcesReadError() {
-		return getString("connector.getResources.read_error");
+		return getString("connector.getResources.read_error"); //$NON-NLS-1$
 	}
 
@@ -283,5 +281,5 @@
 	 */
 	public String getCreateFolderEnabled() {
-		return getString("connector.createFolder.enabled");
+		return getString("connector.createFolder.enabled"); //$NON-NLS-1$
 	}
 
@@ -293,5 +291,5 @@
 	 */
 	public String getCreateFolderDisabled() {
-		return getString("connector.createFolder.disabled");
+		return getString("connector.createFolder.disabled"); //$NON-NLS-1$
 	}
 
@@ -303,5 +301,5 @@
 	 */
 	public String getInvalidCommandSpecified() {
-		return getString("connector.invalid_command_specified");
+		return getString("connector.invalid_command_specified"); //$NON-NLS-1$
 	}
 	
@@ -313,5 +311,5 @@
 	 */
 	public String getFolderAlreadyExistsError() {
-		return getString("connector.createFolder.folder_already_exists_error");
+		return getString("connector.createFolder.folder_already_exists_error"); //$NON-NLS-1$
 	}
 	
@@ -323,5 +321,5 @@
 	 */
 	public String getInvalidNewFolderNameSpecified() {
-		return getString("connector.createFolder.invalid_new_folder_name_specified");
+		return getString("connector.createFolder.invalid_new_folder_name_specified"); //$NON-NLS-1$
 	}
 	
@@ -333,5 +331,5 @@
 	 */
 	public String getCreateFolderWriteError() {
-		return getString("connector.createFolder.write_error");
+		return getString("connector.createFolder.write_error"); //$NON-NLS-1$
 	}
 
@@ -343,5 +341,5 @@
 	 */
 	public String getInvalidResouceTypeSpecified() {
-		return getString("connector.invalid_resource_type_specified");
+		return getString("connector.invalid_resource_type_specified"); //$NON-NLS-1$
 	}
 
@@ -353,5 +351,5 @@
 	 */
 	public String getInvalidCurrentFolderSpecified() {
-		return getString("connector.invalid_current_folder_specified");
+		return getString("connector.invalid_current_folder_specified"); //$NON-NLS-1$
 	}