3.5.0 beta2

f41
David Tardon 13 years ago
parent 79bf9ca105
commit 02742a4ed0

4
.gitignore vendored

@ -46,3 +46,7 @@
/libreoffice-help-3.4.99.1.tar.bz2 /libreoffice-help-3.4.99.1.tar.bz2
/libreoffice-translations-3.4.99.1.tar.bz2 /libreoffice-translations-3.4.99.1.tar.bz2
/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 /cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
/libreoffice-core-3.4.99.2.tar.bz2
/libreoffice-binfilter-3.4.99.2.tar.bz2
/libreoffice-help-3.4.99.2.tar.bz2
/libreoffice-translations-3.4.99.2.tar.bz2

@ -1,52 +0,0 @@
From 75d215d47331f816c5d41a34b63badf6e1636ac8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 16 Dec 2011 09:53:31 +0100
Subject: [PATCH] Fix typo and clean up.
---
scp2/source/ooo/module_hidden_ooo.scp | 1 -
scp2/source/python/module_python.scp | 2 +-
scp2/source/python/module_python_mailmerge.scp | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index da5775b..024ec68 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -616,7 +616,6 @@ Module gid_Module_Root_Files_6
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Pymailmerge,
- gid_File_Pymailmerge_msgbox,
gid_File_Xsl_Common_Measure_Conversion,
gid_File_Xsl_Common_Math_Functions,
gid_File_Xsl_Export_Common_Body,
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 32f0dc8..6ee8345 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Pyuno
gid_Dir_PythonFramework_Versions_ver_lib,
gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
Unixlinks = (gid_Unixlink_Python_Headers,
gid_Unixlink_Python_Resources,
gid_Unixlink_Python_Versions_Current,
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 3027e85..cf5ad7e 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -32,7 +32,7 @@
File gid_File_Pymailmerge
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
- name = "mailmerge.zip";
+ Name = "mailmerge.zip";
Styles = (ARCHIVE);
End
#endif
--
1.7.7.3

@ -1,30 +0,0 @@
From 39cbce553da1834f78b77f48b2f1be9578d6cc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 13 Dec 2011 21:01:28 +0000
Subject: [PATCH] Resolves: rhbz#761009 IFSD_Equal is asymmetrical
---
vcl/generic/glyphs/glyphcache.cxx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 89696d1..c524c08 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -148,9 +148,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
// NOTE: ignoring meFamily deliberately
// compare with the requested width, allow default width
- if( (rA.mnWidth != rB.mnWidth)
- && ((rA.mnHeight != rB.mnWidth) || (rA.mnWidth != 0)) )
+ int nAWidth = rA.mnWidth != 0 ? rA.mnWidth : rA.mnHeight;
+ int nBWidth = rB.mnWidth != 0 ? rB.mnWidth : rB.mnHeight;
+ if( nAWidth != nBWidth )
return false;
+
#ifdef ENABLE_GRAPHITE
if (rA.meLanguage != rB.meLanguage)
return false;
--
1.7.6.4

@ -1,41 +0,0 @@
From d11f2ccdcecca78bc654ca0b787ea112c1dfe10c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 15 Dec 2011 11:57:08 +0100
Subject: [PATCH] Resolves: rhbz#767708 avoid SIGBUS writing to overcommitted
mmaped diskspace
---
bridges/source/cpp_uno/shared/vtablefactory.cxx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 2703ac0..b049c7f 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -65,6 +66,10 @@
#error Unsupported platform
#endif
+#if defined USE_DOUBLE_MMAP
+#include <fcntl.h>
+#endif
+
using bridges::cpp_uno::shared::VtableFactory;
namespace {
@@ -259,9 +264,10 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
}
unlink(tmpfname);
delete[] tmpfname;
- if (ftruncate(block.fd, block.size) == -1)
+ int err = posix_fallocate(block.fd, 0, block.size);
+ if (err != 0)
{
- perror("truncation of executable memory area failed");
+ fprintf(stderr, "posix_fallocate failed with code %d\n", err);
close(block.fd);
block.fd = -1;
break;
--
1.7.7.4

@ -1,28 +0,0 @@
From ee29bb2a47311d86f794d10bbcfad27644baebb5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 14 Dec 2011 07:11:47 +0100
Subject: [PATCH] force gbuild stage for CustomTargets
gb_SourceEnvAndRecurse_STAGE is unset in CustomTarget's make process
when the parent make has been started in sourced environment. This leads
to all sorts of "interesting" failures because the gbuild classes and
platform stuff are not loaded...
---
solenv/gbuild/CustomTarget.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 41b23b8..1e075af 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,6 +31,7 @@ define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
gb_AWK="$(gb_AWK)" gb_XSLTPROC="$(gb_XSLTPROC)" GBUILDDIR="$(GBUILDDIR)" SRCDIR="$(SRCDIR)" \
+ gb_SourceEnvAndRecurse_STAGE=gbuild \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
--
1.7.7.3

@ -1,403 +0,0 @@
From 4d9293660776b6d97289cf7a1bf8f6be7ad05649 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 15 Dec 2011 12:49:36 +0100
Subject: [PATCH] these translations do already exist in translations repo
---
sysui/desktop/share/launcher_comment.ulf | 169 --------------------------
sysui/desktop/share/launcher_genericname.ulf | 167 -------------------------
2 files changed, 0 insertions(+), 336 deletions(-)
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
index c9cd594..71c82e2 100755
--- a/sysui/desktop/share/launcher_comment.ulf
+++ b/sysui/desktop/share/launcher_comment.ulf
@@ -1,190 +1,21 @@
[writer]
en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer."
-ast = "Escribi y edita testos y gráficos en cartes, informes, documentos y páxines web."
-ca = "Creeu i editeu text i gràfics a cartes, informes, documents i pàgines web."
-da = "Opret og redigér tekst og grafik i breve, rapporter, dokumenter og hjemmesider."
-de = "Texte und Grafiken in Briefen, Berichten, Dokumenten und Webseiten erstellen und bearbeiten."
-es = "Cree y edite textos y gráficos en cartas, informes, documentos y páginas web."
-fi = "Luo ja muokkaa tekstejä ja grafiikkaa kirjeisiin, raportteihin, asiakirjoihin ja WWW-sivuille."
-fr = "Créer et modifier des textes et graphiques pour lettres, rapports, documents ou pages Web."
-gl = "Cree e modifique textos e gráficos en cartas, informes, documentos e páxinas web."
-he = "יצירה ועריכה של טקסט וגרפיקה במכתבים, דוחות, מסמכים ואתרי אינטרנט."
-hr = "Stvorite i uredite tekstualna i grafička pisma, izvještaje, dokumente i web stranice."
-hu = "Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése"
-it = "Crea e modifica testo e grafica in lettere, rapporti, documenti e pagine Web."
-is = "Búa til og sýsla með texta og myndefni í bréfum, skýrslum, ýmsum textaskjölum og vefsíðum."
-ja = "手紙やレポート、文書、Webページ向けの文章や画像を作成・編集します。"
-ku = "Nivîs û grafîkên di name, rapor, belge û rûpelên torê de çêbike û sererast bike."
-nl = "Tekst en afbeeldingen bewerken in brieven, rapporten, documenten en webpagina's. "
-pt_BR = "Crie e edite seus textos e gráficos em cartas, relatórios, documentos ou páginas da web."
-ro = "Creați și editați documente text și grafice sub formă de scrisori, rapoarte, articole sau pagini web."
-ru = "Создание и редактирование текстов и изображений в письмах, отчётах, документах и на веб-страницах."
-sl = "Ustvarjajte in urejajte besedilo in grafiko v pismih, poročilih, dokumentih in spletnih straneh."
-te = "పత్రాలు, నివేదికలు మరియు వెబ్ పేజీలలో పాఠ్యం మరియు గ్రాఫిక్స్ సృష్టి మరియు సవరణ"
-vi = "Tạo và soạn văn bản và hình trong thư, báo cáo, tài liệu và trang web."
-zh_CN = "创建编辑文档、报告、信件和网页中的文本和图形。"
-zh_TW = "建立與編輯書信、報告、文件與網頁中的文字和圖形。"
[impress]
en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
-ast = "Fai y edita presentaciones pa pases de diapositives, reuniones y páxines web."
-ca = "Creeu i editeu presentacions per a diapositives, conferències i pàgines web."
-da = "Opret og rediger præsentationer til diasshows, møder og hjemmesider."
-de = "Präsentationen für Vorführungen, Besprechungen und Web-Auftritte erstellen und bearbeiten."
-el = "Δημιουργία και επεξεργασία παρουσιάσεων για προβολές διαφανειών, συσκέψεις και ιστοσελίδες"
-es = "Cree y edite presentaciones para pases de diapositivas, reuniones y páginas web."
-fi = "Luo ja muokkaa esityksiä esitelmiin, tapaamisiin ja WWW-sivuille."
-fr = "Créer et modifier des présentations pour des diaporamas, des conférences et pour le Web."
-gl = "Cree e modifique presentacións para diaporamas, conferencias e páxinas web."
-he = "יצירה ועריכה של מצגות עבור שקופיות, פגישות ואתרי אינטרנט."
-hr = "Stvorite i uredite prezentacije za sastanke i web stranice."
-hu = "Bemutatók készítése és szerkesztése diavetítésekhez vagy a webre"
-it = "Crea e modifica presentazioni per proiezioni, meeting e pagine Web."
-is = "Búa til og breyta kynningum fyrir ráðstefnur, fyrirlestra og fyrir birtingu á vef."
-ja = "スライドショーや会議、Webページ向けのプレゼンテーションを作成・編集します。"
-nl = "Presentaties maken voor diavoorstellingen, vergaderingen en webpagina's."
-pt_BR = "Crie e edite apresentações para reuniões ou páginas da web."
-ro = "Creați și editați prezentări, diapozitive sau pagini web."
-ru = "Создание и редактирование презентаций для слайд-шоу, докладов и веб-страниц."
-sl = "Ustvarjajte in urejajte predstavitve za srečanja, predstavitve in spletne strani."
-vi = "Tạo trình diễn để chiếu tự động, cho cuộc họp hoặc trang web"
-zh_CN = "创建编辑用于幻灯片放映、会议和网页的演示文稿。"
-zh_TW = "建立與編輯投影片放映、會議、網頁中的簡報。"
[draw]
en-US = "Create and edit drawings, flow charts, and logos by using Draw."
-ast = "Crea y edita dibuxos, diagrames de fluxu y logos."
-ca = "Creeu i editeu dibuixos, diagrames de flux i logotips."
-da = "Opret og rediger tegninger, diagrammer og logoer."
-de = "Zeichnungen, Flussdiagramme und Logos erstellen und bearbeiten"
-el = "Δημιουργία και επεξεργασία σχεδιασμάτων, διαγραμμάτων ροής και λογοτύπων."
-es = "Cree y edite dibujos, diagramas de flujo y logotipos."
-fi = "Luo ja muokkaa piirroksia, vuokaavioita ja logoja."
-fr = "Créer et modifier des dessins, diagrammes et logos."
-gl = "Cree e modifique debuxos, diagramas de fluxo e logotipos."
-he = ".יצירה ועריכה של ציורים, תרשימי זרימה וסמלילים"
-hr = "Stvorite i uredite crteže, dijagrame toka i logotipove."
-hu = "Rajzok, folyamatábrák és logók létrehozása és szerkesztése"
-it = "Crea e modifica disegni, diagrammi di flusso e loghi."
-is = "Búa til og breyta teikningum, skýringamyndum og flæðiritum."
-ja = "ベクタ画像やフローチャート、ロゴを編集します。"
-nl = "Tekeningen, diagrammen en logo's maken."
-pt_BR = "Crie e edite desenho, fluxograma ou logos"
-ro = "Creați și editați desene, grafice și logouri. "
-ru = "Создание и редактирование рисунков, диаграмм и логотипов."
-sl = "Ustvarjajte in urejajte slike, diagrame poteka in logotipe."
-te = "చిత్రాలు,చిహ్నాలు(లోగో) మరియు ఫ్లో చార్టులు సృష్టి మరియు సవరణ"
-vi = "Tạo và sửa hình vẽ, sơ đồ và biểu tượng"
-zh_CN = "创建编辑图形、图表和标志。"
-zn_TW = "建立與編輯繪圖、流程圖與標誌。"
[calc]
en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
-ast = "Fai cálculos, analiza información y xestiona llistes en fueyes de cálculu."
-ca = "Executeu càlculs, analitzeu informació i gestioneu llistats en fulls de càlcul."
-da = "Udfør beregninger, analysér information og håndter lister i regneark."
-de = "Berechnungen ausführen, Informationen analysieren und Listen in Tabellen verwalten."
-el = "Εκτέλεση υπολογισμών, ανάλυση πληροφοριών και διαχείριση καταλόγων στα λογιστικά φύλλα"
-es = "Realice cálculos, analice información y gestione listas en hojas de cálculo."
-fi = "Tee laskelmia, käsittele tietoa ja hallitse luetteloita laskentataulukoissa."
-fr = "Réaliser des calculs, analyser les informations et gérer des listes avec des feuilles de calcul."
-gl = "Realice cálculos, analice información e administre listas en follas de cálculo."
-he = "ביצוע חישובים, ניתוח מידע וניהול רשימות בגיליונות אלקטרונים."
-hr = "Upravljajte izračunima i analizirajte informacije u proračunskim tablicama."
-hu = "Számítások végrehajtása, adatok elemzése és listák kezelése munkafüzetekben"
-it = "Esegue calcoli, analizza informazioni e gestisce elenchi in fogli di calcolo."
-is = "Framkvæma útreikninga, greina gögn og meðhöndla lista í töfluformi."
-ja = "シート上にある数値の集計や分析、シートの管理を行います。"
-nl = "Berekeningen maken, informatie analyseren en lijsten beheren in rekenbladen."
-pt_BR = "Realize cálculos, analise informação e gerencie listas em planilhas"
-ro = "Efectuați calcule, analizați informații și administrați liste în foi de calcul."
-ru = "Расчёты, анализ информации и управление списками с помощью электронных таблиц."
-sl = "Izvajajte izračune, analizirajte informacije in upravljajte sezname in preglednice."
-te = "స్ప్రెడ్ షీట్ లో లెక్కించు, వివరాలను విశ్లేషించు మరియు జాబితా నిర్వహించు "
-vi = "Tính toán, xử lý thông tin và quản lý danh sách trong tờ bảng tính"
-zh_CN = "在电子表格中计算、分析、管理信息。"
-zh_TW = "在試算表中進行計算、分析資訊,以及管理清單。"
[math]
en-US = "Create and edit scientific formulas and equations by using Math."
-ast = "Fai y edita fórmules científiques y ecuaciones."
-ca = "Creeu i editeu fórmules científiques i equacions."
-da = "Opret og redigér videnskabelige formler og ligninger."
-de = "Wissenschaftliche Formeln und Gleichungen erstellen und bearbeiten."
-el = "Δημιουργία και επεξεργασία επιστημονικών τύπων και εξισώσεων."
-es = "Cree y edite fórmulas científicas y ecuaciones."
-fi = "Luo ja muokkaa tieteellisiä kaavoja ja yhtälöitä."
-fr = "Créer et modifier des formules scientifiques et des équations."
-gl = "Cree e modifique fórmulas científicas e ecuacións."
-he = "יצירה ועריכה של נוסחות מדעיות ומשוואות."
-hr = "Stvorite i uredite znanstvene formule i jednadžbe."
-hu = "Képletek és egyenletek létrehozása és szerkesztése"
-it = "Crea e modifica formule scientifiche ed equazioni."
-is = "Búa til og breyta vísindaformúlum og jöfnum."
-ja = "数式や方程式を作成・編集します。"
-nl = "Wetenschappelijke formules en vergelijkingen maken."
-pt_BR = "Crie e edite fórmulas e equações científicas."
-ro = "Creați și editați formule științifice și ecuații."
-ru = "Создание и редактирование научных формул и уравнений."
-sl = "Ustvarjajte in urejajte znanstvene formule in enačbe."
-te = "శాస్త్ర సూత్రాలు మరియు సమీకరణాల సృష్టి మరియు సవరణ"
-vi = "Tạo và soạn công thức và phương trình khoa học"
-zh_CN = "创建编辑数学公式和方程"
-zh_TW = "建立與編輯科學公式與方程式"
-
[base]
en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
-ast = "Xestiona bases de datos, fai consultes ya informes, sigui y xestiona la to información."
-ca = "Gestioneu bases de dades, creeu consultes i informes per fer un seguiment i gestionar la vostra informació."
-da = "Håndtér databaser, og opret forespørgsler og rapporter til at overvåge og administrere dine informationer."
-de = "Datenbanken verwalten, Abfragen und Berichte erstellen, um Ihre Daten zu überblicken und zu verwalten."
-el = "Διαχείριση βάσεων δεδομένων, δημιουργία ερωτημάτων και αναφορών για την παρακολούθηση και διαχείριση των πληροφοριών σας."
-es = "Gestione bases de datos, cree consultas e informes, siga y gestione su información."
-fi = "Hallitse tietokantoja, tee hakuja ja raportteja seurataksesi ja hallitaksesi tietoja."
-fr = "Gérer des bases de données, créer des requêtes et des rapports pour le suivi et l'analyse de vos données."
-gl = "Administre bases de datos, cree consultas e informes, siga e xestione a súa información."
-he = "ניהול מסדי נתונים, יצירת חקירות ודוחות על מנת לנהל את המידע שלכם ולעקוב אחריו."
-hr = "Upravljajte bazama podataka, definirajte upite i izvještaje za praćenje i upravljanje vašim informacijama."
-hu = "Adatbázisok kezelése, lekérdezések és jelentések készítése az információinak kezeléséhez"
-it = "Gestisce database, crea query e rapporti per tracciare e gestire le proprie informazioni."
-is = "Sýsla með gagnagrunna, búa til útfyllingarform og skýrslur, safna saman og vinna úr ýmiskonar gögnum."
-ja = "データベースの管理やクエリの作成、情報の追跡や管理した結果を報告します。"
-nl = "Databases beheren, query's en rapporten maken om uw informatie te beheren en op te zoeken."
-nn = "Handsam databaser og lag spørringar og rapportar for å gjera informasjonen oversiktleg"
-pt_BR = "Administre base de dados, crie consultas e relatórios para rastrear e gerenciar informação."
-ro = "Administrați baze de date, creați interogări și rapoarte pentru a urmări și administra informațiile proprii."
-ru = "Управление базами данных, создание запросов и отчётов для контролирования вашей информации."
-sl = "Upravljajte podatkovne zbirke, ustvarjajte poizvedbe in poročila za sledenje in upravljanje svojih podatkov."
-te = "మీ జాబితా మరియు వివరాలకోసం డాటాబేస్ నిర్వహణ మరియు ప్రశ్నలు, నివేదికల సృష్టి "
-vi = "Quản lý cơ sở dữ liệu, tạo lệnh tìm kiếm và báo cáo để theo dõi và quản lý thông tin của bạn."
-zh_CN = "管理数据库,创建查询和报告,跟踪和管理您的信息。"
-zh_TW = "管理資料庫、建立查詢與報告,以追蹤及管理您的資訊。"
-
[startcenter]
en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation."
-ast = "Suite de productividá d'oficina compatible con ODF, el formatu de documentos abiertu y estandarizáu. Col sofitu de la Document Foundation."
-ca = "Paquet ofimàtic compatible amb el format estàndard de documents ODF. Mantingut per la Document Foundation."
-da = "Office produktionspakken er kompatibel med det åbne og standardiseret ODF-dokumentformat. Understøttet af The Document Foundation."
-de = "Die zum offenen und standardisierten ODF-Format kompatible Sammlung von Büroanwendungen. Unterstützt durch »The Document Foundation«."
-es = "Suite de productividad para la oficina compatible con ODF, el formato de documentos abierto y estandarizado. Con el soporte de la Document Foundation."
-fi = "Avointa ja standardoitua ODF-asiakirjamuotoa tukeva toimisto-ohjelmisto. The Document Foundation -säätiön tukema."
-fr = "Suite bureautique compatible avec le format de document standard et ouvert ODF. Soutenue par The Document Foundation."
-gl = "A suite de produtividade de oficina compatíbel co formato aberto e estandarizado de documentos ODF. Co apoio da Document Foundation"
-he = "חבילת הפרודקטיביות המשרדית תואמת את פורמט המסמכים הפתוח והתקני ODF. נתמכת על ידי The Document Foundation."
-hr = "Paket uredskih aplikacija s podrškom za otvoren i standardiziran ODF format dokumenata. Podržan od strane Document fundacije."
-hu = "A nyílt és szabványos ODF formátummal kompatibilis irodai programcsomag a Document Foundation támogatásával"
-it = "La suite di produttività compatibile con il formato standard e aperto dei documenti ODF. Supportata dalla The Document Foundation."
-is = "Forritavöndull til hjálpar við vinnu við gagna- og textavinnslu, styðst við ODF sjalasniðið sem er staðlað og frjálst snið fyrir ýmiskonar skjöl. Stutt af Document Foundation."
-ja = "オープンで標準化されたODFドキュメントフォーマットに対応した生産性の高いオフィススイートです。The Document Foundationによってサポートされています。"
-nl = "Het kantoorpakket compatibel met ODF (het gestandaardiseerde Open Document Formaat). Ondersteund door The Document Foundation. "
-pt_BR = "Suíte de escritório produtiva, compatível com o formato aberto ODF. Suportado pela The Document Foundation."
-ro = "Suita de birou compatibilă cu formatul de document liber și standardizat ODF, cu asistență oferită de The Document Foundation."
-ru = "Офисный пакет, совместимый с открытым и стандартизованным форматом документов ODF. Поддерживается The Document Foundation."
-sl = "Pisarniška zbirka, združljiva z odprtim in standardiziranim zapisom ODF. Podpira jo The Document Foundation."
-te = "రహస్యాలు లేని మరియు ప్రామాణికమైన ODF కు అనుకూలమైన కార్యాలయ ఉత్పాదకత అనువర్తనాల సముదాయం, డాక్యుమెంట్ ఫౌండేషన్ తోడ్పాటుతో"
-vi = "Bộ văn phòng thích hợp với chuẩn đinh dạng tài liệu mở ODF, nhận được sự hỗ trợ từ Quỹ The Document Foundation"
-zh_CN = "兼容开放标准 ODF 的办公软件套装。由 The Document Foundation 支持。"
-zh_TW = "與開放且標準化的 ODF 文件格式相容的辦公生產力套裝軟體。由文件基金會提供支援。"
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index 902826c..ff8041a 100755
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -1,190 +1,23 @@
[writer]
en-US = "Word Processor"
-ast = "Procesador de testos"
-ca = "Processador de texts"
-da = "Tekstbehandling"
-de = "Textverarbeitung"
-es = "Procesador de textos"
-fi = "Tekstinkäsittely"
-fr = "Traitement de texte"
-gl = "Procesador de texto"
-he = "מעבד תמלילים"
-hr = "Obrađivač teksta"
-hu = "Szövegszerkesztő"
-it = "Word processor"
-is = "Ritvinnsla"
-ja = "ワープロ"
-ku = "Bernameya nivîsê"
-nl = "Tekstverwerker"
-pt_BR = "Processador de texto"
-ro = "Procesor de documente"
-ru = "Редактор документов"
-sl = "Urejevalnik besedila"
-te = "పాఠ్య సవరణ"
-vi = "Soạn thảo văn bản"
-zh_CN = "文档编辑器"
-zh_TW = "文書處理器"
[impress]
en-US = "Presentation"
-ast = "Presentación"
-ca = "Presentació"
-da = "Præsentation"
-de = "Präsentationen"
-el = "Παρουσίαση"
-es = "Presentación"
-fi = "Esitys"
-fr = "Présentation"
-gl = "Presentación"
-he = "מצגות"
-hr = "Prezentacija"
-hu = "Bemutatókészítő"
-it = "Presentazione"
-is = "Skyggnusýning"
-ja = "プレゼンテーション"
-nl = "Presentatie"
-pt_BR = "Apresentação"
-ro = "Prezentări"
-ru = "Презентация"
-sl = "Predstavitev"
-vi = "Trình diễn"
-zh_CN = "演示文稿"
-zh_TW = "簡報"
[calc]
en-US = "Spreadsheet"
-ast = "Fueya de cálculu"
-ca = "Full de càlcul"
-da = "Regneark"
-de = "Tabellenkalkulation"
-el = "Λογιστικό φύλλο"
-es = "Hoja de cálculo"
-fi = "Taulukko"
-fr = "Feuille de calcul"
-gl = "Folla de cálculo"
-he = "גיליון אלקטרוני"
-hr = "Proračunske tablice"
-hu = "Táblázatkezelő"
-it = "Foglio di calcolo"
-is = "Töflureikniblað"
-ja = "表計算"
-nl = "Rekenblad"
-pt_BR = "Planilha"
-ro = "Foi de calcul"
-ru = "Электронные таблицы"
-sl = "Preglednica"
-te = "స్ప్రెడ్ షీట్"
-vi = "Tờ bảng tính"
-zh_CN = "电子表格"
-zh_TW = "試算表"
[base]
en-US = "Database Development"
-ast = "Desendolcu de bases de datos"
-ca = "Desenvolupament de bases de dades"
-da = "Databaseudvikling"
-de = "Datenbankentwicklung"
-el = "Ανάπτυξη βάσεων δεδομένων"
-es = "Desarrollo de bases de datos"
-fi = "Tietokanta"
-fr = "Développement de bases de données"
-gl = "Desenvolvemento de bases de datos"
-he = "פיתוח מסדי נתונים"
-hr = "Razvoj baza podataka"
-hu = "Adatbázis-fejlesztés"
-it = "Sviluppo database"
-is = "Hönnun gagnagrunna"
-ja = "データベース開発"
-nl = "Database-ontwikkeling"
-nn = "Databasehandsaming"
-pt_BR = "Desenvolvimento de base de dados"
-ro = "Dezvoltare baze de date"
-ru = "Разработка баз данных"
-sl = "Razvoj podatkovnih zbirk"
-te = "డాటాబేస్ అభివృద్ధి"
-vi = "Phát triển Cơ sở dữ liệu"
-zn_CN = "数据库开发"
-zh_TW = "資料庫開發"
[math]
en-US = "Formula Editor"
-ast = "Editor de fórmules"
-ca = "Editor de fórmules"
-da = "Formelredigering"
-de = "Formel-Editor"
-el = "Τύπος"
-es = "Editor de fórmulas"
-fi = "Kaavaeditori"
-fr = "Éditeur de formules"
-gl = "Editor de fórmulas"
-he = "עורך נוסחות"
-hr = "Uređivač jednadžbi"
-hu = "Képletszerkesztő"
-it = "Editor di formule"
-is = "Formúluritill"
-ja = "数式エディタ"
-nl = "Formule-editor"
-pt_BR = "Editor de fórmula"
-ro = "Editor de formule"
-ru = "Редактор формул"
-sl = "Urejevalnik formule"
-te = "సూత్ర సవరణి"
-vi = "Trình soạn công thức"
-zh_CN = "公式编辑器"
-zh_TW = "公式編輯器"
[draw]
en-US = "Drawing Program"
-ast = "Programa de dibuxu"
-ca = "Programa de dibuix"
-da = "Tegneprogram"
-de = "Zeichenprogramm"
-el = "Πρόγραμμα Σχεδίασης"
-es = "Programa de dibujo"
-fi = "Piirros"
-fr = "Logiciel de dessin"
-gl = "Programa de debuxo"
-he = "תוכנת ציור"
-hr = "Crtanje"
-hu = "Rajzoló"
-it = "Programma di disegno"
-is = "Teikniforrit"
-ja = "図形描画"
-nl = "Tekenprogramma"
-pt_BR = "Programa para desenho"
-ro = "Program de desensare "
-ru = "Программа для рисования"
-sl = "Program za risanje"
-te = "చిత్రలేఖన ప్రోగ్రామ్"
-vi = "Chương trình Vẽ"
-zh_CN = "绘图工具"
-zh_TW = "繪圖程式"
[startcenter]
en-US = "Office"
-ast = "Oficina"
-ca = "Oficina"
-da = "Kontor"
-de = "Büroanwendungen"
-es = "Oficina"
-fi = "Toimisto"
-fr = "Bureautique"
-gl = "Oficina"
-he = "אופיס"
-hr = "Ured"
-hu = "Iroda"
-it = "Office"
-is = "Skrifstofa"
-ja = "オフィス"
-nl = "Kantoor"
-pt_BR = "Escritório"
-ro = "Suită de birou"
-ru = "Офис"
-sl = "Pisarna"
-te = "కార్యాలయం"
-vi = "Bộ văn phòng"
-zh_CN = "办公"
-zh_TW = "辦公"
[javafilter]
en-US = "Small Device Format Importer"
--
1.7.7.3

@ -1,7 +1,7 @@
--- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000 --- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000
+++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000 +++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000
@@ -403,7 +403,6 @@ @@ -403,7 +403,6 @@
{
$installdir = installer::systemactions::create_directories("install", $languageref); $installdir = installer::systemactions::create_directories("install", $languageref);
installer::logger::print_message( "... creating installation set in $installdir ...\n" ); installer::logger::print_message( "... creating installation set in $installdir ...\n" );
- remove_old_installation_sets($installdir); - remove_old_installation_sets($installdir);

@ -27,7 +27,7 @@
Summary: Free Software Productivity Suite Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 3.4.99.1 Version: 3.4.99.2
Release: 1%{?dist} Release: 1%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity Group: Applications/Productivity
@ -61,7 +61,6 @@ Source19: http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a
Source20: http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz Source20: http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
# TODO: IIRC mysql-connector-cpp is in Fedora. Is it usable? # TODO: IIRC mysql-connector-cpp is in Fedora. Is it usable?
Source21: http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz Source21: http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
Source22: http://dev-www.libreoffice.org/src/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
BuildRequires: binutils, java-devel < 1:1.7.0, boost-devel, zlib-devel BuildRequires: binutils, java-devel < 1:1.7.0, boost-devel, zlib-devel
@ -111,12 +110,7 @@ Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
Patch11: libreoffice-gcj.patch Patch11: libreoffice-gcj.patch
Patch12: libreoffice-rhel6poppler.patch Patch12: libreoffice-rhel6poppler.patch
%endif %endif
Patch13: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch Patch13: 0001-fix-syntactic-error.patch
Patch14: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
Patch15: 0001-force-gbuild-stage-for-CustomTargets.patch
Patch16: 0001-these-translations-do-already-exist-in-translations-.patch
Patch17: 0001-fix-syntactic-error.patch
Patch18: 0001-Fix-typo-and-clean-up.patch
# TODO: this in S390 only, so it can wait .-) # TODO: this in S390 only, so it can wait .-)
#Patch13: solenv.fix.mk.inheritance.patch #Patch13: solenv.fix.mk.inheritance.patch
@ -738,6 +732,7 @@ Rules for auto-correcting common %{langname} typing errors. \
%prep %prep
%setup -q -c -a 1 -a 2 -a 3 %setup -q -c -a 1 -a 2 -a 3
rm -rf git-hooks */git-hooks
for a in */*; do mv `pwd`/$a .; done for a in */*; do mv `pwd`/$a .; done
#Customize Palette to remove Sun colours and add Red Hat colours #Customize Palette to remove Sun colours and add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \ (head -n -1 extras/source/palettes/standard.soc && \
@ -762,12 +757,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch11 -p1 -b .gcj.patch %patch11 -p1 -b .gcj.patch
%patch12 -p0 -b .rhel6poppler.patch %patch12 -p0 -b .rhel6poppler.patch
%endif %endif
%patch13 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch %patch13 -p1 -b .fix-syntactic-error.patch
%patch14 -p1 -b .rhbz767708-avoid-SIGBUS-writing-to-overcom.patch
%patch15 -p1 -b .force-gbuild-stage-for-CustomTargets.patch
%patch16 -p1 -b .these-translations-do-already-exist-in-translations-.patch
%patch17 -p1 -b .fix-syntactic-error.patch
%patch18 -p1 -b .Fix-typo-and-clean-up.patch
#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch #%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
# TODO: check this # TODO: check this
@ -860,7 +850,6 @@ cp %{SOURCE18} ext_sources
cp %{SOURCE19} ext_sources cp %{SOURCE19} ext_sources
cp %{SOURCE20} ext_sources cp %{SOURCE20} ext_sources
cp %{SOURCE21} ext_sources cp %{SOURCE21} ext_sources
cp %{SOURCE22} ext_sources
touch src.downloaded touch src.downloaded
. ./Env.Host.sh . ./Env.Host.sh
@ -1408,6 +1397,7 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libitglo.so %{baseinstdir}/program/libitglo.so
%{baseinstdir}/program/libitilo.so %{baseinstdir}/program/libitilo.so
%{baseinstdir}/program/libofficebeanlo.so %{baseinstdir}/program/libofficebeanlo.so
%{baseinstdir}/program/liboooimprovecorelo.so
%{baseinstdir}/program/libfilelo.so %{baseinstdir}/program/libfilelo.so
%{baseinstdir}/program/libfilterconfiglo.so %{baseinstdir}/program/libfilterconfiglo.so
%{baseinstdir}/program/libflatlo.so %{baseinstdir}/program/libflatlo.so
@ -1959,7 +1949,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{baseinstdir} %dir %{baseinstdir}
%dir %{baseinstdir}/program %dir %{baseinstdir}/program
%{baseinstdir}/program/libcdrimportlo.so
%{baseinstdir}/program/libflashlo.so %{baseinstdir}/program/libflashlo.so
%{baseinstdir}/program/libsvgfilterlo.so %{baseinstdir}/program/libsvgfilterlo.so
%{baseinstdir}/program/libvisioimportlo.so %{baseinstdir}/program/libvisioimportlo.so
@ -2044,6 +2033,14 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Wed Dec 21 2011 David Tardon <dtardon@redhat.com> - 3.4.99.2-1
- 3.5.0 beta2
- drop integrated 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
- drop integrated 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
- drop integrated 0001-force-gbuild-stage-for-CustomTargets.patch
- drop integrated 0001-these-translations-do-already-exist-in-translations-.patch
- drop integrated 0001-Fix-typo-and-clean-up.patch
* Sun Dec 18 2011 David Tardon <dtardon@redhat.com> - 3.4.99.1-1 * Sun Dec 18 2011 David Tardon <dtardon@redhat.com> - 3.4.99.1-1
- 3.5.0 beta1 - 3.5.0 beta1
- drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch - drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch

@ -1,5 +1,5 @@
cbd39b7a741c1b6bfa9ca153496c3d13 libreoffice-core-3.4.99.1.tar.bz2 ad6dd1d1eb6f76472ba0031f02ce8b9f libreoffice-core-3.4.99.2.tar.bz2
1fbefad872975a71837da4b3ebbcf31c libreoffice-binfilter-3.4.99.1.tar.bz2 a06ce4cab2216eef4c92d5550f318203 libreoffice-binfilter-3.4.99.2.tar.bz2
798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 798b2ffdc8bcfe7bca2cf92b62caf685 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@ -8,11 +8,10 @@ ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.
b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
a8b25a0bf696fd126a08319d88998492 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 a8b25a0bf696fd126a08319d88998492 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
e1c178b18f130b40494561f02bc1a948 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 e1c178b18f130b40494561f02bc1a948 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
379ddf3008e76f338e0973adc375340d libreoffice-help-3.4.99.1.tar.bz2 a4c0300d0b272b43d0a488676d5022f2 libreoffice-help-3.4.99.2.tar.bz2
7c2549f6b0a8bb604e6c4c729ffdcfe6 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz 7c2549f6b0a8bb604e6c4c729ffdcfe6 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
0981bda6548a8c8233ffce2b6e4b2a23 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz 0981bda6548a8c8233ffce2b6e4b2a23 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
cc8eb870d6a324d36575420efd856319 cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 13f3cdee1c8a5a471e8240821a94b4b9 libreoffice-translations-3.4.99.2.tar.bz2
f08b4a6ec456e8c4f1e06acf51d1def4 libreoffice-translations-3.4.99.1.tar.bz2
185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll 185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll
c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh 74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh

Loading…
Cancel
Save