1 files changed, 10 insertions, 17 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Strings.js b/frontend/gamma/js/Clipperz/PM/Strings.js
index a051365..7e855ff 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings.js
@@ -1,46 +1,44 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; }
 if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; }
 
 //-----------------------------------------------------------------------------
 /*
 Clipperz.PM.Strings.standardStrings = {
 	'loginPanelSwitchLanguageSelectOptions':	[
 / *
 		{tag:'option', html:"Arabic (Oman) (العربية)", value:'ar-OM', disabled:true},
 		{tag:'option', html:"Arabic (Syria) (العربية)", value:'ar-SY', disabled:true},
 		{tag:'option', html:"Bahasa Indonesia", value:'id-ID', disabled:true},
 		{tag:'option', html:"Bulgarian (Български)", value:'bg-BG', disabled:true},
 		{tag:'option', html:"Català", value:'ca-ES', disabled:true},
 		{tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN', disabled:true},
 		{tag:'option', html:"Chinese (Traditional) (正體中文)", value:'zh-TW', disabled:true},
 		{tag:'option', html:"Czech (Česky)", value:'cs-CZ', disabled:true},
 		{tag:'option', html:"Dansk", value:'da-DK', disabled:true},
 		{tag:'option', html:"Deutsch", value:'de-DE'/ *, disabled:true* /},
 		{tag:'option', html:"English (American)", value:'en-US'/ *, disabled:true* /},
@@ -220,64 +218,59 @@ Clipperz.PM.Strings.Languages.setSelectedLanguage = function(aLanguage) {
 		MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.Languages[Clipperz.PM.Strings.defaultLanguages['default']]);
 		MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.GeneralSettings[Clipperz.PM.Strings.defaultLanguages['default']]);
 
 		MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.Languages[selectedLanguage]);
 		MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.GeneralSettings[selectedLanguage]);
 
 		Clipperz.PM.Strings.stringsObjectStore = new Clipperz.KeyValueObjectStore(/*{'name':'String.stringsObjectStore [1]'}*/);
 		Clipperz.PM.Strings.stringsObjectStore.initWithValues(translations);
 
 		if (typeof(bookmarklet) != 'undefined') {
 			Clipperz.PM.Strings.stringsObjectStore.setValue('bookmarklet', Clipperz.PM.Strings.translateBookmarklet(bookmarklet));
 		}
 
 		MochiKit.Signal.signal(Clipperz.PM.Strings.Languages, 'switchLanguage', selectedLanguage);
 	}
 }
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Strings.getValue = function (aKeyPath, someKeyValues) {
 	var	result;
 	
 	result = Clipperz.PM.Strings.stringsObjectStore.getValue(aKeyPath);
 
-//try {
 	if (typeof(result) == 'string') {
 		if (typeof (someKeyValues) != 'undefined') {
 			var	key;
 		
 			for (key in someKeyValues) {
 				result = result.replace( new RegExp(key), someKeyValues[key]);
-	//			result.replace(, '');
 			}
 		}
 
 		result = result.replace(new RegExp('\n'), '<br>');
 	}
-//} catch (exception) {
-//	console.log("####", result, aKeyPath, someKeyValues, exception);
-//}
 
 	return result;
 }
 
 Clipperz.PM.Strings.errorDescriptionForException = function (anException) {
 	var result;
 	
 	result = Clipperz.PM.Strings.getValue('exceptionsMessages' + '.' + anException.name);
 
 	if (result == null) {
 		result = anException.message;
 	}
 	
 	return result;
 },
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Strings.Languages.initSetup = function() {
 	var	language;
 	var	languageParser;
 
 	language = navigator.language || navigator.userLanguage;	//	en, en-US, .... "de", "nb-no"
 	languageParser = new RegExp("language=([a-z]{2}(?:\-[a-z]{2})?)(\&|$)", "i");