[interchange-cvs] interchange - racke modified 3 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Wed Apr 30 08:14:00 2003


User:      racke
Date:      2003-04-30 12:13:19 GMT
Modified:  dist/lib/UI/locales de_DE.cfg default.cfg
Modified:  dist/lib/UI/pages/admin merge_meta.html
Log:
i18n updates for merge metadata

Revision  Changes    Path
2.38      +57 -3     interchange/dist/lib/UI/locales/de_DE.cfg


rev 2.38, prev_rev 2.37
Index: de_DE.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/locales/de_DE.cfg,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -r2.37 -r2.38
--- de_DE.cfg	24 Apr 2003 17:05:43 -0000	2.37
+++ de_DE.cfg	30 Apr 2003 12:13:19 -0000	2.38
@@ -201,6 +201,12 @@
 "Allow full expressions",
 undef,
 
+"Already merged to current version %s.",
+"Bereits mit aktueller Version %s zusammengefügt.",
+
+"Already merged to higher version %s.",
+"Bereits mit höherer Version %s zusammengefügt.",
+
 "Amount",
 "Betrag",
 
@@ -372,6 +378,12 @@
 "Cancel ship edit",
 undef,
 
+"Cannot merge metadata -- column(s) '%s' is missing in table %s.",
+"Metadaten konnten nicht vereinigt werden - Spalte(n) '%s' fehlen in Tabelle %s.",
+
+"Cannot merge metadata -- table %s is missing.",
+"Metadaten konnten nicht vereinigt werden - Tabelle %s fehlt",
+
 "Card Number",
 undef,
 
@@ -675,6 +687,12 @@
 "Decrypt Credit Card",
 undef,
 
+"Defer all",
+"Alle zurückstellen",
+
+"Defer decision",
+"Entscheidung zurückstellen",
+
 "Delete",
 "Löschen",
 
@@ -831,6 +849,9 @@
 "Entries matching %s",
 "Einträge, die zu %s passen",
 
+"Entries merged:",
+"Vereinigte Einträge:",
+
 "Entry page:",
 "Startseite:",
 
@@ -1066,7 +1087,7 @@
 "In Inhalten",
 
 "Inactive",
-undef,
+"Nicht aktiv",
 
 "Inactive Customers",
 "Passive Kunden",
@@ -1134,6 +1155,9 @@
 "Items in cart",
 undef,
 
+"Items to merge",
+"Zu vereinigende Einträge",
+
 "January",
 "Januar",
 
@@ -1143,6 +1167,12 @@
 "June",
 "Juni",
 
+"Keep all",
+"Alle beibehalten",
+
+"Keep old value forever",
+"Alten Wert dauerhaft beibehalten",
+
 "Knar",
 "Knar",
 
@@ -1323,16 +1353,31 @@
 "Merchandising Editor",
 "Absatzförderungseditor",
 
+"Merge",
+"Vereinigen",
+
 "Merge Metadata",
-undef,
+"Metadaten vereinigen",
+
+"Merge all",
+"Alle vereinigen",
 
 "Merge anyway",
 undef,
 
 "Merge metadata",
-undef,
+"Metadaten vereinigen",
 
 "Merge new metadata values from upgraded Interchange version",
+"Neue Metadaten von aktualisierter Interchangeversion einfügen",
+
+"Merge run, UI version %s, metadata version %s",
+"Vereinigungslauf, UI-Version %s, Metadatenversion %s",
+
+"Merge still needed:",
+"Vereinigung benötigt:",
+
+"Merging anyway.",
 undef,
 
 "Meta field edit",
@@ -1448,6 +1493,9 @@
 "No inactive customers.",
 "Keine passiven Kunden.",
 
+"No merge needed:",
+"Keine Vereinigung notwendig:",
+
 "No meta display",
 "Metadarstellung deaktivieren",
 
@@ -2289,6 +2337,9 @@
 "To:",
 undef,
 
+"Toggle showing identical keys",
+"Darstellung identischer Schlüssel umschalten",
+
 "Total",
 "Summe",
 
@@ -2679,6 +2730,9 @@
 
 "reverse numeric",
 undef,
+
+"saved",
+"gespeichert",
 
 "shipped",
 "verschickt",



2.26      +13 -0     interchange/dist/lib/UI/locales/default.cfg


rev 2.26, prev_rev 2.25
Index: default.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/locales/default.cfg,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -r2.25 -r2.26
--- default.cfg	8 Apr 2003 14:10:11 -0000	2.25
+++ default.cfg	30 Apr 2003 12:13:19 -0000	2.26
@@ -364,6 +364,19 @@
 "key=%s",
 undef,
 
+# merge_meta.html
+"Already merged to current version %s.",
+undef,
+
+"Already merged to higher version %s.",
+undef,
+
+"Cannot merge metadata -- table %s is missing.",
+undef,
+
+"Cannot merge metadata -- column(s) '%s' is missing in table %s.",
+undef,
+
 # order.html
 "Archive checked orders",
 undef,



2.6       +15 -15    interchange/dist/lib/UI/pages/admin/merge_meta.html


rev 2.6, prev_rev 2.5
Index: merge_meta.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/merge_meta.html,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- merge_meta.html	18 Mar 2003 11:40:27 -0000	2.5
+++ merge_meta.html	30 Apr 2003 12:13:19 -0000	2.6
@@ -114,7 +114,7 @@
 [elsif scratch merge_anyway]
 	<blockquote class=cerror>
 		[scratchd merge_anyway]<br>
-	Merging anyway.
+	[L]Merging anyway.[/L]
 	</blockquote>
 	[tmpn do_merge]1[/tmpn]
 [/elsif]
@@ -128,7 +128,7 @@
 <div style="margin-left: 5px">
 <dl>
 
-	<dt class=titlebox>Merge run, UI version [scratch newver], metadata version [scratch curver]</dt>
+	<dt class=titlebox>[msg arg.0="[scratch newver]" arg.1="[scratch curver]"]Merge run, UI version %s, metadata version %s[/msg]</dt>
 	<dd>
 	<br>
 	
@@ -274,15 +274,15 @@
 	<blockquote class=cerror>[scratchd merge_error]</blockquote>
 	[else]
 	<UL>
-		<LI>Entries merged: [scratch merge_updated]
-		<LI>No merge needed: [scratch merge_complete]
-		<LI>Merge still needed: [scratch merge_needed]
+		<LI>[L]Entries merged:[/L] [scratch merge_updated]
+		<LI>[L]No merge needed:[/L] [scratch merge_complete]
+		<LI>[L]Merge still needed:[/L] [scratch merge_needed]
 	</UL>
 	[/else]
 	[/if]
 	</dd>
 
-	<dt class=titlebox>Items to merge </dt>
+	<dt class=titlebox>[L]Items to merge[/L] </dt>
 [output name=top_of_form]
 	<form action="[process href=@@MV_PAGE@@]" method=POST name=mergeform>
 	<input type=hidden name=mv_action value=back>
@@ -303,14 +303,14 @@
 			<td width=600>
 				<input type=hidden name=merge_key value="$code">
 				<select name=merge_status>
-					<option value=0>Defer decision
-					<option value=1>Merge
-					<option value="-1">Keep old value forever
+					<option value=0>[L]Defer decision[/L]
+					<option value=1>[L]Merge[/L]
+					<option value="-1">[L]Keep old value forever[/L]
 				</select>
-				<a href="javascript:set_all_select(0)">Defer all</a>
-				<a href="javascript:set_all_select(1)">Merge all</a>
-				<a href="javascript:set_all_select(2)">Keep all</a>
-				<a href="javascript:toggle_identical()">Toggle showing identical keys</a>
+				<a href="javascript:set_all_select(0)">[L]Defer all[/L]</a>
+				<a href="javascript:set_all_select(1)">[L]Merge all[/L]</a>
+				<a href="javascript:set_all_select(2)">[L]Keep all[/L]</a>
+				<a href="javascript:toggle_identical()">[L]Toggle showing identical keys[/L]</a>
 			</td>
 		</tr>
 		</table>
@@ -452,9 +452,9 @@
 [/perl]
 	</table>
 [output name=bottom_buttons]
-	<input type=submit value=Merge>
+	<input type=submit value="[L]Merge[/L]">
 [output name=top_buttons]
-	<input type=submit value=Merge>
+	<input type=submit value="[L]Merge[/L]">
 [output name=bottom_of_form]
 	</form>
 [output name=""]