Hi,
To integrate latest translations for 2010.03(d.o.o #14192), I'd like to
commit below changes:
1) Bump version for opensolaris-welcome, update
opensolaris-welcome/html/index.html -- the changes are attached.
2) Update translations for a bunch of files:
opensolaris-welcome/po/*.po
opensolaris-welcome/html/*/index.html
gnome-control-center/po-sun/*.po
gnome-desktop/po-sun/*.po
gnome-panel/po-sun/*.po
gnome-power-manager/po-sun/*.po
gnome-session/po-sun/*.po
gnome-system-tools/po-sun/*.po
gst-plugins-good/po-sun/*.po
gtk2/po-sun/*.po
libgksuui/po-sun/*.po
nautilus/po-sun/*.po
po-sun-tarballs/po-sun/*.po
system-config-printer/po-sun/*.po
Below are the changes made to Makefile and spec files of
opensolaris-welcome.
Index: Makefile
===================================================================
--- Makefile (revision 192)
+++ Makefile (working copy)
@@ -1,5 +1,5 @@
PACKAGE=opensolaris-welcome
-VERSION=0.0.30
+VERSION=0.0.31
top_builddir=.
top_srcdir=.
@@ -52,7 +52,7 @@
html/C/css/sIFR-screen.css \
$(null)
-ALL_LINGUAS=C ar cs de el es fr it hu id ja ko nl pl pt_BR ru sv zh_CN
zh_HK zh_TW
+ALL_LINGUAS=C ar ca cs de el es fr it hu id ja ko nl pl pt_BR ru sv
zh_CN zh_HK zh_TW
ALL_FILES= $(foreach ling, $(ALL_LINGUAS), $(addprefix html/$(ling)/,
$(ALL_FILES_BASE)))
ALL_FILES+= html/index.html $(ALL_IMAGES) $(ALL_STYLE)
Index: html/index.html
===================================================================
--- html/index.html (revision 192)
+++ html/index.html (working copy)
@@ -24,6 +24,7 @@
} else if(langinfo == "zh-TW") {
langurl='zh_TW/index.html';
} else if(langinfo.substr(0,2) == "ar" ||
+ langinfo.substr(0,2) == "ca" ||
langinfo.substr(0,2) == "cs" ||
langinfo.substr(0,2) == "de" ||
langinfo.substr(0,2) == "el" ||
@@ -67,6 +68,7 @@
<ul>
<li><a href="C/index.html">English</a></li>
<li><a href="ar/index.html">???????</a></li>
+<li><a href="ca/index.html">catal?</a></li>
<li><a href="cs/index.html">?e?tina</a></li>
<li><a href="de/index.html">Deutsch</a></li>
<li><a href="el/index.html">????????</a></li>
Index: SUNWopensolaris-welcome.spec
===================================================================
--- SUNWopensolaris-welcome.spec (revision 20647)
+++ SUNWopensolaris-welcome.spec (working copy)
@@ -9,20 +9,17 @@
Name: SUNWopensolaris-welcome
Summary: OpenSolaris Welcome document
-Version: 0.0.30
+Version: 0.0.31
Source:
http://dlc.sun.com/osol/jds/downloads/extras/opensolaris-welcome/opensolaris-welcome-%{version}.tar.bz2
SUNW_BaseDir: /
SUNW_Copyright: %{name}.copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# date:2010-01-12 owner:padraig type:bug doo: 13244
-Patch01: opensolaris-welcome-01-fix-addmoresoftware.diff
%include default-depend.inc
BuildRequires: SUNWgnome-common-devel
Requires: SUNWPython
%prep
%setup -q -n opensolaris-welcome-%{version}
-%patch1 -p1
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -33,7 +30,8 @@
cd $RPM_BUILD_ROOT/%_datadir/locale; \
/bin/ls | grep -v '^de$' | grep -v '^es$' | grep -v '^fr$' | grep -v
'^it$' |\
grep -v '^ja$' | grep -v '^ko$' | grep -v '^pt_BR$' | grep -v '^ru$' |\
- grep -v '^ar$' | grep -v '^cs$' | grep -v '^el$' | grep -v '^hu$' |\
+ grep -v '^ar$' | grep -v '^ca$' | grep -v '^cs$' | grep -v '^el$' |\
+ grep -v '^he$' | grep -v '^hu$' |\
grep -v '^id$' | grep -v '^nl$' | grep -v '^pl$' |\
grep -v '^sv$' | grep -v '^zh_CN$' | grep -v '^zh_HK$' | grep -v
'^zh_TW$' |\
xargs /bin/rm -r; \
@@ -67,6 +65,11 @@
%dir %attr (0755, root, other) %{_datadir}/locale/ar/LC_MESSAGES
%{_datadir}/locale/ar/LC_MESSAGES/*.mo
+%{_datadir}/doc/opensolaris-welcome/html/ca
+%dir %attr (0755, root, other) %{_datadir}/locale/ca
+%dir %attr (0755, root, other) %{_datadir}/locale/ca/LC_MESSAGES
+%{_datadir}/locale/ca/LC_MESSAGES/*.mo
+
%{_datadir}/doc/opensolaris-welcome/html/cs
%dir %attr (0755, root, other) %{_datadir}/locale/cs
%dir %attr (0755, root, other) %{_datadir}/locale/cs/LC_MESSAGES
@@ -92,6 +95,11 @@
%dir %attr (0755, root, other) %{_datadir}/locale/fr/LC_MESSAGES
%{_datadir}/locale/fr/LC_MESSAGES/*.mo
+#%{_datadir}/doc/opensolaris-welcome/html/hu
+%dir %attr (0755, root, other) %{_datadir}/locale/he
+%dir %attr (0755, root, other) %{_datadir}/locale/he/LC_MESSAGES
+%{_datadir}/locale/he/LC_MESSAGES/*.mo
+
%{_datadir}/doc/opensolaris-welcome/html/hu
%dir %attr (0755, root, other) %{_datadir}/locale/hu
%dir %attr (0755, root, other) %{_datadir}/locale/hu/LC_MESSAGES
@@ -163,6 +171,10 @@
%attr (-, root, sys) %{_sysconfdir}/xdg/autostart/*
%changelog
+* Fri Jan 29 2010 - harry.fu at sun.com
+- Bump the version to 0.0.31.
+- Update/Add translations.
+- Remove patch opensolaris-welcome-01-fixaddmoresoftware since the
changes are implemented in opensolaris-icons-copy.sh already.
* Tue Jan 12 2010 - padraig.obriain at sun.com
- Add patch opensolaris-welcome-01-fixaddmoresoftware
* Mon Dec 21 2009 - glynn.foster at sun.com
Best Regards,
Harry Fu
