You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2017/04/02 09:38:06 UTC

svn commit: r1009572 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/bg-test/ content/it/download/ content/sr/ content/sr/download/

Author: buildbot
Date: Sun Apr  2 09:38:05 2017
New Revision: 1009572

Log:
Staging update by buildbot for ooo-site

Added:
    websites/staging/ooo-site/trunk/content/sr/download/
    websites/staging/ooo-site/trunk/content/sr/download/index.html
    websites/staging/ooo-site/trunk/content/sr/download/msg_prop_l10n_sr.js
    websites/staging/ooo-site/trunk/content/sr/index_old.html
    websites/staging/ooo-site/trunk/content/sr/msg_prop_l10n_sr.js
Removed:
    websites/staging/ooo-site/trunk/content/bg-test/
    websites/staging/ooo-site/trunk/content/sr/google3b713cda4a0fc5a7.html
Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/it/download/msg_prop_l10n_it.js
    websites/staging/ooo-site/trunk/content/robots.txt
    websites/staging/ooo-site/trunk/content/sr/index.html
    websites/staging/ooo-site/trunk/content/sr/topnav.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr  2 09:38:05 2017
@@ -1 +1 @@
-1789848
+1789867

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr  2 09:38:05 2017
@@ -1 +1 @@
-1789848
+1789867

Modified: websites/staging/ooo-site/trunk/content/it/download/msg_prop_l10n_it.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/it/download/msg_prop_l10n_it.js (original)
+++ websites/staging/ooo-site/trunk/content/it/download/msg_prop_l10n_it.js Sun Apr  2 09:38:05 2017
@@ -265,17 +265,17 @@ l10n.dl_checksum_sha256_text			= "SHA256
 l10n.dl_checksum_sha256_title			= "SHA256 hash for: ";
 
 l10n.dl_help_img_title				= "Differenza tra installazione completa e language pack";
-l10n.dl_help_img_src				= "https://www.openoffice.org/download/cachedimages/help-information-icon.png";
+l10n.dl_help_img_src				= "/download/cachedimages/help-information-icon.png";
 l10n.dl_help_img_alt				= "Informazioni di installazione";
 l10n.dl_help_text				= "Cos'è un language pack?";
 l10n.dl_help_title				= "Differenza tra installazione completa e language pack";
 l10n.dl_checksum_img_title			= "Come verificare firme e checksum?";
-l10n.dl_checksum_img_src			= "/cachedimages/help-information-icon.png";
+l10n.dl_checksum_img_src			= "/download/cachedimages/help-information-icon.png";
 l10n.dl_checksum_img_alt			= "Verifica";
 l10n.dl_checksum_text				= "Come verificare il download?";
 l10n.dl_checksum_title				= "Verifica delle checksum";
 l10n.dl_report_img_title			= "Il link di download non funziona? Segnalatelo qui.";
-l10n.dl_report_img_src				= "/cachedimages/help-report-broken-link-icon.png";
+l10n.dl_report_img_src				= "/download/cachedimages/help-report-broken-link-icon.png";
 l10n.dl_report_img_alt				= "Link non funzionante";
 l10n.dl_report_text				= "Segnalate un link non funzionante";
 l10n.dl_report_title				= "Segnalate un link non funzionante.";
@@ -287,7 +287,7 @@ l10n.dl_langpack_link_error_text		= "Lan
 l10n.dl_langpack_link_error_title		= "Cambiate lingua, piattaforma o versione.";
 
 l10n.dl_error_problem_img_title			= "Il file selezionato non è disponibile";
-l10n.dl_error_problem_img_src			= "/cachedimages/exclamation-icon.png";
+l10n.dl_error_problem_img_src			= "/download/cachedimages/exclamation-icon.png";
 l10n.dl_error_problem_img_alt			= "Errore";
 l10n.dl_error_problem_text			= "Problema: ";
 l10n.dl_error_solution_text			= "Soluzione: ";
@@ -350,6 +350,7 @@ l10n.dl_analyze_table_javascript_text		=
 
 
 // General: Links to webpage files that could be localized.
+l10n.dl_rel_notes_aoo413_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/Informazioni+su+Apache+OpenOffice+4.1.3+-+Italiano";
 l10n.dl_rel_notes_aoo412_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61326082";
 l10n.dl_rel_notes_aoo411_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";
 l10n.dl_rel_notes_aoo410_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/Informazioni+su+Apache+OpenOffice+4.1+-+IT";

Modified: websites/staging/ooo-site/trunk/content/robots.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/robots.txt (original)
+++ websites/staging/ooo-site/trunk/content/robots.txt Sun Apr  2 09:38:05 2017
@@ -27,5 +27,4 @@ Disallow: /download-NEXT2/
 Disallow: /de/Archiv/
 Disallow: /no-test/
 Disallow: /test-hu/
-Disallow: /bg-test/
 Disallow: /lt-old/

Added: websites/staging/ooo-site/trunk/content/sr/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/download/index.html (added)
+++ websites/staging/ooo-site/trunk/content/sr/download/index.html Sun Apr  2 09:38:05 2017
@@ -0,0 +1,172 @@
+<!--#include virtual="/doctype.html" -->
+<html>
+<head>
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta itemprop="name" content="Download Apache OpenOffice" />
+  <meta itemprop="description" content="Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
+  <meta itemprop="image" content="https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png" />
+  <meta property="og:title" content="Download Apache OpenOffice" />
+  <meta property="og:description" content="Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
+  <meta property="og:image" content="https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png" />
+  <meta name="description" content="Official Apache OpenOffice download page. Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
+  <title>Apache OpenOffice Downloads - Official Site</title>
+  <script type="text/javascript" src="/download/globalvars.js"></script>
+  <script type="text/javascript" src="./msg_prop_l10n_sr.js"></script>
+  <script type="text/javascript" src="/download/languages.js"></script>
+  <script type="text/javascript" src="/download/release_matrix.js"></script>
+  <script type="text/javascript" src="/download/boxed_download.js"></script>
+  <script type="text/javascript" src="/download/download.js"></script>
+  <style type="text/css">
+  /* <![CDATA[ */
+  /*-------------------- Exceptions on standard css -----------------------*/
+  @import "/download/styles.css";
+  @import "/download/exceptions.css";
+  /* ]]> */
+  </style>
+  <script>
+    if ( window.document.referrer.indexOf( "shell.windows.com" ) != -1 ) {
+       location.href = "/why/why_odf.html";
+    }
+
+    function share( platform ) {
+      _gaq.push( ['_trackEvent', 'social', 'shareDownload', platform] ); 
+
+      if ( platform == 'apacheblog' ) {
+        window.open( 'https://blogs.apache.org/OOo/', '_blank' );
+      } else if ( platform == 'facebook' ) {
+        window.open( 'https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'twitter' ) {
+        window.open( 'https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+200+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'google+' ) {
+        window.open( 'https://plus.google.com/share?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=400, height=440' );
+      }
+    }
+  </script>
+
+<!--#include virtual="/google-analytics.js" --> 
+<!--#include virtual="/scripts/entourage.js" -->
+</head>
+<body>
+<!--#include virtual="/sr/brand.html" -->
+  <div id="topbara">
+    <!--#include virtual="/sr/topnav.html" -->
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/sr/">sr</a>&nbsp;&raquo;&nbsp;<a href="/sr/download/">download</a></div>
+  </div>
+  <div id="clear"></div>
+  
+  
+  <div id="content">
+    
+    
+    
+
+<div class="overall_optionset">
+
+  <div class="optionset">
+
+    <!-- Text above the first colored box -->
+    <script type="text/javascript">
+    <!--
+    // The text in the H1 tag is intentionally shown as "display: none" (do not display).
+    // This is to please accessibility tools like a screen reader.
+    document.write( "<h1 style='display: none;'>" + l10n.dl_headline_text + "</h1>" );
+    //-->
+    </script>
+
+    <!-- Green: Stable release -->
+    <!-- Download via select boxes -->
+    <script type="text/javascript">
+    <!--
+
+    // Set a specific language ISO code to force to assemble a certain localized build as download link.
+    // Changed: The variable can now be found in the "msg_prop_l10n_<ISO_code>.js".
+
+    // Get the download box from a separate file.
+    DL.createDownloadBox();
+
+    // Fill the select boxes and wait for the user's choice.
+    DL.init( 1 );
+
+    entourage.initialize();
+
+    //-->
+    </script>
+
+    <!-- Green: Stable release: No JavaScript enabled -->
+    <noscript>
+    <div class="first button green-sel" id="optionitem2">
+      <div class="green-sel-icon"></div>
+      <h2>
+        <a style="cursor: pointer;" href="https://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+          title="Select from all platforms, languages, language packs to download">
+          Apache OpenOffice Downloads - Official Site
+        </a>
+      </h2>
+      <p>
+        <a style="cursor: pointer;" href="https://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+          title="Select from all platforms, languages and language packs to download">The browser seems to have JavaScript
+          disabled. This technique is used for showing the actual download link. If you want to download Apache
+          OpenOffice anyway, click this text to choose from the alternative download webpage.
+          Our apologies for the inconvenience.
+        </a>
+      </p>
+    </div>
+    </noscript>
+
+    <!-- Light Blue: Share download with social networks -->
+    <script type="text/javascript">
+    <!--
+    // Get the share box from a separate file.
+    DL.createShareBox();
+    //-->
+    </script>
+
+    <!-- Blue: Extensions -->
+    <script type="text/javascript">
+    <!--
+    // Get the extensions box from a separate file.
+    DL.createExtensionsBox();
+    //-->
+    </script>
+
+    <!-- Blue: Templates -->
+    <script type="text/javascript">
+    <!--
+    // Get the templates box from a separate file.
+    DL.createTemplatesBox();
+    //-->
+    </script>
+
+  </div> <!-- class "optionset" -->
+
+  <div class="additionalinformation">
+
+    <!-- Navigation bar -->
+    <script type="text/javascript">
+    <!--
+    // Get the navigation bar from a separate file.
+    DL.createNavigationBar();
+    //-->
+    </script>
+
+    <br /><br />
+
+    <!-- Logo section -->
+    <script type="text/javascript">
+    <!--
+    // Get the logo section from a separate file.
+    DL.createLogoSection();
+    //-->
+    </script>
+
+  </div> <!-- class: additionalinformation -->
+
+</div> <!-- class: overall_optionset -->
+
+
+  </div>
+<!--#include virtual="/footer.html" -->
+</body>
+</html>

Added: websites/staging/ooo-site/trunk/content/sr/download/msg_prop_l10n_sr.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/download/msg_prop_l10n_sr.js (added)
+++ websites/staging/ooo-site/trunk/content/sr/download/msg_prop_l10n_sr.js Sun Apr  2 09:38:05 2017
@@ -0,0 +1,366 @@
+/* This file is to maintain text information that can be used on the download webpage via JavaScript when
+ * including this file.
+ *
+ * Instead of hard coded text in the green box please use these variables and translate it to your favorite language.
+ *
+ * Wrong:   "Download Apache OpenOffice"
+ * Correct: l10n.dl_green_box_headline_text
+ */
+
+
+
+// Object that contains all following variables.
+var l10n = new Object();
+
+// The following variables are used in the "index.html" file:
+
+// Set a specific language ISO code to force to assemble a download link with a certain language.
+DL.NL_LANG					= "sr";
+
+// General:
+l10n.dl_headline_text				= "Apache OpenOffice Download";
+
+// Download: Strings in the green box (used in "index.html").
+l10n.dl_green_box_headline_text			= "Download Apache OpenOffice";
+l10n.dl_green_box_headline_title		= "Download Apache OpenOffice for your favorite operating system, language and version";
+l10n.dl_green_box_subtext1_text			= "Hosted by Sourceforge.net - A trusted website";
+l10n.dl_green_box_subtext1_title		= "Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website";
+l10n.dl_green_box_subtext2_text			= "Select your favorite operating system, language and version";
+l10n.dl_green_box_subtext2_title		= "Select your favorite operating system, language and version";
+l10n.dl_green_box_selectbox_os_title		= "Select your favorite operating system";
+l10n.dl_green_box_selectbox_lang_title		= "Select your favorite language";
+l10n.dl_green_box_selectbox_ver_title		= "Select your favorite release version";
+
+// The strings that will be shown in the OS, language and version drop-down select boxes.
+// You must leave at least one single empty string (see the comment lines below the 3 following variables)!
+l10n.dl_green_box_select_box_os_values		= [ "Windows (EXE)",
+				    		    "Linux 64-bit (x86-64) (DEB)",
+						    "Linux 64-bit (x86-64) (RPM)",
+						    "Linux 32-bit (x86) (DEB)",
+						    "Linux 32-bit (x86) (RPM)",
+						    "OS X (version >= 10.7) (DMG)",
+						    "OS X (version <= 10.6) (DMG)",
+						    "More platforms / operating systems" ];
+/* l10n.dl_green_box_select_box_os_values	= [ "" ]; */
+
+l10n.dl_green_box_select_box_language_values	= [ "Asturian (Asturianu)",
+						    "Basque (Euskara)",
+						    "Bulgarian (български език)",
+                                                    "Catalan (Català)",
+                                                    "Catalan Valencia AVL (Català Valencià AVL)",
+                                                    "Catalan Valencia RACV (Català Valencià RACV)",
+						    "Chinese [simplified] (简体中文)",
+						    "Chinese [traditional] (正體中文)",
+						    "Czech (Čeština)",
+						    "Danish (Dansk)",
+						    "Dutch (Nederlands)",
+						    "English [British]",
+						    "English [US]",
+						    "Finnish (Suomi)",
+						    "French (Français)",
+						    "Galician (Galego)",
+						    "German (Deutsch)",
+						    "Greek (ελληνικά)",
+						    "Hebrew (עברית)",
+						    "Hindi (हिन्दी)",
+						    "Hungarian (Magyar)",
+						    "Italian (Italiano)",
+						    "Japanese (日本語)",
+						    "Khmer (ភាសាខ្មែរ)",
+						    "Korean (한국어)",
+						    "Lithuanian (Lietuvių)",
+						    "Norwegian [Bokmal] (Norsk [Bokmål])",
+						    "Polish (Polski)",
+						    "Portuguese [Brazilian] (Português [do Brasil])",
+						    "Portuguese [European] (Português [Europeu])",
+						    "Russian (Русский)",
+						    "Scottish [Gaelic] (Gàidhlig)",
+						    "Serbian [Cyrillic] (Cрпски [ћирилицом])",
+						    "Slovak (Slovenský jazyk [slovenčina])",
+						    "Slovenian (Slovenski jezik [slovenščina])",
+						    "Spanish (Español)",
+						    "Swedish (Svenska)",
+						    "Tamil (தமிழ்)",
+						    "Thai (ภาษาไทย)",
+						    "Turkish (Türkçe)",
+						    "Vietnamese (Tiếng Việt)" ];
+/* l10n.dl_green_box_select_box_language_values	= [ "" ]; */
+
+l10n.dl_green_box_select_box_version_values	= [ "4.1.3",
+                            "4.1.2",
+                            "4.1.1",
+                            "4.1.0",
+						    "4.0.1",
+						    "4.0.0",
+						    "3.4.1",
+						    "Older releases" ];
+
+/* l10n.dl_green_box_select_box_version_values	= [ "" ]; */
+
+// Download: Strings in the sub-green box (used in "index.html").
+// Not defined for now.
+
+// Download: Strings in the yellow box (used in "index.html").
+// Not defined for now.
+
+// Download: Strings in the sub-yellow box (used in "index.html").
+// Not defined for now.
+
+// Share: Strings in the light-blue box (used in "index.html").
+l10n.dl_share_light_blue_box_headline_text	= "Help Spread the Word";
+l10n.dl_share_light_blue_box_headline_title	= "Help spread the word and tell your friends about Apache OpenOffice";
+l10n.dl_share_light_blue_box_text_text		= "Please tell your friends about Apache OpenOffice:";
+l10n.dl_share_light_blue_box_text_title		= "Help spread the word and tell your friends about Apache OpenOffice";
+l10n.dl_share_light_blue_box_blog_text		= "Official Blog";
+l10n.dl_share_light_blue_box_blog_title		= "Weblog of OpenOffice";
+l10n.dl_share_light_blue_box_blog_src		= "/images/logo-rss-32.png";
+l10n.dl_share_light_blue_box_blog_alt		= "Weblog of OpenOffice";
+l10n.dl_share_light_blue_box_facebook_text	= "Facebook";
+l10n.dl_share_light_blue_box_facebook_title	= "Please tell your friends about Apache OpenOffice via Facebook";
+l10n.dl_share_light_blue_box_facebook_src	= "/images/logo-facebook-32.png";
+l10n.dl_share_light_blue_box_facebook_alt	= "Share on Facebook";
+l10n.dl_share_light_blue_box_twitter_text	= "Twitter";
+l10n.dl_share_light_blue_box_twitter_title	= "Please tell your friends about Apache OpenOffice via Twitter";
+l10n.dl_share_light_blue_box_twitter_src	= "/images/logo-twitter-32.png";
+l10n.dl_share_light_blue_box_twitter_alt	= "Share on Twitter";
+l10n.dl_share_light_blue_box_googleplus_text	= "Google+";
+l10n.dl_share_light_blue_box_googleplus_title	= "Please tell your friends about Apache OpenOffice via Google+";
+l10n.dl_share_light_blue_box_googleplus_src	= "/images/logo-googleplus-32.png";
+l10n.dl_share_light_blue_box_googleplus_alt	= "Share on Google+";
+
+// Extensions: Strings in the blue box (top) (used in "index.html").
+l10n.dl_ext_blue_box_headline_text		= "Get Apache OpenOffice Extensions and Dictionaries";
+l10n.dl_ext_blue_box_headline_title		= "Choose from a wide range of additional and individual functionality";
+l10n.dl_ext_blue_box_text_text			= "Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries from other users.";
+l10n.dl_ext_blue_box_text_title			= "Choose from a wide range of additional and individual functionality";
+l10n.dl_ext_blue_box_text_href			= "http://extensions.openoffice.org/";
+
+// Templates: Strings in the blue box (bottom) (used in "index.html").
+l10n.dl_tlp_blue_box_headline_text		= "Get Apache OpenOffice Templates";
+l10n.dl_tlp_blue_box_headline_title		= "Choose from a wide range of additional and individual documents";
+l10n.dl_tlp_blue_box_text_text			= "Extend your Apache OpenOffice creativity with a large and growing library of templates from other users.";
+l10n.dl_tlp_blue_box_text_title			= "Choose from a wide range of additional and individual documents";
+l10n.dl_tlp_blue_box_text_href			= "http://templates.openoffice.org/";
+
+// Strings in the navigation bar (used in "index.html").
+// Release Information
+l10n.dl_nav_headline_1_text			= "Release Information";
+l10n.dl_nav_sysreq_text				= "System Requirements";
+l10n.dl_nav_sysreq_title			= "HDD: ~300MB free - Memory: &gt;128MB - Processor: &gt;500MHz - OS: Windows, macOS (OS&nbsp;X), Linux, Solaris, FreeBSD...";
+l10n.dl_nav_sysreq_href				= "https://www.openoffice.org/dev_docs/source/sys_reqs_aoo41.html";
+l10n.dl_nav_license_text			= "License";
+l10n.dl_nav_license_title			= "Apache OpenOffice License";
+l10n.dl_nav_license_href			= "https://www.openoffice.org/license.html";
+l10n.dl_nav_source_text				= "Source";
+l10n.dl_nav_source_title			= "For developers and power users: Get the source to build Apache OpenOffice from scratch.";
+l10n.dl_nav_source_href				= "https://openoffice.apache.org/downloads.html";
+l10n.dl_nav_build_text				= "Building Guide";
+l10n.dl_nav_build_title				= "For developers and power users: HowTo guide to build Apache OpenOffice from scratch.";
+l10n.dl_nav_build_href				= "https://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO";
+l10n.dl_nav_sdk_text				= "Software Development Kit (SDK)";
+l10n.dl_nav_sdk_title				= "For developers: Software Development Kit.";
+l10n.dl_nav_sdk_href				= "https://openoffice.apache.org/downloads.html";
+l10n.dl_nav_devbuilds_text			= "Development Builds";
+l10n.dl_nav_devbuilds_title			= "For QA volunteers: Development Builds";
+l10n.dl_nav_devbuilds_href			= "https://www.openoffice.org/download/devbuilds.html";
+
+// Documentation
+l10n.dl_nav_headline_2_text			= "Documentation";
+l10n.dl_nav_schedule_text			= "Release Schedules";
+l10n.dl_nav_schedule_title			= "When are new releases planned?";
+l10n.dl_nav_schedule_href			= "https://cwiki.apache.org/confluence/display/OOOUSERS/Releases";
+l10n.dl_nav_hist_schedule_text			= "Historic Release Schedule";
+l10n.dl_nav_hist_schedule_title			= "When were old releases planned?";
+l10n.dl_nav_hist_schedule_href			= "https://wiki.openoffice.org/wiki/Product_Release";
+l10n.dl_nav_inst_guide_text			= "Installation Guides";
+l10n.dl_nav_inst_guide_title			= "Instructions for installing Apache OpenOffice on Windows, macOS (OS&nbsp;X) and Linux machines";
+l10n.dl_nav_inst_guide_href			= "https://www.openoffice.org/download/common/instructions.html";
+l10n.dl_nav_user_guide_text			= "User Guides";
+l10n.dl_nav_user_guide_title			= "Extensive user manuals for every day use";
+l10n.dl_nav_user_guide_href			= "https://www.openoffice.org/documentation/index.html";
+l10n.dl_nav_why_java_text			= "Java and Apache OpenOffice";
+l10n.dl_nav_why_java_title			= "Explains why to use Java and what it is";
+l10n.dl_nav_why_java_href			= "https://www.openoffice.org/download/common/java.html";
+l10n.dl_nav_eol_text				= "End-Of-Life Information";
+l10n.dl_nav_eol_title				= "Information about releases that have reached End-Of-Life status";
+l10n.dl_nav_eol_href				= "https://www.openoffice.org/development/releases/eol.html";
+
+// Additional Resources
+l10n.dl_nav_headline_3_text			= "Additional Resources";
+l10n.dl_nav_support_text			= "Support";
+l10n.dl_nav_support_title			= "If the information above did not answer your question: Free and paid support!";
+l10n.dl_nav_support_href			= "https://www.openoffice.org/support/index.html";
+l10n.dl_nav_local_text				= "Localizations";
+l10n.dl_nav_local_title				= "Information and support in your favorite language";
+l10n.dl_nav_local_href				= "https://openoffice.apache.org/native-lang.html";
+l10n.dl_nav_stat_text				= "Download Statistics";
+l10n.dl_nav_stat_title				= "Download and other statistics";
+l10n.dl_nav_stat_href				= "https://www.openoffice.org/stats/index.html";
+l10n.dl_nav_mirrors1_text			= "Alternative download mirrors #1";
+l10n.dl_nav_mirrors1_title			= "Use Sourceforge mirrors to download Apache OpenOffice";
+l10n.dl_nav_mirrors1_href			= "https://sourceforge.net/projects/openofficeorg.mirror/files/";
+l10n.dl_nav_mirrors2_text			= "Alternative download mirrors #2";
+l10n.dl_nav_mirrors2_title			= "Use Apache mirrors to download Apache OpenOffice";
+l10n.dl_nav_mirrors2_href			= "https://www.apache.org/dyn/closer.lua/openoffice/";
+l10n.dl_nav_porting_text			= "3rd party ports and distributions";
+l10n.dl_nav_porting_title			= "Ports and distributions from 3rd party vendors";
+l10n.dl_nav_porting_href			= "https://www.openoffice.org/porting/index.html";
+l10n.dl_nav_archive_text			= "Archived and legacy releases";
+l10n.dl_nav_archive_title			= "Download legacy and archived releases";
+l10n.dl_nav_archive_href			= "https://www.openoffice.org/download/archive.html";
+
+// List items in the navigation bar that are not used for now.
+l10n.dl_nav_release_notes_text			= "Release Notes";
+l10n.dl_nav_release_notes_title			= "What is new, what has been improved in Apache OpenOffice?";
+l10n.dl_nav_release_notes_href			= "https://www.openoffice.org/development/releases/index.html";
+l10n.dl_nav_checksum_text			= "Verify the downloaded file";
+l10n.dl_nav_checksum_title			= "How to verify the downloaded file with signatures and hashes?";
+l10n.dl_nav_checksum_href			= "https://www.openoffice.org/download/checksums.html";
+
+// Strings for the logo graphics.
+l10n.dl_img_sourceforge_title			= "Sourceforge - Download, Develop and Publish Free Open Source Software";
+l10n.dl_img_sourceforge_href			= "https://www.sourceforge.net/";
+l10n.dl_img_sourceforge_src			= "https://www.openoffice.org/images/sourceforge.png";
+l10n.dl_img_sourceforge_alt			= "Sourceforge";
+l10n.dl_img_w3c_title				= "W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents";
+l10n.dl_img_w3c_href				= "https://validator.w3.org/check?uri=referer";
+l10n.dl_img_w3c_src				= "https://www.openoffice.org/images/valid-xhtml10-blue.png";
+l10n.dl_img_w3c_alt				= "W3C Validator";
+
+
+
+// The following variables are used in the "download.js" file:
+
+// Download: Strings in the green box (used in "download.js").
+l10n.dl_full_link_text				= "Download full installation";
+l10n.dl_full_link_title				= "Click to download: ";
+l10n.dl_langpack_link_text			= "Download language pack";
+l10n.dl_langpack_link_title			= "Click to download: ";
+
+l10n.dl_full_link_porting_text			= "Porting: Click to choose from 3rd party vendors";
+l10n.dl_full_link_porting_title			= "Click to browse to the porting webpage and download from 3rd party vendors";
+l10n.dl_full_link_archive_text			= "Archive: Click to choose from legacy releases";
+l10n.dl_full_link_archive_title			= "Click to browse to the archive and download legacy releases";
+
+// Download: Strings in the sub-green box (used in "download.js").
+l10n.dl_rel_info_headline_text			= "Release: ";
+l10n.dl_rel_info_milestone_text			= "Milestone ";
+l10n.dl_rel_info_buildid_text			= "Build ID ";
+l10n.dl_rel_info_svn_text			= "SVN "
+l10n.dl_rel_info_rel_date_text			= "Released ";
+l10n.dl_rel_notes_text				= "Release Notes";
+l10n.dl_rel_notes_title				= "Release Notes for Apache OpenOffice ";
+
+l10n.dl_headline_full_text			= "Full installation: ";
+l10n.dl_headline_langpack_text			= "Language pack: ";
+l10n.dl_filesize_text				= "File size ~ ";
+l10n.dl_megabyte_text				= " MByte";
+l10n.dl_checksum_headline_text			= "Signatures and hashes: ";
+l10n.dl_checksum_keys_text			= "KEYS";
+l10n.dl_checksum_keys_title			= "KEYS signature file";
+l10n.dl_checksum_asc_text			= "ASC";
+l10n.dl_checksum_asc_title			= "ASC signature for: ";
+l10n.dl_checksum_md5_text			= "MD5";
+l10n.dl_checksum_md5_title			= "MD5 hash for: ";
+l10n.dl_checksum_sha256_text			= "SHA256";
+l10n.dl_checksum_sha256_title			= "SHA256 hash for: ";
+
+l10n.dl_help_img_title				= "What is the difference between full installation and language pack?";
+l10n.dl_help_img_src				= "/download/cachedimages/help-information-icon.png";
+l10n.dl_help_img_alt				= "Install info";
+l10n.dl_help_text				= "What is a language pack?";
+l10n.dl_help_title				= "What is the difference between full installation and language pack?";
+l10n.dl_checksum_img_title			= "How to verify the downloaded file with checksums?";
+l10n.dl_checksum_img_src			= "/download/cachedimages/help-information-icon.png";
+l10n.dl_checksum_img_alt			= "Checksum verify";
+l10n.dl_checksum_text				= "How to verify the download?";
+l10n.dl_checksum_title				= "How to verify the downloaded file with checksums?";
+l10n.dl_report_img_title			= "Broken download link? Click here to report.";
+l10n.dl_report_img_src				= "/download/cachedimages/help-report-broken-link-icon.png";
+l10n.dl_report_img_alt				= "Broken link";
+l10n.dl_report_text				= "Report broken link";
+l10n.dl_report_title				= "Broken download link? Click here to report.";
+
+// Download: Strings for error text in the sub-red box (used in "download.js").
+l10n.dl_full_link_error_text			= "No full installation available";
+l10n.dl_full_link_error_title			= "Please select another language, platform or version.";
+l10n.dl_langpack_link_error_text		= "No language pack available";
+l10n.dl_langpack_link_error_title		= "Please select another language, platform or version.";
+
+l10n.dl_error_problem_img_title			= "The selected download file is not available";
+l10n.dl_error_problem_img_src			= "/download/cachedimages/exclamation-icon.png";
+l10n.dl_error_problem_img_alt			= "Error text";
+l10n.dl_error_problem_text			= "Problem: ";
+l10n.dl_error_solution_text			= "Solution: ";
+l10n.dl_error_aoo_text				= "Apache OpenOffice ";
+l10n.dl_error_not_available_for_text		= " is not available for ";
+l10n.dl_error_please_select_1_text		= "Please select version 4.0.1.";
+l10n.dl_error_please_select_2_text		= "Please select version 4.1.0 or newer.";
+l10n.dl_error_please_select_3_text		= "Please select a download for Windows, macOS (OS&nbsp;X) or Linux.";
+l10n.dl_error_please_select_4_text		= "Please select another language or version.";
+
+l10n.dl_unknown_platform_text			= "unknown operating system / platform";
+
+// Download: Strings with customized error text in the sub-red box (used in "download.js").
+// Can be used when the default text in the variables above cannot be translated correctly.
+l10n.dl_error_custom_1_text			= "";
+l10n.dl_error_custom_2_text			= "";
+l10n.dl_error_custom_3_text			= "";
+l10n.dl_error_custom_4_text			= "";
+
+
+
+// The following variables are used in the "analyze.html" file:
+
+// Analyze: Strings for the instruction text (used in "analyze.html").
+l10n.dl_analyze_headline_text			= "How to report a broken download link?";
+l10n.dl_analyze_instruction_select_text		= "<b>Select your favorites</b>: Operating system, language and version in the green below.";
+l10n.dl_analyze_instruction_verify_text		= "Verify that these options <b>still do not</b> lead to valid download links.";
+l10n.dl_analyze_instruction_click_text		= "Click on the button below the green box: ";
+l10n.dl_analyze_instruction_copy_text		= "Copy the selected table data into the clipboard: ";
+l10n.dl_analyze_instruction_new_mail_text	= "Create a new mail.";
+l10n.dl_analyze_instruction_problem_text	= "<b>Write a problem description</b> (what does not work and what do you expect).";
+l10n.dl_analyze_instruction_details_text	= "Please also add <b>details about the used operating system</b>.";
+l10n.dl_analyze_instruction_paste_text		= "Paste the copied data at the end of the mail.";
+l10n.dl_analyze_instruction_only_download_text	= "Please <b>send the mail only in case of download problems</b> and not if you cannot install.";
+l10n.dl_analyze_instruction_no_install_text	= "This webpage cannot help at all with installation problems.";
+l10n.dl_analyze_instruction_send_mail_text	= "Finally, <b>send the mail</b> to the: ";
+l10n.dl_analyze_instruction_mailing_list_text	= "Apache OpenOffice Development Mailing List";
+l10n.dl_analyze_instruction_mailing_list_title	= "Send the report to the Apache OpenOffice developers mailing list";
+l10n.dl_analyze_instruction_learn_more_text	= "Click here to learn more about what a mailing list is";
+l10n.dl_analyze_instruction_learn_more_title	= "Learn more about what a mailing list is";
+l10n.dl_analyze_instruction_answer_text		= "We will try to answer as soon as we get the mail and the problem analyzed.";
+l10n.dl_analyze_instruction_thanks_text		= "Thank you for your report.";
+
+// Analyze: Strings for the 3 buttons (used in "analyze.html").
+l10n.dl_analyze_update_button_text		= "Click to update the table";
+l10n.dl_analyze_update_button_title		= "Put the selected options as values into the table below";
+l10n.dl_analyze_select_button_text		= "Click to select the table";
+l10n.dl_analyze_select_button_title		= "Select all data in the table below";
+l10n.dl_analyze_copy_button_text		= "Copy with [Ctrl]+[C] / [&#8984;]+[C]";
+l10n.dl_analyze_copy_button_title		= "Copy the selected table data via [ Ctrl ] + [ C ] or [ &#8984; ] + [ C ] into the clipboard";
+
+// Analyze: Strings for the table (used in "analyze.html").
+l10n.dl_analyze_table_browser_text		= "Browser variables";
+l10n.dl_analyze_table_values_text		= "Values";
+l10n.dl_analyze_table_yes_text			= "Yes";
+l10n.dl_analyze_table_no_text			= "No";
+l10n.dl_analyze_table_stable_release_text	= "Stable Release";
+l10n.dl_analyze_table_javascript_text		= "JavaScript&nbsp;functions/variables";
+
+
+
+// General: Links to webpage files that could be localized.
+l10n.dl_rel_notes_aoo413_link            	= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes";
+l10n.dl_rel_notes_aoo412_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes";
+l10n.dl_rel_notes_aoo411_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";
+l10n.dl_rel_notes_aoo410_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes";
+l10n.dl_rel_notes_aoo401_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes";
+l10n.dl_rel_notes_aoo400_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";
+l10n.dl_help_link				= "https://www.openoffice.org/download/full_vs_lp.html";
+l10n.dl_checksum_link				= "https://www.openoffice.org/download/checksums.html";
+l10n.dl_report_link				= "https://www.openoffice.org/download/analyze.html";
+l10n.dl_porting_link				= "https://www.openoffice.org/porting/index.html";
+l10n.dl_archive_link				= "https://www.openoffice.org/download/archive.html";
+l10n.dl_aoo341_link				= "https://www.openoffice.org/download/other-341.html";
+

Modified: websites/staging/ooo-site/trunk/content/sr/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/index.html (original)
+++ websites/staging/ooo-site/trunk/content/sr/index.html Sun Apr  2 09:38:05 2017
@@ -3,47 +3,85 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-    <title>
-        Пројекат Apache OpenOffice у Србији - слободан канцеларијски пакет
-    </title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="description" content="OpenOffice.org је водећи слободан канцеларијски софтверски пакет са програмима за обраду текста, таблице, презентације, шеме и цртеже као и базе података доступан и на српском језику. Можете да га бесплатно преузмете и легално користите на неограниченом броју рачунара." /> 
-    <meta name="keywords" content="OpenOffice.org, програми на српском, локализовани софтвер, канцеларијски софтвер, ОпенОфис, Open Office, OpenOffice, openoffice, пословни софтвер, отворени код, OOo, ooo, open source" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <style type="text/css" media="screen, projection">
-/*<![CDATA[*/
-<!--
-  @import url(/styles/DeHome.css);
-  @import url(/styles/DeNoNav.css); 
--->
-/*]]>*/
-    </style>
+    <meta name="description" content="The official home page of the Apache OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw and Base." />
+    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open Document Format, free office editors" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link href="https://plus.google.com/+openoffice" rel="publisher" />
+    <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
+    <script type="text/javascript" src="/download/globalvars.js"></script>
+    <script type="text/javascript" src="./msg_prop_l10n_sr.js"></script>
     <style type="text/css">
-    div.welcomenote {
-        line-height: 150%;
-        width: 900px;
-    }
-    div.welcomenote a {
-        text-decoration: none;
-    }
-    div.welcomenote h3 {
-        font-size: 100%;
-        margin-bottom: -10px;
-        color: #f2ba00;
-        text-shadow: 0 1px 2px rgba(0,0,0,0.25);
-    }
-    #bodycol div.campaign {
-        margin-top: 30px;
-    }
-
-    #bodycol div.campaign h2 {
-        margin-top: 20px;
-    }
-    
+    /* <![CDATA[ */
+    /*-------------------- Exceptions on standard css -----------------------*/
+    @import "/css/home.css";
+    @import "/css/styles.css";
+    @import "/css/exceptions.css";
+    /* ]]> */
     </style>
-	  
+    <script>
+      function follow( platform ) {
+        _gaq.push( ['_trackEvent','social', 'followUs', platform] ); 
+
+        if ( platform == 'ApacheBlog' ) {
+          window.open( "https://blogs.apache.org/OOo/", "_blank" );
+        } else if ( platform == 'Facebook' ) {
+          window.open( "https://www.facebook.com/ApacheOO", "_blank" );
+        } else if ( platform == 'Twitter' ) {
+          window.open( "https://twitter.com/ApacheOO", "_blank" );
+        } else if ( platform == 'GooglePlus' ) {
+          window.open( "https://plus.google.com/+openoffice", "_blank" );
+        } else if ( platform == 'YouTube' ) {
+          window.open( "https://www.youtube.com/channel/UC5VAaY4mqQVhNe8j7fZCEfw", "_blank" );
+        }
+      }
+
+      function showAlertBox() {
+	// The text is defined in "/msg_prop_l10n.js".
+
+	// Show alert box or not?
+	if( l10n.index_alert_box_show ) {
+		// If no background color value was set then use the default value.
+		if( ! l10n.index_alert_box_background_color || l10n.index_alert_box_background_color === "" )
+			l10n.index_alert_box_background_color = "#FFD9A7";
+
+		// Show alert box with defined background color.
+		// Depending if link is available, make the whole DIV clickable or not.
+		if( l10n.index_alert_box_href ) {
+			// Show the text with link and cursor as poiner.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color
+			+ "; ' onclick='window.open( \"" + l10n.index_alert_box_href
+			+ "\", \"_blank\" ); return false;'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: pointer;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: pointer;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		} else {
+			// Show the text without link and normal cursor.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color + "'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: default;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: default;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		}
+		document.write( "</div>" ); // Alert box
+	}
+      }
+    </script>
 
-  
 <!--#include virtual="/google-analytics.js" --> 
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
@@ -61,92 +99,332 @@
     
     
 
-<div class="welcomenote">
-<a><img src="/news/stats2011_ooo.png" width="900px" height="315px" alt="58.1% предузећа у Србији користи OpenOffice.org" /></a><br/>
+<!-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a
+screen reader.
+-->
+<h1 style="display: none;">Apache OpenOffice</h1>
 
+<div id="actionstatements">
 
-<table cellpadding="0px" cellspacing="15px"><tr>
-<td>
-<p>
-<strong><a href="stajeto/index.html">OpenOffice.org</a> је водећи слободан канцеларијски софтверски пакет са програмима за <acronym title="OpenOffice.org Писац/ Writer">обраду текста</acronym>, <acronym title="OpenOffice.org Рачун/ Calc">таблице</acronym>, <acronym title="OpenOffice.org Презентација/ Impress">презентације</acronym>, <acronym title="OpenOffice.org Цртање/ Draw">шеме и цртеже</acronym> као и <acronym title="OpenOffice.org База/ Base">базе података</acronym>.</strong> 
-<p>
-Доступан је на великом броју светских <a href="http://projects.openoffice.org/native-lang.html">језика</a> и ради на уобичајеним рачунарима. Можете да га <a href="preuzmi.html">бесплатно преузмете</a> и легално користите на рачунарима.
-</p>
-</td><td>
-<p>Ваше документе чува у међународно стандардизованом отвореном документ-формату (ISO 26300), а чита и пише датотеке у форматима из Microsoft Office и других пакета.
-</p>
-
-<h3>Слободан, отворен, бесплатан</h3>
-<p>
-Развија се као слободан софтвер коме доприносе корисници широм света и партнери, који на њему заснивају своје производе, како би он постао још бољи и распрострањенији. <a href="projekat.html">Придружите се пројекту</a>.
-</p>
-</td></tr></table>
+  <script type="text/javascript">
+  <!--
+  // Show alert box.
+  // Change to 'true' if you want to show the text that is defined in the variables above.
+  showAlertBox();
+  //-->
+  </script>
+
+  <ul>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-info">
+        <div class="action-text action-link">
+          <a href="/why/index.html"><h2>I want to learn more about OpenOffice</h2>
+          <p>What is Apache OpenOffice? And why should I use it?</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+  </ul>
+
+  <!-- Show the download link with currently available version number, loaded via JavaScript -->
+  <script type="text/javascript">
+  <!--
+  document.write( "<ul><li>"
+    + "<div class='action-download'>"
+      + "<div class='action-text action-link'>"
+        + "<a href='./download/index.html'>"
+          + "<h2>I want to download Apache OpenOffice</h2>"
+          + "<p style='font-size: 1.0em; font-weight: bold;'>(Most recent release: " + DL.VERSION + ")</p>"
+          + "<p>Download Apache OpenOffice for free <b>(really!)</b> | "
+            + "<a href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
+              + "title='Blog post: With Apache OpenOffice you get what you do not pay for' target='_blank'>"
+              + "Click here to get more information"
+            + "</a>."
+          + "</p>"
+        + "</a>"
+      + "</div>"
+    + "</div>"
+  + "</li></ul>" );
+  //-->
+  </script>
+
+  <!-- Show the download link, without version number -->
+  <noscript>
+    <div class="action-download">
+      <div class="action-text action-link">
+        <a href="./download/index.html">
+          <h2>I want to download Apache OpenOffice</h2>
+          <p>Download Apache OpenOffice for free, or find out about other ways of getting it.</p>
+        </a>
+      </div>
+    </div>
+  </noscript>
+
+  <ul>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-help">
+        <div class="action-text action-link">
+          <a href="/support/index.html"><h2>I need help with my OpenOffice</h2>
+          <p>Help is at hand whenever you need it.</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-extend">
+        <div class="action-text action-link">
+          <a href="/extensions/index.html"><h2>I want to do more with my OpenOffice</h2>
+          <p>Extend Apache OpenOffice with additional functionality, templates and clipart.</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-participate">
+        <div class="action-text action-link">
+          <a href="https://openoffice.apache.org/get-involved.html"><h2>I want to participate in OpenOffice</h2>
+          <p>Apache OpenOffice is made with help from people all over the world. Feel free to contribute!</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+     <div class="action-social">
+        <div class="action-text action-link">
+          <a href="/social/index.html" onclick="javascript:follow('SocialLink');">
+          <h2>I want to stay in touch with OpenOffice</h2>
+          <p>Follow the progress of OpenOffice via our announcement list, social media areas and blog.</p></a>
+            <div class="action-social-extra">
+              <p>
+                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('ApacheBlog');"
+                title="Blog of OpenOffice."><img src="/images/logo-rss-16.png" alt="Blog of OpenOffice" />
+                <a>Official Blog</a></span>
+                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Facebook');"
+                title="Follow us on Facebook."><img src="/images/logo-facebook-16.png" alt="Follow us on Facebook." />
+                <a>Facebook</a></span>
+                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Twitter');"
+                title="Follow us on Twitter."><img src="/images/logo-twitter-16.png" alt="Follow us on Twitter." />
+                <a>Twitter</a></span>
+                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('GooglePlus');"
+                title="Follow us on Google+."><img src="/images/logo-googleplus-16.png" alt="Follow us on Google+." />
+                <a>Google+</a></span>
+		<span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'YouTube' );"
+                title="Subscribe to our YouTube channel"><img src="/images/logo-youtube-16.png" alt="Subscribe to our YouTube channel" />
+                <a>YouTube</a>
+		</span>
+              </p>
+            </div>
+        </div>
+      </div>
+     </li>
+    <li>
+      <hr />
+    </li>
+  </ul>
+
+  <div id="SupportedAndSupporters">
+    <a href="https://validator.w3.org/check?uri=referer"
+    title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
+    <img src="https://www.w3.org/Icons/valid-xhtml10-blue.png"
+    alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"/></a>
+  </div>
 </div>
 
-<br clear="both"/>
+<div id="news">
 
-<div class="campaign">
+  <div class="first campaign" style="height: 210px; float: right; overflow: auto;">
+    <h2>Recent Blog Posts</h2>
 
-    <h2><a href="saopstenja/">новости и саопштења »</a></h2> 
-    <p>14.10. — <a href="http://otvorenidokument.com">Форум OpenOffice.org корисника</a></p> 
-    <p>13.10. — <a href="saopstenja/2010-10-13.html">OpenOffice.org, несташни десетогодишњак</a></p> 
-    <p>01.09. — <a href="saopstenja/2010-09-01.html">Oracle подржава софтверску револуцију – прослава десетогодишњице пројекта OpenOffice.org</a></p> 
-    <p>22.04. — <a href="saopstenja/2010-04-22.html">Бесплатне видео лекције, обука за OpenOffice.org 2 и 3.</a></p> 
-    <p>Пријавите се на <a href="http://feeds.feedburner.com/srooo"><img src="/pics/rss.gif" width="12px" height="12px" border="0px" /> довод новости</a>.
+    <p style="text-align:right">
+      <a href="https://blogs.apache.org/OOo/">All Posts</a>
     </p>
 
-    <h2><a href="kontakt.html">контактирајте нас »</a></h2>
-
-    <div style="width: 220px; background: #9fc3f5; padding: 10px; margin-top: 15px">
-    <h2 style="margin-top: 0px;"><a href="http://templates.openoffice.org">готови шаблони »</a></h2>
     <p>
-    Преузмите готове шаблоне за лепше и функционалније пословне и личне документе.
+      <em>28 November 2016:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/over_200_million_downloads_of">
+      Over 200 million downloads of Apache OpenOffice</a>
+      <br />
+
+      <em>12 October 2016:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_12">
+      Announcing Apache OpenOffice 4.1.3</a>
+      <br />
+
+      <em>28 October 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_11">
+      Announcing Apache OpenOffice 4.1.2</a>
+      <br />
+    
+      <em>27 September 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/coming_soon_apache_openoffice_4">
+      Coming soon... Apache OpenOffice 4.1.2</a>
+      <br />
+    
+      <em>13 May 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/authoring_e_books_in_apache">
+      Authoring e-Books in Apache OpenOffice</a>
+      <br />
+    
+      <em>13 April 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/collaboration_is_in_our_dna">
+      Collaboration is in our DNA</a>
+      <br />
+    
+      <em>31 December 2014:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2014_a">
+      Apache OpenOffice in 2014: a year in review</a>
+      <br />
     </p>
+  </div>
+
+  <div id="all_news" style="height: 375px; float: left; overflow: auto;">
+    <div class="campaign">
+      <h2>Recent News</h2>
+
+      <p style="text-align:right">
+        <a href="news/index.html">All News</a>
+      </p>
+      <p></p>
+
+      <h2>Apache OpenOffice 4.1.3 released</h2>
+
+      <p>
+        <em>12 October 2016:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_12"
+        title="Offical blog post about Apache OpenOffice 4.1.3">official release of version 4.1.3</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.3">Release Notes</a> you can read about all new bugfixes,
+        improvements and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.3">Don't miss to download</a> the new release and find out yourself.
+      </p>
     </div>
-    <img src="/pics/templates.png" width="240px" height="35px" alt="иконице шаблона"/><br/>
 
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.2 released</h2>
 
-</div> <!-- Крај "campaign" -->
+      <p>
+        <em>28 October 2015:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_11"
+        title="Offical blog post about Apache OpenOffice 4.1.2">official release of version 4.1.2</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.2">Release Notes</a> you can read about all bugfixes,
+        improvements and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.2">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
 
-<a name="navigacija"></a>
-<div id="actionstatements">
-    <ul>      
-    
-    <li><div class="action-info"><div class="action-text action-link">
-        <h2><a name="content" href="stajeto/index.html">Желим да сазнам више о пакету</a></h2>
-        <p><a href="stajeto/index.html">Које су предности пакета OpenOffice.org? Шта је ту занимљиво?</a></p>
-  </div></div></li>
-  <li><hr /></li>
-    
-    <li><div class="action-download"><div class="action-text action-link">
-        <h2><a href="http://www.openoffice.org/download/"><strong>Желим да набавим Apache OpenOffice</strong></a></h2>
-        <p><a href="http://www.openoffice.org/download/">Преузмите Apache OpenOffice или сазнајте како до њега да дођете.</a></p>
-  </div></div></li>
-  <li><hr /></li>
-  
-    <li><div class="action-help"><div class="action-text action-link">
-        <h2><a href="podrska.html">Тражим подршку за OpenOffice.org</a></h2>
-        <p><a href="podrska.html">Помоћ је ту када је потребна</a></p>
-  </div></div></li>
-  <li><hr /></li>
-  
-    <li><div class="action-extend"><div class="action-text action-link">
-        <h2><a href="prosirenja.html">Хоћу више од пакета OpenOffice.org</a></h2>
-        <p><a href="prosirenja.html">Проширите OpenOffice.org додатним функцијама, шаблонима и материјалом</a></p>
-  </div></div></li>
-  <li><hr /></li>
-          
-    <li><div class="action-participate"><div class="action-text action-link">
-        <h2><a href="projekat.html">Желим да се прикључим пројекту</a></h2>
-        <p><a href="projekat.html">OpenOffice.org развијају људи широм света. Слободно нам се придружите!</a></p>
-  </div></div></li>
-  <li><hr /></li>
-    
-    </ul>
+    <div class="campaign">
+      <h2>Udine moves to OpenOffice, will save 360,000 Euro</h2>
+
+      <p>
+        <em>16 September 2014:</em>
+        The City of Udine, in Italy, announced a process that will lead to the installation
+        of OpenOffice on 900 municipal desktops, saving the city 360,000 Euro.  
+        ZDNet's Raffaele Mastrolonardo has the
+        <a href="http://www.zdnet.com/another-italian-city-announces-its-ditching-microsoft-windows-for-open-source-7000033682/">details</a>.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.1 released</h2>
+
+      <p>
+        <em>21 August 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1"
+        title="Offical blog post about Apache OpenOffice 4.1.1">official release of version 4.1.1</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.1">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.1">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
 
-</div> <!-- Kraj "actionstatements" -->
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.0 released</h2>
+
+      <p>
+        <em>29 April 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce"
+        title="Offical blog post about Apache OpenOffice 4.1.0">official release of version 4.1.0</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.0">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>100 Million downloads</h2>
+
+      <p>
+        <em>17 April 2014:</em>
+        The Apache OpenOffice project is proud to tell you that our software was   
+        <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56"
+        title="Apache OpenOffice was downloaded 100 million times">downloaded over 100 million times</a>. Join us in
+        celebrating this big achievement!
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Italian region adopts OpenOffice, saves 2 Million Euro</h2>
+
+      <p>
+        <em>10 October 2013:</em>
+        The Italian administrative region of Emilia-Romagna announced plans to move to OpenOffice,
+        <a href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million">
+        saving 2 million euro</a>.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Volunteers, not Amateurs</h2>
+
+      <p>
+        <em>8 January 2013:</em>
+        Apache OpenOffice is developed 100% by volunteers.  Apache does not pay for developers, for translators, for QA,
+        for marketing, for UI, for support, etc. Of course, we're happy to accept
+        <a href="https://www.apache.org/foundation/contributing.html">donations to the Apache Software Foundation</a>, to
+        keep our servers runnings and for similar overhead expenses. But our products are developed entirely by
+        volunteers.
+      </p>
+      <p>Some users are initially worried by this statement:<br /><strong>How can software for free, developed by
+	volunteers, be any good?<br /></strong><a href="/why/why_volunteers.html">Read on for an answer...</a>
+      </p>
+    </div>
+
+  </div>
+
+</div>
 
+<!-- Every new element and text that is defined below the previous DIV will be actually dislayed wrapped below this DIV
+(because of "clear: both" instead of floated around the previous DIVs. This is really needed. -->
 
+<div style="clear: both;"></div>
 
 
   </div>

Added: websites/staging/ooo-site/trunk/content/sr/index_old.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/index_old.html (added)
+++ websites/staging/ooo-site/trunk/content/sr/index_old.html Sun Apr  2 09:38:05 2017
@@ -0,0 +1,155 @@
+<!--#include virtual="/doctype.html" -->
+<html>
+<head>
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+    <title>
+        Пројекат Apache OpenOffice у Србији - слободан канцеларијски пакет
+    </title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="description" content="OpenOffice.org је водећи слободан канцеларијски софтверски пакет са програмима за обраду текста, таблице, презентације, шеме и цртеже као и базе података доступан и на српском језику. Можете да га бесплатно преузмете и легално користите на неограниченом броју рачунара." /> 
+    <meta name="keywords" content="OpenOffice.org, програми на српском, локализовани софтвер, канцеларијски софтвер, ОпенОфис, Open Office, OpenOffice, openoffice, пословни софтвер, отворени код, OOo, ooo, open source" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
+    <style type="text/css" media="screen, projection">
+/*<![CDATA[*/
+<!--
+  @import url(/styles/DeHome.css);
+  @import url(/styles/DeNoNav.css); 
+-->
+/*]]>*/
+    </style>
+    <style type="text/css">
+    div.welcomenote {
+        line-height: 150%;
+        width: 900px;
+    }
+    div.welcomenote a {
+        text-decoration: none;
+    }
+    div.welcomenote h3 {
+        font-size: 100%;
+        margin-bottom: -10px;
+        color: #f2ba00;
+        text-shadow: 0 1px 2px rgba(0,0,0,0.25);
+    }
+    #bodycol div.campaign {
+        margin-top: 30px;
+    }
+
+    #bodycol div.campaign h2 {
+        margin-top: 20px;
+    }
+    
+    </style>
+	  
+
+  
+<!--#include virtual="/google-analytics.js" --> 
+<!--#include virtual="/scripts/entourage.js" -->
+</head>
+<body>
+<!--#include virtual="/sr/brand.html" -->
+  <div id="topbara">
+    <!--#include virtual="/sr/topnav.html" -->
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/sr/">sr</a></div>
+  </div>
+  <div id="clear"></div>
+  
+  
+  <div id="content">
+    
+    
+    
+
+<div class="welcomenote">
+<a><img src="/news/stats2011_ooo.png" width="900px" height="315px" alt="58.1% предузећа у Србији користи OpenOffice.org" /></a><br/>
+
+
+<table cellpadding="0px" cellspacing="15px"><tr>
+<td>
+<p>
+<strong><a href="stajeto/index.html">OpenOffice.org</a> је водећи слободан канцеларијски софтверски пакет са програмима за <acronym title="OpenOffice.org Писац/ Writer">обраду текста</acronym>, <acronym title="OpenOffice.org Рачун/ Calc">таблице</acronym>, <acronym title="OpenOffice.org Презентација/ Impress">презентације</acronym>, <acronym title="OpenOffice.org Цртање/ Draw">шеме и цртеже</acronym> као и <acronym title="OpenOffice.org База/ Base">базе података</acronym>.</strong> 
+<p>
+Доступан је на великом броју светских <a href="http://projects.openoffice.org/native-lang.html">језика</a> и ради на уобичајеним рачунарима. Можете да га <a href="preuzmi.html">бесплатно преузмете</a> и легално користите на рачунарима.
+</p>
+</td><td>
+<p>Ваше документе чува у међународно стандардизованом отвореном документ-формату (ISO 26300), а чита и пише датотеке у форматима из Microsoft Office и других пакета.
+</p>
+
+<h3>Слободан, отворен, бесплатан</h3>
+<p>
+Развија се као слободан софтвер коме доприносе корисници широм света и партнери, који на њему заснивају своје производе, како би он постао још бољи и распрострањенији. <a href="projekat.html">Придружите се пројекту</a>.
+</p>
+</td></tr></table>
+</div>
+
+<br clear="both"/>
+
+<div class="campaign">
+
+    <h2><a href="saopstenja/">новости и саопштења »</a></h2> 
+    <p>14.10. — <a href="http://otvorenidokument.com">Форум OpenOffice.org корисника</a></p> 
+    <p>13.10. — <a href="saopstenja/2010-10-13.html">OpenOffice.org, несташни десетогодишњак</a></p> 
+    <p>01.09. — <a href="saopstenja/2010-09-01.html">Oracle подржава софтверску револуцију – прослава десетогодишњице пројекта OpenOffice.org</a></p> 
+    <p>22.04. — <a href="saopstenja/2010-04-22.html">Бесплатне видео лекције, обука за OpenOffice.org 2 и 3.</a></p> 
+    <p>Пријавите се на <a href="http://feeds.feedburner.com/srooo"><img src="/pics/rss.gif" width="12px" height="12px" border="0px" /> довод новости</a>.
+    </p>
+
+    <h2><a href="kontakt.html">контактирајте нас »</a></h2>
+
+    <div style="width: 220px; background: #9fc3f5; padding: 10px; margin-top: 15px">
+    <h2 style="margin-top: 0px;"><a href="http://templates.openoffice.org">готови шаблони »</a></h2>
+    <p>
+    Преузмите готове шаблоне за лепше и функционалније пословне и личне документе.
+    </p>
+    </div>
+    <img src="/pics/templates.png" width="240px" height="35px" alt="иконице шаблона"/><br/>
+
+
+</div> <!-- Крај "campaign" -->
+
+<a name="navigacija"></a>
+<div id="actionstatements">
+    <ul>      
+    
+    <li><div class="action-info"><div class="action-text action-link">
+        <h2><a name="content" href="stajeto/index.html">Желим да сазнам више о пакету</a></h2>
+        <p><a href="stajeto/index.html">Које су предности пакета OpenOffice.org? Шта је ту занимљиво?</a></p>
+  </div></div></li>
+  <li><hr /></li>
+    
+    <li><div class="action-download"><div class="action-text action-link">
+        <h2><a href="http://www.openoffice.org/download/"><strong>Желим да набавим Apache OpenOffice</strong></a></h2>
+        <p><a href="http://www.openoffice.org/download/">Преузмите Apache OpenOffice или сазнајте како до њега да дођете.</a></p>
+  </div></div></li>
+  <li><hr /></li>
+  
+    <li><div class="action-help"><div class="action-text action-link">
+        <h2><a href="podrska.html">Тражим подршку за OpenOffice.org</a></h2>
+        <p><a href="podrska.html">Помоћ је ту када је потребна</a></p>
+  </div></div></li>
+  <li><hr /></li>
+  
+    <li><div class="action-extend"><div class="action-text action-link">
+        <h2><a href="prosirenja.html">Хоћу више од пакета OpenOffice.org</a></h2>
+        <p><a href="prosirenja.html">Проширите OpenOffice.org додатним функцијама, шаблонима и материјалом</a></p>
+  </div></div></li>
+  <li><hr /></li>
+          
+    <li><div class="action-participate"><div class="action-text action-link">
+        <h2><a href="projekat.html">Желим да се прикључим пројекту</a></h2>
+        <p><a href="projekat.html">OpenOffice.org развијају људи широм света. Слободно нам се придружите!</a></p>
+  </div></div></li>
+  <li><hr /></li>
+    
+    </ul>
+
+</div> <!-- Kraj "actionstatements" -->
+
+
+
+
+  </div>
+<!--#include virtual="/footer.html" -->
+</body>
+</html>

Added: websites/staging/ooo-site/trunk/content/sr/msg_prop_l10n_sr.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/msg_prop_l10n_sr.js (added)
+++ websites/staging/ooo-site/trunk/content/sr/msg_prop_l10n_sr.js Sun Apr  2 09:38:05 2017
@@ -0,0 +1,23 @@
+/* This file is to maintain text information that can be used on the download webpage via JavaScript when
+ * including this file.
+ *
+ * Instead of hard coded text in the green box please use these variables and translate it to your favorite language.
+ *
+ * Wrong:   "Download Apache OpenOffice"
+ * Correct: l10n.index_redirect_text
+ */
+
+
+
+// Object that contains all following variables.
+var l10n = new Object();
+
+// The following variables are used in the "index.html" file:
+
+l10n.index_alert_box_show			= true;
+l10n.index_alert_box_background_color		= "#F5A9A9";		// More see "http://html-color-codes.info/"
+l10n.index_alert_box_href			= "https://openoffice.apache.org/translate.html";		// Make the whole alert box clickable with a link.
+									// Maximum 49 characters.
+l10n.index_alert_box_headline_text		= "We need your help to complete translation into Serbian (Cyrillic)!";
+									// Maximum 630 characters.
+l10n.index_alert_box_text_text			= "This note is in English because we have no one to translate this webpage and others into your language. The links on the page will help you download and install Apache OpenOffice with Serbian (Cyrillic) translation. But we still need help with this website. <br /><br /> If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"L10N@openoffice.apache.org\" if you want to volunteer or if you have questions.";

Modified: websites/staging/ooo-site/trunk/content/sr/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/sr/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/sr/topnav.html Sun Apr  2 09:38:05 2017
@@ -11,7 +11,7 @@
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <ul>
 <li><a href="/product/index.html" title="Apache OpenOffice product description">Product</a></li>
-<li><a href="/download/index.html" title="Download OpenOffice">Download</a></li>
+<li><a href="/sr/download/index.html" title="Download OpenOffice">Download</a></li>
 <li><a href="/support/index.html" title="Find Support for OpenOffice">Support</a></li>
 <li><a href="https://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog</a></li>
 <li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>