You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2014/03/16 16:35:52 UTC

svn commit: r1578105 [1/2] - in /openoffice/ooo-site/trunk/content/download/test/l10n: download.js exceptions.css globalvars.js languages.js release_matrix.js

Author: marcus
Date: Sun Mar 16 15:35:52 2014
New Revision: 1578105

URL: http://svn.apache.org/r1578105
Log:
Updated to latest version

Modified:
    openoffice/ooo-site/trunk/content/download/test/l10n/download.js
    openoffice/ooo-site/trunk/content/download/test/l10n/exceptions.css
    openoffice/ooo-site/trunk/content/download/test/l10n/globalvars.js
    openoffice/ooo-site/trunk/content/download/test/l10n/languages.js
    openoffice/ooo-site/trunk/content/download/test/l10n/release_matrix.js

Modified: openoffice/ooo-site/trunk/content/download/test/l10n/download.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/l10n/download.js?rev=1578105&r1=1578104&r2=1578105&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/l10n/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/l10n/download.js Sun Mar 16 15:35:52 2014
@@ -11,22 +11,25 @@
 /*
  * Define global variables
  */
-var LANG_ISO				= "";
-var LANG_ARRAY				= "";
-var LANG_NAME				= "";
-var RELEASE_MATRIX_PLATFORM_POS		= -1;
-var RELEASE_MATRIX_PLATFORM		= "";
-var UI_PLATFORM				= "";
-var URL_PLATFORM			= "";
-var FILENAME				= "";
-var FILESIZE				= 0;
-var EXTENSION				= "";
-var LINK				= "";
-var CHECKSUM_KEYS			= "";
-var CHECKSUM_ASC			= "";
-var CHECKSUM_MD5			= "";
-var CHECKSUM_SHA256			= "";
-var ERROR				= false;
+var LANG_ISO			= "";	 // The language as ISO code
+var LANG_ARRAY			= "";	 // This array contains all language specific data
+var RELEASE_MATRIX_PLATFORM_POS	= -1;	 // The position of the platform in the release matrix array
+var RELEASE_MATRIX_PLATFORM	= "";	 // The platform in the release matrix array
+var UI_PLATFORM			= "";	 // The platform as readable string
+var URL_PLATFORM		= "";	 // The platform as part of the download URL
+var OLD_PLATFORM		= false; // The browser platform is old (true) or not (false)
+var FILENAME			= "";	 // The complete filename of the download URL
+var FILESIZE			= 0;	 // The filesize of the download file
+var EXTENSION			= "";	 // The file extension of the download URL
+var LINK			= "";	 // The complete download URL
+var CHECKSUM_KEYS		= "";	 // The KEYS file as download URL
+var CHECKSUM_ASC		= "";	 // The ASC file as download URL
+var CHECKSUM_MD5		= "";	 // The MD5 file as download URL
+var CHECKSUM_SHA256		= "";	 // The SHA256 file as download URL
+var SOURCEFORGE			= false; // The download URL points to Soureforge
+var OTHER			= false; // The download URL points to 'other.html'
+var ARCHIVE			= false; // The download URL points to the ASF archive
+var ERROR			= false; // The download URL is correct (false) or not (true)?
 
 /*
  * Get array and ISO code for language
@@ -97,9 +100,8 @@ function getLanguage() {
 		thisLanguage = thisLanguageSet[ "-" ];
 	}
 
-	LANG_ISO	= language;
-	LANG_ARRAY	= thisLanguage;
-	LANG_NAME	= thisLanguage[ 2 ];
+	LANG_ISO   = language;
+	LANG_ARRAY = thisLanguage;
 }
 
 /*
@@ -119,87 +121,240 @@ function hasMirrorLink() {
  * Get link to mirror system for download file and checksum file
  * Depends on array-list
  */
-function getLink() {
+function getLink( rel_mode ) {
 	var chk_link = "";
 
-	getLanguage();
-	hasMirrorLink();
-	getPlatform();
-	getFilesize();
+	// If no release mode was given, assume it's about the stable release
+	if ( rel_mode == undefined )
+		rel_mode = 0;
 
+	getLanguage();
+	getPlatform( rel_mode );
+	if ( hasMirrorLink() ) {
+		getFilesize( rel_mode );
+	}
+	/*
 	if ( NL_LANGUAGE == "" )
 		NL_LANGUAGE = LANG_ISO;
-
+	*/
 	/*
 	Trim timestamp from version, required for RC
 	if ( version.indexOf( "_" ) > -1 )
 		version = version.split( "_" )[0];
 	*/
 
+	// If language is supported, then provide a download link. 
 	if ( hasMirrorLink() ) {
-		if ( URL_PLATFORM == "" ) {
-			// If no platform was recognized, set the "other.html" webpage as alternative download URL
-			if ( UI_PLATFORM == "" ) {
-				UI_PLATFORM = unknown_platform;
+		// Release mode
+		if ( rel_mode == 0 ) {
+			// If platform is too old, then provide a general download link to the archive.
+			if ( OLD_PLATFORM ) {
+				// If platform is Mac OS X <=10.6, then provide a download link with previous AOO version.
+/*
+				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+
+					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
+					LINK		= LINK + "/download";
+
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+					chk_link	= chk_link + FILENAME;
+
+					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+					CHECKSUM_ASC	= chk_link + ".asc";
+					CHECKSUM_MD5	= chk_link + ".md5";
+					CHECKSUM_SHA256	= chk_link + ".sha256";
+
+					SOURCEFORGE	= false;
+					OTHER		= false;
+					ARCHIVE		= true;
+					ERROR		= true;
+					return LINK;
+				}
+*/
+				// If platform is Solaris, FreeBSD or OS/2,
+				// then provide a download link to the porting webpage.
+				if ( UI_PLATFORM == "Solaris x86 (PKG)"   ||
+				     UI_PLATFORM == "Solaris SPARC (PKG)" ||
+				     UI_PLATFORM == "FreeBSD (PKG)"       ||
+				     UI_PLATFORM == "OS/2" ) {
+
+					LINK		= "http://www.openoffice.org/porting/index.html";
+
+					SOURCEFORGE	= false;
+					OTHER		= true;
+					ARCHIVE		= false;
+					ERROR		= true;
+					return LINK;
+				}
+				LINK		= "http://archive.apache.org/dist/openoffice/";
+
+				CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+				CHECKSUM_ASC	= "http://archive.apache.org/dist/openoffice/";
+				CHECKSUM_MD5	= "http://archive.apache.org/dist/openoffice/";
+				CHECKSUM_SHA256	= "http://archive.apache.org/dist/openoffice/";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
 			}
-			LINK  = "http://www.openoffice.org/download/other.html";
-			ERROR = true;
-			return LINK;
-		} else {
-			// If platform was recognized, get the download filename and checksum filename
+			// If no platform was recognized, then provide a general download link to the "other.html" webpage.
+			if ( URL_PLATFORM == "" ) {
+				// If no UI string was set, then show it to the user.
+				if ( UI_PLATFORM == "" ) {
+					UI_PLATFORM = "unknown platform/OS";
+				}
+				LINK		= "http://www.openoffice.org/download/other.html";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
+			}
+
+			// If platform was recognized, assemble the filenames for download and checksums
 
-			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE;
+			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO;
 			// FILENAME	= FILENAME + EXTENSION;
 
 			// Assign the file name (column 3) from the release matrix of language and platform
-			FILENAME	= release_aoo400_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
+			FILENAME	= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
 
-			// LINK		= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION + "_";
-			// LINK		= LINK + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION + "/download";
-			LINK		= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/" + FILENAME + "/download";
-
-			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/" + FILENAME;
+			// LINK	= SOURCEFORGE_BASE_URL + LANG_ISO + "/Apache_OpenOffice_" + VERSION + "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME + "/download";
+
+			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME;
+
+			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+			CHECKSUM_ASC	= chk_link + ".asc";
+			CHECKSUM_MD5	= chk_link + ".md5";
+			CHECKSUM_SHA256	= chk_link + ".sha256";
+
+			/*
+			// Used for debugging
+			LINK		= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			LINK		= LINK + "/Apache_OpenOffice_" + "_" + LANG_ISO + EXTENSION;
+			chk_link	= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_" + VERSION;
+			chk_link	= chk_link + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+			*/
+
+			SOURCEFORGE	= true;
+			OTHER		= false;
+			ARCHIVE		= false;
+			ERROR		= false;
+			return LINK;
+		} else {
+			// Beta release mode
+			// If platform is too old, then provide a general download link to the archive.
+			if ( OLD_PLATFORM ) {
+				// If platform is Mac OS X <=10.6, then provide a download link with previous AOO version.
+				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+
+					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
+					LINK		= LINK + "/download";
+
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+					chk_link	= chk_link + FILENAME;
+
+					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
+					CHECKSUM_ASC	= chk_link + ".asc";
+					CHECKSUM_MD5	= chk_link + ".md5";
+					CHECKSUM_SHA256	= chk_link + ".sha256";
+
+					SOURCEFORGE	= false;
+					OTHER		= false;
+					ARCHIVE		= true;
+					ERROR		= true;
+					return LINK;
+				}
+				LINK	= "http://www.openoffice.org/download/all_beta.html";
+
+				SOURCEFORGE	= false;
+				OTHER		= true;
+				ARCHIVE		= false;
+				ERROR		= true;
+				return LINK;
+			}
+			// Assign the file name (column 3) from the release matrix of language and platform
+			FILENAME	= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
+
+			// LINK	= BETA_SOURCEFORGE_BASE_URL + LANG_ISO + "/Apache_OpenOffice_Beta_" + VERSION + "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= BETA_SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME + "/download";
+
+			// chk_link	= BETA_APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO;
+			// chk_link	= chk_link + "/Apache_OpenOffice_Beta_" + VERSION + "_" + URL_PLATFORM + "_";
+			// chk_link	= chk_link + LANG_ISO + EXTENSION;
+			chk_link	= BETA_APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME;
 
 			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
 			CHECKSUM_ASC	= chk_link + ".asc";
 			CHECKSUM_MD5	= chk_link + ".md5";
 			CHECKSUM_SHA256	= chk_link + ".sha256";
 		}
+		SOURCEFORGE	= true;
+		OTHER		= false;
+		ARCHIVE		= false;
+		ERROR		= false;
  		return LINK;
-
-		/*
-		Used for debugging
-		LINK		= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-		LINK		= LINK + "/Apache_OpenOffice_" + "_" + NL_LANGUAGE + EXTENSION;
-		chk_link	= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION;
-		chk_link	= chk_link + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-		return LINK;
-		 */
 	} else {
-		ERROR = true;
-		return false;
+		// Release mode
+		if ( rel_mode == 0 ) {
+			// If language is not supported, then provide the link from the Native Language (NL) group.
+			LINK	= LANG_ARRAY[ 4 ];
+		} else {
+			// Beta release mode
+			// If language is not supported, then provide the "all_beta.html" as download link.
+			LINK	= "http://www.openoffice.org/download/all_beta.html";
+		}
+		ERROR	= true;
+ 		return LINK;
 	}
 }
 
 /*
  * Get platform of browser
- * Depending on internal browser data
+ * Depends on internal browser data
  */
-function getPlatform() {
+function getPlatform( rel_mode ) {
 	// For more help or data see: "http://www.useragentstring.com"
 
-	var os	= navigator.platform.toLowerCase();
-	var ua	= navigator.userAgent.toLowerCase();
-	var av	= navigator.appVersion.toLowerCase();
+	var os		= navigator.platform.toLowerCase();	// Get the platform string in lower cases
+	var ua		= navigator.userAgent.toLowerCase();	// Get the User Agent string in lower cases
+	var av		= navigator.appVersion.toLowerCase();	// Get the application version in lower cases
+	UI_PLATFORM	= "";					// Delete any previously set string
+	URL_PLATFORM	= "";					// Delete any previously set string
+	EXTENSION	= "";					// Delete any previously set string
+
+	// Add ECMA262-5 Array methods if not supported natively
+	// To workaround that MSIE 8 and older do not support this function
+	if ( !( 'indexOf' in Array.prototype ) ) {
+		Array.prototype.indexOf= function( find, i /*opt*/ ) {
+			if ( i === undefined )
+				i = 0;
+			if ( i < 0 )
+				i+= this.length;
+			if ( i < 0 )
+				i = 0;
+			for ( var n = this.length; i < n; i++ ) {
+				if ( i in this && this[ i ] === find )
+					return i;
+			}
+			return -1;
+		};
+	}
 
 	if ( os ) {
-
-	  // Recognized but not supported platforms / OS, set $UI_PLATFORM to show it to the user
-	  if ( os.indexOf( "sunos"		) != -1 ) {	UI_PLATFORM	= "Solaris x86 (PKG)";
-	    if ( ua.indexOf( "sun4u"		) != -1 )	UI_PLATFORM	= "Solaris SPARC (PKG)";
-	  }
+	  // Recognized but not supported platforms/OS, set $UI_PLATFORM to show it to the user.
 	  if ( os.indexOf( "os/2"		) != -1 )	UI_PLATFORM	= "OS/2";
 	  if ( os.indexOf( "freebsd"		) != -1 )	UI_PLATFORM	= "FreeBSD (PKG)";
 	  if ( os.indexOf( "openbsd"		) != -1 )	UI_PLATFORM	= "OpenBSD";
@@ -213,12 +368,18 @@ function getPlatform() {
 	  if ( os.indexOf( "vms"		) != -1 )	UI_PLATFORM	= "OpenVMS";
 	  if ( os.indexOf( "alphaserver"	) != -1 )	UI_PLATFORM	= "AlphaServer";
 	  if ( os.indexOf( "qnx"		) != -1 )	UI_PLATFORM	= "QNX";
-	  if ( os.indexOf( "x11"		) != -1 )	UI_PLATFORM	= "an unknown OS (X11 support)";
-
+	  if ( os.indexOf( "x11"		) != -1 )	UI_PLATFORM	= "unknown OS (X11 support)";
 	  if ( os.indexOf( "arm"		) != -1 )	UI_PLATFORM	= "ARM mobile devices";
-
+	  if ( os.indexOf( "sunos"		) != -1 ) {	UI_PLATFORM	= "Solaris x86 (PKG)";
+								OLD_PLATFORM	= true;
+	  }
+	  if ( ua.indexOf( "sun4u"		) != -1 ) {	UI_PLATFORM	= "Solaris SPARC (PKG)";
+								OLD_PLATFORM	= true;
+	  }
 	  if ( ua.indexOf( "ppc"		) != -1 ||
-	       ua.indexOf( "power_pc"		) != -1 )	UI_PLATFORM	= "Mac OS PPC (DMG)";
+	       ua.indexOf( "power_pc"		) != -1 ) {	UI_PLATFORM	= "Mac OS PPC (DMG)";
+								OLD_PLATFORM	= true;
+	  }
 	  if ( ua.indexOf( "iphone"		) != -1 ||
 	       ua.indexOf( "ipad"		) != -1 ||
 	       ua.indexOf( "ipod"		) != -1	)	UI_PLATFORM	= "Apple iPhone/iPad/iPod";
@@ -237,16 +398,14 @@ function getPlatform() {
 	  if ( ua.indexOf( "widerweb"		) != -1 )	UI_PLATFORM	= "mobile phones (WiderWeb)";
 	  if ( ua.indexOf( "brew"		) != -1 )	UI_PLATFORM	= "smartphones (BREW)";
 	  if ( ua.indexOf( "hiptop"		) != -1 )	UI_PLATFORM	= "smartphones (Hiptop)";
-
 	  if ( ua.indexOf( "playstation"	) != -1 )	UI_PLATFORM	= "Sony Playstation";
 	  if ( ua.indexOf( "psp"		) != -1 )	UI_PLATFORM	= "Sony Playstation Portable";
 	  if ( ua.indexOf( "nintendo"		) != -1 )	UI_PLATFORM	= "Nintendo game console";
 	  if ( ua.indexOf( "wii"		) != -1 )	UI_PLATFORM	= "Nintendo Wii game console";
 
-	  // If the $UI_PLATFORM variable is already filled, then something was recognized and no more work is need
-	  if ( UI_PLATFORM ) {
-	    return;
-	  }
+	  // If the $UI_PLATFORM variable is already filled, then something was recognized and no more work is need.
+	  if ( UI_PLATFORM != "" )
+		return;
 
 	  // Windows, x86 or mobile?
 	  if ( os.indexOf( "windows"		) != -1 ||
@@ -257,51 +416,73 @@ function getPlatform() {
 		 ua.indexOf( "mobile"		) != -1 )	UI_PLATFORM	= "Windows Mobile device";
 	  }
 
-	  // Linux, x86 or x86_64, DEB or RPM?
+	  // Linux, x86 or x86-64, DEB or RPM?
 	  if ( os.indexOf( "linux"		) != -1 ) {
-	    // 32-bit, DEB or RPM?
-	    if ( os.indexOf( "x86"		) != -1 ||
-		 os.indexOf( "i686"		) != -1 ||
-		 os.indexOf( "i586"		) != -1 ||
-		 os.indexOf( "i486"		) != -1 ||
-		 os.indexOf( "i386"		) != -1 ) {	UI_PLATFORM	= "Linux 32-bit (RPM)";
+		// 32-bit, DEB or RPM?
+		if ( os.indexOf( "x86"		) != -1 ||
+		     os.indexOf( "i686"		) != -1 ||
+		     os.indexOf( "i586"		) != -1 ||
+		     os.indexOf( "i486"		) != -1 ||
+		     os.indexOf( "i386"		) != -1 ||
+		     av.indexOf( "x86"		) != -1 ||
+		     av.indexOf( "i686"		) != -1 ||
+		     av.indexOf( "i586"		) != -1 ||
+		     av.indexOf( "i486"		) != -1 ||
+		     av.indexOf( "i386"		) != -1 ) {	UI_PLATFORM	= "Linux 32-bit (RPM)";
 								URL_PLATFORM	= "Linux_x86_install-rpm";
 								EXTENSION	= ".tar.gz";
-	      if ( ua.indexOf( "debian"		) != -1 ||
-		   ua.indexOf( "ubuntu"		) != -1 ||
-		   ua.indexOf( "iceweasel"	) != -1 ) {	UI_PLATFORM	= "Linux Debian 32-bit (DEB)";
+		     if ( ua.indexOf( "debian"    ) != -1 ||
+			  ua.indexOf( "ubuntu"    ) != -1 ||
+			  ua.indexOf( "iceweasel" ) != -1 ) {	UI_PLATFORM	= "Linux Debian 32-bit (DEB)";
 								URL_PLATFORM	= "Linux_x86_install-deb";
 								EXTENSION	= ".tar.gz";
-	      }
-	    }
-	    // 64-bit, DEB or RPM?
-	    if ( os.indexOf( "_64"		) != -1 ||
-		 os.indexOf( "-64"		) != -1 ||
-		 os.indexOf( "x64"		) != -1 ||
-		 os.indexOf( "amd64"		) != -1 ) {	UI_PLATFORM	= "Linux 64-bit (RPM)";
+		     }
+		}
+		// 64-bit, DEB or RPM?
+		if ( os.indexOf( "_64"		) != -1 ||
+		     os.indexOf( "-64"		) != -1 ||
+		     os.indexOf( "x64"		) != -1 ||
+		     os.indexOf( "amd64"	) != -1 ||
+		     av.indexOf( "_64"		) != -1 ||
+		     av.indexOf( "-64"		) != -1 ||
+		     av.indexOf( "x64"		) != -1 ||
+		     av.indexOf( "amd64"	) != -1 ) {	UI_PLATFORM	= "Linux 64-bit (RPM)";
 								URL_PLATFORM	= "Linux_x86-64_install-rpm";
 								EXTENSION	= ".tar.gz";
-	      if ( ua.indexOf( "debian"		) != -1 ||
-		   ua.indexOf( "ubuntu"		) != -1 ||
-		   ua.indexOf( "iceweasel"	) != -1 ) {	UI_PLATFORM	= "Linux Debian 64-bit (DEB)";
+		     if ( ua.indexOf( "debian"	  ) != -1 ||
+		          ua.indexOf( "ubuntu"	  ) != -1 ||
+		          ua.indexOf( "iceweasel" ) != -1 ) {	UI_PLATFORM	= "Linux Debian 64-bit (DEB)";
 								URL_PLATFORM	= "Linux_x86-64_install-deb";
 								EXTENSION	= ".tar.gz";
-	      }
-	    }
+		     }
+		}
 	  }
 
-	  // Mac OS x86?
-	  if ( os.indexOf( "mac"		) != -1 ) {	UI_PLATFORM	= "Mac OS 32-bit Intel (DMG)";
-								URL_PLATFORM	= "Mac_x86_install";
+	  // Mac OS X?
+	  if ( os.indexOf( "mac"		) != -1 ) {	UI_PLATFORM	= "OS X 64-bit Intel (DMG)";
+								URL_PLATFORM	= "MacOS_x86_install";
 								EXTENSION	= ".dmg";
+		// OS X is 10.6 or older?
+		if ( ua.indexOf( "10.6"		) != -1 ||
+		     ua.indexOf( "10_6"		) != -1 ||
+		     ua.indexOf( "10.5"		) != -1 ||
+		     ua.indexOf( "10_5"		) != -1 ||
+		     ua.indexOf( "10.4"		) != -1 ||
+		     ua.indexOf( "10_4"		) != -1 ||
+		     ua.indexOf( "10.3"		) != -1 ||
+		     ua.indexOf( "10_3"		) != -1 ) {	UI_PLATFORM	= "Mac OS X (10.6 or older)";
+								if ( rel_mode > 0 )
+									OLD_PLATFORM = true;
+		}
 	  } 
 	} 
 
 	// If nothing was recognized until now, set $UI_PLATFORM to show it to the user
-	if ( ! UI_PLATFORM ) {
-		ERROR = true;
-		UI_PLATFORM = unknown_platform;
+	if ( UI_PLATFORM == "" ) {
+		UI_PLATFORM = "unknown platform/OS";
+		ERROR	    = true;
 	}
+
 	return;
 }
 
@@ -309,7 +490,7 @@ function getPlatform() {
  * Get file size for download file
  * Depends on array-list
  */
-function getFilesize() {
+function getFilesize( rel_mode ) {
 	// Depending on $URL_PLATFORM assign the platform position of the release matrix
 	switch ( URL_PLATFORM ) {
 		case "Linux_x86-64_install-deb":
@@ -324,7 +505,10 @@ function getFilesize() {
 		case "Linux_x86_install-rpm":
 			RELEASE_MATRIX_PLATFORM_POS = 5;
 			break;
-		case "Mac_x86_install":
+		case "MacOS_x86-64_install":
+			RELEASE_MATRIX_PLATFORM_POS = 8;
+			break;
+		case "MacOS_x86_install":
 			RELEASE_MATRIX_PLATFORM_POS = 8;
 			break;
 		case "Win_x86_install":
@@ -336,14 +520,22 @@ function getFilesize() {
 
 	// If a platform was found and no error occurred, assign the array data and filesize from the release matrix
 	if ( RELEASE_MATRIX_PLATFORM_POS > -1 && !ERROR ) {
-		// Assign all values from the release matrix of language and platform
-		RELEASE_MATRIX_PLATFORM		= release_aoo400_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
-
-		// Assign the file size (column 2) from the release matrix of language and platform
-		FILESIZE			= release_aoo400_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		if ( rel_mode == 0 ) {
+			// Release mode
+			// Assign all values from the release matrix of language and platform
+			RELEASE_MATRIX_PLATFORM	= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
+			// Assign the file size (column 2) from the release matrix of language and platform
+			FILESIZE		= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		} else {
+			// Beta release mode
+			// Assign all values from the release matrix of language and platform
+			RELEASE_MATRIX_PLATFORM	= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ];
+			// Assign the file size (column 2) from the release matrix of language and platform
+			FILESIZE		= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 2 ];
+		}
 	} else {
-		ERROR				= true;
-		FILESIZE			= 0;
+		ERROR	 = true;
+		FILESIZE = 0;
 	}
 
 	return FILESIZE;
@@ -358,112 +550,3 @@ function openItem( itemid, uri ) {
 	document.location = uri;
 }
 
-/*
- * Write the green box for the One-Click-Download
- */
-
-function writeGreenBox() {
-	// Get the download URL
-	var LINK = getLink();
-
-	if ( hasMirrorLink() ) {
-		if ( LINK.toLowerCase().indexOf( "sourceforge" ) != -1 ) {
-			// Download directly from a mirror with displayed platform and language.
-			document.write( "<div class='first button green' id='optionitem1'"
-			+ "onclick='openItem('optionitem1','" + LINK + "');" + "return false;'>" );
-			document.write( "<h2>"
-			+ "<a href='" + LINK
-			+ "' title='Version " + VERSION + " - Milestone " + MILESTONE + " - Build ID " + BUILD
-			+ " - SVN " + SVN_REV + "'>"
-			+ green_box_1_headline + " " + VERSION
-			+ "</a>"
-			+ "</h2>"
-			+ "<p>"
-			+ "<a href='" + LINK
-			+ "' title='Version " + VERSION + " - Milestone " + MILESTONE + " - Build ID " + BUILD
-			+ " - SVN " + SVN_REV + "'>"
-			+ green_box_1_click + "<br />"
-			+ "<b>" + UI_PLATFORM + "</b> " + green_box_1_and + " <b>" + LANG_ARRAY[ 2 ] + "</b> "
-			+ "(~" + FILESIZE + " " + green_box_1_megabyte + ")"
-			+ "</a>"
-			+ "</p>");
-		} else {
-			// OS and/or package manager was not recognized, therefore use "other.html" as download link.
-			document.write( "<div class='first button green' id='optionitem1'"
-			+ "onclick='openItem('optionitem1','" + LINK + "');" + "return false;'>" );
-			document.write( "<h2>"
-			+ "<a href='" + LINK
-			+ "' title='" + LINK + "'>"
-			+ green_box_2_headline + " " + VERSION
-			+ "</a>"
-			+ "</h2>"
-			+ "<p>"
-			+ "<a href='" + LINK
-			+ "' title='" + LINK + "'>"
-			+ green_box_2_no_build1 + " "
-			+ "<b>" + UI_PLATFORM + "</b>. " + green_box_2_no_build2
-			+ "</a>"
-			+ "</p>" );
-    		}
-	} else {
-		// Download from an alternative webpage if hasMirrorLink() == false.
-		document.write( "<div class='first button green' id='optionitem1'"
-		+ "onclick='openItem('optionitem1','" + LANG_ARRAY[ 3 ] + "');" + "return false;'>" );
-		document.write( "<h2>"
-		+ "<a href='" + LANG_ARRAY[ 4 ]
-		+ "' title='" + LANG_ARRAY[ 4 ] + "'>"
-		+ green_box_3_headline + " " + VERSION
-		+ "</a>"
-		+ "</h2>"
-		+ "<p>"
-		+ "<a href='" + LANG_ARRAY[ 4 ]
-		+ "' title='" + LANG_ARRAY[ 4 ] + "'>"
-		+ green_box_3_no_build1 + " "
-		+ "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b>. "
-		+ green_box_3_no_build2
-		+ "</a>"
-		+ "</p>" );
-	}
-	document.write( "</div>" );
-
-	// Show some helpful links for SDK, source, checksums, release notes, legacy version.
-	document.write( "<div class='sub-green'>" );
-	document.write( "<p>" );
-	if ( CHECKSUM_ASC ) {
-		document.write( sub_green_box_hash_text + " "
-		+ "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS "   + sub_green_box_signature_title + "'>KEYS</a> , "
-		+ "<a href='" + CHECKSUM_ASC    + "' + title='ASC "    + sub_green_box_signature_title + "'>ASC</a> , "
-		+ "<a href='" + CHECKSUM_MD5    + "' + title='MD5 "    + sub_green_box_hash_title + "'>MD5</a> , "
-		+ "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 " + sub_green_box_hash_title + "'>SHA256</a> , "
-		+ "<a href='../checksums.html' "
-		+ "title='" + sub_green_box_verify_title + "'>"
-		+ sub_green_box_verify_text + "</a> | ");
-	}
-	document.write( "<a href='" + sub_green_box_release_notes_link + "' "
-	+ "title='" + sub_green_box_release_notes_title + " " + VERSION + "?'>"
-	+ sub_green_box_release_notes_text
-	+ "</a> | <br />"
-	+ "<a href='other.html' "
-	+ "title='" + sub_green_box_other_title + "'>"
-	+ "<b>" + sub_green_box_other_text + "</b>"
-	+ "</a> | "
-	+ "<a href='other.html#source' "
-	+ "title='" + sub_green_box_source_title + "'>"
-	+ sub_green_box_source_text
-	+ "</a> | <br />"
-	+ "<a href='../../porting/index.html' "
-	+ "title='" + sub_green_box_ports_title + "'>"
-	+ sub_green_box_ports_text
-	+ "</a> | "
-	+ sub_green_box_old_legacy_text + " "
-	+ "<a href='other-341.html' "
-	+ "title='" + sub_green_box_old_title + " " + OLDVERSION + "'><b>" + OLDVERSION + "</b>"
-	+ "</a> + "
-	+ "<a href='../legacy/index.html' "
-	+ "title='" + sub_green_box_legacy_title + " "
-	+ LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b>"
-	+ "</a>"
-	+ "</p>"
-	+ "</div>" );
-}
-

Modified: openoffice/ooo-site/trunk/content/download/test/l10n/exceptions.css
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/l10n/exceptions.css?rev=1578105&r1=1578104&r2=1578105&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/l10n/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/download/test/l10n/exceptions.css Sun Mar 16 15:35:52 2014
@@ -24,27 +24,32 @@ h1 { padding-left: 0.5em; }
 #navcol { display: none; }
 .warning { border: solid 3px #F00; background: #FDD; padding: 1em; }
 
-.optionset { margin: 0 0 0 -2px; float: left; width: 67%; max-width: 1200px; }
-.optionset a { margin: 0; padding: .1em 0 .25em 3%; width: 97%; color: #333; }
-.optionset p { margin: 0; padding: .1em 0 .25em 3%; width: 97%; color: #333; }
+#content h2 { margin-top: 0; }
+
+.optionset { margin: 0 0 0 -2px; float: left; width: 77%; max-width: 1200px; }
+.optionset a { margin: 0; padding: .1em 0 .25em 3%; color: #333; }
+.optionset p { margin: 0; padding: .1em 0 .25em 3%; color: #333; }
 .optionset p a { margin: 0; padding: 0; color: #333; }
+.optionset a p { margin: 0; padding: 0; color: #333; }
 #bodycol .optionset p a:hover, #bodycol .optionset .button:hover p a { color: #000; }
-.optionset .button { margin-top: 20px; }
+.optionset .button { border-radius: 15px; margin-top: 10px; }
 .optionset .button h2 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
-.optionset .button h2 a { display: block; padding: 25px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button h2 a { display: block; padding: 25px 25% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
+.optionset .button a h2 { display: block; padding: 0px 0% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
 .optionset .button h3 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
-.optionset .button h3 a { display: block; padding: 5px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button h3 a { display: block; padding: 5px 25% 0 3%; font-weight: bold; text-decoration: none; cursor: pointer; }
 .optionset .button p { padding: 0; font-size: .9em; padding-bottom: 25px; cursor: pointer; }
-.optionset .button p a { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; width: 72%; }
+.optionset .button p a { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; }
+.optionset .button a p { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; }
 .optionset .first { margin-top: 0; }
 .optionset p.promotional { margin-top: 25px; }
 
-.green { background: url(http://www.openoffice.org/download/cachedimages/button-green.png) #D1EAA0 right top no-repeat; }
-.green:hover { background: url(http://www.openoffice.org/download/cachedimages/button-green.png) #C3E480 right -200px no-repeat; }
+.green { background: url(cachedimages/button-green.png) #D1EAA0 right top no-repeat; }
+.green:hover { background: url(cachedimages/button-green.png) #C3E480 right -200px no-repeat; }
 .green h2 a { color: #718D36; }
 .green:hover h2 a, #bodycol .green h2 a:hover { color: #546828; }
-.sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; font-size: .8em; }
-.sub-green p { padding: .1em 3%; width: 94%; }
+.sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; }
+.sub-green p { padding: .1em 3%; width: 72%; }
 
 .grey { background: #C0C0C0 right top no-repeat; cursor: default; }
 .grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
@@ -56,46 +61,94 @@ h1 { padding-left: 0.5em; }
 .grey:hover h2 a, #bodycol .grey h2 a:hover { color: #202020; cursor: default; }
 .grey:hover h3 a, #bodycol .grey h3 a:hover { color: #202020; cursor: default; }
 .grey:hover p a, #bodycol .grey p a:hover { color: #202020; cursor: default; }
-.sub-grey { background: #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; font-size: .8em; cursor: default; }
-.sub-grey p { padding: .1em 3%; width: 94%; cursor: default; }
+.sub-grey { background: #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; border-radius: 15px; font-size: .8em; cursor: default; }
+.sub-grey p { padding: .1em 3%; width: 72%; cursor: default; }
 
 /* exchanged the normal picture with one that includes the extension repository graphic */
-.blue { background: url(http://www.openoffice.org/download/cachedimages/button-blue-ext.png) #D8E5F6 right top no-repeat; }
-.blue:hover { background: url(http://www.openoffice.org/download/cachedimages/button-blue-ext.png) #C3D9F1 right -200px no-repeat; }
+.blue { background: url(cachedimages/button-blue-ext.png) #D8E5F6 right top no-repeat; }
+.blue:hover { background: url(cachedimages/button-blue-ext.png) #C3D9F1 right -200px no-repeat; }
 .blue h2 a { color: #2D72CE; }
+.blue a h2 { color: #2D72CE; }
+.blue p { color: #2D72CE; }
 .blue:hover h2 a, #bodycol .blue h2 a:hover { color: #21549A; }
-.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; font-size: .8em; }
-.sub-blue p { padding: .1em 3%; width: 94%; }
+.blue:hover a h2, #bodycol .blue a h2:hover { color: #21549A; }
+.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-blue p { padding: .1em 3%; width: 72%; }
 
-.lightblue { background: url(http://www.openoffice.org/download/cachedimages/button-lightblue.png) #D8E5F6 right 0 no-repeat; }
-.lightblue:hover { background: url(http://www.openoffice.org/download/cachedimages/button-lightblue.png) #C3D9F1 right -200px no-repeat; }
+.lightblue { background: url(cachedimages/button-lightblue.png) #D8E5F6 right top no-repeat; }
+.lightblue:hover { background: url(cachedimages/button-lightblue.png) #C3D9F1 right -200px no-repeat; }
 .lightblue h2 a { color: #2D72CE; }
+.lightblue a h2 { color: #2D72CE; }
 .lightblue:hover h2 a, #bodycol .lightblue h2 a:hover { color: #21549A; }
-.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; font-size: .8em; }
-.sub-lightblue p { padding: .1em 3%; width: 94%; }
+.lightblue:hover a h2, #bodycol .lightblue a h2:hover { color: #21549A; }
+.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid #D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-lightblue p { padding: .1em 3%; width: 72%; }
 
-.yellow { background: url(http://www.openoffice.org/download/cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
-.yellow:hover { background: url(http://www.openoffice.org/download/cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; }
+.yellow { background: url(cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
+.yellow:hover { background: url(cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; }
 .yellow h2 a { color: #E09C09; }
+.yellow a h2 { color: #E09C09; }
 .yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
-.sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; font-size: .8em; }
-.sub-yellow p { padding: .1em 3%; width: 94%; }
+.yellow:hover a h2, #bodycol .yellow a h2:hover { color: #C80; }
+.sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow p { padding: .1em 3%; width: 72%; }
+
+.yellow_wo_icon { background: #FFF379 right top no-repeat; }
+.yellow_wo_icon:hover { background: #FFF24F right -200px no-repeat; }
+/*.yellow_wo_icon { background: url(cachedimages/button-yellow.png) #FFF379 right top no-repeat; } */
+/*.yellow_wo_icon:hover { background: url(cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; } */
+.yellow_wo_icon h2 a { color: #E09C09; }
+.yellow_wo_icon a h2 { color: #E09C09; }
+.yellow_wo_icon:hover h2 a, #bodycol .yellow_wo_icon h2 a:hover { color: #C80; }
+.yellow_wo_icon:hover a h2, #bodycol .yellow_wo_icon a h2:hover { color: #C80; }
+.sub-yellow_wo_icon { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow_wo_icon p { padding: .1em 3%; width: 72%; }
+
+.yellow_gradient { 
+background: url(cachedimages/button-yellow-top.png) #FFF379 right top no-repeat; /* Old browsers */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* FF3.6+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb), color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6), color-stop(0%, #fcffb6), color-stop(100%, #fbe977)); /* Chrome,Safari4+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, # fbe977 100%); /* Chrome10+,Safari5.1+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* Opera 11.10+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat -ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* IE10+ */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fcffb6 0%, #fbe977 100%); /* W3C */
+background: url(cachedimages/button-yellow-top.png) right top no-repeat filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fbe977', GradientType=0 ); /* IE6-9 */ }
+.yellow_gradient:hover { 
+background: url(cachedimages/button-yellow-bottom.png) #FFF24F right top no-repeat; /* Old browsers */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* FF3.6+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb), color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6), color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* Opera 11.10+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, -ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* IE10+ */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4 0%, #fac81d 100%); /* W3C */
+background: url(cachedimages/button-yellow-bottom.png) right top no-repeat, filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb', endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
+.yellow_gradient h2 a { color: #E09C09; }
+.yellow_gradient a h2 { color: #E09C09; }
+.yellow_gradient:hover h2 a, #bodycol .yellow_gradient h2 a:hover { color: #C80; }
+.yellow_gradient:hover a h2, #bodycol .yellow_gradient a h2:hover { color: #C80; }
+.sub-yellow_gradient { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; border-radius: 15px; font-size: .8em; }
+.sub-yellow_gradient p { padding: .1em 3%; width: 72%; }
 
-.orange { background: url(http://www.openoffice.org/download/cachedimages/button-orange.png) #FFD9A7 right 0 no-repeat; }
-.orange:hover { background: url(http://www.openoffice.org/download/cachedimages/button-orange.png) #FFBE67 right -200px no-repeat; }
+.orange { background: url(cachedimages/button-orange.png) #FFD9A7 right top no-repeat; }
+.orange:hover { background: url(cachedimages/button-orange.png) #FFBE67 right -200px no-repeat; }
 .orange h2 a { color: #D36812; }
 .orange:hover h2 a, #bodycol .orange h2 a:hover { color: #C94800; }
-.sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; font-size: .8em; }
-.sub-orange p { padding: .1em 3%; width: 94%; }
+.sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; border-radius: 15px; font-size: .8em; }
+.sub-orange p { padding: .1em 3%; width: 72%; }
+
+.red { background: #FFD9A7 right top no-repeat; cursor: default; }
+.red h2 a { color: #D36812; cursor: default; }
+.sub-red { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; border-radius: 15px; font-size: .8em; cursor: default; }
+.sub-red p { padding: .1em 3%; width: 72%; cursor: default; }
 
-.additionalinformation { background: none; float: right; width: 28%; clear: none; }
+.additionalinformation { background: none; float: right; width: 21%; clear: none; }
 .additionalinformation h2 { border-bottom: 1px solid #CCC; margin-bottom: 5px; margin-top: 0px; }
 .additionalinformation h3 { margin-left: 5px; margin-bottom: 5px; }
 .additionalinformation li { margin-left: 5px; font-size: 12px; }
 .additionalinformation a {color:#107EC0;text-decoration:underline;}
 .additionalinformation a:hover {background-color: #e6ebed;}
 
-.additionalinformation #nativelang { background-image: url(http://www.openoffice.org/download/cachedimages/nativelang.gif); background-repeat: no-repeat; background-position: top left; }
+.additionalinformation #nativelang { background-image: url(cachedimages/nativelang.gif); background-repeat: no-repeat; background-position: top left; }
 
 #downloadextendedtext p { background: none; }
 #downloadextendedtext ul { background: none; font-weight: bold; list-style: none; margin: 0px; padding: 0px; font-size: 2em; width: 100%; float: left; color: #333; padding-left: 20px; }
@@ -109,11 +162,11 @@ h1 { padding-left: 0.5em; }
 #downloadextendedtext ul.nonqabuilds li ul { font-size: .5em; }
 
 /* .4em is a little bit too small for nonqa */
-/* Overrides some of the special settings for the parent li */
+/*Overrides some of the special settings for the parent li*/
 #downloadextendedtext ul li ul li { border: 0px none; margin: 0px; padding: 0px; width: auto; margin-right: .4em; }
 #downloadextendedtext ul li ul li:hover { background: none; }
 
 .largetable table tr.even td { background: #EEEEEE; }
 .largetable table tr.odd td  { background: none; }
-.builds   { background-position: left; background-repeat: no-repeat; padding: 2px 0 2px 18px; display: block; }
+.builds { background-position: left; background-repeat: no-repeat; padding: 2px 0 2px 18px; display: block; }
 

Modified: openoffice/ooo-site/trunk/content/download/test/l10n/globalvars.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/l10n/globalvars.js?rev=1578105&r1=1578104&r2=1578105&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/l10n/globalvars.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/l10n/globalvars.js Sun Mar 16 15:35:52 2014
@@ -10,29 +10,51 @@
    SCHEMA:  Set the naming-schema for the download-set (e.g., "aoo") (not used as only 1 mirror system is used)
 */
 
-// General variables for the most recent stable release
-var VERSION			= "4.0.0";
-var MILESTONE			= "AOO400m3";
-var BUILD			= "9702";
-var SVN_REV			= "r1503704";
-
+// Most recent stable release: General variables 
+var VERSION			= "4.0.1";
+var MILESTONE			= "AOO401m5";
+var BUILD			= "9714";
+var SVN_REV			= "r1524958";
+var REL_DATE			= "2013-Oct-01";
+var PRE_VERSION			= "4.0.1";
 var OLDVERSION			= "3.4.1";
 var LEGACYVERSION		= "3.3.0";
 
-
-// Variables for the tables for the most recent stable release
 var PLATFORM			= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86" );
-var FULL_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","fi","fr","gd","gl","hu","it","ja","ko","nl","pt","pt-BR","ru","sk","sl","ta","zh-CN" );
-var LP_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","fi","fr","gd","gl","hu","it","ja","ko","nl","pt","pt-BR","ru","sk","sl","ta","zh-CN" );
+var FULL_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" );
+var LP_LANG			= new Array( "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" );
 var SDK_LANG			= new Array( "en-US" );
 
 // Base URLs to the Sourceforge and Apache mirror server
-var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + VERSION + "/binaries/";
+var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + VERSION     + "/binaries/";
+var SOURCEFORGE_PREVIOUS_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + PRE_VERSION + "/binaries/";
 var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"        + VERSION;
 var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/openoffice/"		        + VERSION;
-// var PEOPLE_BASE_URL		= "http://people.apache.org/~marcus/aoo/"		        + VERSION;
-// var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/aoo/"	        + VERSION;
-// var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/aoo/"			        + VERSION;
+var APACHE_DIST_PREVIOUS_URL	= "http://www.apache.org/dist/openoffice/"		        + PRE_VERSION;
+
+// Beta Release: General variables 
+var BETA_VERSION		= "4.1.0-beta";
+var BETA_NAME			= "4.1.0 Beta";
+var BETA_MILESTONE		= "AOO410m14";
+var BETA_BUILD			= "9760";
+var BETA_SVN_REV		= "r1573601";
+var BETA_REL_DATE		= "2014-Mar-10";
+var BETA_ACTIVE			= true;
+
+var BETA_PLATFORM		= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86-64" );
+var BETA_FULL_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );
+var BETA_LP_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );
+var BETA_SDK_LANG		= new Array( "en-US" );
+
+// Base URLs to the Sourceforge and Apache mirror server
+var BETA_SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" + BETA_VERSION + "/binaries/";
+var BETA_APACHE_BASE_URL	= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"		   + BETA_VERSION;
+var BETA_APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/openoffice/"				   + BETA_VERSION;
+
+// Debug: Uncomment to use different base URLs
+// var PEOPLE_BASE_URL		= "http://people.apache.org/~marcus/aoo/"				   + VERSION;
+// var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/aoo/"			   + VERSION;
+// var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/aoo/"					   + VERSION;
 
 // Deprecated mirror server
 // var MIRROR_BOUNCER_URL	= "http://openoffice.bouncer.osuosl.org/";
@@ -41,3 +63,4 @@ var APACHE_DIST_BASE_URL	= "http://www.a
 
 // The maximal available number of languages
 var LANG_MAX			= 133;
+

Modified: openoffice/ooo-site/trunk/content/download/test/l10n/languages.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/l10n/languages.js?rev=1578105&r1=1578104&r2=1578105&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/l10n/languages.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/l10n/languages.js Sun Mar 16 15:35:52 2014
@@ -13,10 +13,13 @@ a      b     0	      1				2				        3
 
 var languages = {
 "ast":{"-": ['ast',   'Asturian',               'Asturianu',				'y', 'http://www.openoffice.org/ast/']},
-"zh": {"-": ['zh',    'Chinese',		'Chinese',				'y', 'http://www.openoffice.org/zh/new/zh_cn/downloads.html'],
-      "cn": ['zh-CN', 'Chinese (simplified)',	'简体中文',				'y', 'http://www.openoffice.org/zh/new/zh_cn/downloads.html'],
-      "tw": ['zh-TW', 'Chinese (traditional)',	'正體中文',				'n', 'http://www.openoffice.org/zh/new/zh_tw/downloads.html']},
+"eu": {"-": ['eu',    'Basque',                 'Euskara',				'y', 'http://www.openoffice.org/eu/']},
+"bg": {"-": ['bg',    'Bulgarian',              'български език',			'y', 'http://www.openoffice.org/bg/']},
+"zh": {"-": ['zh',    'Chinese',		'Chinese',				'y', 'http://www.openoffice.org/download/other.html'],
+      "cn": ['zh-CN', 'Chinese (simplified)',	'简体中文',				'y', 'http://www.openoffice.org/download/other.html'],
+      "tw": ['zh-TW', 'Chinese (traditional)',	'正體中文',				'y', 'http://www.openoffice.org/download/other.html']},
 "cs": {"-": ['cs',    'Czech',			'Čeština',				'y', 'http://www.openoffice.org/cs/']},
+"da": {"-": ['da',    'Danish',                 'Dansk',				'y', 'http://www.openoffice.org/da/']},
 "nl": {"-": ['nl',    'Dutch',			'Nederlands',				'y', 'http://www.openoffice.org/nl/downloaden.html']},
 "en": {"-": ['en',    'English',		'English',				'y', 'http://www.openoffice.org/download/other.html'],
       "en": ['en-EN', 'English',		'English',				'y', 'http://www.openoffice.org/download/other.html'],
@@ -26,78 +29,76 @@ var languages = {
 "fr": {"-": ['fr',    'French',			'Fran&ccedil;ais',			'y', 'http://www.openoffice.org/fr/']},
 "gl": {"-": ['gl',    'Galician',		'Galego',				'y', 'http://www.openoffice.org/gl/']},
 "de": {"-": ['de',    'German',			'Deutsch',				'y', 'http://www.openoffice.org/de/']},
-"el": {"-": ['el',    'Greek',                  '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;ά', 'n', 'http://www.openoffice.org/el/']},
+"el": {"-": ['el',    'Greek',                  '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;ά', 'y', 'http://www.openoffice.org/el/']},
+"hi": {"-": ['hi',    'Hindi',                  'हिन्दी',					'y', 'http://www.openoffice.org/hi/']},
 "hu": {"-": ['hu',    'Hungarian',		'Magyar',				'y', 'http://www.openoffice.org/hu/about-downloads.html']},
 "it": {"-": ['it',    'Italian',		'Italiano',				'y', 'http://www.openoffice.org/it/download/']},
-"ja": {"-": ['ja',    'Japanese',		'日本語',					'y', 'http://www.openoffice.org/ja/']},
+"ja": {"-": ['ja',    'Japanese',		'日本語',				'y', 'http://www.openoffice.org/ja/']},
+"km": {"-": ['km',    'Khmer',			'ភាសាខ្មែរ',			'y', 'http://www.openoffice.org/download/other.html']},
 "ko": {"-": ['ko',    'Korean',                 '한국어',					'y', 'http://www.openoffice.org/ko/']},
+"lt": {"-": ['lt',    'Lithuanian',             'Lietuvių',				'y', 'http://www.openoffice.org/lt/']},
+"nb": {"-": ['nb',    'Norwegian (Bokmal)',     'Norsk (Bokmål)',			'y', 'http://www.openoffice.org/no/']},
+"pl": {"-": ['pl',    'Polish',                 'Polski',				'y', 'http://www.openoffice.org/pl/product.download.html']},
 "pt": {"-": ['pt',    'Portuguese (European)',	'Portugu&ecirc;s (Europeu)',		'y', 'http://www.openoffice.org/pt/download/download.htm'],
       "br": ['pt-BR', 'Portuguese (Brazilian)',	'Portugu&ecirc;s (do Brasil)',		'y', 'http://www.openoffice.org/pt-br/'],
       "pt": ['pt-PT', 'Portuguese (European)',	'Portugu&ecirc;s (Europeu)',		'y', 'http://www.openoffice.org/pt/download/download.htm']},
 "ru": {"-": ['ru',    'Russian',		'Русский',				'y', 'http://www.openoffice.org/download/test/index.html']},
 "gd": {"-": ['gd',    'Scottish (Gaelic)',	'Gàidhlig',				'y', 'http://www.openoffice.org/gd/']},
+"sr": {"-": ['sr',    'Serbian (Cyrillic)',     'Cрпски (ћирилицом)',			'y', 'http://www.openoffice.org/sr/preuzmi.html']},
 "sk": {"-": ['sk',    'Slovak',			'Slovenský jazyk (slovenčina)',		'y', 'http://www.openoffice.org/sk/']},
 "sl": {"-": ['sl',    'Slovenian',		'Slovenski jezik (slovenščina)',	'y', 'http://www.openoffice.org/sl/']},
 "es": {"-": ['es',    'Spanish',		'Espa&ntilde;ol',			'y', 'http://www.openoffice.org/es/']},
+"sv": {"-": ['sv',    'Swedish',                'Svenska',				'y', 'http://www.openoffice.org/sv/get/']},
 "ta": {"-": ['ta',    'Tamil',                  'தமிழ்',					'y', 'http://www.openoffice.org/ta/']},
+"th": {"-": ['th',    'Thai',                   'ภาษาไทย',				'y', 'http://www.openoffice.org/download/other.html']},
+"tr": {"-": ['tr',    'Turkish',                'T&uuml;rk&ccedil;e',			'y', 'http://www.openoffice.org/tr/']},
+"vi": {"-": ['vi',    'Vietnamese',             'Tiếng Việt',				'y', 'http://www.openoffice.org/vi/']},
+
 
 "ar": {"-": ['ar',    'Arabic',			'عربي',					'n', 'http://www.openoffice.org/ar/']},
-"as": {"-": ['as',    'Assamese',               'অসমীয়া',				'n',  'http://www.openoffice.org/download/other.html']},
-"eu": {"-": ['eu',    'Basque',                 'Euskara',				'n', 'http://www.openoffice.org/eu/']},
+"as": {"-": ['as',    'Assamese',               'অসমীয়া',					 'n', 'http://www.openoffice.org/download/other.html']},
 "be": {"-": ['be',    'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html'],
       "be": ['be-BE', 'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html'],
       "by": ['be-BY', 'Belarusian',             'Беларуская мова',			'n', 'http://www.openoffice.org/download/other.html']},
-"bn": {"-": ['bn',    'Bengali',                'বাংলা',					'n', 'http://www.openoffice.org/bn/']},
-"bg": {"-": ['bg',    'Bulgarian',              'български език',			'n', 'http://www.openoffice.org/bg/']},
+"bn": {"-": ['bn',    'Bengali',                'বাংলা',					 'n', 'http://www.openoffice.org/bn/']},
 "my": {"-": ['my',    'Burmese',                'မြန်မာဘာသာ',			'n', 'http://www.openoffice.org/my/']},
 "ca": {"-": ['ca',    'Catalan',                'Català',				'n', 'http://www.softcatala.org/projectes/openoffice/'],
       "ca": ['ca-CA', 'Catalan',                'Català',				'n', 'http://www.softcatala.org/projectes/openoffice/'],
       "xv": ['ca-XV', 'Catalan (Valencian)',    'Català (Valencià)',			'n', 'http://www.openoffice.org/download/other.html']},
 "hr": {"-": ['hr',    'Croatian',               'hrvatski',				'n', 'http://www.openoffice.org/hr/']},
-"da": {"-": ['da',    'Danish',                 'Dansk',				'n', 'http://www.openoffice.org/da/']},
-"dz": {"-": ['dz',    'Dzongkha',               'རྫོང་ཁ',					'n', 'http://www.openoffice.org/download/other.html']},
+"dz": {"-": ['dz',    'Dzongkha',               'རྫོང་ཁ',					 'n', 'http://www.openoffice.org/download/other.html']},
 "eo": {"-": ['eo',    'Esperanto',              'Esperanto',				'n', 'http://www.openoffice.org/eo/']},
 "et": {"-": ['et',    'Estonian',               'Eesti keel',				'n', 'http://www.openoffice.org/download/other.html']},
 "ka": {"-": ['ka',    'Georgian',               'ქართული ენა',				'n', 'http://www.openoffice.org/ka/']},
-"gu": {"-": ['gu',    'Gujarati',               'ગુજરાતી',				'n', 'http://www.openoffice.org/gu/']},
+"gu": {"-": ['gu',    'Gujarati',               'ગુજરાતી',					'n', 'http://www.openoffice.org/gu/']},
 "he": {"-": ['he',    'Hebrew',                 'עִבְרִית',					'n', 'http://www.openoffice.org/download/other.html']},
-"hi": {"-": ['hi',    'Hindi',                  'हिन्दी',					'n', 'http://www.openoffice.org/hi/']},
 "is": {"-": ['is',    'Icelandic',              'Íslenska',				'n', 'http://www.openoffice.org/download/other.html']},
 "id": {"-": ['id',    'Indonesian',             'Bahasa Indonesia',			'n', 'http://www.openoffice.org/id/']},
 "ga": {"-": ['ga',    'Irish',                  'Gaeilge',				'n', 'http://www.openoffice.org/ga/']},
-"km": {"-": ['km',    'Khmer',			'ភាសាខ្មែរ',				'n', 'http://www.openoffice.org/download/other.html']},
 "kn": {"-": ['kn',    'Kannada',                'ಕನ್ನಡ',					'n', 'http://www.openoffice.org/download/other.html']},
 "ku": {"-": ['ku',    'Kurdish',                'Kurdî',				'n', 'http://www.openoffice.org/download/other.html']},
 "lv": {"-": ['lv',    'Latvian',                'Latviešu valoda',			'n', 'http://www.openoffice.org/lv/']},
 "lo": {"-": ['lo',    'Laotian',                'ພາສາລາວ',				'n', 'http://www.openoffice.org/lo/']},
-"lt": {"-": ['lt',    'Lithuanian',             'Lietuvių',				'n', 'http://www.openoffice.org/lt/']},
 "mk": {"-": ['mk',    'Macedonian',             'Македонски',				'n', 'http://www.openoffice.org/mk/']},
 "ml": {"-": ['ml',    'Malayalam',              'മലയാളം',				'n', 'http://www.openoffice.org/ml/']},
 "ms": {"-": ['ms',    'Malaysian',              'بهاس ملايو',				'n', 'http://www.openoffice.org/ms/']},
 "mr": {"-": ['mr',    'Marathi',                'मराठी',					'n', 'http://www.openoffice.org/download/other.html']},
 "mn": {"-": ['mn',    'Mongolian',              'Монгол хэл',				'n', 'http://www.openoffice.org/mn/']},
-"nb": {"-": ['nb',    'Norwegian (Bokmal)',     'Norsk (Bokmål)',			'n', 'http://www.openoffice.org/no/']},
 "nn": {"-": ['nn',    'Norwegian (Nynorsk)',    'Norsk (Nynorsk)',			'n', 'http://www.openoffice.org/no/']},
 "no": {"-": ['no',    'Norwegian',              'Norsk',				'n', 'http://www.openoffice.org/no/']},
 "oc": {"-": ['oc',    'Occitan',                'Occitan',				'n', 'http://www.openoffice.org/download/other.html']},
 "or": {"-": ['or',    'Oriya',                  'ଓଡ଼ିଆ',					'n', 'http://www.openoffice.org/download/other.html']},
 "om": {"-": ['om',    'Oromo',                  'ኦሮሚኛ',					'n', 'http://www.openoffice.org/om/']},
-"pl": {"-": ['pl',    'Polish',                 'Polski',				'n', 'http://www.openoffice.org/pl/product.download.html']},
 "pa": {"-": ['pa',    'Punjabi',                'ਪੰਜਾਬੀ',					'n', 'http://www.openoffice.org/pa/'],
       "pa": ['pa-PA', 'Punjabi',                'ਪੰਜਾਬੀ',					'n', 'http://www.openoffice.org/pa/'],
       "in": ['pa-IN', 'Punjabi',                'ਪੰਜਾਬੀ',					'n', 'http://www.openoffice.org/pa/']},
 "ro": {"-": ['ro',    'Romanian',               'Română',				'n', 'http://www.openoffice.org/ro/']},
-"sr": {"-": ['sr',    'Serbian (Cyrillic)',     'Cрпски (ћирилицом)',			'n', 'http://www.openoffice.org/sr/preuzmi.html']},
 "sh": {"-": ['sh',    'Serbian (Latin)',        'Srpski (latinicom)',			'n', 'http://www.openoffice.org/sr/lat/preuzmi.html']},
 "si": {"-": ['si',    'Sinhala',                'සිංහල',					'n', 'http://www.openoffice.org/si/']},
-"sv": {"-": ['sv',    'Swedish',                'Svenska',				'n', 'http://www.openoffice.org/sv/get/']},
-"te": {"-": ['te',    'Telugu',                 'తెలుగు',					'n', 'http://www.openoffice.org/download/other.html']},
-"th": {"-": ['th',    'Thai',                   'ภาษาไทย',				'n', 'http://www.openoffice.org/download/other.html']},
-"tr": {"-": ['tr',    'Turkish',                'T&uuml;rk&ccedil;e',			'n', 'http://www.openoffice.org/tr/']},
+"te": {"-": ['te',    'Telugu',                 'తెలుగు',				'n', 'http://www.openoffice.org/download/other.html']},
 "uk": {"-": ['uk',    'Ukrainian',              'Yкраї́нська мо́ва',			'n', 'http://www.openoffice.org/uk/']},
 "ug": {"-": ['ug',    'Uyghur',                 'ئۇيغۇرچە‎',				'n', 'http://www.openoffice.org/download/other.html']},
 "uz": {"-": ['uz',    'Uzbek',                  'Ўзбек',				'n', 'http://www.openoffice.org/uz/']},
-"vi": {"-": ['vi',    'Vietnamese',             'Tiếng Việt',				'n', 'http://www.openoffice.org/vi/']},
 "cy": {"-": ['cy',    'Welsh',                  'Cymraeg',				'n', 'http://www.openoffice.org/download/test/index.html']}
 };