diff options
| author | Gediminas Paulauskas <menesis@src.gnome.org> | 2001-02-11 10:56:16 +0800 |
|---|---|---|
| committer | Gediminas Paulauskas <menesis@src.gnome.org> | 2001-02-11 10:56:16 +0800 |
| commit | ac9abd5e6096d8511a1fe3892cf9453eb7c7ba2f (patch) | |
| tree | da4ce19c2974866c33947265c03b235be10ec315 | |
| parent | a5e0765d8ac3be83d705c4ea8af2684fd84addd1 (diff) | |
| download | gsoc2013-evolution-ac9abd5e6096d8511a1fe3892cf9453eb7c7ba2f.tar.gz gsoc2013-evolution-ac9abd5e6096d8511a1fe3892cf9453eb7c7ba2f.tar.zst gsoc2013-evolution-ac9abd5e6096d8511a1fe3892cf9453eb7c7ba2f.zip | |
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
103 files changed, 445 insertions, 1766 deletions
diff --git a/.cvsignore b/.cvsignore index e64a21f886..6df7b90c42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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-* + @@ -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 diff --git a/Makefile.am b/Makefile.am index 55fd6b5552..4d3bfaae5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1f904bf7ce..fbabca7b9a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -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 diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore index 67db02346b..87b35d3be5 100644 --- a/addressbook/conduit/.cvsignore +++ b/addressbook/conduit/.cvsignore @@ -5,4 +5,5 @@ Makefile.in Makefile libeaddress_conduit.la e-address-conduit-control-applet -e-address.conduit
\ No newline at end of file +e-address-conduit-control-applet.desktop +e-address.conduit diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index 99373e85e3..a1ced3e4c6 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -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) - - - - - diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop b/addressbook/conduit/e-address-conduit-control-applet.desktop deleted file mode 100644 index 3ae83b8d77..0000000000 --- a/addressbook/conduit/e-address-conduit-control-applet.desktop +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Name=Evolution Address conduit -Name[sl]=Evolucijin veznik naslovov -Name[da]=Udstående -Name[es]=Enlace del libro de direcciones de Evolution -Name[fr]=Conduit Adresses -Name[no]=Oppgaver -Name[sk]=Spojka adresára Evolution -Name[sv]=Adresser -Name[tr]=Adres parçası -Comment=Configure the address conduit -Comment[sl]=Nastavi veznik naslovov -Comment[da]=Konfigurér Udstående -Comment[es]=Configura el enlace del libro de direcciones -Comment[fr]=Configuration du conduit Adresses -Comment[no]=Konfigurér oppgavelisten -Comment[sk]=Nastavenie spojky adresára -Comment[sv]=Konfigurera adresskanalen -Comment[tr]=Adres parçasının ayarları -Exec=e-address-conduit-control-applet --cap-id=1 -Terminal=0 -Type=Application diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop.in b/addressbook/conduit/e-address-conduit-control-applet.desktop.in new file mode 100644 index 0000000000..10633de800 --- /dev/null +++ b/addressbook/conduit/e-address-conduit-control-applet.desktop.in @@ -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 diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index fb200df78f..d5ed7feeaa 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -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) diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade index 5d49fd06ff..ddcc058ab2 100644 --- a/addressbook/contact-editor/contact-editor.glade +++ b/addressbook/contact-editor/contact-editor.glade @@ -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> diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade index 7f52321021..b91a040d46 100644 --- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade +++ b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade @@ -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> diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h deleted file mode 100644 index 8eb13c9818..0000000000 --- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h +++ /dev/null @@ -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?"); diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h deleted file mode 100644 index bb9c0b5b30..0000000000 --- a/addressbook/contact-editor/e-contact-editor-strings.h +++ /dev/null @@ -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"); diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade index e46064bb92..46d1a180b6 100644 --- a/addressbook/contact-editor/fulladdr.glade +++ b/addressbook/contact-editor/fulladdr.glade @@ -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> diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h deleted file mode 100644 index f2a6e153f9..0000000000 --- a/addressbook/contact-editor/fulladdr.glade.h +++ /dev/null @@ -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:"); diff --git a/addressbook/contact-editor/fullname-strings.h b/addressbook/contact-editor/fullname-strings.h deleted file mode 100644 index e2b7232af6..0000000000 --- a/addressbook/contact-editor/fullname-strings.h +++ /dev/null @@ -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:"); diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade index b2d4a5d6a6..17be70647c 100644 --- a/addressbook/contact-editor/fullname.glade +++ b/addressbook/contact-editor/fullname.glade @@ -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> diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index b4f5bd1a09..dee94188db 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -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 $@ diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 9b9c448873..e1c8795707 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -66,7 +66,6 @@ glade_DATA = select-names.glade EXTRA_DIST = \ $(glade_DATA) \ - select-names.glade.h \ $(oaf_DATA) \ $(IDLS) diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade index 063d39c1fa..4eb3599f85 100644 --- a/addressbook/gui/component/select-names/select-names.glade +++ b/addressbook/gui/component/select-names/select-names.glade @@ -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> diff --git a/addressbook/gui/component/select-names/select-names.glade.h b/addressbook/gui/component/select-names/select-names.glade.h deleted file mode 100644 index 432ceac23d..0000000000 --- a/addressbook/gui/component/select-names/select-names.glade.h +++ /dev/null @@ -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"); diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index fb200df78f..d5ed7feeaa 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -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) diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 5d49fd06ff..ddcc058ab2 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -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> diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade index 7f52321021..b91a040d46 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade +++ b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade @@ -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> diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h deleted file mode 100644 index 8eb13c9818..0000000000 --- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h +++ /dev/null @@ -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?"); diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h deleted file mode 100644 index bb9c0b5b30..0000000000 --- a/addressbook/gui/contact-editor/e-contact-editor-strings.h +++ /dev/null @@ -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"); diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade index e46064bb92..46d1a180b6 100644 --- a/addressbook/gui/contact-editor/fulladdr.glade +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -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> diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h deleted file mode 100644 index f2a6e153f9..0000000000 --- a/addressbook/gui/contact-editor/fulladdr.glade.h +++ /dev/null @@ -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:"); diff --git a/addressbook/gui/contact-editor/fullname-strings.h b/addressbook/gui/contact-editor/fullname-strings.h deleted file mode 100644 index e2b7232af6..0000000000 --- a/addressbook/gui/contact-editor/fullname-strings.h +++ /dev/null @@ -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:"); diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade index b2d4a5d6a6..17be70647c 100644 --- a/addressbook/gui/contact-editor/fullname.glade +++ b/addressbook/gui/contact-editor/fullname.glade @@ -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> diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 0f9a07438e..00f851da72 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -125,5 +125,4 @@ gladedir = $(datadir)/evolution/glade glade_DATA = alphabet.glade EXTRA_DIST = \ - $(glade_DATA) \ - alphabet.glade.h + $(glade_DATA) diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade index bc6e5f3798..dc6ee33966 100644 --- a/addressbook/gui/widgets/alphabet.glade +++ b/addressbook/gui/widgets/alphabet.glade @@ -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> diff --git a/addressbook/gui/widgets/alphabet.glade.h b/addressbook/gui/widgets/alphabet.glade.h deleted file mode 100644 index 7b037bced4..0000000000 --- a/addressbook/gui/widgets/alphabet.glade.h +++ /dev/null @@ -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"); diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 5da0e655ff..fc3b174d98 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -66,5 +66,4 @@ contact_print_style_editor_test_LDADD = \ EXTRA_DIST = \ $(glade_DATA) \ - $(ecps_DATA) \ - e-contact-print.glade.h + $(ecps_DATA) diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade index be24c9fc60..ff7aa91377 100644 --- a/addressbook/printing/e-contact-print.glade +++ b/addressbook/printing/e-contact-print.glade @@ -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> diff --git a/addressbook/printing/e-contact-print.glade.h b/addressbook/printing/e-contact-print.glade.h deleted file mode 100644 index c9013fd937..0000000000 --- a/addressbook/printing/e-contact-print.glade.h +++ /dev/null @@ -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"); diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 60624f8a3d..57a653d0a3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -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 diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore index 83c86fa189..e8ba6ad844 100644 --- a/calendar/conduits/calendar/.cvsignore +++ b/calendar/conduits/calendar/.cvsignore @@ -6,3 +6,4 @@ e-calendar.conduit .libs libecalendar_conduit.la e-calendar-conduit-control-applet +e-calendar-conduit-control-applet.desktop diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 025eb591da..ba432d5bdc 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -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) diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/calendar-conduit-control-applet.desktop deleted file mode 100644 index 1db9fca7e7..0000000000 --- a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop +++ /dev/null @@ -1,23 +0,0 @@ -[Desktop Entry] -Name=Calendar conduit -Name[pt_BR]=Conduit calendário -Name[da]=Gnome kalender -Name[es]=Enlace de calendario -Name[fr]=Conduit Calendrier -Name[no]=GNOME kalender -Name[sk]=Spojka Kalendár -Name[sv]=Kalenderkanal -Name[tr]=Takvim parçası -Comment=Configure the GnomeCal conduit -Comment[pt_BR]=Configurar o conduit GnomeCal -Comment[da]=Konfigurér GnomeCal-komponent -Comment[es]=Configurar el enlace de calendario -Comment[fr]=Configuration du conduit calendrier -Comment[no]=Konfigurér GnomeCal-komponent -Comment[sk]=Nastavenie spojky GnomeCal -Comment[sv]=Konfigurera GnomeCal-kanalen -Comment[tr]=GnomeCal takvim parçası ayarları -Exec=calendar-conduit-control-applet --cap-id=1 -Terminal=0 -Type=Application -Icon=gnome-calendar-conduit.png diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop deleted file mode 100644 index eb8385e51e..0000000000 --- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop +++ /dev/null @@ -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ára Evolution -Name[sv]=Kalenderkanal -Name[tr]=Takvim parçası -Comment=Configure the GnomeCal conduit -Comment[sl]=Nastavi veznik GnomeKoledarja -Comment[da]=Konfigurér GnomeCal-komponent -Comment[es]=Configurar el enlace con GnomeCal -Comment[fr]=Configuration du conduit calendrier -Comment[no]=Konfigurér GnomeCal-komponent -Comment[sk]=Nastavenie spojky GnomeCal -Comment[sv]=Konfigurera GnomeCal-kanalen -Comment[tr]=GnomeCal takvim parçası ayarları -Exec=e-calendar-conduit-control-applet --cap-id=1 -Terminal=0 -Type=Application -Icon=gnome-calendar-conduit.png diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in new file mode 100644 index 0000000000..322e63c802 --- /dev/null +++ b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in @@ -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 diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore index 6b94f92c38..3ee063c770 100644 --- a/calendar/conduits/todo/.cvsignore +++ b/calendar/conduits/todo/.cvsignore @@ -5,4 +5,5 @@ Makefile *.lo *.la e-todo-conduit-control-applet +e-todo-conduit-control-applet.desktop e-todo.conduit diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index ec4a8a23fb..ce99497c4d 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -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) - - - - - - - - - - - diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop deleted file mode 100644 index 67ca779ded..0000000000 --- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Name=Evolution ToDo conduit -Name[da]=Udstå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ılacaklar parçası -Comment=Configure the todo conduit -Comment[da]=Konfigurér Udstående -Comment[es]=Configurar el enlace con el componente `Por Hacer' -Comment[fr]=Configuration du conduit `A Faire' -Comment[no]=Konfigurér oppgavelisten -Comment[sk]=Nastavenie spojky todo -Comment[sv]=Konfigurerar att göra-listan -Comment[tr]=Yapılacaklar parçası ayarları -Exec=e-todo-conduit-control-applet --cap-id=1 -Terminal=0 -Type=Application diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in new file mode 100644 index 0000000000..216c07afd5 --- /dev/null +++ b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in @@ -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 diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 9a0a6a1564..351194da4f 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -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 \ diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade index 32d7e03f8b..41718d0572 100644 --- a/calendar/gui/alarm-notify/alarm-notify.glade +++ b/calendar/gui/alarm-notify/alarm-notify.glade @@ -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> diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 39ae32d758..dd9a2b2540 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -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) diff --git a/calendar/gui/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade index 32d7e03f8b..41718d0572 100644 --- a/calendar/gui/dialogs/alarm-notify.glade +++ b/calendar/gui/dialogs/alarm-notify.glade @@ -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> diff --git a/calendar/gui/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h deleted file mode 100644 index 053395a4c5..0000000000 --- a/calendar/gui/dialogs/alarm-notify.glade.h +++ /dev/null @@ -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)"); diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index c0e225764b..f6eccb163d 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -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> diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h deleted file mode 100644 index 71ba85a8bd..0000000000 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade.h +++ /dev/null @@ -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."); diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade index a9cf4f62e9..ae7ea9681a 100644 --- a/calendar/gui/dialogs/task-editor-dialog.glade +++ b/calendar/gui/dialogs/task-editor-dialog.glade @@ -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> diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h deleted file mode 100644 index 2ec3ad93af..0000000000 --- a/calendar/gui/dialogs/task-editor-dialog.glade.h +++ /dev/null @@ -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"); diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade index a9cf4f62e9..ae7ea9681a 100644 --- a/calendar/gui/dialogs/task-page.glade +++ b/calendar/gui/dialogs/task-page.glade @@ -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> diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade index 1a44687c8f..eb950139a1 100644 --- a/calendar/gui/e-itip-control.glade +++ b/calendar/gui/e-itip-control.glade @@ -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> diff --git a/calendar/gui/e-itip-control.glade.h b/calendar/gui/e-itip-control.glade.h deleted file mode 100644 index 33372424b4..0000000000 --- a/calendar/gui/e-itip-control.glade.h +++ /dev/null @@ -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 %%"); diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade index bcbbea4eda..5b9a057f46 100644 --- a/calendar/gui/e-meeting-dialog.glade +++ b/calendar/gui/e-meeting-dialog.glade @@ -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> diff --git a/calendar/gui/e-meeting-dialog.glade.h b/calendar/gui/e-meeting-dialog.glade.h deleted file mode 100644 index 4c17bc32b3..0000000000 --- a/calendar/gui/e-meeting-dialog.glade.h +++ /dev/null @@ -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"); diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade index 10fdcfe54e..615bd3eed3 100644 --- a/calendar/gui/event-editor-dialog.glade +++ b/calendar/gui/event-editor-dialog.glade @@ -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> diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h deleted file mode 100644 index f4008b76e5..0000000000 --- a/calendar/gui/event-editor-dialog.glade.h +++ /dev/null @@ -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"); diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade index 6b81612b6c..289ad7ab69 100644 --- a/calendar/gui/goto-dialog.glade +++ b/calendar/gui/goto-dialog.glade @@ -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> diff --git a/calendar/gui/goto-dialog.glade.h b/calendar/gui/goto-dialog.glade.h deleted file mode 100644 index 8701da0ec8..0000000000 --- a/calendar/gui/goto-dialog.glade.h +++ /dev/null @@ -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"); diff --git a/composer/ChangeLog b/composer/ChangeLog index 4704e382d7..87db5bf2a6 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -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): diff --git a/composer/Makefile.am b/composer/Makefile.am index bd56284ac8..89a4187583 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -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 diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade index fe25b6a4fd..4679a0d8e0 100644 --- a/composer/e-msg-composer-attachment.glade +++ b/composer/e-msg-composer-attachment.glade @@ -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> diff --git a/composer/e-msg-composer-attachment.glade.h b/composer/e-msg-composer-attachment.glade.h deleted file mode 100644 index f8bcebf1d7..0000000000 --- a/composer/e-msg-composer-attachment.glade.h +++ /dev/null @@ -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" - ""); diff --git a/data/.cvsignore b/data/.cvsignore index 282522db03..13fe803164 100644 --- a/data/.cvsignore +++ b/data/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +evolution.keys diff --git a/data/Makefile.am b/data/Makefile.am index 1748709438..250a51a7f2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -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)
\ No newline at end of file +EXTRA_DIST = $(mime_in_files) diff --git a/data/evolution.desktop b/data/evolution.desktop deleted file mode 100644 index 6e1c463530..0000000000 --- a/data/evolution.desktop +++ /dev/null @@ -1,30 +0,0 @@ -[Desktop Entry] -Name=Evolution -Name[pt_BR]=Evolution -Name[da]=Evolution -Name[es]=Evolution -Name[fr]=Evolucija -Name[hu]=Evolúció -Name[lt]=Evolution -Name[no]=Evolution -Name[ru]=ü×ÏÌÀÃÉÑ -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ónico, contactos y agenda de tareas. -Comment[fr]=Courrier électronique, Contacts, Agenda et Tâches. -Comment[hu]=A GNOME csoportmunka-szoftvere -Comment[lt]=El. pağtas, adresai ir uşduotys -Comment[no]=E-post, kontakter og oppgaver. -Comment[ru]=üÌ.ĞÏŞÔÁ, ËÏÎÔÁËÔÙ É ÚÁÄÁÎÉÑ. -Comment[sk]=Po¹ta, Kontakty a Úlohy. -Comment[sl]=Po¹ta, stiki in naloge. -Comment[sv]=E-post, kontakter och uppgifter. -Comment[tr]=ePosta, tanık ve görevler -Exec=evolution -Terminal=0 -Type=Application diff --git a/data/evolution.keys b/data/evolution.keys.in index 5bd89cbda5..c2c27d1af7 100644 --- a/data/evolution.keys +++ b/data/evolution.keys.in @@ -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 diff --git a/evolution.desktop b/evolution.desktop deleted file mode 100644 index d4f0871ab3..0000000000 --- a/evolution.desktop +++ /dev/null @@ -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í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ıch nástrojov Evolution -Comment[sl]=Programje za delo v skupini Evolucija -Comment[sv]=Grupprogramvaran Evolution -Comment[tr]=Evolution kitlesel işlemler uygulaması -Exec=evolution -Icon=evolution.png -Terminal=0 -Type=Application diff --git a/evolution.desktop.in b/evolution.desktop.in new file mode 100644 index 0000000000..de3c05adb1 --- /dev/null +++ b/evolution.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +_Name=Evolution +_Comment=The Evolution groupware suite +Exec=evolution +Icon=evolution.png +Terminal=0 +Type=Application diff --git a/filter/ChangeLog b/filter/ChangeLog index e475866297..bde9b4f311 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -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. diff --git a/filter/Makefile.am b/filter/Makefile.am index daeb79f5b4..89a9c2f257 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -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 diff --git a/filter/filter.glade b/filter/filter.glade index 1445ed7be8..96eeb3dc63 100644 --- a/filter/filter.glade +++ b/filter/filter.glade @@ -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> diff --git a/filter/filter.glade.h b/filter/filter.glade.h deleted file mode 100644 index 109d2e44f1..0000000000 --- a/filter/filter.glade.h +++ /dev/null @@ -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"); diff --git a/mail/ChangeLog b/mail/ChangeLog index 1d3e2c6640..d8c96c6954 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -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 diff --git a/mail/Makefile.am b/mail/Makefile.am index 0cbec8d49e..15335f2aed 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -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 $@ diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 9ae62d88b3..c30d6baba0 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -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> diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h deleted file mode 100644 index 81d686570a..0000000000 --- a/mail/mail-config.glade.h +++ /dev/null @@ -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"); diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade index 339fe0372f..5169f450c3 100644 --- a/mail/subscribe-dialog.glade +++ b/mail/subscribe-dialog.glade @@ -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> diff --git a/mail/subscribe-dialog.glade.h b/mail/subscribe-dialog.glade.h deleted file mode 100644 index cb1a1b1076..0000000000 --- a/mail/subscribe-dialog.glade.h +++ /dev/null @@ -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"); diff --git a/po/ChangeLog b/po/ChangeLog index 709bde4404..75221fb0f0 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -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. diff --git a/po/POTFILES.ignore b/po/POTFILES.ignore deleted file mode 100644 index e69de29bb2..0000000000 --- a/po/POTFILES.ignore +++ /dev/null diff --git a/po/POTFILES.in b/po/POTFILES.in index c2ded23ca8..fdb76ac951 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 diff --git a/po/POTFILES.skip b/po/POTFILES.skip index afdc5c68eb..cedd793894 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -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 diff --git a/po/README.tools b/po/README.tools deleted file mode 100644 index 4ec99c1640..0000000000 --- a/po/README.tools +++ /dev/null @@ -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. @@ -8401,3 +8401,27 @@ msgstr "_Søg" #~ msgid "_Create New Folder..." #~ msgstr "_Opret ny mappe..." + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3 +msgid "Evolution Address conduit " +msgstr "Udstående" + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4 +msgid "Configure the address conduit" +msgstr "Konfigurér Udstå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ér GnomeCal-komponent" + +#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3 +msgid "Evolution ToDo conduit " +msgstr "Udstående" + +#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4 +msgid "Configure the todo conduit" +msgstr "Konfigurér Udstående" diff --git a/po/desk.pl b/po/desk.pl deleted file mode 100755 index 08a2a18a56..0000000000 --- a/po/desk.pl +++ /dev/null @@ -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; -} - - @@ -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'" @@ -8665,3 +8665,31 @@ msgstr "Recher_cher" #~ msgid "_Unselect All" #~ msgstr "_Dé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'" @@ -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" @@ -8769,3 +8769,39 @@ msgstr "Sø_k" #~ msgid "Run filter \"%s\"" #~ msgstr "Kjø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é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é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ér oppgavelisten" + +#: data/evolution.keys.in:3 +msgid "address card" +msgstr "adressekort" + +#: data/evolution.keys.in:11 +msgid "calendar information" +msgstr "kalenderinformasjon" diff --git a/po/pt_BR.po b/po/pt_BR.po index ed8058b97f..b27e463cb5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -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íte do grupo Evolution" @@ -7530,3 +7530,31 @@ msgstr "Túto správu u¾ nezobrazova»." msgid "Sear_ch" msgstr "_Nájs»" + +#: evolution.desktop.in:4 +msgid "The Evolution groupware suite" +msgstr "Sada groupwarovıch nástrojov Evolution" + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3 +msgid "Evolution Address conduit " +msgstr "Spojka adresára Evolution" + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4 +msgid "Configure the address conduit" +msgstr "Nastavenie spojky adresára" + +#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3 +msgid "Evolution Calendar conduit" +msgstr "Spojka kalendá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" @@ -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" @@ -5,7 +5,7 @@ # Christian Rose <menthos@menthos.com>, 2000. # Martin Norbä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_ök" #~ 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" @@ -7690,3 +7690,31 @@ msgstr "init_corba(): GNOME başlatılamadı" msgid "init_bonobo(): could not initialize Bonobo" msgstr "init_bonobo(): Bonobo başlatılamadı" + +#: evolution.desktop.in:4 +msgid "The Evolution groupware suite" +msgstr "Evolution kitlesel işlemler uygulaması" + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:3 +msgid "Evolution Address conduit " +msgstr "Adres parçası" + +#: addressbook/conduit/e-address-conduit-control-applet.desktop.in:4 +msgid "Configure the address conduit" +msgstr "Adres parçasının ayarları" + +#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:3 +msgid "Evolution Calendar conduit" +msgstr "Takvim parçası" + +#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in:4 +msgid "Configure the GnomeCal conduit" +msgstr "GnomeCal takvim parçası ayarları" + +#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:3 +msgid "Evolution ToDo conduit " +msgstr "Yapılacaklar parçası" + +#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in:4 +msgid "Configure the todo conduit" +msgstr "Yapılacaklar parçası ayarları" diff --git a/po/ui-extract.pl b/po/ui-extract.pl deleted file mode 100755 index 9eb96497b6..0000000000 --- a/po/ui-extract.pl +++ /dev/null @@ -1,304 +0,0 @@ -#!/usr/bin/perl -w - -# -# The XML UI Translation Extractor -# -# Copyright (C) 2000 Free Software Foundation. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# Authors: Kenneth Christiansen <kenneth@gnu.org> -# - - -## Release information -my $VERSION = "0.9.5"; - -## Script options - Enable by setting value to 1 -my $ENABLE_GLADE = "1"; -my $ENABLE_XML = "1"; -my $ENABLE_XP = "0"; - -## Loaded modules -use strict; -use File::Basename; -use Getopt::Long; - -## Scalars used by the option stuff -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; - - -my $FILE; -my $OUTFILE; - -my %string = (); -my @elements; -my @items; -my $n; - -## Always print first -$| = 1; - -## Handle options -GetOptions ( - "local|l" => \$LOCAL_ARG, - "help|h|?" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - ) or &Error; - -&SplitOnArgument; - - -## Check for options. -## This section will check for the different options. - -sub SplitOnArgument { - - if ($VERSION_ARG) { - &Version; - - } elsif ($HELP_ARG) { - &Help; - - } elsif ($LOCAL_ARG) { - &PlaceLocal; - &Preparation; - &WriteFile; - - } elsif ($UPDATE_ARG) { - &PlaceNormal; - &Preparation; - &WriteFile; - - } elsif (@ARGV > 0) { - &PlaceNormal; - &Message; - &Preparation; - &WriteFile; - - } else { - &Help; - - } -} - -sub PlaceNormal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; -} - -sub PlaceLocal { - $FILE = $ARGV[0]; - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - - -sub PreCheck { - if (! $ENABLE_XML) { if ($FILE =~ /xml$/sg) { &WriteError; }} - if (! $ENABLE_GLADE) { if ($FILE =~ /glade$/sg) { &WriteError; }} - if (! $ENABLE_XP) { if ($FILE =~ /\/xp\/(.*)\.h$/sg) { &WriteError; }} -} - -## Sub for printing release information -sub Version{ - print "The XML UI Translations Extractor $VERSION\n"; - print "Written by Kenneth Christiansen, 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; -} - -## Sub for printing usage information -sub Help{ - print "Usage: ui-extract.pl [FILENAME] [OPTIONS] ...\n"; - print "Generates a headerfile from an xml source.\n\nGraps all strings "; - print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed "; - print "xml tags. Read the docs for more info.\n\n"; - print " -V, --version shows the version\n"; - print " -H, --help shows this help page\n"; - print "\nReport bugs to <kenneth\@gnu.org>.\n"; - exit; -} - -## Sub for printing error messages -sub Error{ -# print "ui-extract: invalid option @ARGV\n"; - print "Try `ui-extract.pl --help' for more information.\n"; - exit; -} - -sub Message { - print "Generating headerfile for translation.\n"; -} - -sub Preparation { - - &PreCheck; - if (-s "$OUTFILE"){ - unlink "$OUTFILE"; - } - - &Convert ($FILE); -} - -sub WriteError { - # print "Could not generate $FILE.h\n"; - exit; -} - -sub WriteFile { - - open OUT, ">>$OUTFILE"; - if (! %string) { &WriteError; } - &addMessages; - close OUT; - - print "Wrote $OUTFILE\n"; -} - -sub Convert($) { - - ## Reading the file - my $input; { - local (*IN); - local $/; #slurp mode - open (IN, "<$FILE") || die "can't open $FILE: $!"; - $input = <IN>; - } - - if (!-s "$OUTFILE"){ - open OUT, ">$OUTFILE"; - - print OUT "/*\n"; - print OUT " * Translatable strings file generated by extract-ui.\n"; - print OUT " * DO NOT compile this file as part of your application.\n"; - print OUT " */\n\n"; - - } - close OUT; - -################## -if ($ENABLE_XML) { -################## - - ### For generic translatable XML files ### - - if ($FILE =~ /xml$/sg){ - while ($input =~ /[\t\n\s]_[a-zA-Z0-9_]+=\"([^\"]+)\"/sg) { - $string{$1} = []; - } - - while ($input =~ /<_[a-zA-Z0-9_]+>([^_]+)<\/_[a-zA-Z0-9_]+>/sg) { - $string{$1} = []; - }} -} - -#################### -if ($ENABLE_GLADE) { -#################### - - ### For translatable Glade XML files ### - - if ($FILE =~ /glade$/sg){ - my $translate = "label|title|text|format|copyright|comments| - preview_text|tooltip"; - - while ($input =~ /<($translate)>([^<]+)<\/($translate)>/sg) { - - # Glade has some bugs, especially it uses translations tags to contain little - # non-translatable content. We work around this, by not including these - # strings that only includes something like: label4, and window1 - if ($2 =~ /^(window|label)[0-9]$/g) { - } else { - $string{$2} = []; - } - } - - while ($input =~ /<items>(..[^<]*)<\/items>/sg) { - @items = split (/\n/, $1); - for ($n = 0; $n < @items; $n++) { - $string{$items[$n]} = []; - } - }} -} - -################# -if ($ENABLE_XP) { -################# - - ### For generic translatable XP header files ### - - if ($FILE =~ /\/xp\/(.*)\.h$/sg){ - while ($input =~ /\((.*),(.+)\"(.*)\"/g) { - my $tag = $1; - $string{$3} = [$tag]; - }} - - } -} - -sub addMessages{ - - foreach my $theMessage (sort keys %string) { - - my ($tag) = @{ $string{$theMessage} }; - - # Replace XML codes for special chars to - # geniune gettext syntax - #--------------------------------------- - $theMessage =~ s/"/\\"/mg; - $theMessage =~ s/</</mg; - $theMessage =~ s/>/>/mg; - - if ($theMessage =~ /\n/) { - - @elements = split (/\n/, $theMessage); - for ($n = 0; $n < @elements; $n++) { - - if ($n == 0) { - print OUT "gchar *s = N_"; - print OUT "(\"$elements[$n]\\n\"\n"; - } - - elsif ($n == @elements - 1) { - print OUT " "; - print OUT "\"$elements[$n]\");\n"; - } - - elsif ($n > 0) { - print OUT " "; - print OUT "(\"$elements[$n]\\n\");\n"; - } - } - - } else { - - if ($tag) { print OUT "/* $tag */\n"; } - print OUT "gchar *s = N_(\"$theMessage\");\n"; - - } - - } -} - diff --git a/po/update.pl b/po/update.pl deleted file mode 100755 index 2b6accb302..0000000000 --- a/po/update.pl +++ /dev/null @@ -1,367 +0,0 @@ -#!/usr/bin/perl -w - -# -# GNOME PO Update Utility -# -# Copyright (C) 2000 Free Software Foundation. -# -# This script is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# Authors: Kenneth Christiansen <kenneth@gnu.org> -# - -# NOTICE: Please remember to change the variable $PACKAGE to reflect -# the package this script is used within. - -$PACKAGE="evolution"; - -use File::Basename; - -# Declare global variables -#------------------------- -my $VERSION = "1.5beta5"; -my $LANG = $ARGV[0]; - -# Always print as the first thing -#-------------------------------- -$| = 1; - -# Figure out what package that is in use -#--------------------------------------- -#open FILE, "../configure.in"; -# while (<FILE>) { -# next if /^dnl/; #ignore comments -# if ($_=~/AM_INIT_AUTOMAKE\((.*),(.*)\)/o){ -# $PACKAGE=$1; -# last; #stop when found -# } -# if ($_=~/PACKAGE\((.*)\)/o){ -# $PACKAGE=$1; -# last; #stop when found -# } -# } -#close FILE; - - -# Give error if script is run without an argument -#------------------------------------------------ -if (! $LANG){ - print "update.pl: missing file arguments\n"; - print "Try `update.pl --help' for more information.\n"; - exit; -} - -# Use the supplied arguments -#--------------------------- -if ($LANG=~/^-(.)*/){ - - if ("$LANG" eq "--version" || "$LANG" eq "-V"){ - &Version; - } - elsif ($LANG eq "--help" || "$LANG" eq "-H"){ - &Help; - } - elsif ($LANG eq "--dist" || "$LANG" eq "-D"){ - &Merging; - } - elsif ($LANG eq "--pot" || "$LANG" eq "-P"){ - - # Check for .headerlock file, so the Makefile - # will not generate the header files twise - #-------------------------------------------- - if (-e ".headerlock"){ - &GeneratePot; - }else{ - &GenHeaders; - &GeneratePot;} - exit; - } - elsif ($LANG eq "--headers" || "$LANG" eq "-S"){ - &GenHeaders; - exit; - } - elsif ($LANG eq "--maintain" || "$LANG" eq "-M"){ - &Maintain; - } - else { - &InvalidOption; - } - -} else { - - # Run standard procedure - #----------------------- - if(-s "$LANG.po"){ - &GenHeaders; - &GeneratePot; - &Merging; - &Status; - } - - # Report error if the language file supplied - # to the command line is non-existent - #------------------------------------------- - else { - &NotExisting; - } -} - -sub Version{ - - # Print version information - #-------------------------- - print "GNOME PO Updater $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; -} - -sub Help{ - - # Print usage information - #------------------------ - print "Usage: ./update.pl [OPTIONS] ...LANGCODE\n"; - print "Updates pot files and merge them with the translations.\n\n"; - print " -H, --help shows this help page\n"; - print " -P, --pot generate the pot file only\n"; - print " -S, --headers generate the XML headerfiles in POTFILES.in\n"; - print " -M, --maintain search for missing files in POTFILES.in\n"; - print " -V, --version shows the version\n"; - print "\nExamples of use:\n"; - print "update.sh --pot just creates a new pot file from the source\n"; - print "update.sh da created new pot file and updated the da.po file\n\n"; - print "Report bugs to <kenneth\@gnome.org>.\n"; - exit; -} - -sub Maintain{ - - # Search and fine, all translatable files - # --------------------------------------- - $i18nfiles="find ../ -print | egrep '.*\\.(c|y|cc|c++|h|gob)' "; - - open(BUF2, "POTFILES.in") || die "update.pl: there's no POTFILES.in!!!\n"; - - print "Searching for missing _(\" \") entries...\n"; - - open(BUF1, "$i18nfiles|"); - - @buf1_1 = <BUF1>; - @buf1_2 = <BUF2>; - - # Check if we should ignore some found files, when - # comparing with POTFILES.in - #------------------------------------------------- - if (-s ".potignore"){ - open FILE, ".potignore"; - while (<FILE>) { - if ($_=~/^[^#]/o){ - push @bup, $_; - } - } - print "Found .potignore: Ignoring files...\n"; - @buf1_2 = (@bup, @buf1_2); - } - - foreach my $file (@buf1_1){ - open FILE, "<$file"; - while (<FILE>) { - if ($_=~/_\(\"/o){ - $file = unpack("x3 A*",$file) . "\n"; - push @buf2_1, $file; - last; - } - } - } - - @buf3_1 = sort (@buf2_1); - @buf3_2 = sort (@buf1_2); - - my %in2; - foreach (@buf3_2) { - $in2{$_} = 1; - } - - foreach (@buf3_1){ - if (!exists($in2{$_})){ - push @result, $_ - } - } - - # Save file with information about the files missing - # if any, and give information about this proceedier - #--------------------------------------------------- - if(@result){ - open OUT, ">missing"; - print OUT @result; - print "\nHere is the result:\n\n", @result, "\n"; - print "The file \"missing\" has been placed in the current directory.\n"; - print "Files supposed to be ignored should be placed in \".potignore\"\n"; - } - - # If there is nothing to complain about, notice the user - #------------------------------------------------------- - else{ - print "\nWell, it's all perfect! Congratulation!\n"; - } -} - -sub InvalidOption{ - - # Handle invalid arguments - #------------------------- - print "update.pl: invalid option -- $LANG\n"; - print "Try `update.pl --help' for more information.\n"; -} - -sub GenHeaders{ - - # Generate the .h header files, so we can allow glade and - # xml translation support - #-------------------------------------------------------- - if(-s "ui-extract.pl"){ - - print "Found ui-extract.pl script\nRunning ui-extract...\n"; - - open FILE, "<POTFILES.in"; - while (<FILE>) { - - # Find .xml files in POTFILES.in and generate the - # files with help from the ui-extract.pl script - #-------------------------------------------------- - if ($_=~ /(.*)(\.xml)/o){ - $filename = "../$1.xml"; - $xmlfiles="perl \.\/ui-extract.pl --local $filename"; - system($xmlfiles); - } - - # Find .glade files in POTFILES.in and generate - # the files with help from the ui-extract.pl script - #-------------------------------------------------- - elsif ($_=~ /(.*)(\.glade)/o){ - $filename = "../$1.glade"; - $xmlfiles="perl \.\/ui-extract.pl --local $filename"; - system($xmlfiles); - } - } - close FILE; - - # Create .headerlock file, so the script will know - # that we already passed this section. This is required - # since the individual sections can be reaced at different - # times by the Makefile - #--------------------------------------------------------- - system("touch .headerlock"); - } -} - -sub GeneratePot{ - - # Generate the potfiles from the POTFILES.in file - #------------------------------------------------ - - print "Building the $PACKAGE.pot...\n"; - - system ("mv POTFILES.in POTFILES.in.old"); - - open INFILE, "<POTFILES.in.old"; - open OUTFILE, ">POTFILES.in"; - while (<INFILE>) { - if ($_ =~ /\.(glade|xml)$/) { - s/\.glade$/\.glade\.h/; - s/\.xml$/\.xml\.h/; - $_ = basename($_); - $_ = "po/tmp/$_\n"; - } - print OUTFILE $_; - } - close OUTFILE; - close INFILE; - - $GETTEXT ="xgettext --default-domain\=$PACKAGE --directory\=\.\." - ." --add-comments --keyword\=\_ --keyword\=N\_" - ." --files-from\=\.\/POTFILES\.in "; - $GTEST ="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot " - ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)"; - - system($GETTEXT); - system($GTEST); - print "Wrote $PACKAGE.pot\n"; - system("mv POTFILES.in.old POTFILES.in"); - - # If .headerlock file is found, it means that the potfiles - # already has been generated. If so delete the generated - # .h header files. The reason for this approach with a - # file as a marker is due to that the Makefile runs the - # scripts in turns - #--------------------------------------------------------- - - if(-e ".headerlock"){ - unlink(".headerlock"); - - print "Removing generated header (.h) files..."; - system("rm ./tmp/ -rf"); - } - print "done\n"; -} - -sub Merging{ - - if ($ARGV[1]){ - $LANG = $ARGV[1]; - } else { - $LANG = $ARGV[0]; - } - - if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") { - print "Merging $LANG.po with $PACKAGE.pot..."; - } - - $MERGE="cp $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po"; - - system($MERGE); - - if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") { - print "\n\n"; - } - - # Remove the "messages" trash file generated - # by gettext, aswell as the backup file - #------------------------------------------- - unlink "messages"; - unlink "$LANG.po.old"; -} - -sub NotExisting{ - - # Report error if supplied language - # file is non-existant - #---------------------------------- - print "update.pl: sorry, $LANG.po does not exist!\n"; - print "Try `update.pl --help' for more information.\n"; - exit; -} - -sub Status{ - - # Print status information about the po file - #------------------------------------------- - $STATUS="msgfmt --statistics $LANG.po"; - - system($STATUS); - print "\n"; -} diff --git a/po/update.sh b/po/update.sh new file mode 100755 index 0000000000..f16601f81b --- /dev/null +++ b/po/update.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Script for translators not being able to run autogen.sh +# +# Copyright (C) 2000 Free Software Foundation. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# Authors: Kenneth Christiansen <kenneth@gnu.org> + +PACKAGE=evolution + +DEPENDS=$(which xml-i18n-toolize 2> /dev/null) + +if [ "$DEPENDS" = "" -o ! -x "$DEPENDS" ] ; + then echo "The xml-i18n-tools system is not installed or in path!" + echo + echo "The module $PACKAGE requires this inplimentation, which" + echo "can be found at:" + echo + echo " ftp://ftp.gnome.org/pub/GNOME/stable/xml-i18n-tools " + echo + echo "Please install before trying to update the translations" + echo "again..." + echo + exit +fi + +XMLDIR=$(which xml-i18n-toolize | sed s@/bin/xml-i18n-toolize@@) +XML_I18N_EXTRACT="$XMLDIR/share/xml-i18n-tools/xml-i18n-extract" +XML_I18N_UPDATE="$XMLDIR/share/xml-i18n-tools/xml-i18n-update" +PACKAGE=$PACKAGE XML_I18N_EXTRACT=$XML_I18N_EXTRACT \ +$XML_I18N_UPDATE $1 |