Merge pull request #1 from mate-desktop/master

up
author: Perberos <[email protected]> 2012-07-19 14:17:16 -0700
committer: Perberos <[email protected]> 2012-07-19 14:17:16 -0700
commit: 78f1e23185a2853a41e536caf07f9c6dc1208ecd (patch)
tree: 3cc3551cf94c738bea7f14d79ac20e9fdadef898
parent: d42fb230451217ce424a7d58147ad0b90da93480 (diff)
parent: 568a0926c1c8c3798f931add5e71edf480ebf3cd (diff)
download: mate-desktop-78f1e23185a2853a41e536caf07f9c6dc1208ecd.tar.bz2
mate-desktop-78f1e23185a2853a41e536caf07f9c6dc1208ecd.tar.xz
3 files changed, 266 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 4eaf97c..85ffc8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,264 @@
+commit d42fb230451217ce424a7d58147ad0b90da93480
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Jun 29 14:38:45 2012 +0200
+
+ sync translations with transifex
+
+ po/ar.po | 25 +--
+ po/ast.po | 52 +++---
+ po/ca.po | 544 +++++++++++++------------------------------------------------
+ po/nl.po | 19 ++-
+ po/pl.po | 12 +-
+ po/pt.po | 462 +++++++++------------------------------------------
+ 6 files changed, 249 insertions(+), 865 deletions(-)
+
+commit 0090b007a0a91785796113d9a5df7766b21a92b2
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Jun 29 14:38:39 2012 +0200
+
+ add po gnome copyrights file
+
+ po/gnome-copyrights.txt | 1370 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 1370 insertions(+)
+
+commit 2c47083b6cb8803970b1977b46fcc6c8acf72d0c
+Author: Perberos <[email protected]>
+Date: Tue Jun 5 17:00:12 2012 -0300
+
+ Update master
+
+ libmate-desktop/mate-bg-crossfade.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+commit 206fe346c7aa4ab963103bab290b1fe38a4e6121
+Author: Stefano Karapetsas <[email protected]>
+Date: Mon Apr 23 12:12:06 2012 +0200
+
+ use appropriate include for "N_"
+
+ mate-about/mate-about.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e008971ab430999c50ac0a978a78be527ce2e249
+Author: Stefano Karapetsas <[email protected]>
+Date: Mon Apr 23 12:10:12 2012 +0200
+
+ add missing include for "N_"
+ http://developer.gnome.org/glib/2.30/glib-I18N.html#N-:CAPS
+
+ mate-about/mate-about.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+commit abc603ab57675cfaa7d3111abd8a43b6dcb4ff8b
+Author: Perberos <[email protected]>
+Date: Sun Apr 22 22:30:42 2012 -0300
+
+ removing N_() outside code scope
+
+ mate-about/mate-about.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 54e93070063dfc4d31e67605ce9c2e48c8521091
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Apr 20 16:32:23 2012 +0200
+
+ restore some copyrights deleted by transifex
+
+ po/af.po | 8 +++++---
+ po/am.po | 7 ++++---
+ po/an.po | 8 +++++---
+ po/ast.po | 7 ++++---
+ po/az.po | 6 +++---
+ po/be.po | 9 +++++----
+ po/bg.po | 12 +++++++++---
+ po/bn.po | 9 ++++++---
+ 8 files changed, 41 insertions(+), 25 deletions(-)
+
+commit dfbb7f6d9f6593ddf192ae6e9b6cba7bbe458917
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Apr 20 16:17:32 2012 +0200
+
+ sync translations with transifex
+
+ po/pl.po | 9 +++++----
+ po/pt_BR.po | 17 +++++++++--------
+ po/ru.po | 17 +++++++++--------
+ 3 files changed, 23 insertions(+), 20 deletions(-)
+
+commit a13316addc185bfc4fc66e76117e2d0bf9987a33
+Author: Stefano Karapetsas <[email protected]>
+Date: Mon Apr 16 16:46:50 2012 +0200
+
+ sync translations with transifex
+
+ po/af.po | 527 ++++++++++++++-----------------------------
+ po/am.po | 640 +++++++++++++++--------------------------------------
+ po/an.po | 210 +++++-------------
+ po/ar.po | 46 +++-
+ po/as.po | 301 +++++++++++--------------
+ po/ast.po | 408 ++++++++++++----------------------
+ po/az.po | 520 +++++++++++++++----------------------------
+ po/be.po | 461 +++++++++++++++-----------------------
+ po/bg.po | 218 +++++-------------
+ po/bn.po | 611 ++++++++++----------------------------------------
+ po/bn_IN.po | 312 +++++++++++---------------
+ po/br.po | 264 +++++++++++-----------
+ po/bs.po | 523 +++++++++++++++----------------------------
+ po/crh.po | 260 +++++++++-------------
+ po/cy.po | 660 +++++++++++++++---------------------------------------
+ po/da.po | 409 ++++------------------------------
+ po/dz.po | 487 +++++++++++++++++-----------------------
+ po/el.po | 254 +++++----------------
+ po/en_CA.po | 489 ++++++++++++++++------------------------
+ po/en_GB.po | 340 +++++-----------------------
+ po/eo.po | 194 ++++------------
+ po/es.po | 341 ++++++----------------------
+ po/et.po | 212 +++++++-----------
+ po/eu.po | 225 +++++--------------
+ po/fa.po | 620 +++++++++++++++------------------------------------
+ po/fi.po | 376 +++++++++----------------------
+ po/fr.po | 246 ++++++---------------
+ po/fur.po | 451 +++++++++++++++++--------------------
+ po/he.po | 312 +++++---------------------
+ po/hi.po | 314 +++++++++++---------------
+ po/hr.po | 465 ++++++++++++++++----------------------
+ po/hu.po | 221 +++++-------------
+ po/hy.po | 378 ++++++++++++-------------------
+ po/ia.po | 48 +++-
+ po/id.po | 227 +++++--------------
+ po/ig.po | 416 +++++++++++-----------------------
+ po/is.po | 289 +++++++++++-------------
+ po/ja.po | 208 ++++-------------
+ po/ka.po | 455 ++++++++++++++++----------------------
+ po/kk.po | 337 ++++++----------------------
+ po/kn.po | 195 ++++------------
+ po/ko.po | 317 ++++----------------------
+ po/ku.po | 383 ++++++++++++--------------------
+ po/ky.po | 480 +++++++++++++++++-----------------------
+ po/mai.po | 302 +++++++++++--------------
+ po/mg.po | 462 ++++++++++++++------------------------
+ po/mi.po | 413 +++++++++++++---------------------
+ po/mk.po | 466 ++++++++++++++++----------------------
+ po/ml.po | 303 +++++++++++--------------
+ po/mn.po | 604 ++++++++++----------------------------------------
+ po/mr.po | 305 +++++++++++--------------
+ po/ms.po | 257 +++++++++------------
+ po/nb.po | 205 +++++------------
+ po/nds.po | 304 +++++++++++--------------
+ po/ne.po | 495 +++++++++++++++++------------------------
+ po/nl.po | 360 +++++-------------------------
+ po/nn.po | 453 +++++++++++--------------------------
+ po/or.po | 218 +++++-------------
+ po/pl.po | 202 ++++-------------
+ po/pt_BR.po | 323 +++++----------------------
+ po/ro.po | 222 +++++--------------
+ po/ru.po | 229 +++++--------------
+ po/si.po | 492 ++++++++++++++++-------------------------
+ po/sk.po | 219 +++++-------------
+ po/sl.po | 280 ++++++-----------------
+ po/sq.po | 460 ++++++++++++++++----------------------
+ po/sr.po | 437 +++++-------------------------------
+ po/[email protected] | 437 +++++-------------------------------
+ po/sv.po | 214 ++++++------------
+ po/ta.po | 276 +++++++++--------------
+ po/te.po | 301 +++++++++++--------------
+ po/th.po | 540 ++++++--------------------------------------
+ po/tr.po | 410 ++++++++++++----------------------
+ po/ug.po | 619 +++++++++++++++++++++++----------------------------
+ po/uk.po | 257 +++++++++------------
+ po/ur.po | 386 +++++++++++++-------------------
+ po/uz.po | 477 +++++++++++++++------------------------
+ po/vi.po | 319 +++++++++++++-------------
+ po/wa.po | 676 +++++++++++++++-----------------------------------------
+ po/yo.po | 519 +++++++++++++++----------------------------
+ po/zh_CN.po | 217 +++++-------------
+ po/zh_HK.po | 329 +++++----------------------
+ po/zh_TW.po | 335 +++++-----------------------
+ po/zu.po | 521 +++++++++++++++----------------------------
+ 84 files changed, 9675 insertions(+), 20819 deletions(-)
+
+commit fc5bb69b0d5c76497933924ca86353b63ab9107d
+Author: Stefano Karapetsas <[email protected]>
+Date: Sat Apr 7 20:17:14 2012 +0200
+
+ updated de translation
+
+ po/de.po | 239 ++++++++++++++------------------------------------------------
+ 1 file changed, 54 insertions(+), 185 deletions(-)
+
+commit 3ec1b64051a195a2067a2f2cb76f5b98eab76bae
+Author: Stefano Karapetsas <[email protected]>
+Date: Sat Apr 7 20:15:46 2012 +0200
+
+ updated it translation
+
+ po/it.po | 252 ++++++++++++++++----------------------------------------------
+ 1 file changed, 64 insertions(+), 188 deletions(-)
+
+commit a9cf654696840edffd8df48ac90cebe713368cb9
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Apr 6 12:16:22 2012 +0200
+
+ re-add mate-version.xml.in.in
+ some apps, like mate-system-monitor, are using it
+ thanks to benpicco
+
+ Makefile.am | 2 ++
+ configure.in | 1 +
+ mate-version.xml.in.in | 7 +++++++
+ 3 files changed, 10 insertions(+)
+
+commit a87bbb3eb240a3cd6e648af4fc9c2f57a7fc7269
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Apr 6 11:16:24 2012 +0200
+
+ update gettext package name
+
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 290ba540814997f3a64e2cd098a75656ec60c1de
+Author: Stefano Karapetsas <[email protected]>
+Date: Fri Apr 6 11:16:07 2012 +0200
+
+ update about strings for MATE
+
+ mate-about/mate-about.h | 29 +++++++++++++++--------------
+ 1 file changed, 15 insertions(+), 14 deletions(-)
+
+commit ddd383e65f6ab7fd45055d6f7906050f86c0a915
+Author: Stefano Karapetsas <[email protected]>
+Date: Thu Feb 23 12:44:33 2012 +0100
+
+ update translations (ar, ia*)
+ ia (interlingua) is a new translation
+
+ po/LINGUAS | 1 +
+ po/ar.po | 383 +++++++++++++++++-------------------------------------------
+ po/ia.po | 234 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 340 insertions(+), 278 deletions(-)
+
+commit cfc1d978df582a280b680b7f46027b05020f140f
+Author: Steve Zesch <[email protected]>
+Date: Wed Feb 22 21:13:37 2012 -0500
+
+ Preparing for 1.2 release
+
+ ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ autogen.sh | 4 ++--
+ configure.in | 4 ++--
+ 3 files changed, 48 insertions(+), 4 deletions(-)
+
 commit bc53751054ab3b2e693620311e6cd80bccb8b831
 Author: Perberos <[email protected]>
 Date: Wed Feb 22 01:58:42 2012 -0300
 
 some ugly gtk3 porting
 
- libmate-desktop/libmateui/mate-bg-crossfade.h | 15 ++-
+ libmate-desktop/libmateui/mate-bg-crossfade.h | 15 +-
 libmate-desktop/libmateui/mate-bg.h | 26 ++--
 libmate-desktop/mate-bg-crossfade.c | 84 +++++++----
- libmate-desktop/mate-bg.c | 199 +++++++++++++++++-------
+ libmate-desktop/mate-bg.c | 199 ++++++++++++++++++-------
 4 files changed, 222 insertions(+), 102 deletions(-)
 
 commit 23d4ca43c7d3659ad619c0534424ef16b94be6ca
@@ -17,7 +268,7 @@ Date: Wed Feb 22 01:57:43 2012 -0300
 set patch on archlinux script
 
 distro/archlinux/PKGBUILD | 15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit 341fc293a5edc0dda25c4a8d465d19bd293fb6da
 Author: Perberos <[email protected]>
@@ -38,7 +289,7 @@ Date: Sun Jan 29 16:12:00 2012 +0100
 AUTHORS | 13 ++-
 ChangeLog | 364 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 MAINTAINERS | 4 +-
- README | 19 +---
+ README | 19 +--
 configure.in | 4 +-
 5 files changed, 383 insertions(+), 21 deletions(-)
 
@@ -49,7 +300,7 @@ Date: Mon Jan 9 22:15:23 2012 -0500
 Changed mate.gr.jp to gnome.gr.jp as requested in Issue #86
 
 po/ja.po | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 3c6f1ee22c1463661d681feec5d35d8a363b5061
 Author: Stefano Karapetsas <[email protected]>
@@ -58,7 +309,7 @@ Date: Tue Dec 27 10:08:49 2011 +0100
 updated MATE homepage
 
 mate-about/mate-about.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2f1081f86c007053c8527c9423802bbcbe55505c
 Author: Perberos <[email protected]>
@@ -67,7 +318,7 @@ Date: Fri Dec 9 14:02:56 2011 -0200
 background fade broke the file-manager
 
 libmate-desktop/mate-bg-crossfade.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit e79a1b6123a19e82905b26e2d15c4e673ec7e5f3
 Author: Steve Zesch <[email protected]>
@@ -88,7 +339,7 @@ Date: Wed Dec 7 06:52:26 2011 -0300
 
 mate-about/mate-about.c | 1 +
 mate-about/mate-about.h | 3 +++
- 2 files changed, 4 insertions(+), 0 deletions(-)
+ 2 files changed, 4 insertions(+)
 
 commit 720cc9c1a782927bdaf4a6f955d791bbd8c9d2ec
 Author: Perberos <[email protected]>
@@ -110,7 +361,7 @@ Date: Sat Dec 3 23:22:00 2011 -0300
 adding contributor
 
 mate-about/mate-about.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit defb2af0d4d28ff9fa10dedc04ea12658665a77c
 Author: Perberos <[email protected]>
@@ -118,9 +369,9 @@ Date: Fri Dec 2 07:39:37 2011 -0300
 
 adding version tag
 
- configure.in | 4 +-
+ configure.in | 4 ++--
 distro/archlinux/PKGBUILD | 2 +-
- mate-about/mate-about.c | 35 +++++++++++++++++++++------------
+ mate-about/mate-about.c | 35 ++++++++++++++++++++-------------
 mate-about/mate-about.h | 47 ++++++++++++++++++++++-----------------------
 4 files changed, 48 insertions(+), 40 deletions(-)
 
@@ -134,7 +385,7 @@ Date: Fri Dec 2 07:37:13 2011 -0300
 m4/intltool.m4 | 216 -------
 m4/ltsugar.m4 | 123 ----
 m4/mate-doc-utils.m4 | 56 --
- 4 files changed, 0 insertions(+), 2100 deletions(-)
+ 4 files changed, 2100 deletions(-)
 
 commit d00aab12b6ace2c3dda3efbc2aaa2646d78a9099
 Author: Perberos <[email protected]>
@@ -203,7 +454,7 @@ Date: Thu Dec 1 22:07:25 2011 -0300
 desktop-docs/lgpl/es/es.po | 1186 ++++++
 desktop-docs/lgpl/eu/eu.po | 412 +++
 desktop-docs/lgpl/fi/fi.po | 1138 ++++++
- desktop-docs/lgpl/fr/fr.po | 1223 ++++++
+ desktop-docs/lgpl/fr/fr.po | 1223 +++++++
 desktop-docs/lgpl/hu/hu.po | 412 +++
 desktop-docs/lgpl/ko/ko.po | 1124 ++++++
 desktop-docs/lgpl/lgpl.omf.in | 10 +
@@ -406,4 +657,4 @@ Date: Thu Dec 1 22:07:25 2011 -0300
 po/zh_HK.po | 488 +++
 po/zh_TW.po | 502 +++
 po/zu.po | 430 +++
- 264 files changed, 106708 insertions(+), 0 deletions(-)
+ 264 files changed, 106708 insertions(+)
diff --git a/configure.in b/configure.in
index 9c28506..d3a6548 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 m4_define([mate_platform], [1])
-m4_define([mate_minor], [2])
+m4_define([mate_minor], [4])
 m4_define([mate_micro], [0])
 
 m4_define(mate_version, [mate_platform.mate_minor.mate_micro]),
diff --git a/distro/ubuntu/build b/distro/ubuntu/build
deleted file mode 100755
index 36dab8f..0000000
--- a/distro/ubuntu/build
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# fill it
-pkgname=mate-desktop
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Library with common API for various MATE modules"
-depends=('mate-conf' 'gtk2-engines-pixbuf')
-# editar esta funcion!
-build() {
- cd $pkgsrc
- # descomprimir
- tar xvzf download
- # entramos a la carpeta
- cd ${pkgname}
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static --disable-scrollkeeper || return 1
-
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
-
- # prevent conflicts errors
- mv "${pkgdir}/usr/share/omf" "${pkgdir}/usr/share/mate-omf"
- #rm -rf ${pkgdir}/usr/share/omf
-}
-
-# esto incluye la parte que se repite en la mayoria de los builds
-. /usr/share/mate-doc-utils/mate-debian.sh
author	Perberos <[email protected]>	2012-07-19 14:17:16 -0700
committer	Perberos <[email protected]>	2012-07-19 14:17:16 -0700
commit	78f1e23185a2853a41e536caf07f9c6dc1208ecd (patch)
tree	3cc3551cf94c738bea7f14d79ac20e9fdadef898
parent	d42fb230451217ce424a7d58147ad0b90da93480 (diff)
parent	568a0926c1c8c3798f931add5e71edf480ebf3cd (diff)
download	mate-desktop-78f1e23185a2853a41e536caf07f9c6dc1208ecd.tar.bz2 mate-desktop-78f1e23185a2853a41e536caf07f9c6dc1208ecd.tar.xz