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/08 23:00:14 UTC

svn commit: r1010077 [31/31] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/pl/ content/pl/Archive/ content/pl/Archive/apps/ content/pl/Archive/apps/hr5000/ content/pl/Archive/grafika/ content/pl/Archive/info/ content/pl/Archive/marke...

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.iso-8859-2.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.iso-8859-2.txt (added)
+++ websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.iso-8859-2.txt Sat Apr  8 23:00:09 2017
@@ -0,0 +1,302 @@
+rem Makro kwota s�ownie, ver 1.5
+rem (C) 2008, Jan S�upski, jslupski@juljas.net
+rem http://juljas.net/linux/tips/openoffice.html
+rem
+rem Licencja: GNU LGPL version 2.1
+rem http://www.gnu.org/licenses/lgpl-2.1.html
+rem
+rem Doda� makro mo�na tak: MENU->Narz�dzia->Makra->Zarz�dzaj Makrami->Makro
+rem Wybra� Moje makra->Standard, nacisn�� "Nowy" i w oknie wklei� t� tre��
+rem 
+rem Dzia�aj� makra:
+rem =SLOWNIE(123)
+rem =SLOWNIEZL(123)
+rem =SLOWNIEZL100GR(123)
+rem
+rem Zakres liczb - od -999 999 999,99 do 999 999 999,99
+rem 
+rem Nie dzia�aj�:
+rem - cz�ci u�amkowe w wersji SLOWNIE()
+rem - zapis groszy/cz�ci u�amkowej w postaci s�ownej
+rem - liczby >= 1 000 000 000 (�atwo poprawi�/dopisa�)
+rem
+
+sub slownie1(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "jeden"
+		Case 2 
+			s = "dwa"
+		Case 3 
+			s = "trzy"
+		Case 4 
+			s = "cztery"
+		Case 5 
+			s = "pi��"
+		Case 6 
+			s = "sze��"
+		Case 7 
+			s = "siedem"
+		Case 8 
+			s = "osiem"
+		Case 9 
+			s = "dziewi��"
+	End Select
+	Slownie1 = s
+End Sub
+
+sub Slownie10(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "dziesi��"
+		Case 2 
+			s = Slownie1(numer) & "dzie�cia"
+		Case 3
+			s = Slownie1(numer) & "dzie�ci"
+		Case 4 
+			s = "czterdzie�ci"
+		Case 5 to 9
+			s = Slownie1(numer) & "dziesi�t"
+	End Select
+	Slownie10 = s
+End Sub
+
+sub slownie19(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = "dziesi��"
+		Case 1 
+			s = "jedena�cie"
+		Case 2 
+			s = "dwana�cie"
+		Case 3 
+			s = "trzyna�cie"
+		Case 4 
+			s = "czterna�cie"
+		Case 5 
+			s = "pi�tna�cie"
+		Case 6 
+			s = "szesna�cie"
+		Case 7 
+			s = "siedemna�cie"
+		Case 8 
+			s = "osiemna�cie"
+		Case 9 
+			s = "dziewi�tna�cie"
+	End Select
+	Slownie19 = s
+End Sub
+
+sub Slownie100(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "sto"
+		Case 2 
+			s = "dwie�cie"
+		Case 3, 4
+			s = Slownie1(numer) & "sta"
+		Case 5 to 9
+			s = Slownie1(numer) & "set"
+	End Select
+	Slownie100 = s
+End Sub
+
+sub Slownie999(numer) as string
+	Dim ja as integer
+	Dim dz as integer
+	Dim se as integer
+	je = numer mod 10
+	dz = fix(numer/10)  mod 10
+	se = fix(numer/100) mod 10
+	dim s as string
+	dim t as string
+	dim u as string
+
+	s = Slownie100(se)
+	if dz = 1 then
+		t = Slownie19(je)
+		u = ""
+	else
+		t = Slownie10(dz)
+		u = Slownie1(je)
+	end if
+
+	if s <> "" and (t<>"" or u<>"") then
+		s = s & " "
+	end if
+	if t <> "" and u <> "" then
+		t = t & " "
+	end if
+
+	Slownie999 = s & t & u
+End sub
+
+sub Slownie000(numer) as integer
+	Dim je as integer
+	Dim dz as integer
+	je = numer mod 10
+	dz = fix(numer/10)  mod 10
+	if numer = 0 then
+		typ = 0
+	elseif numer = 1 then
+		typ = 1
+	elseif dz<>1 and je>=2 and je<=4 then
+		typ = 2
+	else
+		typ = 3
+	end if
+	Slownie000 = typ
+End Sub
+
+Function Slownie(kwota) as string
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		Slownie="za du�a lub b��dna liczba (" & cstr(kwota) & ")"
+		goto koniec1
+	end if
+	dim s as string
+	dim m as string
+	dim k as long
+
+	m=""
+	if kwota < 0 then
+		m = m & "minus "
+		kwota = 0-kwota
+	end if
+
+	k = clng(fix(kwota))
+
+	if k=0 then
+		s = "zero"
+	else
+		s = Slownie999(k mod 1000)
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		if s<>"" and (k mod 1000)>0 then
+			s = " " & s
+		end if
+		select case Slownie000(k mod 1000)
+			case 0
+
+			case 1
+				s =                           "tysi�c"  & s
+			case 2
+				s = Slownie999(k mod 1000) & " tysi�ce" & s
+			case 3
+				s = Slownie999(k mod 1000) & " tysi�cy" & s
+		end select
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		if s<>"" and (k mod 1000)>0 then
+			s = " " & s
+		end if
+		select case Slownie000(k mod 1000)
+			case 0
+
+			case 1
+				s =                           "milion"  & s
+			case 2
+				s = Slownie999(k mod 1000) & " miliony" & s
+			case 3
+				s = Slownie999(k mod 1000) & " milion�w" & s
+		end select
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		s = cstr(k*1000000000) & " + " & s
+	end if
+
+	Slownie = m & s
+
+koniec1:
+
+End Function
+
+function SlownieZL(kwota)
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		SlownieZL="za du�a lub b��dna liczba (" & cstr(kwota) & ")"
+		goto koniec2
+	end if
+
+	s=""
+
+	zl = fix(kwota)
+	gr = kwota - zl
+	if gr < 0 then
+		gr = 0-gr
+	end if
+	gr = fix((gr*100)mod 100)
+	
+	rem s = cstr(kwota) & " # " & cstr(zl) & " # " & cstr(gr) & " # " & s & slownie(zl)
+	s = s & slownie(zl)
+	select case Slownie000(zl mod 1000)
+		case 1
+			s = s & " z�oty"
+		case 2
+			s = s & " z�ote"
+		case 0,3
+			s = s & " z�otych"
+	end select
+	if true or gr <> 0 then
+		s = s & " " & cstr(gr) & " gr."
+	end if
+	SlownieZL=s
+koniec2:
+end function
+
+
+function SlownieZL100GR(kwota)
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		SlownieZL100GR="za du�a lub b��dna liczba (" & cstr(kwota) & ")"
+		goto koniec3
+	end if
+
+	s=""
+
+	zl = fix(kwota)
+	gr = kwota - zl
+	if gr < 0 then
+		gr = 0-gr
+	end if
+	gr = fix((gr*100)mod 100)
+	
+	rem "minus" jest dodatwany automatycznie w slownie(zl) chyba, �e zl=0
+	if kwota<0 and zl=0 then 
+		s = s & "minus "
+	end if
+	
+	s = s & slownie(zl)
+	select case Slownie000(zl mod 1000)
+		case 1
+			s = s & " z�oty"
+		case 2
+			s = s & " z�ote"
+		case 0,3
+			s = s & " z�otych"
+	end select
+	if true or gr <> 0 then
+		s = s & " " 
+		if gr<10 then
+			s = s & "0"
+		end if
+		s = s & cstr(gr) & "/100"
+	end if
+	SlownieZL100GR=s
+koniec3:
+end function
+
+rem vim:ts=4:ft=vb

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.txt (added)
+++ websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/makro_slownie/openoffice_files/kwota_slownie.txt Sat Apr  8 23:00:09 2017
@@ -0,0 +1,302 @@
+rem Makro kwota słownie, ver 1.5
+rem (C) 2008, Jan Słupski, jslupski@juljas.net
+rem http://juljas.net/linux/tips/openoffice.html
+rem
+rem Licencja: GNU LGPL version 2.1
+rem http://www.gnu.org/licenses/lgpl-2.1.html
+rem
+rem Dodać makro można tak: MENU->Narzędzia->Makra->Zarządzaj Makrami->Makro
+rem Wybrać Moje makra->Standard, nacisnąć "Nowy" i w oknie wkleić tę treść
+rem 
+rem Działają makra:
+rem =SLOWNIE(123)
+rem =SLOWNIEZL(123)
+rem =SLOWNIEZL100GR(123)
+rem
+rem Zakres liczb - od -999 999 999,99 do 999 999 999,99
+rem 
+rem Nie działają:
+rem - części ułamkowe w wersji SLOWNIE()
+rem - zapis groszy/części ułamkowej w postaci słownej
+rem - liczby >= 1 000 000 000 (łatwo poprawić/dopisać)
+rem
+
+sub slownie1(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "jeden"
+		Case 2 
+			s = "dwa"
+		Case 3 
+			s = "trzy"
+		Case 4 
+			s = "cztery"
+		Case 5 
+			s = "pięć"
+		Case 6 
+			s = "sześć"
+		Case 7 
+			s = "siedem"
+		Case 8 
+			s = "osiem"
+		Case 9 
+			s = "dziewięć"
+	End Select
+	Slownie1 = s
+End Sub
+
+sub Slownie10(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "dziesięć"
+		Case 2 
+			s = Slownie1(numer) & "dzieścia"
+		Case 3
+			s = Slownie1(numer) & "dzieści"
+		Case 4 
+			s = "czterdzieści"
+		Case 5 to 9
+			s = Slownie1(numer) & "dziesiąt"
+	End Select
+	Slownie10 = s
+End Sub
+
+sub slownie19(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = "dziesięć"
+		Case 1 
+			s = "jedenaście"
+		Case 2 
+			s = "dwanaście"
+		Case 3 
+			s = "trzynaście"
+		Case 4 
+			s = "czternaście"
+		Case 5 
+			s = "piętnaście"
+		Case 6 
+			s = "szesnaście"
+		Case 7 
+			s = "siedemnaście"
+		Case 8 
+			s = "osiemnaście"
+		Case 9 
+			s = "dziewiętnaście"
+	End Select
+	Slownie19 = s
+End Sub
+
+sub Slownie100(numer) as string
+	dim s as string
+	select case numer
+		Case 0 
+			s = ""
+		Case 1 
+			s = "sto"
+		Case 2 
+			s = "dwieście"
+		Case 3, 4
+			s = Slownie1(numer) & "sta"
+		Case 5 to 9
+			s = Slownie1(numer) & "set"
+	End Select
+	Slownie100 = s
+End Sub
+
+sub Slownie999(numer) as string
+	Dim ja as integer
+	Dim dz as integer
+	Dim se as integer
+	je = numer mod 10
+	dz = fix(numer/10)  mod 10
+	se = fix(numer/100) mod 10
+	dim s as string
+	dim t as string
+	dim u as string
+
+	s = Slownie100(se)
+	if dz = 1 then
+		t = Slownie19(je)
+		u = ""
+	else
+		t = Slownie10(dz)
+		u = Slownie1(je)
+	end if
+
+	if s <> "" and (t<>"" or u<>"") then
+		s = s & " "
+	end if
+	if t <> "" and u <> "" then
+		t = t & " "
+	end if
+
+	Slownie999 = s & t & u
+End sub
+
+sub Slownie000(numer) as integer
+	Dim je as integer
+	Dim dz as integer
+	je = numer mod 10
+	dz = fix(numer/10)  mod 10
+	if numer = 0 then
+		typ = 0
+	elseif numer = 1 then
+		typ = 1
+	elseif dz<>1 and je>=2 and je<=4 then
+		typ = 2
+	else
+		typ = 3
+	end if
+	Slownie000 = typ
+End Sub
+
+Function Slownie(kwota) as string
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		Slownie="za duża lub błędna liczba (" & cstr(kwota) & ")"
+		goto koniec1
+	end if
+	dim s as string
+	dim m as string
+	dim k as long
+
+	m=""
+	if kwota < 0 then
+		m = m & "minus "
+		kwota = 0-kwota
+	end if
+
+	k = clng(fix(kwota))
+
+	if k=0 then
+		s = "zero"
+	else
+		s = Slownie999(k mod 1000)
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		if s<>"" and (k mod 1000)>0 then
+			s = " " & s
+		end if
+		select case Slownie000(k mod 1000)
+			case 0
+
+			case 1
+				s =                           "tysiąc"  & s
+			case 2
+				s = Slownie999(k mod 1000) & " tysiące" & s
+			case 3
+				s = Slownie999(k mod 1000) & " tysięcy" & s
+		end select
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		if s<>"" and (k mod 1000)>0 then
+			s = " " & s
+		end if
+		select case Slownie000(k mod 1000)
+			case 0
+
+			case 1
+				s =                           "milion"  & s
+			case 2
+				s = Slownie999(k mod 1000) & " miliony" & s
+			case 3
+				s = Slownie999(k mod 1000) & " milionów" & s
+		end select
+	end if
+	k = fix(k/1000)
+
+	if k <> 0 then 
+		s = cstr(k*1000000000) & " + " & s
+	end if
+
+	Slownie = m & s
+
+koniec1:
+
+End Function
+
+function SlownieZL(kwota)
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		SlownieZL="za duża lub błędna liczba (" & cstr(kwota) & ")"
+		goto koniec2
+	end if
+
+	s=""
+
+	zl = fix(kwota)
+	gr = kwota - zl
+	if gr < 0 then
+		gr = 0-gr
+	end if
+	gr = fix((gr*100)mod 100)
+	
+	rem s = cstr(kwota) & " # " & cstr(zl) & " # " & cstr(gr) & " # " & s & slownie(zl)
+	s = s & slownie(zl)
+	select case Slownie000(zl mod 1000)
+		case 1
+			s = s & " złoty"
+		case 2
+			s = s & " złote"
+		case 0,3
+			s = s & " złotych"
+	end select
+	if true or gr <> 0 then
+		s = s & " " & cstr(gr) & " gr."
+	end if
+	SlownieZL=s
+koniec2:
+end function
+
+
+function SlownieZL100GR(kwota)
+	if kwota>=1000000000 or kwota<=-1000000000 then
+		SlownieZL100GR="za duża lub błędna liczba (" & cstr(kwota) & ")"
+		goto koniec3
+	end if
+
+	s=""
+
+	zl = fix(kwota)
+	gr = kwota - zl
+	if gr < 0 then
+		gr = 0-gr
+	end if
+	gr = fix((gr*100)mod 100)
+	
+	rem "minus" jest dodatwany automatycznie w slownie(zl) chyba, że zl=0
+	if kwota<0 and zl=0 then 
+		s = s & "minus "
+	end if
+	
+	s = s & slownie(zl)
+	select case Slownie000(zl mod 1000)
+		case 1
+			s = s & " złoty"
+		case 2
+			s = s & " złote"
+		case 0,3
+			s = s & " złotych"
+	end select
+	if true or gr <> 0 then
+		s = s & " " 
+		if gr<10 then
+			s = s & "0"
+		end if
+		s = s & cstr(gr) & "/100"
+	end if
+	SlownieZL100GR=s
+koniec3:
+end function
+
+rem vim:ts=4:ft=vb

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-logo-2.0-pl-135x60.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-logo-2.0-pl-135x60.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-logo-2.0-pl-archiwum.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-logo-2.0-pl-archiwum.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-makro-2.2pl.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo-makro-2.2pl.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-CD-pl-wkladka-archiwum.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-CD-pl-wkladka-archiwum.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-CD-pl-wkladka-miniatura.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-CD-pl-wkladka-miniatura.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-cd-koszulka-miniatura.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-cd-koszulka-miniatura.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-cd-koszulka-pl-archiwum.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-cd-koszulka-pl-archiwum.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-os-CD-pl-wkladka-archiwum.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-os-CD-pl-wkladka-archiwum.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-os-CD-pl-wkladka-miniatura.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/ooo2-os-CD-pl-wkladka-miniatura.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/openofficeviewer.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/openofficeviewer.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/pl_PL-pack.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/pl_PL-pack.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/pl_PL.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/pl_PL.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/prezentacje.tar.bz2
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/prezentacje.tar.bz2
------------------------------------------------------------------------------
    svn:mime-type = application/x-bzip2

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/prezentacje.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/prezentacje.txt (added)
+++ websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/prezentacje.txt Sat Apr  8 23:00:09 2017
@@ -0,0 +1,17 @@
+Licencje
+
+/matthewpilsbury/
+
+Please use these for your own presentations for personal or business purposes. You are free to distribute the presentations however you like. I'd be interested in knowing if these get used - let me know.
+�r�d�o: http://www.create-one.co.uk/matthewpilsbury/projects.html
+
+/OOExtras/
+
+LGPL
+�r�d�o:http://ooextras.sourceforge.net/
+
+/TheLinuxBox/
+
+LGPL
+�r�d�o: http://thelinuxbox.org/?p=24
+

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/thes_pl_PL.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/thes_pl_PL.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/thes_pl_PL_v2.zip
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/pl/Archive/www/pliki/thes_pl_PL_v2.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: websites/staging/ooo-site/trunk/content/pl/Archive/your_choice.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/Archive/your_choice.html (added)
+++ websites/staging/ooo-site/trunk/content/pl/Archive/your_choice.html Sat Apr  8 23:00:09 2017
@@ -0,0 +1,161 @@
+<!--#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" />
+<title>Twój wybór. OpenOffice.org</title>
+<link rel="shortcut icon" href="http://www.openoffice.org/favicon.ico" />
+<meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
+<meta name="author" content="OpenOffice.org Marketing Project" />
+<meta name="description" content="Twój wybór - OpenOffice.org" />
+<style type="text/css">
+#contextualinformation { display: none ! important;
+}
+#contextualinformation.contentpart { display: none ! important;
+}
+#toptabs { display: none ! important;
+}
+#login { display: none ! important;
+}
+#apphead { display: none ! important;
+}
+.axial { display: none ! important;
+}
+#projecthome { display: none ! important;
+}
+#longdescription { display: none ! important;
+}
+.infomark { display: none ! important;
+}
+h1 { color: rgb(0, 62, 161);
+}
+h2 { color: rgb(0, 62, 161);
+}
+td { vertical-align: top;
+}
+.tasknav { display: none ! important;
+}
+#navcol { display: none ! important;
+}
+</style>
+
+<!--#include virtual="/google-analytics.js" --> 
+<!--#include virtual="/scripts/entourage.js" -->
+</head>
+<body>
+<!--#include virtual="/pl/brand.html" -->
+  <div id="topbara">
+    <!--#include virtual="/pl/topnav.html" -->
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/pl/">pl</a>&nbsp;&raquo;&nbsp;<a href="/pl/Archive/">Archive</a></div>
+  </div>
+  <div id="clear"></div>
+  
+  
+  <div id="content">
+    
+    
+    
+<table style="width: 100%;" border="0">
+  <tbody>
+    <tr>
+      <td><div style="border: 1px dashed black; margin: 0px auto; padding: 15px; width: 94%; background-color: rgb(255, 255, 255);">
+          <h1>  Twój wybór. OpenOffice.org 2 </h1>
+<p>  Używasz pakietu Microsoft Office? Myślisz może o aktualizacji do MS Office 2007? Według ankiet 98% użytkowników MS Office nic nie zmieni i nie będzie wydawać pieniędzy na aktualizację. Oprogramowanie, które mają, przecież wcale nie przestanie nagle działać. </p>
+<p>  A może jednak po zobaczeniu reklam nowych produktów firmy Microsoft zastanawiasz się, czy nie nadeszła pora na zmiany? </p>
+<h2>  Sześć faktów o MS Office 2007 pod rozwagę </h2>
+<ol> 
+<li>  Jeżeli obecnie używasz pakietu MS Office, zauważysz, że MS Office 2007 robi to samo, drukuje te same litery, generuje takie same arkusze, jak poprzednia wersja. Po co wydawać pieniądze, żeby robić to samo? </li>
+<li>  MS Office 2007 ma zupełnie inny "nowy wygląd", przez co może utrudniać pracę. Czy ta zmiana jest na rękę użytkownikom? A może to chwyt marketingowy mający na celu odróżnienie MS Office od konkurencji takiej jak OpenOffice.org? </li>
+<li>  Wraz z nowym MS Office otrzymasz zestaw plików pomocy zawierający 50000 stron objaśnień do "nowego wyglądu". Czy masz tyle czasu, aby nauczyć się wszystkiego? </li>
+<li>  Dystrybutorzy, szkoleniowcy i wsparcie techniczne Microsoftu mają nadzieję, że sporo zarobią na pomaganiu klientom w przejściu na nową wersję. Czy masz niezbędne wsparcie, aby poradzić sobie ze zmianami? </li>
+<li> Aktualizacje oprogramowania są głównym źródłem dochodów dla Microsoftu. Czy na pewno mają one na celu wygodę użytkowników? </li>
+<li>  W 2006 roku Microsoft prowadził długą i kosztowną kampanię reklamową. Użytkownicy, którzy nie aktualizowali programów, byli "biurowymi dinozaurami". Dlaczego woli obrażać ludzi zamiast dawać im możliwość podjęcia samodzielnej decyzji?</li> </ol>
+<h2>  Sześć faktów o OpenOffice.org 2 pod rozwagę </h2>
+<ol> 
+<li>  Niezależni recenzenci zauważyli, że OpenOffice.org 2 to naprawdę dobre oprogramowanie i użytkownicy dotychczas korzystający z MS Office bez trudu zaczynają w nim pracować. </li> 
+<li>  OpenOffice.org 2 ma wszystkie potrzebne funkcje w jednym pakiecie i zawiera użyteczne dodatki, np. tworzenie plików PDF. Czy nie gubisz się wśród wielu "wydań" pakietu MS Office? </li>
+<li>  Niektóre badania wskazują, że koszt przejścia na OpenOffice.org 2 jest o 90% niższy niż aktualizacja do MS Office 2007 i opanowywanie nowego interfejsu użytkownika. </li>
+<li>  OpenOffice.org 2 odczyta większość plików MS Office. Jeśli zmienisz pakiet biurowy na OpenOffice.org 2, nie stracisz czasu na na tworzenie dokumentów, arkuszy kalkulacyjnych czy prezentacji od nowa. </li>
+<li>  Warunki licencji OpenOffice.org pozwalają na jego instalację na dowolnej liczbie komputerów i używanie go w dowolnym celu. Warunki licencji firmy Microsoft są restrykcyjne i trudno się w nich połapać. </li>
+<li>  OpenOffice.org jest całkowicie bezpłatny. Po co płacić firmie Microsoft za oprogramowanie, skoro istnieje naprawdę coś równie dobrego i za darmo? Zaś profesjonalna pomoc techniczna dla pakietu OpenOffice.org jest świadczona w języku polskim przez wiele różnych firm. Kosztuje ona 10% ceny jednej licencji MS Office.</li>
+</ol> 
+<br/> 
+<p>  Wybór należy do Ciebie. Jeżeli masz dobry pakiet biurowy, po co go zmieniać? A jeżeli chcesz zmian, wypróbuj najpierw OpenOffice.org 2. Jeżeli Ci się spodoba, zatrzymaj go sobie i poleć innym. </p>
+<br/> 
+<br />
+<span style="FONT-WEIGHT:bold; FONT-STYLE:italic">Użytkownicy wybierają OpenOffice.org 2 najczęściej dzięki rekomendacji znajomych (z czego jesteśmy dumni).</span><br/> 
+
+<div style="TEXT-ALIGN:center">  <h2>  <span style="FONT-WEIGHT:bold">Wybór należy do Ciebie - 
+<a href="http://pl.openoffice.org/product.download.html">pobierz OpenOffice.org</a> już dziś!</span>  </h2>
+            <br />
+            <br />
+          </div>
+        </div></td>
+      <td></td>
+      <td style="border: 3px double silver; padding: 4px; background-color: rgb(222, 238, 255);"><div>
+          <table style="border: 0px none white; padding: 0px;">
+            <tbody>
+              <tr>
+                <td><h2>Więcej na temat OpenOffice.org</h2>
+                  <ul>
+                    <li><a href="http://www.openoffice.org/product/writer.html">Edytor tekstu</a></li>
+                    <li><a href="http://www.openoffice.org/product/calc.html">Arkusz kalkulacyjny</a></li>
+                    <li><a href="http://www.openoffice.org/product/impress.html">Prezentacje</a></li>
+                    <li><a href="http://www.openoffice.org/product/draw.html">Grafika</a></li>
+                    <li><a href="http://www.openoffice.org/product/base.html">Baza danych</a></li>
+                    <li><a href="http://www.openoffice.org/product/docs/ooo2prodflyera4en.pdf">Broszury (pdf)</a></li>
+                  </ul>
+                  <h2>Koszty migracji</h2>
+                  <ul>
+                    <li><a href="http://computerworld.com.sg/ShowPage.aspx?pagetype=2&amp;articleid=2742&amp;amp;amp;pubid=3&amp;issueid=66">USA</a></li>
+                    <li><a href="http://insight.zdnet.co.uk/software/linuxunix/0,39020472,39236214,00.htm">Francja</a></li>
+                  </ul>                  
+              </tr>
+              <tr>
+                <td><br />
+                  <br />
+                  <div style="text-align: center;">
+                    <a href="http://pl.openoffice.org/product.download.html"><img style="border: 0px solid ; width: 125px; height: 50px;" src="http://pl.openoffice.org/grafika/125x50_5.png" alt="Pobierz OpenOffice.org" title="Pobierz OpenOffice.org"/></a>
+                  </div>
+                  <br />
+                  <br /></td>
+              </tr>
+            </tbody>
+          </table>
+        </div></td>
+    </tr>
+    <tr>
+      <td><br />
+        <div style="border: 1px dashed black; margin: 0px auto; padding: 15px; width: 94%; background-color: rgb(255, 255, 255);"><small><b>Webmasterzy!</b> Wspierajcie wolność wyboru! Razem możemy promować darmowe oprogramowanie. Wystarczy skopiować i wkleić poniższy kod na stronę lub blog i wyświetlić przycisk "Twój wybór. OpenOffice.org" i kampanii.</small>
+          <table style="border: 0px none white;">
+            <tbody>
+              <tr>
+                <td><img style="border: 0px solid; padding: 3px;" src="grafika/ooo_your_choice.png" alt="Twój wybór. OpenOffice.org"/></td>
+                <td><textarea readonly="readonly" wrap="hard" name="button" rows="4" cols="55"  onclick="this.focus();this.select()">&lt;a href="http://pl.openoffice.org/your_choice.html"&gt;
+&lt;img src="http://pl.openoffice.org/grafika/ooo_your_choice.png"
+border="0" alt="Twój wybór. OpenOffice.org"&gt;&lt;/a&gt;
+</textarea>
+          </td>
+              </tr>
+            </tbody>
+          </table>
+<br />
+<hr style="width: 100%; height: 2px;"/><small>Microsoft,
+Microsoft Office, Word, Excel, i Powerpoint to zastrzeżone znaki towarowe firmy Microsoft Corporation w 
+Stanach Zjednoczonych i/lub innych krajach.</small>
+        </div></td>
+      <td></td>
+      <td></td>
+    </tr>
+  </tbody>
+</table>
+<br />
+<br />
+<br />
+<br />
+
+  </div>
+<!--#include virtual="/footer.html" -->
+</body>
+</html>

Modified: websites/staging/ooo-site/trunk/content/pl/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/pl/index.html (original)
+++ websites/staging/ooo-site/trunk/content/pl/index.html Sat Apr  8 23:00:09 2017
@@ -3,47 +3,84 @@
 <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_pl.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' );
+    <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_pl.js"></script>
+    <style type="text/css">
+    /* <![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" );
+        }
       }
-    }
-  </script>
+
+      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" -->
@@ -62,108 +99,332 @@
     
     
 
-<div class="overall_optionset">
+<!-- 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">
+
+  <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>
 
-  <div class="optionset">
+  <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>
 
-    <!-- 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>
+  <!-- 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>
 
-    <!-- Green: Stable release -->
-    <!-- Download via select boxes -->
-    <script type="text/javascript">
-    <!--
+  <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>
 
-    // 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".
+<div id="news">
 
-    // Get the download box from a separate file.
-    DL.createDownloadBox();
+  <div class="first campaign" style="height: 210px; float: right; overflow: auto;">
+    <h2>Recent Blog Posts</h2>
 
-    // Fill the select boxes and wait for the user's choice.
-    DL.init( 1 );
+    <p style="text-align:right">
+      <a href="https://blogs.apache.org/OOo/">All Posts</a>
+    </p>
+
+    <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>
 
-    entourage.initialize();
+  <div id="all_news" style="height: 375px; float: left; overflow: auto;">
+    <div class="campaign">
+      <h2>Recent News</h2>
 
-    //-->
-    </script>
+      <p style="text-align:right">
+        <a href="news/index.html">All News</a>
+      </p>
+      <p></p>
+
+      <h2>Apache OpenOffice 4.1.3 released</h2>
 
-    <!-- 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>
+        <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>
-    </noscript>
 
-    <!-- Light Blue: Share download with social networks -->
-    <script type="text/javascript">
-    <!--
-    // Get the share box from a separate file.
-    DL.createShareBox();
-    //-->
-    </script>
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.2 released</h2>
 
-    <!-- Blue: Extensions -->
-    <script type="text/javascript">
-    <!--
-    // Get the extensions box from a separate file.
-    DL.createExtensionsBox();
-    //-->
-    </script>
+      <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>
 
-    <!-- Blue: Templates -->
-    <script type="text/javascript">
-    <!--
-    // Get the templates box from a separate file.
-    DL.createTemplatesBox();
-    //-->
-    </script>
+    <div class="campaign">
+      <h2>Udine moves to OpenOffice, will save 360,000 Euro</h2>
 
-  </div> <!-- class "optionset" -->
+      <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="additionalinformation">
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.1 released</h2>
 
-    <!-- Navigation bar -->
-    <script type="text/javascript">
-    <!--
-    // Get the navigation bar from a separate file.
-    DL.createNavigationBar();
-    //-->
-    </script>
+      <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>
 
-    <br /><br />
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.0 released</h2>
 
-    <!-- Logo section -->
-    <script type="text/javascript">
-    <!--
-    // Get the logo section from a separate file.
-    DL.createLogoSection();
-    //-->
-    </script>
+      <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>
 
-  </div> <!-- class: additionalinformation -->
+<!-- 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> <!-- class: overall_optionset -->
+<div style="clear: both;"></div>
 
 
   </div>