[meego-commits] 7407: Changes to MeeGo:1.0:Core:Update:Testing/gtk2

[daihan]

Hi,
I have made the following changes to gtk2 in project MeeGo:1.0:Core:Update:Testing. Please review and accept ASAP.

Thank You,
daihan

[This message was auto-generated]

---

Request #7407:

  submit:   home:daihan:branches:MeeGo:1.0:Core:Update:Testing/gtk2(r2)(cleanup) -> MeeGo:1.0:Core:Update:Testing/gtk2


Message:
     add a patch to fix BMC#1662, which is a update 4 blocker

State:   new          2010-09-08T21:42:26 daihan
Comment: None



changes files:
--------------
--- gtk2.changes
+++ gtk2.changes
@@ -0,0 +1,4 @@
+* Fri Sep 9 2010 Hao Li <hao.h.li at intel.com> - 2.20.0
+- Remove MeeGo-ignore-desktop-entry-in-gtkfilechooserdefault.patch to put Document back
+- Add the translation for Document in gtkfilechooserdefault fix BMC#1626, thanks to glin at novell.com for fixing it
+

old:
----
  MeeGo-ignore-desktop-entry-in-gtkfilechooserdefault.patch

new:
----
  MeeGo-Document-Translation-gtkfilechooserdefault.patch

spec files:
-----------
--- gtk2.spec
+++ gtk2.spec
@@ -41,7 +41,7 @@
 Patch103: gtk+-2.16.1-file-chooser-filter-combo-ellipsizing.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=613597
 Patch104: gtk+-2.19.7-fix-introspection-parallel-build.patch
-Patch105: MeeGo-ignore-desktop-entry-in-gtkfilechooserdefault.patch
+Patch105: MeeGo-Document-Translation-gtkfilechooserdefault.patch
 
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -167,7 +167,7 @@
 %patch102 -p1 -b .default-icon-theme
 %patch103 -p1 -b .ellipsizing
 %patch104 -p1 -b .fix-introspection-parallel-build
-%patch105 -p1 -b .MeeGo-ignore-desktop-entry-in-gtkfilechooserdefault
+%patch105 -p1 -b .MeeGo-Document-Translation-gtkfilechooserdefault
 
 %build
 MOZ_OPT_FLAGS=$(echo $CFLAGS| %{__sed} -e 's/-O2//' -e 's/-Wall//' -e 's/-Os//')

other changes:
--------------

++++++ MeeGo-Document-Translation-gtkfilechooserdefault.patch (new)
--- MeeGo-Document-Translation-gtkfilechooserdefault.patch
+++ MeeGo-Document-Translation-gtkfilechooserdefault.patch
+diff --git a/po/ar.po b/po/ar.po
+index a94cdd5..dc2c610 100644
+--- a/po/ar.po
++++ b/po/ar.po
+@@ -1694,8 +1694,8 @@ msgid "Select A File"
+ msgstr "اختر ملفًا"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "سطح المكتب"
++msgid "Documents"
++msgstr "ﺎﻠﻤﺴﺘﻧﺩﺎﺗ"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/ast.po b/po/ast.po
+index dcd49b7..cff6c93 100644
+--- a/po/ast.po
++++ b/po/ast.po
+@@ -1716,8 +1716,8 @@ msgid "Select A File"
+ msgstr "Escueya un Ficheru"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Escritoriu"
++msgid "Documents"
++msgstr "Documentos"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/ca.po b/po/ca.po
+index 59f58b8..7d37ffd 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -1739,8 +1739,8 @@ msgid "Select A File"
+ msgstr "Seleccioneu un fitxer"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Escriptori"
++msgid "Documents"
++msgstr "Documents"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/cs.po b/po/cs.po
+index 914804b..d6f7729 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -1704,8 +1704,8 @@ msgid "Select A File"
+ msgstr "Zvolte soubor"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Pracovní plocha"
++msgid "Documents"
++msgstr "Dokumenty"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/da.po b/po/da.po
+index 13db476..ec45961 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -1737,8 +1737,8 @@ msgid "Select A File"
+ msgstr "Vælg en fil"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Skrivebord"
++msgid "Documents"
++msgstr "Dokumenter"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/de.po b/po/de.po
+index 0b1adc0..6d140b6 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -1732,8 +1732,8 @@ msgid "Select A File"
+ msgstr "Datei auswählen"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Desktop"
++msgid "Documents"
++msgstr "Dokumente"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/en_GB.po b/po/en_GB.po
+index 7a780b8..ba18a10 100644
+--- a/po/en_GB.po
++++ b/po/en_GB.po
+@@ -1701,8 +1701,8 @@ msgid "Select A File"
+ msgstr "Select A File"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Desktop"
++msgid "Documents"
++msgstr "Documents"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/es.po b/po/es.po
+index 59c515a..7269609 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1724,8 +1724,8 @@ msgid "Select A File"
+ msgstr "Seleccione un archivo"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Escritorio"
++msgid "Documents"
++msgstr "Documentos"
+ 
+ # src/file-manager/fm-icon-text-window.c:85
+ #: gtk/gtkfilechooserbutton.c:66
+diff --git a/po/eu.po b/po/eu.po
+index 766d2a6..90409af 100644
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -1706,8 +1706,8 @@ msgid "Select A File"
+ msgstr "Hautatu fitxategia"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Mahaigaina"
++msgid "Documents"
++msgstr "Dokumentuak"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/fi.po b/po/fi.po
+index 53069b0..bcc2dd0 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -1707,8 +1707,8 @@ msgid "Select A File"
+ msgstr "Valitse tiedosto"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Työpöytä"
++msgid "Documents"
++msgstr "Asiakirjat"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/fr.po b/po/fr.po
+index daffe5f..a9c6aa8 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -1733,8 +1733,8 @@ msgid "Select A File"
+ msgstr "Sélectionner un fichier"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Bureau"
++msgid "Documents"
++msgstr "Documents"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/gl.po b/po/gl.po
+index 303aa63..6498de0 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -1733,8 +1733,8 @@ msgid "Select A File"
+ msgstr "Seleccionar un ficheiro"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Escritorio"
++msgid "Documents"
++msgstr "Documentos"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/hu.po b/po/hu.po
+index 1ed1c91..ec65f7f 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -1713,8 +1713,8 @@ msgid "Select A File"
+ msgstr "Válasszon ki egy fájlt"
+ 
+ #: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1848
+-msgid "Desktop"
+-msgstr "Asztal"
++msgid "Documents"
++msgstr "Dokumentumok"
+ 
+ #: gtk/gtkfilechooserbutton.c:66
+ msgid "(None)"
+diff --git a/po/id.po b/po/id.po
+index 51f1305..5d66770 100644
+--- a/po/id.po
(240 more lines skipped)

++++++ deleted files:
--- MeeGo-ignore-desktop-entry-in-gtkfilechooserdefault.patch