Getting almost full and proper use of xml-i18n-tools.

Removed all files where glade writes strings.
Changed Makefile.am to not distribute them.
Changed all glade files to not write strings to those files.

Removed *.desktop and evolution.keys files, because they are generated.
Added them to .cvsignore
Added *.desktop.in evolution.keys.in files without transalted strings.
Added all existing entries from desktop files to po files.
Changed Makefile.am to distribute only .in files, and merge translations into
desktop files.

Removed obsolete files from po/ dir

svn path=/trunk/; revision=8164
This commit is contained in:
Gediminas Paulauskas
2001-02-11 02:56:16 +00:00
parent a5e0765d8a
commit ac9abd5e60
103 changed files with 445 additions and 1766 deletions

View File

@ -22,7 +22,7 @@ stamp-h.in
stamp.h
xlibtool
xltmain.sh
evolution.desktop
evolution.spec
xml-i18n-extract
xml-i18n-merge
xml-i18n-update
xml-i18n-*

View File

@ -1,3 +1,11 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
* data/evolution.keys, evolution.desktop: removed, they are generated.
* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
* data/evolution.desktop: removed, it duplicates above.
* Makefile.am, data/Makefile.am: reflect above changes, merge
translations.
2001-02-09 Jeffrey Stedfast <fejj@ximian.com>
* configure.in: Added hacks to check for Mozilla libs like nspr

View File

@ -5,7 +5,9 @@ appicondir = $(datadir)/pixmaps
appicon_DATA = evolution.png
applicationdir = $(datadir)/gnome/apps/Applications
application_DATA = evolution.desktop
application_in_files = evolution.desktop.in
application_DATA = $(application_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@
EXTRA_DIST = \
AUTHORS \
@ -16,8 +18,10 @@ EXTRA_DIST = \
MAINTAINERS \
NEWS \
$(appicon_DATA) \
$(application_DATA)
$(application_in_files) \
xml-i18n-merge.in \
xml-i18n-update.in \
xml-i18n-extract.in
SUBDIRS = \
intl \

View File

@ -1,3 +1,26 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
Really use xml-i18n-tools.
* conduit/e-address-conduit-control-applet.desktop: removed.
* conduit/e-address-conduit-control-applet.desktop.in: added empty.
* conduit/Makefile.am: reflect above changes, merge translations.
* contact-editor/e-contact-editor-strings.h,
contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
contact-editor/e-contact-editor-confirm-delete.glade.h,
gui/component/select-names/select-names.glade.h:
removed these files, xml-i18n-extract takes care of strings itself.
* contact-editor/*.glade,
gui/component/select-names/select-names.glade,
gui/widgets/alphabet.glade, printing/e-contact-print.glade:
changed project options to not output_translatable_strings.
* contact-editor/Makefile.am, gui/widgets/Makefile.am,
gui/component/select-names/Makefile.am, printing/Makefile.am:
do not include removed files in EXTRA_DIST.
2001-02-07 Chris Toshok <toshok@ximian.com>
* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh

View File

@ -5,4 +5,5 @@ Makefile.in
Makefile
libeaddress_conduit.la
e-address-conduit-control-applet
e-address.conduit
e-address-conduit-control-applet.desktop
e-address.conduit

View File

@ -55,7 +55,9 @@ e-address.conduit: e-address.conduit.in Makefile
ccenterdir = $(datadir)/control-center
ccenterPalmPilotdir = $(ccenterdir)/Peripherals
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = e-address-conduit-control-applet.desktop
ccenterConduits_in_files = e-address-conduit-control-applet.desktop.in
ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@
panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
@ -65,13 +67,8 @@ Conduit_DATA = e-address.conduit
EXTRA_DIST = \
e-address.conduit.in \
$(ccenterConduits_DATA)
$(ccenterConduits_in_files)
install-data-local:
$(mkinstalldirs) $(ccenterConduitsdir)
$(mkinstalldirs) $(Conduitdir)

View File

@ -1,22 +0,0 @@
[Desktop Entry]
Name=Evolution Address conduit
Name[sl]=Evolucijin veznik naslovov
Name[da]=Udst<EFBFBD>ende
Name[es]=Enlace del libro de direcciones de Evolution
Name[fr]=Conduit Adresses
Name[no]=Oppgaver
Name[sk]=Spojka adres<65>ra Evolution
Name[sv]=Adresser
Name[tr]=Adres par<61>as<61>
Comment=Configure the address conduit
Comment[sl]=Nastavi veznik naslovov
Comment[da]=Konfigur<EFBFBD>r Udst<73>ende
Comment[es]=Configura el enlace del libro de direcciones
Comment[fr]=Configuration du conduit Adresses
Comment[no]=Konfigur<EFBFBD>r oppgavelisten
Comment[sk]=Nastavenie spojky adres<65>ra
Comment[sv]=Konfigurera adresskanalen
Comment[tr]=Adres par<61>as<61>n<EFBFBD>n ayarlar<61>
Exec=e-address-conduit-control-applet --cap-id=1
Terminal=0
Type=Application

View File

@ -0,0 +1,6 @@
[Desktop Entry]
_Name=Evolution Address conduit
_Comment=Configure the address conduit
Exec=e-address-conduit-control-applet --cap-id=1
Terminal=0
Type=Application

View File

@ -57,8 +57,4 @@ glade_DATA = \
e-contact-editor-confirm-delete.glade
EXTRA_DIST = $(evolution_DATA) \
$(glade_DATA) \
e-contact-editor-strings.h \
fulladdr.glade.h \
fullname-strings.h \
e-contact-editor-confirm-delete.glade.h
$(glade_DATA)

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
</project>
<widget>

View File

@ -15,8 +15,6 @@
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<gnome_help_support>True</gnome_help_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,7 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Delete Contact?");

View File

@ -1,41 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("_Add");
gchar *s = N_("_Delete");
gchar *s = N_("Phone Types");
gchar *s = N_("New phone type");
gchar *s = N_("Add");
gchar *s = N_("New phone type");
gchar *s = N_("Contact Editor");
gchar *s = N_("_Full Name...");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("Wants to receive _HTML mail");
gchar *s = N_("_Business");
gchar *s = N_("_Home");
gchar *s = N_("Business _Fax");
gchar *s = N_("_Mobile");
gchar *s = N_("Primary Email");
gchar *s = N_("B_usiness");
gchar *s = N_("_This is the mailing address");
gchar *s = N_("C_ontacts...");
gchar *s = N_("Ca_tegories...");
gchar *s = N_("_Job title:");
gchar *s = N_("_Company:");
gchar *s = N_("_Address...");
gchar *s = N_("General");
gchar *s = N_("_Department:");
gchar *s = N_("_Office:");
gchar *s = N_("_Profession:");
gchar *s = N_("_Nickname:");
gchar *s = N_("_Spouse:");
gchar *s = N_("_Birthday:");
gchar *s = N_("_Assistant's name:");
gchar *s = N_("_Manager's Name:");
gchar *s = N_("Anni_versary:");
gchar *s = N_("No_tes:");
gchar *s = N_("Details");

View File

@ -14,8 +14,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,14 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Address _2:");
gchar *s = N_("Check Address");
gchar *s = N_("Countr_y:");
gchar *s = N_("_Address:");
gchar *s = N_("_City:");
gchar *s = N_("_PO Box:");
gchar *s = N_("_State/Province:");
gchar *s = N_("_ZIP Code:");

View File

@ -1,27 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Check Full Name");
gchar *s = N_("\n"
"Mr.\n"
"Mrs.\n"
"Ms.\n"
"Miss\n"
"Dr.\n"
"");
gchar *s = N_("\n"
"Sr.\n"
"Jr.\n"
"I\n"
"II\n"
"III\n"
"Esq.\n"
"");
gchar *s = N_("_First:");
gchar *s = N_("_Title:");
gchar *s = N_("_Middle:");
gchar *s = N_("_Last:");
gchar *s = N_("_Suffix:");

View File

@ -14,8 +14,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>fullname-strings.h</translatable_strings_file>
</project>
<widget>

View File

@ -65,8 +65,7 @@ glade_DATA = addressbook-config.glade
EXTRA_DIST = \
$(glade_DATA) \
$(oaf_DATA) \
addressbook-config.glade
$(oaf_DATA)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@

View File

@ -66,7 +66,6 @@ glade_DATA = select-names.glade
EXTRA_DIST = \
$(glade_DATA) \
select-names.glade.h \
$(oaf_DATA) \
$(IDLS)

View File

@ -13,8 +13,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>select-names.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,10 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Select Names");
gchar *s = N_("Find...");
gchar *s = N_("Select name from:");
gchar *s = N_("Message Recipients");

View File

@ -57,8 +57,4 @@ glade_DATA = \
e-contact-editor-confirm-delete.glade
EXTRA_DIST = $(evolution_DATA) \
$(glade_DATA) \
e-contact-editor-strings.h \
fulladdr.glade.h \
fullname-strings.h \
e-contact-editor-confirm-delete.glade.h
$(glade_DATA)

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
</project>
<widget>

View File

@ -15,8 +15,6 @@
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<gnome_help_support>True</gnome_help_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,7 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Delete Contact?");

View File

@ -1,41 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("_Add");
gchar *s = N_("_Delete");
gchar *s = N_("Phone Types");
gchar *s = N_("New phone type");
gchar *s = N_("Add");
gchar *s = N_("New phone type");
gchar *s = N_("Contact Editor");
gchar *s = N_("_Full Name...");
gchar *s = N_("File As:");
gchar *s = N_("Web page address:");
gchar *s = N_("Wants to receive _HTML mail");
gchar *s = N_("_Business");
gchar *s = N_("_Home");
gchar *s = N_("Business _Fax");
gchar *s = N_("_Mobile");
gchar *s = N_("Primary Email");
gchar *s = N_("B_usiness");
gchar *s = N_("_This is the mailing address");
gchar *s = N_("C_ontacts...");
gchar *s = N_("Ca_tegories...");
gchar *s = N_("_Job title:");
gchar *s = N_("_Company:");
gchar *s = N_("_Address...");
gchar *s = N_("General");
gchar *s = N_("_Department:");
gchar *s = N_("_Office:");
gchar *s = N_("_Profession:");
gchar *s = N_("_Nickname:");
gchar *s = N_("_Spouse:");
gchar *s = N_("_Birthday:");
gchar *s = N_("_Assistant's name:");
gchar *s = N_("_Manager's Name:");
gchar *s = N_("Anni_versary:");
gchar *s = N_("No_tes:");
gchar *s = N_("Details");

View File

@ -14,8 +14,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,14 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Address _2:");
gchar *s = N_("Check Address");
gchar *s = N_("Countr_y:");
gchar *s = N_("_Address:");
gchar *s = N_("_City:");
gchar *s = N_("_PO Box:");
gchar *s = N_("_State/Province:");
gchar *s = N_("_ZIP Code:");

View File

@ -1,27 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Check Full Name");
gchar *s = N_("\n"
"Mr.\n"
"Mrs.\n"
"Ms.\n"
"Miss\n"
"Dr.\n"
"");
gchar *s = N_("\n"
"Sr.\n"
"Jr.\n"
"I\n"
"II\n"
"III\n"
"Esq.\n"
"");
gchar *s = N_("_First:");
gchar *s = N_("_Title:");
gchar *s = N_("_Middle:");
gchar *s = N_("_Last:");
gchar *s = N_("_Suffix:");

View File

@ -14,8 +14,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>fullname-strings.h</translatable_strings_file>
</project>
<widget>

View File

@ -125,5 +125,4 @@ gladedir = $(datadir)/evolution/glade
glade_DATA = alphabet.glade
EXTRA_DIST = \
$(glade_DATA) \
alphabet.glade.h
$(glade_DATA)

View File

@ -15,8 +15,6 @@
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<gnome_help_support>True</gnome_help_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>alphabet.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,8 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("123");
gchar *s = N_("window2");

View File

@ -66,5 +66,4 @@ contact_print_style_editor_test_LDADD = \
EXTRA_DIST = \
$(glade_DATA) \
$(ecps_DATA) \
e-contact-print.glade.h
$(ecps_DATA)

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-contact-print.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,48 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("10 pt. Tahoma");
gchar *s = N_("8 pt. Tahoma");
gchar *s = N_("Blank forms at end:");
gchar *s = N_("Body");
gchar *s = N_("Bottom:");
gchar *s = N_("Dimensions:");
gchar *s = N_("Font...");
gchar *s = N_("Fonts");
gchar *s = N_("Footer:");
gchar *s = N_("Format");
gchar *s = N_("Header");
gchar *s = N_("Header/Footer");
gchar *s = N_("Headings");
gchar *s = N_("Headings for each letter");
gchar *s = N_("Height:");
gchar *s = N_("Immediately follow each other");
gchar *s = N_("Include:");
gchar *s = N_("Landscape");
gchar *s = N_("Left:");
gchar *s = N_("Letter tabs on side");
gchar *s = N_("Margins");
gchar *s = N_("Number of columns:");
gchar *s = N_("Options");
gchar *s = N_("Orientation");
gchar *s = N_("Page");
gchar *s = N_("Page Setup:");
gchar *s = N_("Paper");
gchar *s = N_("Paper source:");
gchar *s = N_("Portrait");
gchar *s = N_("Preview:");
gchar *s = N_("Print using gray shading");
gchar *s = N_("Reverse on even pages");
gchar *s = N_("Right:");
gchar *s = N_("Sections:");
gchar *s = N_("Shading");
gchar *s = N_("Size:");
gchar *s = N_("Start on a new page");
gchar *s = N_("Style name:");
gchar *s = N_("Top:");
gchar *s = N_("Type:");
gchar *s = N_("Width:");
gchar *s = N_("label26");

View File

@ -1,3 +1,24 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
Really use xml-i18n-tools.
* conduits/calendar/e-calendar-conduit-control-applet.desktop,
conduits/todo/e-todo-conduit-control-applet.desktop: removed.
* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,
conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.
* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:
reflect above changes, merge translations.
* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract
takes care of strings itself.
* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings
* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed
files in EXTRA_DIST.
2001-02-08 JP Rosevear <jpr@ximian.com>
* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget

View File

@ -6,3 +6,4 @@ e-calendar.conduit
.libs
libecalendar_conduit.la
e-calendar-conduit-control-applet
e-calendar-conduit-control-applet.desktop

View File

@ -52,7 +52,9 @@ e-calendar.conduit: e-calendar.conduit.in Makefile
ccenterdir = $(datadir)/control-center
ccenterPalmPilotdir = $(ccenterdir)/Peripherals
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = e-calendar-conduit-control-applet.desktop
ccenterConduits_in_files = e-calendar-conduit-control-applet.desktop.in
ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@
panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
@ -62,7 +64,7 @@ Conduit_DATA = e-calendar.conduit
EXTRA_DIST = \
e-calendar.conduit.in \
$(ccenterConduits_DATA)
$(ccenterConduits_in_files)
install-data-local:
$(mkinstalldirs) $(ccenterConduitsdir)

View File

@ -1,23 +0,0 @@
[Desktop Entry]
Name=Calendar conduit
Name[pt_BR]=Conduit calend<6E>rio
Name[da]=Gnome kalender
Name[es]=Enlace de calendario
Name[fr]=Conduit Calendrier
Name[no]=GNOME kalender
Name[sk]=Spojka Kalend<6E>r
Name[sv]=Kalenderkanal
Name[tr]=Takvim par<61>as<61>
Comment=Configure the GnomeCal conduit
Comment[pt_BR]=Configurar o conduit GnomeCal
Comment[da]=Konfigur<EFBFBD>r GnomeCal-komponent
Comment[es]=Configurar el enlace de calendario
Comment[fr]=Configuration du conduit calendrier
Comment[no]=Konfigur<EFBFBD>r GnomeCal-komponent
Comment[sk]=Nastavenie spojky GnomeCal
Comment[sv]=Konfigurera GnomeCal-kanalen
Comment[tr]=GnomeCal takvim par<61>as<61> ayarlar<61>
Exec=calendar-conduit-control-applet --cap-id=1
Terminal=0
Type=Application
Icon=gnome-calendar-conduit.png

View File

@ -1,23 +0,0 @@
[Desktop Entry]
Name=Evolution Calendar conduit
Name[sl]=Evolucijin veznik koledarja
Name[da]=Gnome kalender
Name[es]=Enlace con el calendario de Evolution
Name[fr]=Conduit Calendrier
Name[no]=GNOME kalender
Name[sk]=Spojka kalend<6E>ra Evolution
Name[sv]=Kalenderkanal
Name[tr]=Takvim par<61>as<61>
Comment=Configure the GnomeCal conduit
Comment[sl]=Nastavi veznik GnomeKoledarja
Comment[da]=Konfigur<EFBFBD>r GnomeCal-komponent
Comment[es]=Configurar el enlace con GnomeCal
Comment[fr]=Configuration du conduit calendrier
Comment[no]=Konfigur<EFBFBD>r GnomeCal-komponent
Comment[sk]=Nastavenie spojky GnomeCal
Comment[sv]=Konfigurera GnomeCal-kanalen
Comment[tr]=GnomeCal takvim par<61>as<61> ayarlar<61>
Exec=e-calendar-conduit-control-applet --cap-id=1
Terminal=0
Type=Application
Icon=gnome-calendar-conduit.png

View File

@ -0,0 +1,7 @@
[Desktop Entry]
_Name=Evolution Calendar conduit
_Comment=Configure the GnomeCal conduit
Exec=e-calendar-conduit-control-applet --cap-id=1
Terminal=0
Type=Application
Icon=gnome-calendar-conduit.png

View File

@ -5,4 +5,5 @@ Makefile
*.lo
*.la
e-todo-conduit-control-applet
e-todo-conduit-control-applet.desktop
e-todo.conduit

View File

@ -54,7 +54,9 @@ e-todo.conduit: e-todo.conduit.in Makefile
ccenterdir = $(datadir)/control-center
ccenterPalmPilotdir = $(ccenterdir)/Peripherals
ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
ccenterConduits_DATA = e-todo-conduit-control-applet.desktop
ccenterConduits_in_files = e-todo-conduit-control-applet.desktop.in
ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@
panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
panelConduits_DATA = $(ccenterConduits_DATA)
@ -64,19 +66,8 @@ Conduit_DATA = e-todo.conduit
EXTRA_DIST = \
e-todo.conduit.in \
$(ccenterConduits_DATA)
$(ccenterConduits_in_files)
install-data-local:
$(mkinstalldirs) $(ccenterConduitsdir)
$(mkinstalldirs) $(Conduitdir)

View File

@ -1,20 +0,0 @@
[Desktop Entry]
Name=Evolution ToDo conduit
Name[da]=Udst<EFBFBD>ende
Name[es]=Enlace con el componente `Por Hacer' de Evolution
Name[fr]=Conduit Evolution `A Faire'
Name[no]=Oppgaver
Name[sk]=Spojka ToDo Evolution
Name[sv]=Att g<>ra-lista
Name[tr]=Yap<EFBFBD>lacaklar par<61>as<61>
Comment=Configure the todo conduit
Comment[da]=Konfigur<EFBFBD>r Udst<73>ende
Comment[es]=Configurar el enlace con el componente `Por Hacer'
Comment[fr]=Configuration du conduit `A Faire'
Comment[no]=Konfigur<EFBFBD>r oppgavelisten
Comment[sk]=Nastavenie spojky todo
Comment[sv]=Konfigurerar att g<>ra-listan
Comment[tr]=Yap<EFBFBD>lacaklar par<61>as<61> ayarlar<61>
Exec=e-todo-conduit-control-applet --cap-id=1
Terminal=0
Type=Application

View File

@ -0,0 +1,6 @@
[Desktop Entry]
_Name=Evolution ToDo conduit
_Comment=Configure the todo conduit
Exec=e-todo-conduit-control-applet --cap-id=1
Terminal=0
Type=Application

View File

@ -45,12 +45,6 @@ glade_DATA = \
e-itip-control.glade \
goto-dialog.glade
glade_messages = \
event-editor-dialog.glade.h \
e-meeting-dialog.glade.h \
e-itip-control.glade.h \
goto-dialog.glade.h
evolution_calendar_SOURCES = \
$(IDL_GENERATED) \
alarm.c \
@ -142,7 +136,6 @@ oaf_DATA = GNOME_Evolution_Calendar_Control.oafinfo GNOME_Evolution_Calendar.oaf
EXTRA_DIST = \
$(glade_DATA) \
$(glade_messages) \
bell.xpm \
check-filled.xpm \
dayview.xpm \

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -31,11 +31,5 @@ glade_DATA = \
cal-prefs-dialog.glade \
task-editor-dialog.glade
glade_messages = \
alarm-notify.glade.h \
cal-prefs-dialog.glade.h \
task-editor-dialog.glade.h
EXTRA_DIST = \
$(glade_DATA) \
$(glade_messages)
$(glade_DATA)

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,10 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Close");
gchar *s = N_("Edit appointment");
gchar *s = N_("Snooze");
gchar *s = N_("Snooze time (minutes)");

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>cal-prefs-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,52 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("12 hour (am/pm)");
gchar *s = N_("24 hour");
gchar *s = N_("Alarms timeout after");
gchar *s = N_("Audio Alarms");
gchar *s = N_("Beep when alarm windows appear.");
gchar *s = N_("Calendar");
gchar *s = N_("Calendar Preferences");
gchar *s = N_("Colors");
gchar *s = N_("Compress weekends");
gchar *s = N_("Date navigator options");
gchar *s = N_("Defaults");
gchar *s = N_("Display options");
gchar *s = N_("Due Date");
gchar *s = N_("Enable snoozing for");
gchar *s = N_("End of day:");
gchar *s = N_("First day of week:");
gchar *s = N_("Fri");
gchar *s = N_("Highlight");
gchar *s = N_("Items Due Today");
gchar *s = N_("Items Due Today:");
gchar *s = N_("Items Not Yet Due");
gchar *s = N_("Items Not Yet Due:");
gchar *s = N_("Mon");
gchar *s = N_("Overdue Items");
gchar *s = N_("Overdue Items:");
gchar *s = N_("Pick a color");
gchar *s = N_("Priority");
gchar *s = N_("Remind me of all appointments");
gchar *s = N_("Reminders");
gchar *s = N_("Sat");
gchar *s = N_("Show");
gchar *s = N_("Show appointment end times");
gchar *s = N_("Show week numbers");
gchar *s = N_("Start of day:");
gchar *s = N_("Sun");
gchar *s = N_("TaskPad");
gchar *s = N_("Thu");
gchar *s = N_("Time Until Due");
gchar *s = N_("Time divisions:");
gchar *s = N_("Time format:");
gchar *s = N_("Tue");
gchar *s = N_("Visual Alarms");
gchar *s = N_("Wed");
gchar *s = N_("Work week");
gchar *s = N_("minutes before they occur.");
gchar *s = N_("seconds.");

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,34 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Su_mmary:");
gchar *s = N_("Date & Time");
gchar *s = N_("Sta_rt Date:");
gchar *s = N_("_Due Date:");
gchar *s = N_("Progress");
gchar *s = N_("_Status:");
gchar *s = N_("Not Started\n"
"In Progress\n"
"Completed\n"
"Cancelled\n"
"");
gchar *s = N_("_Priority:");
gchar *s = N_("High\n"
"Normal\n"
"Low\n"
"Undefined\n"
"");
gchar *s = N_("% Comp_lete:");
gchar *s = N_("Classification");
gchar *s = N_("Pu_blic");
gchar *s = N_("Pri_vate");
gchar *s = N_("_Confidential");
gchar *s = N_("_Contacts...");
gchar *s = N_("Ca_tegories...");
gchar *s = N_("Task");
gchar *s = N_("Date Completed:");
gchar *s = N_("URL:");
gchar *s = N_("Details");

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-itip-control.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,19 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("window1");
gchar *s = N_("Calendar Message");
gchar *s = N_("Date:");
gchar *s = N_("Organizer:");
gchar *s = N_("Summary:");
gchar *s = N_("Description:");
gchar *s = N_("date-start");
gchar *s = N_("--to--");
gchar *s = N_("date-end");
gchar *s = N_("Sender");
gchar *s = N_("Loading Calendar");
gchar *s = N_("Loading calendar...");
gchar *s = N_("%P %%");

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-meeting-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,37 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Meeting Invitations");
gchar *s = N_("Publish\n"
"Event");
gchar *s = N_("Request\n"
"Meeting");
gchar *s = N_("Cancel\n"
"Meeting");
gchar *s = N_("Schedule\n"
"Time");
gchar *s = N_("Organizer: ");
gchar *s = N_("Attendees: ");
gchar *s = N_("Add");
gchar *s = N_("Delete");
gchar *s = N_("Edit");
gchar *s = N_("Attendee");
gchar *s = N_("Role");
gchar *s = N_("RSVP");
gchar *s = N_("Status");
gchar *s = N_("Attendee");
gchar *s = N_("Attendee address");
gchar *s = N_("Role");
gchar *s = N_("Chair\n"
"Required Participant\n"
"Optional Participant\n"
"Non-Participant\n"
"Other\n"
"\n"
"\n"
"");
gchar *s = N_("Required Participant");
gchar *s = N_("RSVP");

View File

@ -13,8 +13,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>event-editor-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,66 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Su_mmary:");
gchar *s = N_("Date & Time");
gchar *s = N_("_Start time:");
gchar *s = N_("_End time:");
gchar *s = N_("A_ll day event");
gchar *s = N_("Classification");
gchar *s = N_("Pu_blic");
gchar *s = N_("Pri_vate");
gchar *s = N_("_Confidential");
gchar *s = N_("_Contacts...");
gchar *s = N_("Ca_tegories...");
gchar *s = N_("Appointment");
gchar *s = N_("Appointment Basics");
gchar *s = N_("Su_mmary:");
gchar *s = N_("_Starting date:");
gchar *s = N_("Reminders");
gchar *s = N_("Show a dialog\n"
"Play a sound\n"
"Send an email\n"
"Run a program\n"
"");
gchar *s = N_("minute(s)\n"
"hour(s)\n"
"day(s)\n"
"");
gchar *s = N_("before\n"
"after\n"
"");
gchar *s = N_("start of appointment\n"
"end of appointment\n"
"");
gchar *s = N_("Settings...");
gchar *s = N_("label55");
gchar *s = N_("Add");
gchar *s = N_("Delete");
gchar *s = N_("Reminder");
gchar *s = N_("Appointment Basics");
gchar *s = N_("Su_mmary:");
gchar *s = N_("_Starting date:");
gchar *s = N_("Recurrence Rule");
gchar *s = N_("No recurrence");
gchar *s = N_("Simple recurrence");
gchar *s = N_("Custom recurrence");
gchar *s = N_("Every");
gchar *s = N_("day(s)\n"
"week(s)\n"
"month(s)\n"
"year(s)\n"
"");
gchar *s = N_("for\n"
"until\n"
"forever\n"
"");
gchar *s = N_("Exceptions");
gchar *s = N_("Add");
gchar *s = N_("Modify");
gchar *s = N_("Delete");
gchar *s = N_("label21");
gchar *s = N_("Preview");
gchar *s = N_("Recurrence");

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>goto-dialog.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,20 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Go To Date");
gchar *s = N_("Go To Today");
gchar *s = N_("January");
gchar *s = N_("February");
gchar *s = N_("March");
gchar *s = N_("April");
gchar *s = N_("May");
gchar *s = N_("June");
gchar *s = N_("July");
gchar *s = N_("August");
gchar *s = N_("September");
gchar *s = N_("October");
gchar *s = N_("November");
gchar *s = N_("December");

View File

@ -1,3 +1,9 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
* e-msg-composer-attachment.glade.h: removed.
* e-msg-composer-attachment.glade: do not write strings to above.
* Makefile.am: don't include glade.h in EXTRA_DIST.
2001-02-10 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c (attach_to_multipart):

View File

@ -37,9 +37,6 @@ gladedir = $(datadir)/evolution/glade
glade_DATA = \
e-msg-composer-attachment.glade
glade_messages = \
e-msg-composer-attachment.glade.h
libcomposerincludedir = $(includedir)/composer
noinst_LIBRARIES = libcomposer.a
@ -84,7 +81,6 @@ libcomposer_a_SOURCES = \
EXTRA_DIST = \
$(glade_DATA) \
$(glade_messages) \
$(IDLS) \
bad-icon.xpm

View File

@ -21,8 +21,6 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>e-msg-composer-attachment.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,14 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Attachment properties");
gchar *s = N_("MIME type:");
gchar *s = N_("Description:");
gchar *s = N_("File name:");
gchar *s = N_("Send as:");
gchar *s = N_("Attachment\n"
"Inline attachment\n"
"");

View File

@ -1,2 +1,3 @@
Makefile
Makefile.in
evolution.keys

View File

@ -1,6 +1,6 @@
mimedir = $(datadir)/mime-info
mime_DATA = evolution.keys
mime_in_files = evolution.keys.in
mime_DATA = $(mime_in_files:.keys.in=.keys)
@XML_I18N_MERGE_KEYS_RULE@
EXTRA_DIST = \
evolution.desktop \
$(mime_DATA)
EXTRA_DIST = $(mime_in_files)

View File

@ -1,30 +0,0 @@
[Desktop Entry]
Name=Evolution
Name[pt_BR]=Evolution
Name[da]=Evolution
Name[es]=Evolution
Name[fr]=Evolucija
Name[hu]=Evol<EFBFBD>ci<EFBFBD>
Name[lt]=Evolution
Name[no]=Evolution
Name[ru]=<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Name[sk]=Evolution
Name[sl]=Evolucija
Name[sv]=Evolution
Name[tr]=Evolution
Comment=Mail, Contacts and Task.
Comment[pt_BR]=Correio, Contatos e Tarefa.
Comment[da]=E-post, kontakter og opgaver.
Comment[es]=Correo electr<74>nico, contactos y agenda de tareas.
Comment[fr]=Courrier <20>lectronique, Contacts, Agenda et T<>ches.
Comment[hu]=A GNOME csoportmunka-szoftvere
Comment[lt]=El. pa<70>tas, adresai ir u<>duotys
Comment[no]=E-post, kontakter og oppgaver.
Comment[ru]=<EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
Comment[sk]=Po<EFBFBD>ta, Kontakty a <20>lohy.
Comment[sl]=Po<EFBFBD>ta, stiki in naloge.
Comment[sv]=E-post, kontakter och uppgifter.
Comment[tr]=ePosta, tan<61>k ve g<>revler
Exec=evolution
Terminal=0
Type=Application

View File

@ -1,6 +1,5 @@
text/x-vcard
description=address card
[no]description=adressekort
_description=address card
default_action_type=component
default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
@ -8,8 +7,7 @@ text/x-vcard
short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
text/x-calendar
description=calendar information
[no]description=kalenderinformasjon
_description=calendar information
default_action_type=component
default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
@ -17,8 +15,7 @@ text/x-calendar
short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
text/calendar
description=calendar information
[no]description=kalenderinformasjon
_description=calendar information
default_action_type=component
default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control

View File

@ -1,25 +0,0 @@
[Desktop Entry]
Name=Evolution
Name[pt_BR]=Evolution
Name[es]=Evolution
Name[fr]=Evolution
Name[it]=Evolution
Name[no]=Evolution
Name[sk]=Evolution
Name[sl]=Evolucija
Name[sv]=Evolution
Name[tr]=Evolution
Comment=The Evolution groupware suite
Comment[pt_BR]=Su<EFBFBD>te do grupo Evolution
Comment[es]=El programa de trabajo en grupo Evolution
Comment[fr]=La suite de travail collaboratif Evolution
Comment[it]=La suite di produttivita' personale Evolution
Comment[no]=Gruppevaresuiten Evolution
Comment[sk]=Sada groupwarov<6F>ch n<>strojov Evolution
Comment[sl]=Programje za delo v skupini Evolucija
Comment[sv]=Grupprogramvaran Evolution
Comment[tr]=Evolution kitlesel i<>lemler uygulamas<61>
Exec=evolution
Icon=evolution.png
Terminal=0
Type=Application

7
evolution.desktop.in Normal file
View File

@ -0,0 +1,7 @@
[Desktop Entry]
_Name=Evolution
_Comment=The Evolution groupware suite
Exec=evolution
Icon=evolution.png
Terminal=0
Type=Application

View File

@ -1,3 +1,9 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
* filter.glade.h: removed.
* filter.glade: do not donnt output to above one.
* Makefile.am: do not include filter.glade.h in EXTRA_DIST.
2001-02-06 Dan Winship <danw@ximian.com>
* filter-option.c (get_widget): Translate the option title.

View File

@ -71,7 +71,7 @@ libfilter_la_SOURCES = \
libfilter_la_DEPENDENCIES = libfilter-i18n.h
EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
filter.glade filter.glade.h libfilter-i18n.h
$(glade_DATA) libfilter-i18n.h
# basic rules.
filterdir = $(datadir)/evolution

View File

@ -10,8 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>filter.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,15 +0,0 @@
/*
* Translatable strings file generated by extract-ui.
* Add this file to your project's POTFILES.in
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Add");
gchar *s = N_("Delete");
gchar *s = N_("Edit");
gchar *s = N_("Edit Filters");
gchar *s = N_("Edit VFolders");
gchar *s = N_("Filter Rules");
gchar *s = N_("Remove");
gchar *s = N_("Virtual Folders");
gchar *s = N_("vFolder Sources");

View File

@ -1,3 +1,9 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
* mail-config.glade.h: removed, xml-i18n-extract's the strings itself.
* *.glade: do not output_translatable_strings
* Makefile.am: removed *.glade.h from EXTRA_DIST.
2001-02-09 Dan Winship <danw@ximian.com>
* mail-local.c: Updates for CamelStore changes, small memory leak

View File

@ -168,16 +168,13 @@ oaf_DATA = GNOME_Evolution_Mail.oafinfo
gladedir = $(datadir)/evolution/glade
glade_DATA = mail-config.glade local-config.glade
glade_messages = \
mail-config.glade.h
iconsdir = $(datadir)/images/evolution
$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl
$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) $(glade_messages)
EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@

View File

@ -13,8 +13,6 @@
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>mail-config.glade.h</translatable_strings_file>
</project>
<widget>

View File

@ -1,107 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Mail Configuration Druid");
gchar *s = N_("Mail Configuration");
gchar *s = N_("Welcome to the Evolution Mail Configuration Druid.\n"
"\n"
"Click \"Next\" to begin. ");
gchar *s = N_("Identity");
gchar *s = N_("Required");
gchar *s = N_("Email Address:");
gchar *s = N_("Full Name:");
gchar *s = N_("Optional");
gchar *s = N_("Organization:");
gchar *s = N_("Signature file:");
gchar *s = N_("Receiving Email");
gchar *s = N_("Server Type: ");
gchar *s = N_("Server Configuration");
gchar *s = N_("Host:");
gchar *s = N_("Username:");
gchar *s = N_("Path:");
gchar *s = N_("Keep mail on server");
gchar *s = N_("Automatically check mail every");
gchar *s = N_("minutes.");
gchar *s = N_("Check settings");
gchar *s = N_("Authentication");
gchar *s = N_("Authentication");
gchar *s = N_("Authentication Type:");
gchar *s = N_("Password:");
gchar *s = N_("Remember my password");
gchar *s = N_("Sending Email");
gchar *s = N_("Server Type: ");
gchar *s = N_("Server Configuration");
gchar *s = N_("Host:");
gchar *s = N_("Server requires authentication");
gchar *s = N_("Check settings");
gchar *s = N_("Account Management");
gchar *s = N_("Account Information");
gchar *s = N_("Name:");
gchar *s = N_("Make this my default account");
gchar *s = N_("Done");
gchar *s = N_("Congratulations, your mail configuration is complete.\n"
"\n"
"You are now ready to send and receive email \n"
"using Evolution. \n"
"\n"
"Click \"Finish\" to save your settings.");
gchar *s = N_("Account Properties");
gchar *s = N_("Mail Account");
gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\".");
gchar *s = N_("User Information");
gchar *s = N_("Select signature file");
gchar *s = N_("Name:");
gchar *s = N_("E-Mail Address:");
gchar *s = N_("Reply-To:");
gchar *s = N_("Organization:");
gchar *s = N_("Signature:");
gchar *s = N_("General");
gchar *s = N_("Incoming Mail Server");
gchar *s = N_("Save password");
gchar *s = N_("This server requires a secure connection (SSL)");
gchar *s = N_("Username:");
gchar *s = N_("Password:");
gchar *s = N_("Authentication:");
gchar *s = N_("Hostname:");
gchar *s = N_("Type:");
gchar *s = N_("Plain Text\n"
"Kerberos\n"
"CRAM-MD5\n"
"DIGEST-MD5\n"
"");
gchar *s = N_("Outgoing Mail Server");
gchar *s = N_("This server requires a secure connection (SSL)");
gchar *s = N_("Type:");
gchar *s = N_("Hostname:");
gchar *s = N_("Authentication:");
gchar *s = N_("None\n"
"CRAM-MD5\n"
"");
gchar *s = N_("Sendmail\n"
"SMTP\n"
"");
gchar *s = N_("Servers");
gchar *s = N_("Miscellaneous");
gchar *s = N_("Path:");
gchar *s = N_("Keep mail on server");
gchar *s = N_("Advanced");
gchar *s = N_("Evolution Mail Configuration");
gchar *s = N_("Account");
gchar *s = N_("Type");
gchar *s = N_("Add");
gchar *s = N_("Edit");
gchar *s = N_("Delete");
gchar *s = N_("Default");
gchar *s = N_("Mail");
gchar *s = N_("Sources");
gchar *s = N_("Add");
gchar *s = N_("Edit");
gchar *s = N_("Delete");
gchar *s = N_("News");
gchar *s = N_("Send mail in HTML format by default.");
gchar *s = N_("Mark messages as \"Read\" after:");
gchar *s = N_("seconds.");
gchar *s = N_("Other");

View File

@ -10,7 +10,6 @@
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>subscribe-dialog.glade.h</translatable_strings_file>
</project>

View File

@ -1,12 +0,0 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Display folders whose name contain:");
gchar *s = N_("All Folders");
gchar *s = N_("Subscribed");
gchar *s = N_("Query");
gchar *s = N_("Subscribe");
gchar *s = N_("Unsubscribe");

View File

@ -1,3 +1,12 @@
2001-02-11 Gediminas Paulauskas <menesis@delfi.lt>
* *.po: added strings from .desktop files, they are translated here
because we use xml-i18n-tools.
* POTFILES.in: added these *.desktop files, missing *.glade files,
removed *.glade.h and similar files.
* POTFILES.skip: removed all *.glade.h entries - they do not exist
anymore.
2001-02-10 Fatih Demir <kabalak@gtranslator.org>
* tr.po: Took over the stable tr.po also to HEAD.

View File

View File

@ -6,11 +6,13 @@ addressbook/backend/ebook/test-client-list.c
addressbook/backend/ebook/test-client.c
addressbook/conduit/address-conduit-control-applet.c
addressbook/conduit/address-conduit.c
addressbook/conduit/e-address-conduit-control-applet.desktop.in
addressbook/contact-editor/contact-editor.glade
addressbook/contact-editor/e-contact-editor-confirm-delete.glade
addressbook/contact-editor/e-contact-editor-strings.h
addressbook/contact-editor/e-contact-editor.c
addressbook/contact-editor/fulladdr.glade
addressbook/contact-editor/fullname-strings.h
addressbook/contact-editor/fullname.glade
addressbook/gui/component/addressbook-factory.c
addressbook/gui/component/addressbook.c
addressbook/gui/component/addressbook-storage.c
@ -27,6 +29,8 @@ addressbook/printing/e-contact-print.glade
calendar/cal-util/timeutil.c
calendar/conduits/calendar/calendar-conduit-control-applet.c
calendar/conduits/calendar/calendar-conduit.c
calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
calendar/conduits/todo/todo-conduit-control-applet.c
calendar/conduits/todo/todo-conduit.c
calendar/gui/calendar-commands.c
@ -45,6 +49,8 @@ calendar/gui/e-day-view-time-item.c
calendar/gui/e-day-view-top-item.c
calendar/gui/e-day-view.c
calendar/gui/e-itip-control.c
calendar/gui/e-itip-control.glade
calendar/gui/e-meeting-dialog.glade
calendar/gui/e-tasks.c
calendar/gui/e-week-view-main-item.c
calendar/gui/e-week-view.c
@ -103,10 +109,12 @@ composer/e-msg-composer-attachment.glade
composer/e-msg-composer-hdrs.c
composer/e-msg-composer.c
composer/evolution-composer.c
data/evolution.keys.in
executive-summary/component/component-factory.c
executive-summary/component/e-summary-callbacks.c
executive-summary/component/e-summary-url.c
executive-summary/component/e-summary.c
executive-summary/component/executive-summary-config.glade
executive-summary/component/main.c
executive-summary/test-service/rdf-summary.c
filter/filter-datespec.c
@ -151,6 +159,10 @@ mail/mail-view.c
mail/message-list.c
mail/openpgp-utils.c
mail/subscribe-dialog.c
mail/subscribe-dialog.glade
shell/glade/e-shell-folder-creation-dialog.glade
shell/importer/importer.c
shell/importer/import.glade
shell/e-setup.c
shell/e-shell-folder-creation-dialog.c
shell/e-shell-folder-selection-dialog.c
@ -163,7 +175,6 @@ shell/e-shortcuts.c
shell/e-storage-set-view.c
shell/e-storage.c
shell/main.c
shell/importer/importer.c
ui/evolution-addressbook.xml
ui/evolution-calendar.xml
ui/evolution-contact-editor.xml

View File

@ -1,17 +1,12 @@
addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
addressbook/contact-editor/fulladdr.glade.h
addressbook/gui/component/select-names/select-names.glade.h
addressbook/gui/widgets/alphabet.glade.h
addressbook/printing/e-contact-print.glade.h
calendar/gui/dialogs/alarm-notify.glade.h
calendar/gui/dialogs/cal-prefs-dialog.glade.h
calendar/gui/dialogs/task-editor-dialog.glade.h
calendar/gui/e-itip-control.glade.h
calendar/gui/e-meeting-dialog.glade.h
calendar/gui/event-editor-dialog.glade.h
calendar/gui/goto-dialog.glade.h
composer/e-msg-composer-attachment.glade.h
filter/filter.glade.h
mail/mail-config.glade.h
mail/subscribe-dialog.glade.h
tests/ui-tests/store_listing.glade
addressbook/gui/component/select-names/recipient.glade
addressbook/gui/widgets/test-minicard-view.c
calendar/gui/alarm-notify.c
calendar/gui/getdate.c
calendar/gui/alarm-notify/alarm-queue.c
calendar/gui/alarm-notify/notify-main.c
camel/providers/local/camel-mbox-provider.c
cmdline/compose.c
notes/component-factory.c
notes/main.c
tests/ui-tests/message-browser.c

View File

@ -1,58 +0,0 @@
The po/ directory includes two perlscripts, which is done to help
making the translations fully uptodate.
The first script is called update.pl and is supposed to be run like this:
./update.pl [OPTIONS] ...LANGCODE
This will updates the pot file (the po template, generated from the source code)
and merge them with the translations po files.
For instance to do this for Danish, type the following
./update.pl da
The update.pl script also supports other options, they are:
-V, --version shows the version
-H, --help shows this help page
-P, --pot only generates the potfile
-M, --maintain search for missing files in POTFILES.in
Especially the --maintain option is very handy for package maintainer, to check
if you included all the files that have marked strings in the POTFILES.in, so
they will be in the generated po template, the socalled pot file.
There is though one thing to take notice of with this option, please check the
configure.in file to make sure that the files you add to POTFILES.in are being
build, otherwise this can leed to "make dist" throuble.
The other utility is the desk.pl script, which will check the cvs module for
missing translation in files like *.desktop, *.directory, *.soundlist and so on.
Run the script like this:
./desk.pl [OPTIONS] ...LANGCODE ENTRY
An example use could be.
./desk.pl da
which will check all the files for missing Name[da] entries, or
./desk.pl no Comment
which will check all the files for missing Comment[no] entries. "Comment" can
here be replaced with whatever you like
All scripts support the --help option for further help, though it's not very
extensive for the moment.
Kenneth Christiansen
kenneth@gnu.org
kenneth@gnome.org
Both scripts are copyright 2000 The Free Software Foundation and me.

View File

@ -8401,3 +8401,27 @@ msgstr "_S
#~ msgid "_Create New Folder..."
#~ msgstr "_Opret ny mappe..."
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Udst<73>ende"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Konfigur<75>r Udst<73>ende"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Gnome kalender"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Konfigur<75>r GnomeCal-komponent"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Udst<73>ende"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Konfigur<75>r Udst<73>ende"

View File

@ -1,118 +0,0 @@
#!/usr/bin/perl -w
# GNOME entry finder utility.
# (C) 2000 The Free Software Foundation
#
# Author(s): Kenneth Christiansen
$VERSION = "1.0.0 beta 5";
$LANG = $ARGV[0];
$OPTION2 = $ARGV[1];
$SEARCH = "Name";
if (! $LANG){
print "desk.pl: missing file arguments\n";
print "Try `desk.pl --help' for more information.\n";
exit;
}
if ($OPTION2){
$SEARCH=$OPTION2;
}
if ($LANG){
if ($LANG=~/^-(.)*/){
if ("$LANG" eq "--version" || "$LANG" eq "-V"){
print "GNOME Entry finder $VERSION\n";
print "Written by Kenneth Christiansen <kenneth\@gnome.org>, 2000.\n\n";
print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
print "This is free software; see the source for copying conditions. There is NO\n";
print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
exit;
}
elsif ($LANG eq "--help" || "$LANG" eq "-H"){
print "Usage: ./desk.pl [OPTIONS] ...LANGCODE ENTRY\n";
print "Checks .desktop and alike files for missing translations.\n\n";
print " -V, --version shows the version\n";
print " -H, --help shows this help page\n";
print "\nReport bugs to <kenneth\@gnome.org>.\n";
exit;
}
else{
print "desk.pl: invalid option -- $LANG\n";
print "Try `desk.pl --help' for more information.\n";
exit;
}
}
else{
$a="find ../ -print | egrep '.*\\.(desktop|soundlist"
."|directory)' ";
$b="find ../ -print | egrep '.*\\.(desktop|soundlist"
."|directory)' ";
print "Searching for missing $SEARCH\[$LANG\] entries...\n";
open(BUF1, "$a|");
open(BUF2, "$b|");
@buf1 = <BUF1>;
foreach my $file (@buf1){
open FILE, "<$file";
while (<FILE>) {
if ($_=~/$SEARCH\[$LANG\]\=/o){
$file = unpack("x2 A*",$file) . "\n";
push @buff1, $file;
last;
}
}
}
@buf2 = <BUF2>;
foreach my $file (@buf2){
open FILE, "<$file";
while (<FILE>) {
if ($_=~/$SEARCH\=/o){
$file = unpack("x2 A*",$file) . "\n";
push @buff2, $file;
last;
}
}
}
@bufff1 = sort (@buff1);
@bufff2 = sort (@buff2);
my %in2;
foreach (@bufff1) {
$in2{$_} = 1;
}
foreach (@bufff2){
if (!exists($in2{$_})){
push @result, $_ }
}
}
open(OUT1, ">MISSING.$LANG.$SEARCH");
print OUT1 @result ;
close OUT1;
stat("MISSING.$LANG.$SEARCH");
print "\nWell, you need to fix these:\n\n" if -s _;
print @result if -s _;
print "\nThe list is saved in MISSING.$LANG.$SEARCH\n" if -s _;
print "\nWell, it's all perfect! Congratulation!\n" if -z _;
unlink "MISSING.$LANG.$SEARCH" if -z _;
exit;
}

View File

@ -7552,3 +7552,31 @@ msgstr "No mostrar otra vez este mensaje."
#: widgets/misc/e-search-bar.c:135
msgid "Sear_ch"
msgstr "Bus_car"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "El programa de trabajo en grupo Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Enlace del libro de direcciones de Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Configura el enlace del libro de direcciones"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Enlace con el calendario de Evolution"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Configurar el enlace con GnomeCal"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Enlace con el componente `Por Hacer' de Evolution"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Configurar el enlace con el componente `Por Hacer'"

View File

@ -8665,3 +8665,31 @@ msgstr "Recher_cher"
#~ msgid "_Unselect All"
#~ msgstr "_D<5F>selectionner tout"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "La suite de travail collaboratif Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Conduit Adresses"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Configuration du conduit Adresses"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Conduit Calendrier"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Configuration du conduit calendrier"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Conduit Evolution `A Faire'"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Configuration du conduit `A Faire'"

View File

@ -7700,3 +7700,6 @@ msgstr "Invia questo messaggio adesso"
msgid "Sear_ch"
msgstr "_Cerca"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "La suite di produttivita' personale Evolution"

View File

@ -8769,3 +8769,39 @@ msgstr "S
#~ msgid "Run filter \"%s\""
#~ msgstr "Kj<4B>r filter \"%s\""
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Gruppevaresuiten Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Oppgaver"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Konfigur<75>r oppgavelisten"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "GNOME kalender"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Konfigur<75>r GnomeCal-komponent"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Oppgaver"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Konfigur<75>r oppgavelisten"
#: data/evolution.keys.in:3
msgid "address card"
msgstr "adressekort"
#: data/evolution.keys.in:11
msgid "calendar information"
msgstr "kalenderinformasjon"

View File

@ -7322,3 +7322,7 @@ msgstr "_Buscar"
#, c-format
msgid "Group %i"
msgstr "Grupo %i"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Su<53>te do grupo Evolution"

View File

@ -7530,3 +7530,31 @@ msgstr "T
msgid "Sear_ch"
msgstr "_N<5F>js<6A>"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Sada groupwarov<6F>ch n<>strojov Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Spojka adres<65>ra Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Nastavenie spojky adres<65>ra"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Spojka kalend<6E>ra Evolution"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Nastavenie spojky GnomeCal"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Spojka ToDo Evolution"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Nastavenie spojky todo"

View File

@ -8903,3 +8903,23 @@ msgstr "_Iskanje"
#~ msgid "Cannot initialize the configuration system."
#~ msgstr "Ne morem inicializirati nastavitvenega sistema."
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Programje za delo v skupini Evolucija"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Evolucijin veznik naslovov"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Nastavi veznik naslovov"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Evolucijin veznik koledarja"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Nastavi veznik GnomeKoledarja"

View File

@ -5,7 +5,7 @@
# Christian Rose <menthos@menthos.com>, 2000.
# Martin Norb<72>ck <d95mback@dtek.chalmers.se>, 2001.
#
# $Id: sv.po,v 1.61 2001/02/08 00:41:17 menthos Exp $
# $Id: sv.po,v 1.62 2001/02/11 02:56:15 menesis Exp $
#
#: camel/providers/smtp/camel-smtp-transport.c:343
msgid ""
@ -8644,3 +8644,31 @@ msgstr "S_
#~ msgid "init_bonobo(): could not initialize Bonobo"
#~ msgstr "init_bonobo(): kunde inte initiera Bonobo"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Grupprogramvaran Evolution"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Adresser"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Konfigurera adresskanalen"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Kalenderkanal"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "Konfigurera GnomeCal-kanalen"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Att g<>ra-lista"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Konfigurerar att g<>ra-listan"

View File

@ -7690,3 +7690,31 @@ msgstr "init_corba(): GNOME ba
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Bonobo ba<62>lat<61>lamad<61>"
#: evolution.desktop.in:4
msgid "The Evolution groupware suite"
msgstr "Evolution kitlesel i<>lemler uygulamas<61>"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3
msgid "Evolution Address conduit "
msgstr "Adres par<61>as<61>"
#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4
msgid "Configure the address conduit"
msgstr "Adres par<61>as<61>n<EFBFBD>n ayarlar<61>"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3
msgid "Evolution Calendar conduit"
msgstr "Takvim par<61>as<61>"
#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4
msgid "Configure the GnomeCal conduit"
msgstr "GnomeCal takvim par<61>as<61> ayarlar<61>"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3
msgid "Evolution ToDo conduit "
msgstr "Yap<61>lacaklar par<61>as<61>"
#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4
msgid "Configure the todo conduit"
msgstr "Yap<61>lacaklar par<61>as<61> ayarlar<61>"

Some files were not shown because too many files have changed in this diff Show More