aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorMichael Zucci <zucchi@src.gnome.org>2005-07-12 12:04:14 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-07-12 12:04:14 +0800
commit9f12922bd88bd7a83247cc7e0646c72773e2a013 (patch)
treeda9a3d002dfa58ff262ef25ca3effe426fbfcc3a /po
parentcf563ecd524fd20fb3cc8ebade877ad442d85c43 (diff)
downloadgsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.gz
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.bz2
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.lz
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.xz
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.zst
gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.zip
Merge back eplugin-import-branch.
svn path=/trunk/; revision=29725
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog11
-rw-r--r--po/POTFILES.in9
2 files changed, 14 insertions, 6 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 6231adf91a..416ff5127e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -114,6 +114,17 @@
* POTFILES.skip: Added the gal files which need to be skipped.
+2005-07-06 Not Zed <NotZed@Ximian.com>
+
+ * POTFILES.in: removed addressbook importer .server files, added
+ addressbook importer .c files.
+ remove mail & calendar importer .server file
+
+2005-07-01 Not Zed <NotZed@Ximian.com>
+
+ * POTFILES.in: move import.glade to shell/ and remove
+ intelligent.c
+
2005-06-27 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* es.po: Updated Spanish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 19513cc6e9..23dcafdabb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,8 +62,8 @@ addressbook/gui/widgets/eab-vcard-control.c
addressbook/gui/widgets/gal-view-factory-minicard.c
addressbook/gui/widgets/gal-view-factory-treeview.c
addressbook/gui/widgets/test-reflow.c
-addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in
-addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in
+addressbook/importers/evolution-ldif-importer.c
+addressbook/importers/evolution-vcard-importer.c
addressbook/printing/e-contact-print-envelope.c
addressbook/printing/e-contact-print.c
addressbook/printing/e-contact-print.glade
@@ -170,7 +170,6 @@ calendar/gui/print.c
calendar/gui/tasks-component.c
calendar/gui/tasks-control.c
calendar/gui/weekday-picker.c
-calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
calendar/importers/icalendar-importer.c
calendar/zones.h
composer/e-msg-composer-attachment-bar.c
@@ -233,7 +232,6 @@ mail/em-utils.c
mail/em-vfolder-editor.c
mail/em-vfolder-rule.c
mail/evolution-mail.schemas.in.in
-mail/importers/GNOME_Evolution_Mail_Importers.server.in.in
mail/importers/elm-importer.c
mail/importers/evolution-mbox-importer.c
mail/importers/evolution-outlook-importer.c
@@ -346,8 +344,7 @@ shell/e-shell.c
shell/e-user-creatable-items-handler.c
shell/evolution-shell-component-utils.c
shell/evolution-test-component.c
-shell/importer/import.glade
-shell/importer/intelligent.c
+shell/import.glade
shell/main.c
shell/shell.error.xml
smime/gui/ca-trust-dialog.c