From cd654da5a99889a97bb2327a2d2116bc5ea6a7b0 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 2 Aug 2001 23:21:35 +0000
Subject: [PATCH] Removed ":" from labels to make translations easier

svn: r282
---
 gramps/src/EditPerson.glade | 76 ++++++++++++++++++-------------------
 gramps/src/EditPerson.py    | 44 ++++++++++-----------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade
index 35dd145e0..2b811855d 100644
--- a/gramps/src/EditPerson.glade
+++ b/gramps/src/EditPerson.glade
@@ -1117,7 +1117,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label121</name>
-	      <label>Surname :</label>
+	      <label>Surname</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1143,7 +1143,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label120</name>
-	      <label>Given Name :</label>
+	      <label>Given Name</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1169,7 +1169,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label129</name>
-	      <label>Suffix :</label>
+	      <label>Suffix</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1195,7 +1195,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>alt_given</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -1221,7 +1221,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>alt_last</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -1247,7 +1247,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>alt_suffix</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -1273,7 +1273,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label168</name>
-	      <label>Details :</label>
+	      <label>Details</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1299,7 +1299,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>name_details</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -1497,7 +1497,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label103</name>
-		<label>Date :</label>
+		<label>Date</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1523,7 +1523,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label106</name>
-		<label>Place :</label>
+		<label>Place</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1549,7 +1549,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label105</name>
-		<label>Description :</label>
+		<label>Description</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1575,7 +1575,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>eventDate</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1601,7 +1601,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>eventPlace</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1627,7 +1627,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>eventDescription</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1653,7 +1653,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label164</name>
-		<label>Details :</label>
+		<label>Details</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1679,7 +1679,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>event_details</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1908,7 +1908,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label196</name>
-		<label>Value :</label>
+		<label>Value</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1934,7 +1934,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>attr_value</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -1960,7 +1960,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label201</name>
-		<label>Details :</label>
+		<label>Details</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -1986,7 +1986,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>attr_details</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_LEFT</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
@@ -2190,7 +2190,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label142</name>
-	      <label>Country :</label>
+	      <label>Country</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2216,7 +2216,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label143</name>
-	      <label>City/County :</label>
+	      <label>City/County</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2242,7 +2242,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label141</name>
-	      <label>Address :</label>
+	      <label>Address</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2268,7 +2268,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label140</name>
-	      <label>Date :</label>
+	      <label>Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2294,7 +2294,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label148</name>
-	      <label>State/Province :</label>
+	      <label>State/Province</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2320,7 +2320,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label149</name>
-	      <label>ZIP/Postal Code :</label>
+	      <label>ZIP/Postal Code</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2346,7 +2346,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>street</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2372,7 +2372,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>address_start</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2398,7 +2398,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>city</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2424,7 +2424,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>postal</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2450,7 +2450,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>state</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2476,7 +2476,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label193</name>
-	      <label>Details :</label>
+	      <label>Details</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2502,7 +2502,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>addr_details</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2528,7 +2528,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>country</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2893,7 +2893,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label203</name>
-	      <label>Description :</label>
+	      <label>Description</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2919,7 +2919,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label204</name>
-	      <label>Web Address :</label>
+	      <label>Web Address</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2945,7 +2945,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>url_des</name>
-	      <label></label>
+	      <label>:</label>
 	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0</xalign>
@@ -2991,7 +2991,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>url_addr</name>
-		<label></label>
+		<label>:</label>
 		<justify>GTK_JUSTIFY_LEFT</justify>
 		<wrap>False</wrap>
 		<xalign>0</xalign>
diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py
index d66d83045..3034268cd 100644
--- a/gramps/src/EditPerson.py
+++ b/gramps/src/EditPerson.py
@@ -193,7 +193,7 @@ class EditPerson:
         birth = person.getBirth()
         death = person.getDeath()
 
-        self.get_widget("gid").set_text(person.getId())
+        self.get_widget("gid").set_text(": %s" % person.getId())
         self.event_list.set_column_visibility(3,Config.show_detail)
         self.name_list.set_column_visibility(1,Config.show_detail)
         self.attr_list.set_column_visibility(2,Config.show_detail)
@@ -209,7 +209,7 @@ class EditPerson:
                 if attr.getType() == const.save_pattr(Config.attr_name):
                     val = attr.getValue()
                     break
-            self.get_widget("user_data").set_text(val)
+            self.get_widget("user_data").set_text(": %s" % val)
                 
         else:
             self.get_widget("user_label").hide()
@@ -516,10 +516,10 @@ def on_name_list_select_row(obj,row,b,c):
     name = obj.get_row_data(row)
 
     epo.name_frame.set_label(name.getName())
-    epo.alt_given_field.set_text(name.getFirstName())
-    epo.alt_last_field.set_text(name.getSurname())
-    epo.alt_suffix_field.set_text(name.getSuffix())
-    epo.name_details_field.set_text(get_detail_text(name))
+    epo.alt_given_field.set_text(": %s" % name.getFirstName())
+    epo.alt_last_field.set_text(": %s" % name.getSurname())
+    epo.alt_suffix_field.set_text(": %s" % name.getSuffix())
+    epo.name_details_field.set_text(": %s" % get_detail_text(name))
 
 #-------------------------------------------------------------------------
 #
@@ -534,8 +534,8 @@ def on_web_list_select_row(obj,row,b,c):
     epo = obj.get_data(EDITPERSON)
     url = obj.get_row_data(row)
 
-    epo.web_url.set_text(url.get_path())
-    epo.web_description.set_text(url.get_description())
+    epo.web_url.set_text(":%s " % url.get_path())
+    epo.web_description.set_text(": %s" % url.get_description())
 
 #-------------------------------------------------------------------------
 #
@@ -551,8 +551,8 @@ def on_attr_list_select_row(obj,row,b,c):
     attr = obj.get_row_data(row)
 
     epo.attr_type.set_label(const.display_pattr(attr.getType()))
-    epo.attr_value.set_text(attr.getValue())
-    epo.attr_details_field.set_text(get_detail_text(attr))
+    epo.attr_value.set_text(": %s" % attr.getValue())
+    epo.attr_details_field.set_text(": %s" % get_detail_text(attr))
 
 #-------------------------------------------------------------------------
 #
@@ -569,13 +569,13 @@ def on_address_list_select_row(obj,row,b,c):
 
     epo.address_label.set_label("%s %s %s" % \
                                 (a.getCity(),a.getState(),a.getCountry()))
-    epo.address_start.set_text(a.getDate())
-    epo.address_street.set_text(a.getStreet())
-    epo.address_city.set_text(a.getCity())
-    epo.address_state.set_text(a.getState())
-    epo.address_country.set_text(a.getCountry())
-    epo.address_postal.set_text(a.getPostal())
-    epo.addr_details_field.set_text(get_detail_text(a))
+    epo.address_start.set_text(": %s" % a.getDate())
+    epo.address_street.set_text(": %s" % a.getStreet())
+    epo.address_city.set_text(": %s" % a.getCity())
+    epo.address_state.set_text(": %s" % a.getState())
+    epo.address_country.set_text(": %s" % a.getCountry())
+    epo.address_postal.set_text(": %s" % a.getPostal())
+    epo.addr_details_field.set_text(": %s" % get_detail_text(a))
 
 #-------------------------------------------------------------------------
 #
@@ -806,11 +806,11 @@ def on_event_select_row(obj,row,b,c):
     event = obj.get_row_data(row)
 
     epo = obj.get_data(EDITPERSON)
-    epo.event_date_field.set_text(event.getDate())
-    epo.event_place_field.set_text(event.getPlace())
-    epo.event_name_field.set_label(const.display_pevent(event.getName()))
-    epo.event_descr_field.set_text(event.getDescription())
-    epo.event_details_field.set_text(get_detail_text(event))
+    epo.event_date_field.set_text(": %s" % event.getDate())
+    epo.event_place_field.set_text(": %s" % event.getPlace())
+    epo.event_name_field.set_label(": %s" % const.display_pevent(event.getName()))
+    epo.event_descr_field.set_text(": %s" % event.getDescription())
+    epo.event_details_field.set_text(": %s" % get_detail_text(event))
 
 #-------------------------------------------------------------------------
 #