[gnome-shell/datetime: 46/47] Merge branch 'master' into datetime



commit f51984b20c80e44090e830c34f9255917e06d4a7
Merge: 8e9bc60 26f395b
Author: David Zeuthen <davidz redhat com>
Date:   Wed Dec 15 13:12:54 2010 -0500

    Merge branch 'master' into datetime

 data/gnome-shell.schemas          |   13 +-
 data/theme/gnome-shell.css        |   17 +-
 js/misc/telepathy.js              |    4 +-
 js/ui/appDisplay.js               |    6 +-
 js/ui/lookingGlass.js             |   11 +-
 js/ui/magnifier.js                |  722 ++++++++++++++++++------------------
 js/ui/magnifierDBus.js            |    5 +
 js/ui/messageTray.js              |    2 +-
 js/ui/overview.js                 |    4 +-
 js/ui/status/accessibility.js     |   46 +--
 js/ui/status/power.js             |   22 +-
 js/ui/statusMenu.js               |    2 +-
 js/ui/telepathyClient.js          |   57 ++--
 js/ui/windowManager.js            |   38 ++-
 js/ui/workspace.js                |    3 +-
 js/ui/workspaceSwitcherPopup.js   |    6 +
 po/LINGUAS                        |    1 +
 po/POTFILES.in                    |    3 +
 po/es.po                          |  322 +++++++++++------
 po/fa.po                          |  730 +++++++++++++++++++++++++++++++++++++
 po/gl.po                          |  132 ++++++-
 po/he.po                          |  342 ++++++++++++------
 po/it.po                          |  348 ++++++++++++------
 po/nb.po                          |  227 ++++++++----
 po/pa.po                          |  233 ++++++------
 po/pt_BR.po                       |  356 +++++++++++-------
 po/sl.po                          |  348 ++++++++++++------
 po/ta.po                          |  546 +++++++++++++++++++---------
 po/zh_CN.po                       |  318 ++++++++++------
 src/Makefile-st.am                |    2 +-
 src/gdmuser/gdm-user-manager.c    |    2 +
 src/gnome-shell-plugin.c          |    4 +-
 src/shell-embedded-window.c       |    2 +-
 src/shell-global.c                |    8 -
 src/shell-gtk-embed.c             |    2 +-
 src/st/st-icon.c                  |  134 +++++---
 src/st/st-theme-node-drawing.c    |  423 +++++++++++++++-------
 src/st/st-theme-node.c            |   28 ++-
 src/tray/na-tray-child.c          |    2 +-
 src/tray/na-tray-manager.c        |    6 +-
 tests/Makefile.am                 |    1 +
 tests/interactive/border-width.js |   60 +++
 tools/build/gnome-shell.modules   |    1 +
 43 files changed, 3790 insertions(+), 1749 deletions(-)
---



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