[icinga-checkins] icinga.org: icinga-web/mhein/extlayout: resolving merge

git at icinga.org git at icinga.org
Tue May 11 19:18:10 CEST 2010


Module: icinga-web
Branch: mhein/extlayout
Commit: 0726f556b6c382e598e9ba931618b9ad4d714aa0
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=0726f556b6c382e598e9ba931618b9ad4d714aa0

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Thu Apr 29 12:46:08 2010 +0200

resolving merge

---

 app/config/translation.xml |   97 +++++++++++++++++++-------------------------
 1 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/app/config/translation.xml b/app/config/translation.xml
index 20b1822..3877500 100755
--- a/app/config/translation.xml
+++ b/app/config/translation.xml
@@ -1,36 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://agavi.org/agavi/config/parts/translation/1.0">
-	<ae:configuration>
-		
-		<available_locales default_locale="en" default_timezone="GMT">
-			<!-- German, Germany -->
-			<available_locale identifier="de_DE">
-				<ae:parameter name="description">Deutsch</ae:parameter>
-			</available_locale>
-			
-			<!-- English -->
-			<available_locale identifier="en">
-				<ae:parameter name="description">English</ae:parameter>
-			</available_locale>
-			
-			<!-- Spanish -->
-			<available_locale identifier="es">
-				<ae:parameter name="description">Español</ae:parameter>
-			</available_locale>
-			
-			<!-- Polish -->
-			<available_locale identifier="pl">
-				<ae:parameter name="description">Polski</ae:parameter>
-			</available_locale>
-			
-			<!-- Portugese -->
-			<available_locale identifier="pt">
-				<ae:parameter name="description">Português</ae:parameter>
-			</available_locale>
-		</available_locales>
-		
-		
-		<!--
+  <ae:configuration>
+	 <available_locales default_locale="en" default_timezone="GMT">
+		<!-- German, Germany -->
+		<available_locale identifier="de_DE">
+		  <ae:parameter name="description">Deutsch</ae:parameter>
+		</available_locale>
+		<!-- English -->
+		<available_locale identifier="en">
+		  <ae:parameter name="description">English</ae:parameter>
+		</available_locale>
+		<!-- Spanish -->
+		<available_locale identifier="es">
+		  <ae:parameter name="description">Español</ae:parameter>
+		</available_locale>
+		<!-- Polish -->
+		<available_locale identifier="pl">
+		  <ae:parameter name="description">Polski</ae:parameter>
+		</available_locale>
+		<!-- Portugese -->
+		<available_locale identifier="pt">
+		  <ae:parameter name="description">Português</ae:parameter>
+		</available_locale>
+	 </available_locales>
+	 <!--
 		
 			This is quite important. If you're using an gettext translator, the domain
 			have to assembled of translator and text_domain:
@@ -38,28 +31,22 @@
 			* icinga.default
 			
 		-->
-		<translators default_domain="icinga.default">
-		
-			<translator domain="icinga">
-			
-					<!-- Text -->
-					<message_translator class="AppKitGettextTranslator">
-						<ae:parameter name="text_domains">
-							<ae:parameter name="default">%core.root_dir%/app/data/mo</ae:parameter>
-						</ae:parameter>
-					</message_translator>
-					
-					<!-- Date/time (also important for the validators) -->
-					<date_formatter>
-						<ae:parameter name="type">date</ae:parameter>
-						<!-- dd.MM.yyyy hh:mm:ss -->
-						<ae:parameter name="format">medium</ae:parameter>
-					</date_formatter>
-					
-			</translator>
-			
-		</translators>
-		
-	</ae:configuration>
-	
+	 <translators default_domain="icinga.default">
+		<translator domain="icinga">
+		  <!-- Text -->
+		  <message_translator class="AppKitGettextTranslator">
+			 <ae:parameter name="text_domains">
+				<ae:parameter name="default">%core.root_dir%/app/data/mo</ae:parameter>
+				<ae:parameter name="module_heatmap">%core.root_dir%/app/modules/Heatmap/data/mo</ae:parameter>
+			 </ae:parameter>
+		  </message_translator>
+		  <!-- Date/time (also important for the validators) -->
+		  <date_formatter>
+			 <ae:parameter name="type">date</ae:parameter>
+			 <!-- dd.MM.yyyy hh:mm:ss -->
+			 <ae:parameter name="format">medium</ae:parameter>
+		  </date_formatter>
+		</translator>
+	 </translators>
+  </ae:configuration>
 </ae:configurations>





More information about the icinga-checkins mailing list