From 4c2214e329a48fed18cf6b02d102a51e8e84e3c0 Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Thu, 15 Apr 2010 17:35:21 +0200
Subject: [PATCH] consistant word use "Device ID" instead of "UID"

---
 mygpo/web/templates/device.html     | 2 +-
 mygpo/web/templates/devicelist.html | 4 ++--
 mygpo/web/views/__init__.py         | 2 +-
 mygpo/web/views/device.py           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mygpo/web/templates/device.html b/mygpo/web/templates/device.html
index 6b5c4885..d73f6274 100644
--- a/mygpo/web/templates/device.html
+++ b/mygpo/web/templates/device.html
@@ -100,7 +100,7 @@
   </form>
   <br />
   {% endif %}
-  <div class="info">The <strong>UID</strong> connects your physical device with this page, so you should enter the same text on your device and here.</div>
+  <div class="info">The <strong>Device ID</strong> connects your physical device with this page, so you should enter the same text on your device and here.</div>
 
 {% endblock %}
 
diff --git a/mygpo/web/templates/devicelist.html b/mygpo/web/templates/devicelist.html
index c0a99f4b..1b8729fa 100644
--- a/mygpo/web/templates/devicelist.html
+++ b/mygpo/web/templates/devicelist.html
@@ -16,7 +16,7 @@
     <tr>
      <th>{% trans "Name" %}</th>
      <th>{% trans "Type" %}</th>
-     <th>{% trans "UID" %}</th>
+     <th>{% trans "Device ID" %}</th>
     </tr>
     {% for d in devices %}
     {% ifchanged d.sync_group %}
@@ -27,7 +27,7 @@
        <tr>
         <th>{% trans "Name" %}</th>
         <th>{% trans "Type" %}</th>
-        <th>{% trans "UID" %}</th>
+        <th>{% trans "Device ID" %}</th>
        </tr>
       {% endif %}
      {% endifchanged %}
diff --git a/mygpo/web/views/__init__.py b/mygpo/web/views/__init__.py
index 5832fa2b..165d3c27 100644
--- a/mygpo/web/views/__init__.py
+++ b/mygpo/web/views/__init__.py
@@ -191,7 +191,7 @@ def podcast(request, pid):
                        subscriptionmeta.save()
                        success = True
                     except IntegrityError, ie:
-                       error_message = _('You can\'t use the same UID for two devices.')
+                       error_message = _('You can\'t use the same Device ID for two devices.')
             else:
                 privacy_form = PrivacyForm({
                     'public': subscriptionmeta.public
diff --git a/mygpo/web/views/device.py b/mygpo/web/views/device.py
index a4e5c20a..3fd623a7 100644
--- a/mygpo/web/views/device.py
+++ b/mygpo/web/views/device.py
@@ -75,7 +75,7 @@ def show(request, device_id, error_message=None):
                 success = True
             except IntegrityError, ie:
                 device = Device.objects.get(pk=device_id)
-                error_message = _('You can\'t use the same UID for two devices.')
+                error_message = _('You can\'t use the same Device ID for two devices.')
 
     else:
         device_form = DeviceForm({
-- 
2.11.4.GIT