[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1200
Date       : Sat May 27 22:51:00 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/build-resources.pl
   M /Trunk/XaraLX/doc/XaraLX.1
   M /Trunk/XaraLX/wxOil/camelot.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/nev-strings.xrc
   M /Trunk/XaraLX/xaralx.desktop

Added Tobias Burnus' DE translation work


Diff:
Index: Trunk/XaraLX/doc/XaraLX.1
===================================================================
--- Trunk/XaraLX/doc/XaraLX.1	(revision 1199)
+++ Trunk/XaraLX/doc/XaraLX.1	(revision 1200)
@@ -14,8 +14,17 @@
 BXaraLXR will start the XaraLX application.
 
 .SH OPTIONS
-A summary of the options supported by BXaraLXR is available
-at http://www.xaralx.org/
+.TP
+B\-hR, B\-\-helpR
+prints out the usage and exits
+.TP
+B\-vR, B\-\-versionR
+prints out the version and build date and exits
+.TP
+B\-rR, B\-\-resources=RIdirectoryR
+Resources contain dialogs and string tables used by XaraLX. 
+Normally XaraLX uses those linked into the executable.
+See Ihttp://www.xaraxtreme.org/developers/documentation/resource_system_introduction.htmlR
 
 .SH FILES
 I${HOME}/.XaraLXR - file containing options for XaraLX
Index: Trunk/XaraLX/xaralx.desktop
===================================================================
--- Trunk/XaraLX/xaralx.desktop	(revision 1199)
+++ Trunk/XaraLX/xaralx.desktop	(revision 1200)
@@ -3,6 +3,7 @@
 Encoding=UTF-8
 Name=Xara LX
 Comment=Versatile vector graphics program
+Comment[de_DE]=Vielseitiges Vektorgraphik-Programm
 Comment[pt_BR]=Versátil programa para gráficos vetoriais
 Icon=xaralx.png
 Terminal=false
Index: Trunk/XaraLX/Scripts/build-resources.pl
===================================================================
--- Trunk/XaraLX/Scripts/build-resources.pl	(revision 1199)
+++ Trunk/XaraLX/Scripts/build-resources.pl	(revision 1200)
@@ -184,7 +184,11 @@
 }
 
 # If there are no newer files, and force isn't set, exit without even doing the checksum
-exit(0) if (!$newer && !$force);
+if (!$newer && !$force)
+{
+    print STDERR "Nothing new
";
+    exit (0);
+}
 
 my @dialogfiles = sort grep { $_ !~ /-strings\.xrc$/ } @xrcfiles;
 my @stringfiles = sort grep { $_ =~ /-strings\.xrc$/ } @xrcfiles;
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1199)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1200)
@@ -1382,6 +1382,14 @@
 	//
 	BOOL ok;
 
+	// http://portland.freedesktop.org/wiki/TaskOpenURL
+	// ok = LaunchBrowserApp(_T("xdg-open"), strUrl);
+	// if (ok) return ok;
+
+	// http://lists.freedesktop.org/pipermail/xdg/2004-August/004489.html
+	ok = LaunchBrowserApp(_T("desktop-launch"), strUrl);
+	if (ok) return ok;
+
 	ok = LaunchBrowserApp(_T("htmlview"), strUrl);
 	if (ok) return ok;
 
Index: Trunk/XaraLX/wxOil/xrc/EN/nev-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/nev-strings.xrc	(revision 1199)
+++ Trunk/XaraLX/wxOil/xrc/EN/nev-strings.xrc	(revision 1200)
@@ -133,7 +133,7 @@
 			<object class="sizeritem">
 				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
 				<object class="wxStaticText" name="IDS_SPLASHBOX_COPYRIGHT">
-					<label>? Xara Ltd 1995</label>
+					<label>© Xara Ltd 1995</label>
 				</object>
 			</object>
 			<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc	(revision 1199)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc	(revision 1200)
@@ -24,7 +24,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>
@@ -83,7 +83,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>
@@ -150,7 +150,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>


Xara