[gnome-schedule/eximport: 42/42] Merge branch 'master' into eximport
- From: Gaute Hope <gauteh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-schedule/eximport: 42/42] Merge branch 'master' into eximport
- Date: Wed, 2 Nov 2011 20:15:55 +0000 (UTC)
commit ea0fc62adfb4364d47de95b15b11fca6793233f9
Merge: 1364440 817df25
Author: Gaute Hope <eg gaute vetsj com>
Date: Wed Nov 2 21:14:51 2011 +0100
Merge branch 'master' into eximport
Conflicts:
src/crontab.py
src/gnome-schedule-export.py
src/gnome-schedule-import.py
.gitignore | 5 +-
AUTHORS | 10 +-
NEWS | 6 +
TODO | 2 +-
configure.ac | 2 +-
po/ChangeLog | 773 ------------------------------------------
po/POTFILES.in | 3 +
po/ar.po | 94 +++++-
po/bg.po | 94 +++++-
po/ca.po | 94 +++++-
po/cs.po | 152 +++++++--
po/da.po | 103 +++++-
po/de.po | 193 ++++++++---
po/dz.po | 94 +++++-
po/el.po | 94 +++++-
po/en_CA.po | 94 +++++-
po/en_GB.po | 94 +++++-
po/es.po | 227 +++++++++----
po/eu.po | 265 +++++++++-----
po/fi.po | 94 +++++-
po/fr.po | 186 ++++++++---
po/gl.po | 94 +++++-
po/gu.po | 94 +++++-
po/hu.po | 94 +++++-
po/it.po | 94 +++++-
po/lt.po | 94 +++++-
po/nb.po | 92 +++++-
po/ne.po | 94 +++++-
po/nl.po | 94 +++++-
po/nn.po | 94 +++++-
po/oc.po | 94 +++++-
po/pa.po | 94 +++++-
po/pt.po | 94 +++++-
po/pt_BR.po | 94 +++++-
po/ro.po | 94 +++++-
po/ru.po | 94 +++++-
po/rw.po | 94 +++++-
po/sl.po | 506 +++++++++++++++-------------
po/sq.po | 94 +++++-
po/sv.po | 94 +++++-
po/uk.po | 94 +++++-
po/vi.po | 94 +++++-
po/zh_CN.po | 94 +++++-
po/zh_HK.po | 94 +++++-
po/zh_TW.po | 94 +++++-
src/at.py | 100 ++++--
src/atEditor.py | 10 +-
src/crontab.py | 9 +-
src/gnome-schedule-export.py | 6 +-
src/gnome-schedule-import.py | 4 +-
50 files changed, 3988 insertions(+), 1486 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]