aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/backend/ebook/Makefile.am7
-rw-r--r--addressbook/backend/ebook/e-card.c68
-rw-r--r--addressbook/contact-editor/e-contact-save-as.c1
-rw-r--r--addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in14
-rw-r--r--addressbook/gui/component/Makefile.am9
-rw-r--r--addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in4
-rw-r--r--addressbook/gui/component/select-names/Makefile.am8
-rw-r--r--addressbook/gui/contact-editor/e-contact-save-as.c1
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c1
10 files changed, 74 insertions, 49 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 57fc014a80..87acefbbc1 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-12 Kjartan Maraas <kmaraas@gnome.org>
+
+ * gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
+ Marked strings for translation in this newly created file.
+ * gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
+ xml-i18n-tools framework.
+ * gui/component/Makefile.am: Same as above.
+ * gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
+ too.
+
2001-02-11 Jason Leach <jasonleach@usa.net>
* gui/component/addressbook.c: Removed an ancient #include
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 5bd4340c47..335f74cb4c 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -142,9 +142,12 @@ BUILT_SOURCES = $(CORBA_SOURCE)
CLEANFILES += $(BUILT_SOURCES)
oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
+oaf_in_files = GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
# add this back when you add the file to the archive ;)
# GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
-EXTRA_DIST = $(oaf_DATA)
+EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index b282d520fa..12877d3646 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -3052,12 +3052,12 @@ card_to_string (Card *crd)
add_CardStrProperty_to_string (string, _("Card: "), &crd->fname);
if (crd->name.prop.used) {
- addProp_to_string (string, _("\nName: "));
- add_strProp_to_string (string, _("\n Prefix: "), crd->name.prefix);
- add_strProp_to_string (string, _("\n Given: "), crd->name.given);
- add_strProp_to_string (string, _("\n Additional: "), crd->name.additional);
- add_strProp_to_string (string, _("\n Family: "), crd->name.family);
- add_strProp_to_string (string, _("\n Suffix: "), crd->name.suffix);
+ addProp_to_string (string, N_("\nName: "));
+ add_strProp_to_string (string, N_("\n Prefix: "), crd->name.prefix);
+ add_strProp_to_string (string, N_("\n Given: "), crd->name.given);
+ add_strProp_to_string (string, N_("\n Additional: "), crd->name.additional);
+ add_strProp_to_string (string, N_("\n Family: "), crd->name.family);
+ add_strProp_to_string (string, N_("\n Suffix: "), crd->name.suffix);
g_string_append_c (string, '\n');
}
@@ -3071,7 +3071,7 @@ card_to_string (Card *crd)
char *date_str;
date_str = card_bday_str (crd->bday);
- add_strProp_to_string (string, _("\nBirth Date: "), date_str);
+ add_strProp_to_string (string, N_("\nBirth Date: "), date_str);
free (date_str);
}
@@ -3082,15 +3082,15 @@ card_to_string (Card *crd)
CardDelAddr *deladdr = (CardDelAddr *) node->data;
if (deladdr->prop.used) {
- addProp_to_string (string, _("\nAddress:"));
+ addProp_to_string (string, N_("\nAddress:"));
add_strAddrType (string, deladdr->type);
- add_strProp_to_string (string, _("\n Postal Box: "), deladdr->po);
- add_strProp_to_string (string, _("\n Ext: "),deladdr->ext);
- add_strProp_to_string (string, _("\n Street: "),deladdr->street);
- add_strProp_to_string (string, _("\n City: "), deladdr->city);
- add_strProp_to_string (string, _("\n Region: "), deladdr->region);
- add_strProp_to_string (string, _("\n Postal Code: "), deladdr->code);
- add_strProp_to_string (string, _("\n Country: "), deladdr->country);
+ add_strProp_to_string (string, N_("\n Postal Box: "), deladdr->po);
+ add_strProp_to_string (string, N_("\n Ext: "), deladdr->ext);
+ add_strProp_to_string (string, N_("\n Street: "), deladdr->street);
+ add_strProp_to_string (string, N_("\n City: "), deladdr->city);
+ add_strProp_to_string (string, N_("\n Region: "), deladdr->region);
+ add_strProp_to_string (string, N_("\n Postal Code: "), deladdr->code);
+ add_strProp_to_string (string, N_("\n Country: "), deladdr->country);
}
}
@@ -3103,7 +3103,7 @@ card_to_string (Card *crd)
for (node = crd->dellabel.l; node; node = node->next) {
CardDelLabel *dellabel = (CardDelLabel *) node->data;
- add_strProp_to_string (string, _("\nDelivery Label: "),
+ add_strProp_to_string (string, N_("\nDelivery Label: "),
dellabel->data);
add_strAddrType (string, dellabel->type);
}
@@ -3115,10 +3115,10 @@ card_to_string (Card *crd)
if (crd->phone.l->next) {
sep = " ";
- g_string_append (string, _("\nTelephones:\n"));
+ g_string_append (string, N_("\nTelephones:\n"));
} else {
sep = " ";
- g_string_append (string, _("\nTelephone:"));
+ g_string_append (string, N_("\nTelephone:"));
}
for (node = crd->phone.l; node; node = node->next) {
@@ -3142,10 +3142,10 @@ card_to_string (Card *crd)
if (crd->email.l->next) {
sep = " ";
- g_string_append (string, _("\nE-mail:\n"));
+ g_string_append (string, N_("\nE-mail:\n"));
} else {
sep = " ";
- g_string_append (string, _("\nE-mail:"));
+ g_string_append (string, N_("\nE-mail:"));
}
@@ -3164,13 +3164,13 @@ card_to_string (Card *crd)
g_string_append_c (string, '\n');
}
- add_CardStrProperty_to_string (string, _("\nMailer: "), &crd->mailer);
+ add_CardStrProperty_to_string (string, N_("\nMailer: "), &crd->mailer);
if (crd->timezn.prop.used) {
char *str;
str = card_timezn_str (crd->timezn);
- add_strProp_to_string (string, _("\nTime Zone: "), str);
+ add_strProp_to_string (string, N_("\nTime Zone: "), str);
free (str);
}
@@ -3178,11 +3178,11 @@ card_to_string (Card *crd)
char *str;
str = card_geopos_str (crd->geopos);
- add_strProp_to_string (string, _("\nGeo Location: "), str);
+ add_strProp_to_string (string, N_("\nGeo Location: "), str);
free (str);
}
- add_CardStrProperty_to_string (string, _("\nBusiness Role: "), &crd->role);
+ add_CardStrProperty_to_string (string, N_("\nBusiness Role: "), &crd->role);
/* if (crd->logo.prop.used) {
addPropSizedValue (string, _ ("\nLogo: "),
@@ -3194,17 +3194,17 @@ card_to_string (Card *crd)
addstringectProp (string, card_convert_to_stringect (crd->agent));*/
if (crd->org.prop.used) {
- addProp_to_string (string, _("\nOrg: "));
- add_strProp_to_string (string, _("\n Name: "), crd->org.name);
- add_strProp_to_string (string, _("\n Unit: "), crd->org.unit1);
- add_strProp_to_string (string, _("\n Unit2: "), crd->org.unit2);
- add_strProp_to_string (string, _("\n Unit3: "), crd->org.unit3);
- add_strProp_to_string (string, _("\n Unit4: "), crd->org.unit4);
+ addProp_to_string (string, N_("\nOrg: "));
+ add_strProp_to_string (string, N_("\n Name: "), crd->org.name);
+ add_strProp_to_string (string, N_("\n Unit: "), crd->org.unit1);
+ add_strProp_to_string (string, N_("\n Unit2: "), crd->org.unit2);
+ add_strProp_to_string (string, N_("\n Unit3: "), crd->org.unit3);
+ add_strProp_to_string (string, N_("\n Unit4: "), crd->org.unit4);
g_string_append_c (string, '\n');
}
- add_CardStrProperty_to_string (string, _("\nCategories: "), &crd->categories);
- add_CardStrProperty_to_string (string, _("\nComment: "), &crd->comment);
+ add_CardStrProperty_to_string (string, N_("\nCategories: "), &crd->categories);
+ add_CardStrProperty_to_string (string, N_("\nComment: "), &crd->comment);
/* if (crd->sound.prop.used) {
if (crd->sound.type != SOUND_PHONETIC)
@@ -3217,10 +3217,10 @@ card_to_string (Card *crd)
add_SoundType (string, crd->sound.type);
}*/
- add_CardStrProperty_to_string (string, _("\nUnique String: "), &crd->uid);
+ add_CardStrProperty_to_string (string, N_("\nUnique String: "), &crd->uid);
if (crd->key.prop.used) {
- add_strProp_to_string (string, _("\nPublic Key: "), crd->key.data);
+ add_strProp_to_string (string, N_("\nPublic Key: "), crd->key.data);
add_strKeyType (string, crd->key.type);
}
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
index 7209c5e8f8..5a88c31ffa 100644
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ b/addressbook/contact-editor/e-contact-save-as.c
@@ -19,6 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <e-contact-save-as.h>
#include <gal/util/e-util.h>
#include <unistd.h>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
index 01474ce90a..2a523c9dc1 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
@@ -9,7 +9,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Factory for the Addressbook Minicard control"/>
+ _value="Factory for the Addressbook Minicard control"/>
</oaf_server>
@@ -28,9 +28,9 @@
</oaf_attribute>
<oaf_attribute name="name" type="string"
- value="Evolution Addressbook minicard viewer"/>
+ _value="Evolution Addressbook minicard viewer"/>
<oaf_attribute name="description" type="string"
- value="Control that displays an Evolution addressbook minicard."/>
+ _value="Control that displays an Evolution addressbook minicard."/>
</oaf_server>
@@ -43,7 +43,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Factory for the sample Addressbook control"/>
+ _value="Factory for the sample Addressbook control"/>
</oaf_server>
@@ -57,7 +57,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="A sample Bonobo control which displays an addressbook."/>
+ _value="A sample Bonobo control which displays an addressbook."/>
</oaf_server>
@@ -70,7 +70,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Factory for the Evolution addressbook component."/>
+ _value="Factory for the Evolution addressbook component."/>
</oaf_server>
@@ -83,7 +83,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Evolution component for handling contacts."/>
+ _value="Evolution component for handling contacts."/>
<oaf_attribute name="evolution:shell-component-icon" type="string"
value="evolution-contacts.png"/>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index dee94188db..eaefdbab96 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -57,15 +57,20 @@ evolution_addressbook_LDADD = \
evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
+@XML_I18N_MERGE_OAF_RULE@
+
oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Addressbook.oafinfo
+oaf_in_files = GNOME_Evolution_Addressbook.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
gladedir = $(datadir)/evolution/glade
glade_DATA = addressbook-config.glade
EXTRA_DIST = \
$(glade_DATA) \
- $(oaf_DATA)
+ $(oaf_DATA) \
+ addressbook-config.glade\
+ $(oaf_in_files)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
index e3719967b0..7f26e2aaed 100644
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
@@ -9,7 +9,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Factory for the Addressbook's name selection interface"/>
+ _value="Factory for the Addressbook's name selection interface"/>
</oaf_server>
@@ -22,7 +22,7 @@
</oaf_attribute>
<oaf_attribute name="description" type="string"
- value="Evolution's addressbook name selection interface."/>
+ _value="Evolution's addressbook name selection interface."/>
</oaf_server>
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index e1c8795707..0bbff76a71 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -16,9 +16,12 @@ $(IDL_GENERATED): $(IDLS)
$(srcdir)/Evolution-Addressbook-SelectNames.idl
oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Addressbook_SelectNames.oafinfo
-#
+oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
+
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
@@ -66,6 +69,7 @@ glade_DATA = select-names.glade
EXTRA_DIST = \
$(glade_DATA) \
+ $(oaf_in_files) \
$(oaf_DATA) \
$(IDLS)
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index 7209c5e8f8..5a88c31ffa 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -19,6 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <e-contact-save-as.h>
#include <gal/util/e-util.h>
#include <unistd.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index f6c0a3eedc..946be317e4 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -596,6 +596,7 @@ static char *list [] = {
N_("Spouse"),
N_("Note"),
N_("Free-busy URL"),
+ N_("Click here to add a contact")
};
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:32:44 +0800