Index: profile.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v
retrieving revision 1.8.2.1
diff -u -r1.8.2.1 profile.admin.inc
--- modules/profile/profile.admin.inc	16 Oct 2008 12:43:08 -0000	1.8.2.1
+++ modules/profile/profile.admin.inc	16 Feb 2009 19:48:01 -0000
@@ -239,7 +239,7 @@
     $form['fields']['options'] = array('#type' => 'textarea',
       '#title' => t('Selection options'),
       '#default_value' => isset($edit['options']) ? $edit['options'] : '',
-      '#description' => t('A list of all options. Put each option on a separate line. Example options are "red", "blue", "green", etc.'),
+      '#description' => t('A list of all options. Put each option on a separate line. Example options are country codes "AT", "BE", "BG", etc. You can optionally add a different label after an option, separated by a "|" (pipe) character. Example: "AT|Austria", "BE|Belgium", "BG|Bulgaria", etc.'),
     );
   }
   $form['fields']['visibility'] = array('#type' => 'radios',
Index: profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.236.2.3
diff -u -r1.236.2.3 profile.module
--- modules/profile/profile.module	12 Jan 2009 10:09:19 -0000	1.236.2.3
+++ modules/profile/profile.module	16 Feb 2009 20:00:26 -0000
@@ -396,7 +396,14 @@
         $lines = split("[\n\r]", $field->options);
         foreach ($lines as $line) {
           if ($line = trim($line)) {
-            $options[$line] = $line;
+            $parts = explode('|', $line);
+            if ($parts[1]) {
+              // allows labeled option specified as "option|label"
+              $options[trim($parts[0])] = trim($parts[1]);
+            } else {
+              // original behaviour: "option" (= label)
+              $options[$line] = $line;
+            }
           }
         }
         $fields[$category][$field->name] = array('#type' => 'select',