incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michal Hriň <anonym...@apache.org>
Subject CMS diff:
Date Fri, 27 Jul 2012 16:01:38 GMT
Clone URL (Committers only):
https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/sk%2Fbrand.mdtext

Michal Hriň

Index: trunk/content/sk/brand.mdtext
===================================================================
--- trunk/content/sk/brand.mdtext	(revision 1366426)
+++ trunk/content/sk/brand.mdtext	(working copy)
@@ -1,3 +1,4 @@
+brand.mdtext, was in conflict
 home:		home
 search:		hľadať
 name:		Apache OpenOffice (incubating)
@@ -5,6 +6,6 @@
 logo:		AOO_logos/OOo_Website_v2_copy.png
 domain:		www.openoffice.org
 divid:		bannera
-announce:	Oznámenie: Bol vydaný Apache OpenOffice 3.4
-announceurl:	/news/aoo34.html
+announce:	OpenOffice na ApacheCon Europe: Prijímanie príspevkov je Otvorené!
+announceurl:	http://blogs.apache.org/OOo/entry/apache_openoffice_conference_within_a
 announcetip:	Prečítajte si oznámenie


Mime
View raw message