[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. libreoffice_3.3.3-1-119-gd0abe01



The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit d0abe01610c1d58232d627cd43c1d47244f8efc3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jun 24 15:35:18 2011 +0200

    lp#729716: desktop file l10n fixes

diff --git a/changelog b/changelog
index 7ff517d..054d386 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:3.3.3-1ubuntu1~ppa2) natty; urgency=high
 
   * update human icon theme to a 2011-06-24 checkout from master
+  * update fixes for desktop file entries from ubuntu wiki (LP: #720716)
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 24 Jun 2011 11:25:43 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 24 Jun 2011 12:11:29 +0200
 
 libreoffice (1:3.3.3-1ubuntu1~ppa1) natty; urgency=high
 
diff --git a/patches/lp720716.diff b/patches/lp720716.diff
index d7518a6..dccacd5 100644
--- a/patches/lp720716.diff
+++ b/patches/lp720716.diff
@@ -1,8 +1,8 @@
 Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff	2011-06-23 01:58:38.130980302 +0200
-@@ -0,0 +1,724 @@
++++ libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff	2011-06-24 12:04:56.440958308 +0200
+@@ -0,0 +1,728 @@
 +diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
 +index 3cb84f8..a2693a5 100644
 +--- sysui/desktop/menus/base.desktop
@@ -85,7 +85,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 +index e369492..7bd3179 100644
 +--- sysui/desktop/share/launcher_comment.ulf
 ++++ sysui/desktop/share/launcher_comment.ulf
-+@@ -1,21 +1,190 @@
++@@ -1,21 +1,192 @@
 + [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."
@@ -93,6 +93,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ++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."
+++el = "Δημιουργία και επεξεργασία κειμένου και γραφικών σε επιστολές, αναφορές, έγγραφα και ιστοσελίδες."
 ++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."
@@ -218,7 +219,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ++te = "శాస్త్ర సూత్రాలు మరియు సమీకరణాల సృష్టి మరియు సవరణ"
 ++vi = "Tạo và soạn công thức và phương trình khoa học"
 ++zh_CN = "创建编辑数学公式和方程"
-++zh_TW = "建立與編輯科學公式與方程式"
+++zh_TW = "建立與編輯科學公式與方程式。"
 ++
 + 
 + [base]
@@ -257,10 +258,11 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ++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."
+++el = "Η συμβατή με την ανοικτή και πρότυπη μορφή εγγράφων ODF σουίτα γραφείου. Υποστηρίζεται από το The 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."
+++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."
@@ -280,7 +282,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 +index ff8041a..ba16f53 100644
 +--- sysui/desktop/share/launcher_genericname.ulf
 ++++ sysui/desktop/share/launcher_genericname.ulf
-+@@ -1,23 +1,190 @@
++@@ -1,23 +1,191 @@
 + [writer]
 + en-US = "Word Processor"
 ++ast = "Procesador de testos"
@@ -288,6 +290,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ++da = "Tekstbehandling"
 ++de = "Textverarbeitung"
 ++es = "Procesador de textos"
+++el = "Επεξεργαστής κειμένου"
 ++fi = "Tekstinkäsittely"
 ++fr = "Traitement de texte"
 ++gl = "Procesador de texto"
@@ -476,7 +479,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 +index 0000000..7b4c18a
 +--- /dev/null
 ++++ sysui/desktop/share/launcher_unityquicklist.ulf
-+@@ -0,0 +1,167 @@
++@@ -0,0 +1,168 @@
 ++[writer]
 ++en-US = "New Document"
 ++ast = "Documentu nuevu"
@@ -484,6 +487,7 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 ++da = "Nyt dokument"
 ++de = "Neues Dokument"
 ++es = "Documento nuevo"
+++el = "Νέο έγγραφο"
 ++fi = "Uusi tekstiasiakirja"
 ++fr = "Nouveau document"
 ++gl = "Novo documento"
@@ -729,8 +733,8 @@ Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/lp720716.diff
 +     }
 Index: libreoffice-3.3.3/libreoffice-build/patches/dev300/apply
 ===================================================================
---- libreoffice-3.3.3.orig/libreoffice-build/patches/dev300/apply	2011-06-23 01:58:04.000000000 +0200
-+++ libreoffice-3.3.3/libreoffice-build/patches/dev300/apply	2011-06-23 01:59:19.030980292 +0200
+--- libreoffice-3.3.3.orig/libreoffice-build/patches/dev300/apply	2011-06-24 11:27:44.390958872 +0200
++++ libreoffice-3.3.3/libreoffice-build/patches/dev300/apply	2011-06-24 11:31:06.700958821 +0200
 @@ -2388,3 +2388,5 @@
  [ Gcc46 ]
  gcc4.6.0.diff

-- 
LibreOffice packaging repository


Reply to: