[gnome-pilot/GNOME_PILOT_2_32: 23/28] Merge commit 'b7f3623d9c9cb06657abd4909f72742d482c2d1d' into GNOME_PILOT_2_32
- From: Matthew Charles Davey <mcdavey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-pilot/GNOME_PILOT_2_32: 23/28] Merge commit 'b7f3623d9c9cb06657abd4909f72742d482c2d1d' into GNOME_PILOT_2_32
- Date: Mon, 21 Mar 2011 00:46:19 +0000 (UTC)
commit 04eb8b048ccce90ba52f78a7887e2debbbb72ff1
Merge: 354d83e b7f3623
Author: Matt Davey <mcdavey mrao cam ac uk>
Date: Sun Mar 20 23:48:36 2011 +0000
Merge commit 'b7f3623d9c9cb06657abd4909f72742d482c2d1d' into GNOME_PILOT_2_32
.gitignore | 9 +
ChangeLog | 43 +-
Makefile.am | 7 +-
applet/Makefile.am | 3 +-
capplet/Makefile.am | 1 +
conduits/evolution-data-server/Makefile.am | 1 +
conduits/evolution-data-server/todo-conduit.c | 2 +-
conduits/file/Makefile.am | 1 +
configure.ac | 46 +-
gpilotd/Makefile.am | 19 +-
gpilotd/gpilot-daemon.c | 167 +++--
help/C/Makefile.am | 11 -
help/C/gnome-pilot-C.omf | 24 -
help/C/gnome-pilot.xml | 25 +-
help/Makefile.am | 9 +-
help/es/es.po | 690 ++++++++++++++++
help/gnome-pilot.omf.in | 9 +
help/omf.make | 53 --
help/xmldocs.make | 96 ---
po/es.po | 25 +-
po/eu.po | 566 ++++++++------
po/it.po | 1054 ++++++++++++++-----------
po/nb.po | 994 +++++++++++++-----------
po/pt_BR.po | 621 ++++++++-------
po/sv.po | 578 ++++++++------
po/zh_CN.po | 538 ++++++++------
utils/Makefile.am | 1 +
27 files changed, 3425 insertions(+), 2168 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
