Index: trunk/core/admin_templates/js/script.js
===================================================================
diff -u -N -r7391 -r7635
--- trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 7391)
+++ trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 7635)
@@ -438,6 +438,7 @@
 
 	var $prev_opener = opener_action('p');
 	event_bak = get_hidden_field('events[' + $prefix_special + ']')
+	if (!event_bak) event_bak = '';
 	submit_event($prefix_special, $event, $t);
 	opener_action($prev_opener); // restore opener in parent window
 	set_hidden_field('events[' + $prefix_special + ']', event_bak); // restore event
@@ -448,7 +449,7 @@
 {
 	// if url has additional params - store it and make hidden fields from it (later, below)
 	var	$additional = [];
-	if ($url.match('(.*)&(.*)')) {
+	if ($url.match('(.*?)&(.*)')) {
 		$url = RegExp.$1;
 		var tmp = RegExp.$2;
 		var pairs = tmp.split('&');
@@ -489,6 +490,11 @@
 	$kf.action = $prev_action;
 }
 
+function translate_phrase($label, $template) {
+	set_hidden_field('phrases_label', $label);
+	open_popup('phrases', 'OnNew', $template);
+}
+
 function std_precreate_item(prefix_special, edit_template)
 {
 	set_hidden_field(prefix_special+'_mode', 't');
@@ -766,11 +772,10 @@
 	if (!isset($escaped)) $escaped = true;
 
 	if ($escaped) {
-		return $string.match(/<a href="(.*)">(.*)<\/a>/) ?  RegExp.$2 : $string;
+		return $string.replace(/<a href="(.*?)">(.*?)<\/a>/g, '$2');
 	}
-	else {
-		return $string.match(/<a href="(.*)">(.*)<\/a>/) ?  RegExp.$2 : $string;
-	}
+
+	return $string.replace(/<a href="(.*?)">(.*?)<\/a>/g, '$2');
 }
 
 function redirect($url)
@@ -1230,17 +1235,86 @@
 
 	function reset_form(prefix, event, msg)
 	{
-		if (confirm(msg)) {
+		if (confirm(RemoveTranslationLink(msg, true))) {
 			submit_event(prefix, event)
 		}
 	}
 
 	function cancel_edit(prefix, cancel_ev, save_ev, msg)
 	{
-		if (confirm(msg)) {
+		if (confirm(RemoveTranslationLink(msg, true))) {
 			submit_event(prefix, save_ev)
 		}
 		else {
 			submit_event(prefix, cancel_ev)
 		}
-	}
\ No newline at end of file
+	}
+
+
+
+function execJS(node)
+{
+  var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
+  var bOpera = (navigator.userAgent.indexOf('Opera') != -1);
+  var bMoz = (navigator.appName == 'Netscape');
+
+  if (!node) return;
+
+  /* IE wants it uppercase */
+  var st = node.getElementsByTagName('SCRIPT');
+  var strExec;
+
+  for(var i=0;i<st.length; i++)
+  {
+    if (bSaf) {
+      strExec = st[i].innerHTML;
+      st[i].innerHTML = "";
+    } else if (bOpera) {
+      strExec = st[i].text;
+      st[i].text = "";
+    } else if (bMoz) {
+      strExec = st[i].textContent;
+      st[i].textContent = "";
+    } else {
+      strExec = st[i].text;
+      st[i].text = "";
+    }
+
+    try {
+      var x = document.createElement("script");
+      x.type = "text/javascript";
+
+      /* In IE we must use .text! */
+      if ((bSaf) || (bOpera) || (bMoz))
+        x.innerHTML = strExec;
+      else x.text = strExec;
+
+      document.getElementsByTagName("head")[0].appendChild(x);
+    } catch(e) {
+      alert(e);
+    }
+  }
+};
+
+function NumberFormatter() {}
+
+NumberFormatter.ThousandsSep = '\'';
+NumberFormatter.DecimalSep = '.';
+
+NumberFormatter.Parse = function(num)
+{
+	return parseFloat( num.toString().replace(this.ThousandsSep, '').replace(this.DecimalSep, '.') );
+}
+
+NumberFormatter.Format = function(num)
+{
+	num += '';
+	x = num.split('.');
+	x1 = x[0];
+	x2 = x.length > 1 ? this.DecimalSep + x[1] : '';
+	var rgx = /(\d+)(\d{3})/;
+	while (rgx.test(x1)) {
+		x1 = x1.replace(rgx, '$1' + this.ThousandsSep + '$2');
+	}
+	return x1 + x2;
+}