FreeNAS

Revision: 8181
          http://freenas.svn.sourceforge.net/freenas/?rev=8181&view=rev
Author:   zippybr
Date:     2011-10-07 16:23:44 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
another step in direction of tableless datasets

Modified Paths:
--------------
    branches/volumes/gui/freeadmin/navtree.py
    branches/volumes/gui/freeadmin/views.py
    branches/volumes/gui/storage/forms.py
    branches/volumes/gui/storage/models.py
    branches/volumes/gui/storage/nav.py
    branches/volumes/gui/storage/urls.py
    branches/volumes/gui/storage/views.py
    branches/volumes/gui/templates/storage/dataset_confirm_delete.html
    branches/volumes/gui/templates/storage/dataset_edit.html
    branches/volumes/gui/templates/storage/permission.html
    branches/volumes/gui/templates/storage/volumes.html

Modified: branches/volumes/gui/freeadmin/navtree.py
===================================================================
--- branches/volumes/gui/freeadmin/navtree.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/freeadmin/navtree.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -50,7 +50,7 @@
         try:
             mod = __import__('%s.%s' % (where,name), globals(), locals(), [name], -1)
             return mod
-        except ImportError:
+        except ImportError, e:
             return None
 
     """

Modified: branches/volumes/gui/freeadmin/views.py
===================================================================
--- branches/volumes/gui/freeadmin/views.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/freeadmin/views.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -104,7 +104,9 @@
         navtree.auto_generate()
         final = navtree.dijitTree()
         json = simplejson.dumps(final, indent=3)
-    except:
+    except Exception, e:
+        #FIX ME
+        print e
         json = ""
     #from freenasUI.nav import json2nav
     #json2nav(json)['main']

Modified: branches/volumes/gui/storage/forms.py
===================================================================
--- branches/volumes/gui/storage/forms.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/storage/forms.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -699,10 +699,9 @@
     dataset_reservation = forms.CharField(max_length = 128, initial=0, label=_('Reserved space for this dataset and all children'), help_text=_('0=None; example: 1g'))
 
     def __init__(self, *args, **kwargs):
-        self._mp = kwargs.pop("mp", None)
-        dataset = self._mp.mp_path.replace("/mnt/","")
+        self._fs = kwargs.pop("fs", None)
         super(ZFSDataset_EditForm, self).__init__(*args, **kwargs)
-        data = notifier().zfs_get_options(dataset)
+        data = notifier().zfs_get_options(self._fs)
         self.fields['dataset_compression'].initial = data['compression']
         self.fields['dataset_atime'].initial = data['atime']
 

Modified: branches/volumes/gui/storage/models.py
===================================================================
--- branches/volumes/gui/storage/models.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/storage/models.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -60,6 +60,9 @@
             return self._disks
         except:
             return []
+    def get_datasets(self):
+        if self.vol_fstype == 'ZFS':
+            return notifier().list_zfs_datasets(path=self.vol_name, recursive=True)
     def _get_status(self):
         try:
             # Make sure do not compute it twice

Modified: branches/volumes/gui/storage/nav.py
===================================================================
--- branches/volumes/gui/storage/nav.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/storage/nav.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -133,31 +133,30 @@
                 subnav.name = _('Change Permissions')
                 subnav.type = 'editobject'
                 subnav.view = 'storage_mp_permission'
-                subnav.kwargs = {'object_id': i.id}
+                subnav.kwargs = {'path': i.mp_path}
                 subnav.model = 'Volume'
                 subnav.icon = u'ChangePasswordIcon'
                 subnav.app_name = 'storage'
 
-                datasets = models.MountPoint.objects.filter(mp_path__startswith=i.mp_path,mp_ischild=True)
-                for d in datasets:
+                datasets = i.mp_volume.get_datasets()
+                if datasets:
+                    for name, d in datasets.items():
 
-                    nav2 = TreeNode()
-                    nav2.name = d.mp_path
-                    nav2.icon = u'VolumesIcon'
-                    nav2.model = 'MountPoint'
-                    nav2.kwargs = {'oid': d.id, 'model': 'MountPoint'}
+                        nav2 = TreeNode()
+                        nav2.name = d.mountpoint
+                        nav2.icon = u'VolumesIcon'
 
-                    subnav2 = TreeNode()
-                    subnav2.name = _(u'Change Permissions')
-                    subnav2.type = 'editobject'
-                    subnav2.view = 'storage_mp_permission'
-                    subnav2.kwargs = {'object_id': d.id}
-                    subnav2.model = 'Volumes'
-                    subnav2.icon = u'ChangePasswordIcon'
-                    subnav2.app_name = 'storage'
+                        subnav2 = TreeNode()
+                        subnav2.name = _(u'Change Permissions')
+                        subnav2.type = 'editobject'
+                        subnav2.view = 'storage_mp_permission'
+                        subnav2.kwargs = {'path': d.mountpoint}
+                        subnav2.model = 'Volumes'
+                        subnav2.icon = u'ChangePasswordIcon'
+                        subnav2.app_name = 'storage'
 
-                    nav.append_child(nav2)
-                    nav2.append_child(subnav2)
+                        nav.append_child(nav2)
+                        nav2.append_child(subnav2)
 
                 nav.append_child(subnav)
                 self.insert_child(0, nav)

Modified: branches/volumes/gui/storage/urls.py
===================================================================
--- branches/volumes/gui/storage/urls.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/storage/urls.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -43,8 +43,8 @@
     url(r'^datagrid/volume-(?P<vid>\d+)/status/$', 'volume_status', name="storage_volume_status"),
     url(r'^datagrid/volume-(?P<vid>\d+)/status/json/$', 'volume_status_json', name="storage_volume_status_json"),
     url(r'dataset/$', 'dataset_create', name="storage_dataset"),
-    url(r'dataset/delete/(?P<object_id>\d+)/$', 'dataset_delete', name="storage_dataset_delete"),
-    url(r'dataset/edit/(?P<object_id>\d+)/$', 'dataset_edit', name="storage_dataset_edit"),
+    url(r'dataset/delete/(?P<name>.+)/$', 'dataset_delete', name="storage_dataset_delete"),
+    url(r'dataset/edit/(?P<dataset_name>.+)/$', 'dataset_edit', name="storage_dataset_edit"),
     url(r'zvol/$', 'zvol_create', name="storage_zvol"),
     url(r'zvol/delete/(?P<name>.+)/$', 'zvol_delete', name="storage_zvol_delete"),
     url(r'snapshot/delete/(?P<dataset>[-a-zA-Z0-9_/.]+)@(?P<snapname>[-a-zA-Z0-9_.]+)/$', 'snapshot_delete', name="storage_snapshot_delete"),
@@ -52,7 +52,7 @@
     url(r'snapshot/rollback/(?P<dataset>[-a-zA-Z0-9_/.]+)@(?P<snapname>[-a-zA-Z0-9_.]+)/$', 'snapshot_rollback', name="storage_snapshot_rollback"),
     url(r'snapshot/create/(?P<path>[-a-zA-Z0-9_/.]+)/$', 'manualsnap', name="storage_manualsnap"),
     url(r'snapshot/clone/(?P<snapshot>[-a-zA-Z0-9_/.]+@[-a-zA-Z0-9_.]+)/$', 'clonesnap', name="storage_clonesnap"),
-    url(r'mountpoint/permission/(?P<object_id>\d+)/$', 'mp_permission', name="storage_mp_permission"),
+    url(r'mountpoint/permission/(?P<path>.+)/$', 'mp_permission', name="storage_mp_permission"),
     url(r'^wizard/$', 'wizard', name="storage_wizard"),
     url(r'^export/(?P<vid>\d+)/$', 'volume_export', name="storage_export"),
     url(r'^scrub/(?P<vid>\d+)/$', 'zpool_scrub', name="storage_scrub"),

Modified: branches/volumes/gui/storage/views.py
===================================================================
--- branches/volumes/gui/storage/views.py	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/storage/views.py	2011-10-07 16:23:44 UTC (rev 8181)
@@ -57,7 +57,7 @@
 
 def volumes(request):
     en_dataset = models.MountPoint.objects.filter(mp_volume__vol_fstype__exact='ZFS').count() > 0
-    mp_list = models.MountPoint.objects.exclude(mp_volume__vol_fstype__exact='iscsi').select_related().all()
+    mp_list = models.MountPoint.objects.filter(mp_ischild=False).exclude(mp_volume__vol_fstype__exact='iscsi').select_related().all()
     zvols = {}
     for volume in models.Volume.objects.filter(vol_fstype__exact='ZFS'):
         zvol = notifier().list_zfs_vols(volume.vol_name)
@@ -340,13 +340,10 @@
         'form': dataset_form
     })
 
-def dataset_edit(request, object_id):
-    mp = models.MountPoint.objects.get(pk=object_id)
-    dataset_form = forms.ZFSDataset_EditForm(mp=mp)
+def dataset_edit(request, dataset_name):
     if request.method == 'POST':
-        dataset_form = forms.ZFSDataset_EditForm(request.POST, mp=mp)
+        dataset_form = forms.ZFSDataset_EditForm(request.POST, fs=dataset_name)
         if dataset_form.is_valid():
-            dataset_name = mp.mp_path.replace("/mnt/","")
             if dataset_form.cleaned_data["dataset_quota"] == "0":
                 dataset_form.cleaned_data["dataset_quota"] = "none"
             if dataset_form.cleaned_data["dataset_refquota"] == "0":
@@ -370,8 +367,10 @@
                 return JsonResponse(message=_("Dataset successfully edited."))
             else:
                 dataset_form.set_error(_("An error occurred when setting the options"))
+    else:
+        dataset_form = forms.ZFSDataset_EditForm(fs=dataset_name)
     return render(request, 'storage/dataset_edit.html', {
-        'mp': mp,
+        'dataset_name': dataset_name,
         'form': dataset_form
     })
 
@@ -449,34 +448,30 @@
         'form': volume_form
     })
 
-def mp_permission(request, object_id):
-    mp = models.MountPoint.objects.get(id = object_id)
+def mp_permission(request, path):
     if request.method == 'POST':
         form = forms.MountPointAccessForm(request.POST)
         if form.is_valid():
-            mp_path=mp.mp_path.__str__()
-            form.commit(path=mp_path)
+            form.commit(path=path)
             return JsonResponse(message=_("Mount Point permissions successfully updated."))
     else:
-        form = forms.MountPointAccessForm(initial={'path':mp.mp_path})
+        form = forms.MountPointAccessForm(initial={'path':path})
     return render(request, 'storage/permission.html', {
-        'mp': mp,
+        'path': path,
         'form': form,
     })
 
-def dataset_delete(request, object_id):
-    obj = models.MountPoint.objects.get(id=object_id)
+def dataset_delete(request, name):
+
     if request.method == 'POST':
-        retval = notifier().destroy_zfs_dataset(path = obj.mp_path[5:].__str__())
+        retval = notifier().destroy_zfs_dataset(path = name)
         if retval == '':
-            obj.delete()
             return JsonResponse(message=_("Dataset successfully destroyed."))
         else:
             return JsonResponse(error=True, message=retval)
     else:
         return render(request, 'storage/dataset_confirm_delete.html', {
-            'focused_tab' : 'storage',
-            'object': obj,
+            'name': name,
         })
 
 def snapshot_delete(request, dataset, snapname):

Modified: branches/volumes/gui/templates/storage/dataset_confirm_delete.html
===================================================================
--- branches/volumes/gui/templates/storage/dataset_confirm_delete.html	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/templates/storage/dataset_confirm_delete.html	2011-10-07 16:23:44 UTC (rev 8181)
@@ -1,10 +1,10 @@
 {% load i18n %}
 <form dojoType="dijit.form.Form">
 <script type="dojo/event" event="onSubmit" args="e">
-    formSubmit(this, e, '{% url storage_dataset_delete object_id=object.id %}');
+    formSubmit(this, e, '{% url storage_dataset_delete name=name %}');
 </script>
 <table> 
-    <tr><td>{% trans "Are you sure you want to delete?" %}</td></tr>
+    <tr><td><strong>{{ name }}:</strong> {% trans "Are you sure you want to delete?" %}</td></tr>
     <tr>
         <td>
             <button id="submitform" dojoType="dijit.form.Button" type="submit">

Modified: branches/volumes/gui/templates/storage/dataset_edit.html
===================================================================
--- branches/volumes/gui/templates/storage/dataset_edit.html	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/templates/storage/dataset_edit.html	2011-10-07 16:23:44 UTC (rev 8181)
@@ -1,7 +1,7 @@
 {% load i18n %}
 <form dojoType="dijit.form.Form">
     <script type="dojo/event" event="onSubmit" args="e">
-        formSubmit(this, e, '{% url storage_dataset_edit object_id=mp.id %}');
+        formSubmit(this, e, '{% url storage_dataset_edit dataset_name=dataset_name %}');
     </script>
 <table>
 {{ form }}

Modified: branches/volumes/gui/templates/storage/permission.html
===================================================================
--- branches/volumes/gui/templates/storage/permission.html	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/templates/storage/permission.html	2011-10-07 16:23:44 UTC (rev 8181)
@@ -1,7 +1,7 @@
 {% load i18n %}
 <form dojoType="dijit.form.Form">
     <script type="dojo/event" event="onSubmit" args="e">
-        formSubmit(this, e, '{% url storage_mp_permission object_id=mp.id %}');
+        formSubmit(this, e, '{% url storage_mp_permission path=path %}');
     </script>
     <h3>{% trans "Change permission" %}</h3>
     <p>{% blocktrans with mp.mp_path as path %}Change permission on {{ path }} to{% endblocktrans %}:</p>

Modified: branches/volumes/gui/templates/storage/volumes.html
===================================================================
--- branches/volumes/gui/templates/storage/volumes.html	2011-10-07 13:40:02 UTC (rev 8180)
+++ branches/volumes/gui/templates/storage/volumes.html	2011-10-07 16:23:44 UTC (rev 8181)
@@ -113,26 +113,7 @@
 	    </td>
 	    <td>
 
-{% if m.mp_ischild %}
-    <button id="delDSBtn{{ m.id }}" dojoType="dijit.form.Button" type="button">
-        <img src="{{ STATIC_URL }}images/ui/buttons/remove_dataset.png">
-        <script type="dojo/method" event="onClick" args="evt">
-            editScaryObject('{% trans "Destroy Dataset"|force_escape %}', '{% url storage_dataset_delete object_id=m.id %}', [this,]);
-        </script>
-    </button>
-    <div dojoType="dijit.Tooltip" connectId="delDSBtn{{ m.id }}" position="above">
-        <strong>{% trans "Destroy Dataset" %}</strong>
-    </div>
-    <button id="editDataBtn{{ m.id }}" dojoType="dijit.form.Button" type="button">
-        <img src="{{ STATIC_URL }}images/ui/buttons/settings.png" />
-        <script type="dojo/method" event="onClick" args="evt">
-            editObject('{% trans "Edit ZFS Options"|force_escape %}', '{% url storage_dataset_edit object_id=m.id %}', [this,]);
-        </script>
-    </button>
-    <div dojoType="dijit.Tooltip" connectId="editDataBtn{{ m.id }}" position="above">
-        <strong>{% trans "Edit ZFS Options" %}</strong>
-    </div>
-{% else %}
+{% if not m.mp_ischild %}
     <button id="delVolBtn{{ m.id }}" dojoType="dijit.form.Button" type="button">
         <img src="{{ STATIC_URL }}images/ui/buttons/remove_volume.png" width="18px" height="18px">
         <script type="dojo/method" event="onClick" args="evt">
@@ -166,7 +147,7 @@
     <button id="permBtn{{ m.id }}" dojoType="dijit.form.Button" type="button">
         <img src="{{ STATIC_URL }}images/ui/buttons/permissions.png" width="18px" height="18px">
         <script type="dojo/method" event="onClick" args="evt">
-            editObject('{% trans "Change Permissions"|force_escape %}', '{% url storage_mp_permission object_id=m.id %}', [this,]);
+            editObject('{% trans "Change Permissions"|force_escape %}', '{% url storage_mp_permission path=m.mp_path %}', [this,]);
         </script>
     </button>
     <div dojoType="dijit.Tooltip" connectId="permBtn{{ m.id }}" position="above">
@@ -196,6 +177,66 @@
 {% endif %}
 	    </td>
 	</tr>
+    {% for name, dataset in m.mp_volume.get_datasets.items %}
+	    <tr class="{% cycle 'odd' 'even' %}" id="{{ m.id }}">
+	    <td>
+        {{ name }}
+	    </td>
+	    <td>
+		{{ dataset.path }}
+	    </td>
+	    <td>
+		{{ m.used_si }} ({{ m.used_pct }})
+	    </td>
+	    <td>
+		{{ m.avail_si }}
+	    </td>
+	    <td>
+		{{ m.total_si }}
+	    </td>
+	    <td>
+		{{ m.status }}
+	    </td>
+	    <td>
+            <button id="delDSBtn{{ m.id }}{{ name }}" dojoType="dijit.form.Button" type="button">
+                <img src="{{ STATIC_URL }}images/ui/buttons/remove_dataset.png">
+                <script type="dojo/method" event="onClick" args="evt">
+                    editScaryObject('{% trans "Destroy Dataset"|force_escape %}', '{% url storage_dataset_delete name=dataset.path %}', [this,]);
+                </script>
+            </button>
+            <div dojoType="dijit.Tooltip" connectId="delDSBtn{{ m.id }}{{ name }}" position="above">
+                <strong>{% trans "Destroy Dataset" %}</strong>
+            </div>
+            <button id="editDataBtn{{ m.id }}{{ name }}" dojoType="dijit.form.Button" type="button">
+                <img src="{{ STATIC_URL }}images/ui/buttons/settings.png" />
+                <script type="dojo/method" event="onClick" args="evt">
+                    editObject('{% trans "Edit ZFS Options"|force_escape %}', '{% url storage_dataset_edit dataset_name=dataset.path %}', [this,]);
+                </script>
+            </button>
+            <div dojoType="dijit.Tooltip" connectId="editDataBtn{{ m.id }}{{ name }}" position="above">
+                <strong>{% trans "Edit ZFS Options" %}</strong>
+            </div>
+            <button id="permBtn{{ m.id }}{{ name }}" dojoType="dijit.form.Button" type="button">
+                <img src="{{ STATIC_URL }}images/ui/buttons/permissions.png" width="18px" height="18px">
+                <script type="dojo/method" event="onClick" args="evt">
+                    editObject('{% trans "Change Permissions"|force_escape %}', '{% url storage_mp_permission path=dataset.mountpoint %}', [this,]);
+                </script>
+            </button>
+            <div dojoType="dijit.Tooltip" connectId="permBtn{{ m.id }}{{ name }}" position="above">
+                <strong>{% trans "Change Permissions" %}</strong>
+            </div>
+            <button id="snapBtn{{ m.id }}{{ name }}" dojoType="dijit.form.Button" type="button">
+                <img src="{{ STATIC_URL }}images/ui/buttons/create_snapshot.png" width="18px" height="18px">
+                <script type="dojo/method" event="onClick" args="evt">
+                    editObject('{% trans "Create Snapshot"|force_escape %}', '{% url storage_manualsnap path=dataset.mountpoint %}', [this,]);
+                </script>
+            </button>
+            <div dojoType="dijit.Tooltip" connectId="snapBtn{{ m.id }}{{ name }}" position="above">
+                <strong>{% trans "Create Snapshot" %}</strong>
+            </div>
+        </td>
+    </tr>
+    {% endfor %}
 	{% empty %}
 	<tr>
             <td colspan="7">{% trans "No volumes defined" %}</td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8180
          http://freenas.svn.sourceforge.net/freenas/?rev=8180&view=rev
Author:   zippybr
Date:     2011-10-07 13:40:02 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
first step to move zfs datasets outside database

Modified Paths:
--------------
    branches/volumes/gui/middleware/notifier.py
    branches/volumes/gui/middleware/zfs.py

Modified: branches/volumes/gui/middleware/notifier.py
===================================================================
--- branches/volumes/gui/middleware/notifier.py	2011-10-07 11:27:28 UTC (rev 8179)
+++ branches/volumes/gui/middleware/notifier.py	2011-10-07 13:40:02 UTC (rev 8180)
@@ -787,17 +787,19 @@
     def list_zfs_datasets(self, path="", recursive=False):
         """Return a dictionary that contains all ZFS dataset list and their mountpoints"""
         if recursive:
-            zfsproc = self.__pipeopen("/sbin/zfs list -Hr %s" % (path))
+            zfsproc = self.__pipeopen("/sbin/zfs list -Hr -t filesystem %s" % (path))
         else:
-            zfsproc = self.__pipeopen("/sbin/zfs list -H %s" % (path))
+            zfsproc = self.__pipeopen("/sbin/zfs list -H -t filesystem %s" % (path))
         zfs_output, zfs_err = zfsproc.communicate()
         zfs_output = zfs_output.split('\n')
-        retval = {}
+        zfslist = zfs.ZFSList()
         for line in zfs_output:
-            if line != "":
+            if line:
                 data = line.split('\t')
-                retval[data[0]] = data[4]
-        return retval
+                # root filesystem is not treated as dataset by us
+                if data[0].find('/') != -1:
+                    zfslist.append(zfs.ZFSDataset(path=data[0], mountpoint=data[4]))
+        return zfslist
 
     def list_zfs_vols(self, volname):
         """Return a dictionary that contains all ZFS volumes list"""

Modified: branches/volumes/gui/middleware/zfs.py
===================================================================
--- branches/volumes/gui/middleware/zfs.py	2011-10-07 11:27:28 UTC (rev 8179)
+++ branches/volumes/gui/middleware/zfs.py	2011-10-07 13:40:02 UTC (rev 8180)
@@ -360,6 +360,33 @@
             search = self._doc.xpathEval("//provider[@id = '%s']/../name" % provider)
             self.disk = search[0].content
 
+class ZFSList(dict):
+
+    pools = {}
+
+    def append(self, new):
+        if new.pool in self.pools:
+            self.pools.get(new.pool).append(new)
+        else:
+            self.pools[new.pool] = [new]
+        self[new.name] = new
+
+    def __delitem__(self, item):
+        self.pools[item.pool].remove(item)
+        super(ZFSList, self).__delitem__(item)
+
+class ZFSDataset(object):
+
+    name = None
+    path = None
+    pool = None
+    mountpoint = None
+
+    def __init__(self, path, mountpoint):
+        self.path = path
+        self.pool, self.name = path.split('/',1)
+        self.mountpoint = mountpoint
+
 def parse_status(name, doc, data):
 
     status = data.split('config:')[1]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8179
          http://freenas.svn.sourceforge.net/freenas/?rev=8179&view=rev
Author:   zippybr
Date:     2011-10-07 11:27:28 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
allow disk replace in-place

Modified Paths:
--------------
    branches/volumes/gui/storage/forms.py

Modified: branches/volumes/gui/storage/forms.py
===================================================================
--- branches/volumes/gui/storage/forms.py	2011-10-07 11:24:22 UTC (rev 8178)
+++ branches/volumes/gui/storage/forms.py	2011-10-07 11:27:28 UTC (rev 8179)
@@ -932,6 +932,8 @@
         used_disks = []
         for v in models.Volume.objects.all():
             used_disks.extend(v.get_disks())
+        if self.disk and self.disk in used_disks:
+            used_disks.remove(self.disk)
 
         # Grab partition list
         # NOTE: This approach may fail if device nodes are not accessible.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8178
          http://freenas.svn.sourceforge.net/freenas/?rev=8178&view=rev
Author:   zippybr
Date:     2011-10-07 11:24:22 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
fiz typo preventing zpool detach to work

Modified Paths:
--------------
    branches/volumes/gui/middleware/notifier.py

Modified: branches/volumes/gui/middleware/notifier.py
===================================================================
--- branches/volumes/gui/middleware/notifier.py	2011-10-07 11:16:30 UTC (rev 8177)
+++ branches/volumes/gui/middleware/notifier.py	2011-10-07 11:24:22 UTC (rev 8178)
@@ -999,7 +999,7 @@
 
         assert volume.vol_fstype == 'ZFS'
 
-        from_disk = self.label_to_disk(from_label)
+        from_disk = self.label_to_disk(label)
         from_swap = self.part_type_from_device('swap', from_disk)
 
         # Remove the swap partition for another time to be sure.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8177
          http://freenas.svn.sourceforge.net/freenas/?rev=8177&view=rev
Author:   zippybr
Date:     2011-10-07 11:16:30 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Auto-Commit of i18n data from Pootle for GUI

Modified Paths:
--------------
    trunk/gui/locale/az/LC_MESSAGES/django.po
    trunk/gui/locale/gl/LC_MESSAGES/django.po
    trunk/gui/locale/nb/LC_MESSAGES/django.po
    trunk/gui/locale/pt/LC_MESSAGES/django.po
    trunk/gui/locale/pt/LC_MESSAGES/djangojs.po
    trunk/gui/locale/sv/LC_MESSAGES/django.po
    trunk/gui/locale/zh_CN/LC_MESSAGES/django.po
    trunk/gui/locale/zh_TW/LC_MESSAGES/django.po

Modified: trunk/gui/locale/az/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/az/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/az/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -3,20 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@...>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:50-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@..."
+"PO-Revision-Date: 2011-09-21 00:35+0200\n"
+"Last-Translator: raymond <raymondv@..."
 "Language-Team: LANGUAGE <LL@..."
-"Language: \n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.1.6\n"
 
 #: choices.py:35
 msgid "Plain"
@@ -24,19 +24,19 @@
 
 #: choices.py:36 system/models.py:234 templates/system/settings.html:9
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: choices.py:37
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: choices.py:42
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
 #: choices.py:43
 msgid "HTTPS"
-msgstr ""
+msgstr "HTTPS"
 
 #: choices.py:48 choices.py:217
 msgid "Auto"
@@ -108,7 +108,7 @@
 
 #: choices.py:81 choices.py:90
 msgid "Disabled"
-msgstr ""
+msgstr "əlil"
 
 #: choices.py:82
 msgid "Level 1 - Minimum power usage with Standby (spindown)"
@@ -388,7 +388,7 @@
 #: choices.py:434 system/models.py:302 system/models.py:321
 #: system/models.py:457 system/models.py:476
 msgid "Everyday"
-msgstr ""
+msgstr "gündəlik"
 
 #: choices.py:435
 msgid "Every selected weekday"
@@ -465,7 +465,7 @@
 
 #: account/forms.py:95 templates/storage/volumes.html:73
 msgid "Available"
-msgstr ""
+msgstr "mövcud"
 
 #: account/forms.py:146
 msgid "Selected"
@@ -475,7 +475,7 @@
 #: services/models.py:676 services/models.py:935 system/models.py:160
 #: templates/account/bsdusers.html:5 templates/account/bsdusers.html.py:86
 msgid "Username"
-msgstr ""
+msgstr "İstifadəçi adı"
 
 #: account/forms.py:175 account/forms.py:199
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
@@ -489,7 +489,7 @@
 #: system/forms.py:187 system/models.py:167 templates/account/bsdusers.html:9
 #: templates/account/bsdusers.html.py:90
 msgid "Password"
-msgstr ""
+msgstr "parol"
 
 #: account/forms.py:202 account/forms.py:309 system/forms.py:188
 msgid "Password confirmation"
@@ -611,14 +611,14 @@
 
 #: account/models.py:115 templates/account/bsdusers.html:91
 msgid "E-mail"
-msgstr ""
+msgstr "elektron poçtu"
 
 #: account/models.py:120 account/models.py:159 services/models.py:521
 #: services/models.py:1203 system/models.py:242 system/models.py:380
 #: templates/services/iscsi_auth.html:6 templates/system/cronjob.html:10
 #: templates/system/rsync.html:10
 msgid "User"
-msgstr ""
+msgstr "İstifadəçi"
 
 #: account/models.py:121 templates/account/index.html:13
 msgid "Users"

Modified: trunk/gui/locale/gl/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/gl/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/gl/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:49-0700\n"
-"PO-Revision-Date: 2011-06-02 13:35+0200\n"
-"Last-Translator: santigonzalez <santigonzalez@..."
+"PO-Revision-Date: 2011-09-21 00:41+0200\n"
+"Last-Translator: raymond <raymondv@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -269,11 +269,11 @@
 
 #: choices.py:198
 msgid "File"
-msgstr ""
+msgstr "arquivo"
 
 #: choices.py:199
 msgid "Device"
-msgstr ""
+msgstr "dispositivo"
 
 #: choices.py:200
 msgid "ZFS Volume"
@@ -283,11 +283,11 @@
 #: templates/storage/autoimport.html:9 templates/storage/import.html:18
 #: templates/storage/wizard.html:91
 msgid "Disk"
-msgstr ""
+msgstr "Disco"
 
 #: choices.py:205
 msgid "DVD"
-msgstr ""
+msgstr "DVD"
 
 #: choices.py:206
 msgid "Tape"
@@ -476,7 +476,7 @@
 #: services/models.py:676 services/models.py:935 system/models.py:160
 #: templates/account/bsdusers.html:5 templates/account/bsdusers.html.py:86
 msgid "Username"
-msgstr ""
+msgstr "nome de usuario"
 
 #: account/forms.py:175 account/forms.py:199
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
@@ -490,11 +490,11 @@
 #: system/forms.py:187 system/models.py:167 templates/account/bsdusers.html:9
 #: templates/account/bsdusers.html.py:90
 msgid "Password"
-msgstr ""
+msgstr "contrasinal"
 
 #: account/forms.py:202 account/forms.py:309 system/forms.py:188
 msgid "Password confirmation"
-msgstr ""
+msgstr "Confirmar contrasinal"
 
 #: account/forms.py:203 account/forms.py:310 system/forms.py:189
 msgid "Enter the same password as above, for verification."
@@ -619,7 +619,7 @@
 #: templates/services/iscsi_auth.html:6 templates/system/cronjob.html:10
 #: templates/system/rsync.html:10
 msgid "User"
-msgstr ""
+msgstr "usuario"
 
 #: account/models.py:121 templates/account/index.html:13
 msgid "Users"
@@ -709,11 +709,11 @@
 
 #: freeadmin/navtree.py:353 templates/freeadmin/index.html:53
 msgid "Reboot"
-msgstr ""
+msgstr "reiniciar"
 
 #: freeadmin/navtree.py:360 templates/freeadmin/index.html:65
 msgid "Shutdown"
-msgstr ""
+msgstr "peche"
 
 #: freeadmin/views.py:225
 #, python-format
@@ -1182,7 +1182,7 @@
 #: services/models.py:47 services/models.py:48 services/nav.py:5
 #: templates/menubar.html:28 templates/services/index.html:3
 msgid "Services"
-msgstr ""
+msgstr "servizos"
 
 #: services/models.py:60
 msgid "Authentication Model"
@@ -1598,7 +1598,7 @@
 #: templates/sharing/apple.html:14 templates/sharing/unix.html:14
 #: templates/sharing/windows.html:14
 msgid "Comment"
-msgstr ""
+msgstr "comentario"
 
 #: services/models.py:395 services/models.py:444 services/models.py:490
 msgid "You may enter a description here for your reference."
@@ -2116,7 +2116,7 @@
 #: services/models.py:951 services/models.py:952
 #: templates/services/index.html:130
 msgid "TFTP"
-msgstr ""
+msgstr "TFTP"
 
 #: services/models.py:961 services/models.py:1157
 msgid "TCP Port"

Modified: trunk/gui/locale/nb/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/nb/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/nb/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:47-0700\n"
-"PO-Revision-Date: 2011-09-05 07:17+0200\n"
-"Last-Translator: HotRod <reg03@..."
+"PO-Revision-Date: 2011-09-22 06:01+0200\n"
+"Last-Translator: Goodman <jea1963@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: nb\n"
 "MIME-Version: 1.0\n"
@@ -583,7 +583,7 @@
 #: account/models.py:63
 #, python-format
 msgid "Group %s is built-in and can not be deleted!"
-msgstr "Gruppen % er innebygget og kan ikke slettes!"
+msgstr "Gruppen %s er innebygget og kan ikke slettes!"
 
 #: account/models.py:73
 msgid "User ID"
@@ -662,7 +662,7 @@
 
 #: account/views.py:78
 msgid "Password successfully updated."
-msgstr "Passord ble oppdatert."
+msgstr "Passordet ble vellykket oppdatert."
 
 #: account/views.py:92
 msgid "Admin user successfully updated."
@@ -1084,7 +1084,7 @@
 
 #: services/forms.py:309
 msgid "Secret does not match"
-msgstr "Hemmeligheter stemmer ikke"
+msgstr "Hemmeligheter stemmer ikke overens"
 
 #: services/forms.py:324 services/forms.py:325
 msgid "The peer secret is required if you set a peer user."
@@ -1355,7 +1355,7 @@
 
 #: services/models.py:154
 msgid "Enable/disable AIO support."
-msgstr "Dette aktiverer\\deaktiverer støtte for AIO"
+msgstr "Aktivere/deaktivere støtte for AIO."
 
 #: services/models.py:158
 msgid "Minimum AIO read size"
@@ -1398,7 +1398,7 @@
 
 #: services/models.py:184
 msgid "Guest Access"
-msgstr "Gjestetilgang"
+msgstr "Gjeste Tilgang"
 
 #: services/models.py:185
 msgid "Allows guest access to all apple shares on this box."
@@ -1728,11 +1728,11 @@
 
 #: services/models.py:542
 msgid "Authorized Accesses"
-msgstr "Autoriserte tilganger"
+msgstr "Autorisert Adgang"
 
 #: services/models.py:557
 msgid "Target Name"
-msgstr "Målnavn"
+msgstr "Mål Navn"
 
 #: services/models.py:558
 msgid "Base Name will be appended automatically when starting without 'iqn.'."
@@ -1740,7 +1740,7 @@
 
 #: services/models.py:565
 msgid "Target Alias"
-msgstr "Målalias"
+msgstr "Mål alias"
 
 #: services/models.py:566
 #, fuzzy
@@ -2406,7 +2406,7 @@
 #: services/models.py:1132
 msgid "This parameter specifies whether to use SSL/TLS, e.g. on/off/start_tls"
 msgstr ""
-"Med dette parameteret velger du om du vil bruke SSL/TLS, etc on/off/start_tls"
+"Dette parameteret velger du om du vil bruke SSL/TLS, f.eks på/av/starte_tls"
 
 #: services/models.py:1135
 msgid "Self signed certificate"
@@ -2484,7 +2484,7 @@
 
 #: services/models.py:1215
 msgid "Hosts allow"
-msgstr ""
+msgstr "Vert tillates"
 
 #: services/models.py:1216
 msgid ""
@@ -2495,7 +2495,7 @@
 
 #: services/models.py:1220
 msgid "Hosts deny"
-msgstr ""
+msgstr "Vert nektes"
 
 #: services/models.py:1221
 msgid ""
@@ -2729,7 +2729,7 @@
 
 #: sharing/models.py:93
 msgid "Windows Share"
-msgstr ""
+msgstr "Windows Deling"
 
 #: sharing/models.py:94
 #, fuzzy
@@ -3180,7 +3180,7 @@
 
 #: storage/forms.py:875
 msgid "At least one day must be chosen"
-msgstr ""
+msgstr "Minst en dag må velges"
 
 #: storage/forms.py:880
 msgid "Recursive snapshot"
@@ -3192,7 +3192,7 @@
 
 #: storage/forms.py:888
 msgid "Only [-a-zA-Z0-9_.] permitted as snapshot name"
-msgstr ""
+msgstr "Kun [-a -zA-Z0-9_.] er tillatt som speilbilde navn"
 
 #: storage/forms.py:898
 msgid "Invalid prefix"
@@ -3338,7 +3338,7 @@
 
 #: storage/models.py:274
 msgid "Snapshot lifetime value"
-msgstr ""
+msgstr "Speilbildets levetid"
 
 #: storage/models.py:280
 msgid "Snapshot lifetime unit"
@@ -3346,28 +3346,30 @@
 
 #: storage/models.py:284
 msgid "Begin"
-msgstr ""
+msgstr "Begynne"
 
 #: storage/models.py:285
 msgid "When in a day should we start making snapshots, e.g. 8:00"
-msgstr ""
+msgstr "Når på dagen skal vi starte å lage speilbilde, f.eks 8:00"
 
 #: storage/models.py:289
 msgid "End"
-msgstr ""
+msgstr "Slutt"
 
 #: storage/models.py:290
 msgid "When in a day should we stop making snapshots, e.g. 17:00"
-msgstr ""
+msgstr "Når på dagen skal vi stoppe å lage speilbilde, f.eks 17:00"
 
 #: storage/models.py:296
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #: storage/models.py:297
 msgid ""
 "How many minutes passed before a new snapshot is made after the last one."
 msgstr ""
+"Hvor mange minutter mellom hver gang et nytt speilbilde blir laget etter det "
+"siste."
 
 #: storage/models.py:303
 msgid "Occurrence"
@@ -3625,11 +3627,11 @@
 
 #: system/models.py:91
 msgid "Automatically Check for New Firmware"
-msgstr ""
+msgstr "Automatisk Sjekk for Ny Fastvare"
 
 #: system/models.py:93
 msgid "Beep on boot"
-msgstr ""
+msgstr "Bip ved start"
 
 #: system/models.py:95
 msgid "Enable Special System Tuning"
@@ -3742,7 +3744,7 @@
 
 #: system/models.py:203
 msgid "Locality Name (eg, city)"
-msgstr ""
+msgstr "Stedsnavn (f.eks, by)"
 
 #: system/models.py:209
 msgid "State"
@@ -3816,9 +3818,8 @@
 
 #: system/models.py:267 system/models.py:371 system/models.py:519
 #: templates/system/cronjob.html:8 templates/system/rsync.html:8
-#, fuzzy
 msgid "Month"
-msgstr "Måned(er)"
+msgstr "Måned"
 
 #: system/models.py:272 system/models.py:376 system/models.py:524
 #: templates/system/cronjob.html:9 templates/system/rsync.html:9
@@ -3897,11 +3898,11 @@
 
 #: system/models.py:399
 msgid "Archive"
-msgstr ""
+msgstr "Arkiv"
 
 #: system/models.py:400
 msgid "Archive mode"
-msgstr ""
+msgstr "Arkiverings modus"
 
 #: system/models.py:404 templates/freeadmin/generic_model_edit.html:43
 #: templates/network/interface.html:39 templates/network/lagg.html:44
@@ -4407,11 +4408,11 @@
 
 #: templates/network/summary.html:37
 msgid "Default route"
-msgstr ""
+msgstr "Standard rute"
 
 #: templates/network/summary.html:46
 msgid "No default route defined"
-msgstr ""
+msgstr "Ingen standard rute definert"
 
 #: templates/network/vlan.html:21
 msgid "Edit VLAN"
@@ -4522,7 +4523,7 @@
 
 #: templates/services/iscsi.html:5
 msgid "Targets"
-msgstr ""
+msgstr "Mål"
 
 #: templates/services/iscsi.html:11
 msgid "Associated Targets"
@@ -4647,27 +4648,27 @@
 
 #: templates/sharing/apple.html:50
 msgid "Add Apple Share"
-msgstr ""
+msgstr "Legg til Apple deling"
 
 #: templates/sharing/apple.html:52
 msgid "Add Apple Share (AFP)"
-msgstr ""
+msgstr "Legg til Apple Deling (AFP)"
 
 #: templates/sharing/index.html:3
 msgid "Apple"
-msgstr ""
+msgstr "Apple"
 
 #: templates/sharing/index.html:5
 msgid "UNIX"
-msgstr ""
+msgstr "UNIX"
 
 #: templates/sharing/index.html:7
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: templates/sharing/unix.html:8
 msgid "There are no active UNIX Shares."
-msgstr ""
+msgstr "Det er ingen aktive UNIX Delinger"
 
 #: templates/sharing/unix.html:13
 msgid "Mountpoint"
@@ -4800,7 +4801,7 @@
 
 #: templates/storage/replications.html:49
 msgid "No ZFS replication available"
-msgstr ""
+msgstr "Ingen ZFS replikering tilgjengelig"
 
 #: templates/storage/snapshot_confirm_rollback.html:7
 msgid "Are you sure you want to rollback the snapshot to previous state?"
@@ -4958,15 +4959,15 @@
 
 #: templates/storage/wizard.html:61
 msgid "Group type"
-msgstr "ZFS ekstra"
+msgstr "Gruppe type"
 
 #: templates/storage/wizard.html:84
 msgid "ZFS Extra"
-msgstr "ZFS ekstra"
+msgstr "ZFS Ekstra"
 
 #: templates/storage/wizard.html:87
 msgid "The use of only 1 log disk is highly discouraged"
-msgstr "Bruken av bare en loggdisk er ikke anbefalt"
+msgstr "Bruk av bare en loggdisk er ikke anbefalt"
 
 #: templates/storage/wizard.html:93
 msgid "Log"
@@ -5126,7 +5127,7 @@
 
 #: templates/system/system_info.html:8
 msgid "OS Version"
-msgstr "OS versjon"
+msgstr "OS Versjon"
 
 #: templates/system/system_info.html:12
 msgid "Platform"

Modified: trunk/gui/locale/pt/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/pt/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/pt/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:48-0700\n"
-"PO-Revision-Date: 2011-07-11 16:36+0200\n"
+"PO-Revision-Date: 2011-10-01 10:27+0200\n"
 "Last-Translator: Nuno <nuno.piscinas@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: pt\n"
@@ -1343,7 +1343,7 @@
 
 #: services/models.py:141
 msgid "Enable/disable home directories for samba user."
-msgstr "Isto activa\\desactiva directórios home para utilizadores samba."
+msgstr "Isto activa/desactiva directórios home para utilizadores samba."
 
 #: services/models.py:144
 msgid "Enable home directories browsing"
@@ -3276,7 +3276,7 @@
 
 #: storage/forms.py:667 storage/forms.py:724 storage/forms.py:768
 msgid "Enter positive number (optionally suffixed by M, G, T), or, 0"
-msgstr "Insira um número positivo (pode usar um sufixo M, G, T) ou 0"
+msgstr "Insira um número positivo (pode usar um sufixo M, G, T) ou, 0"
 
 #: storage/forms.py:782
 msgid "Volume from which this ZFS Volume will be created on"
@@ -3529,7 +3529,7 @@
 
 #: storage/nav.py:5 templates/menubar.html:18
 msgid "Storage"
-msgstr "Armazenamento"
+msgstr "Discos"
 
 #: storage/nav.py:24
 msgid "View All Snapshots"

Modified: trunk/gui/locale/pt/LC_MESSAGES/djangojs.po
===================================================================
--- trunk/gui/locale/pt/LC_MESSAGES/djangojs.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/pt/LC_MESSAGES/djangojs.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:51-0700\n"
-"PO-Revision-Date: 2011-06-11 19:11+0200\n"
-"Last-Translator: jsemedo <jsemedo@..."
+"PO-Revision-Date: 2011-10-01 10:25+0200\n"
+"Last-Translator: Nuno <nuno.piscinas@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: pt\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@
 
 #: media/lib/js/freeadmin.js:318
 msgid "Storage"
-msgstr "Armazenamento"
+msgstr "Disco"
 
 #: media/lib/js/freeadmin.js:385
 msgid "CronJobs"

Modified: trunk/gui/locale/sv/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/sv/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/sv/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:46-0700\n"
-"PO-Revision-Date: 2011-09-18 21:35+0200\n"
+"PO-Revision-Date: 2011-09-20 20:27+0200\n"
 "Last-Translator: Jonas <mossemansson@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: sv\n"
@@ -460,9 +460,8 @@
 msgstr "Kort Själv-Test"
 
 #: choices.py:469
-#, fuzzy
 msgid "Conveyance Self-Test (ATA  only)"
-msgstr "Utökat självtest (enbart ATA)"
+msgstr "Utökat självtest (enbart  ATA)    "
 
 #: choices.py:470
 msgid "Offline Immediate Test (ATA only)"
@@ -1536,7 +1535,7 @@
 
 #: services/models.py:290
 msgid "iSCSI initial parameter (65536 by default)."
-msgstr ""
+msgstr "iSCI första parameter (65636 som standard) "
 
 #: services/models.py:295
 msgid "Max burst length"

Modified: trunk/gui/locale/zh_CN/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/zh_CN/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/zh_CN/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,8 +8,8 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:49-0700\n"
-"PO-Revision-Date: 2011-09-03 15:25+0200\n"
-"Last-Translator: HALLELUMOE <hallelumoe@..."
+"PO-Revision-Date: 2011-09-30 07:20+0200\n"
+"Last-Translator: Flevi <Flevi@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
 
 #: choices.py:35
 msgid "Plain"
-msgstr "明文"
+msgstr "通俗的"
 
 #: choices.py:36 system/models.py:234 templates/system/settings.html:9
 msgid "SSL"
@@ -112,28 +112,27 @@
 
 #: choices.py:82
 msgid "Level 1 - Minimum power usage with Standby (spindown)"
-msgstr "级别 1 - 使用最小电力待机(降速)"
+msgstr "级别 1 - 省电模式并待机(怠速)"
 
 #: choices.py:83
 msgid "Level 64 - Intermediate power usage with Standby"
-msgstr "级别 64 - 使用中等电力待机"
+msgstr "级别 64 - 正常用电模式并待机"
 
 #: choices.py:84
 msgid "Level 127 - Intermediate power usage with Standby"
-msgstr "级别 127 - 使用中等电力待机"
+msgstr "级别 127 - 正常用电模式并待机"
 
 #: choices.py:85
-#, fuzzy
 msgid "Level 128 - Minimum power usage without Standby (no spindown)"
-msgstr "级别 128 - 使用最小电力不待机(不降速)"
+msgstr "级别 128 - 省电模式但不待机(不怠速)"
 
 #: choices.py:86
 msgid "Level 192 - Intermediate power usage without Standby"
-msgstr "级别 192 - 使用中等电力不待机"
+msgstr "级别 192 - 正常用电模式但不待机"
 
 #: choices.py:87
 msgid "Level 254 - Maximum performance, maximum power usage"
-msgstr "级别 254 - 最高性能，使用最大电力"
+msgstr "级别 254 - 最高性能，最大功耗模式"
 
 #: choices.py:91 choices.py:179
 msgid "Minimum"
@@ -141,7 +140,7 @@
 
 #: choices.py:92
 msgid "Medium"
-msgstr "中等"
+msgstr "普通"
 
 #: choices.py:93
 msgid "Maximum"
@@ -249,7 +248,7 @@
 
 #: choices.py:187
 msgid "Time Machine"
-msgstr "时间机器"
+msgstr "Time Machine"
 
 #: choices.py:190
 msgid "No case folding"
@@ -299,7 +298,7 @@
 
 #: choices.py:211
 msgid "read-write"
-msgstr "读-写"
+msgstr "可读写"
 
 #: choices.py:212
 msgid "read-only"
@@ -312,11 +311,11 @@
 
 #: choices.py:218
 msgid "CHAP"
-msgstr "CHAP"
+msgstr "CHAP （验证通信协议）"
 
 #: choices.py:219
 msgid "Mutual CHAP"
-msgstr "双向 CHAP"
+msgstr "双向 CHAP （验证通信协议）"
 
 #: choices.py:241
 msgid "UPS reaches low battery"
@@ -324,7 +323,7 @@
 
 #: choices.py:242
 msgid "UPS goes on battery"
-msgstr "UPS 改由电池供电"
+msgstr "UPS 改为电池供电"
 
 #: choices.py:245
 msgid "Preferred"
@@ -480,11 +479,11 @@
 
 #: account/forms.py:175 account/forms.py:199
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "必填。不超过 30 个字符，只能使用英文字母、数字和 @/./+/-/_。"
+msgstr "必填。不超过 30 个字符，只能使用英文字母、数字和 @ . + - _字符。"
 
 #: account/forms.py:176 account/forms.py:200
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "这个值只能包含英文字母、数字和 @/./+/-/_字符。"
+msgstr "这个值只能包含英文字母、数字和@ . + - _字符。"
 
 #: account/forms.py:201 account/forms.py:308 services/models.py:680
 #: system/forms.py:187 system/models.py:167 templates/account/bsdusers.html:9
@@ -1160,6 +1159,7 @@
 msgid "Delete underlying file"
 msgstr "删除对应的文件存储"
 
+# 邮件地址%(email)不合法
 #: services/forms.py:788
 #, python-format
 msgid "The email %(email)s is not valid"
@@ -1471,11 +1471,11 @@
 msgid ""
 "Maximum number of pre-send R2T in each connection (32 by default). The "
 "actual number is limited to QueueDepth of the target."
-msgstr ""
+msgstr "每个链接中最大R2T预发送数目（默认为32）。实际数目将在目标队列中被限制。"
 
 #: services/models.py:283
 msgid "MaxOutstandingR2T"
-msgstr ""
+msgstr "最大发出的R2T"
 
 #: services/models.py:284
 msgid "iSCSI initial parameter (16 by default)."
@@ -1538,13 +1538,12 @@
 msgstr "逻辑单元管理员IP地址TCP端口（默认为3261）"
 
 #: services/models.py:337
-#, fuzzy
 msgid "Controller Authorized netmask"
-msgstr "控制器认证群组"
+msgstr "控制器认证的子网掩码"
 
 #: services/models.py:339
 msgid "Logical Unit Controller Authorized netmask (255.255.255.0 by default)"
-msgstr ""
+msgstr "逻辑单元控制器授权的子网掩码(默认255.255.255.0)"
 
 #: services/models.py:346
 msgid "Controller Auth Method"
@@ -1573,7 +1572,7 @@
 
 #: services/models.py:377
 msgid "Type used as extent."
-msgstr ""
+msgstr "类型用于扩展"
 
 #: services/models.py:382
 msgid "Path to the extent"
@@ -1591,7 +1590,7 @@
 msgid ""
 "Size of extent, 0 means auto, a raw number is bytes, or suffix with KB, MB, "
 "TB for convenience."
-msgstr ""
+msgstr "扩展大小，0为自动，数字以bytes计算，或带以KB,MB,TB为后缀"
 
 #: services/models.py:394 services/models.py:443 services/models.py:489
 #: services/models.py:1182 sharing/models.py:45 sharing/models.py:223
@@ -1617,7 +1616,7 @@
 
 #: services/models.py:437 services/models.py:447
 msgid "Portal"
-msgstr ""
+msgstr "入口"
 
 #: services/models.py:438
 msgid ""
@@ -1626,16 +1625,19 @@
 "port number. For any IPs (wildcard address), use '0.0.0.0:3260' and/or "
 "'[::]:3260'. Do not mix wildcard and other IPs at same address family."
 msgstr ""
+"入口的格式为“地址:端口“。例如：对IPV4为\"192.168.1.1:3260\"；对IPV6为“[2001:db8:1:1::1]:3260”。326"
+"0是iSCSI标准端口。对任何IP （通配符地址）， 使用“'0.0.0.0:3260”和/或“[::]:3260”。 "
+"不要在同一地址段将通配符和其他IP地址相混淆。"
 
 #: services/models.py:476 templates/services/iscsi_authini.html:6
 msgid "Initiators"
-msgstr ""
+msgstr "初始的"
 
 #: services/models.py:478
 msgid ""
 "Initiator authorized to access to the iSCSI target. It takes a name or 'ALL' "
 "for any initiators."
-msgstr ""
+msgstr "iSCSI目标的启动器授权。使用名称或“ALL”对任意启动器。"
 
 #: services/models.py:482
 msgid "Authorized network"
@@ -1679,15 +1681,15 @@
 
 #: services/models.py:558
 msgid "Base Name will be appended automatically when starting without 'iqn.'."
-msgstr ""
+msgstr "当启动是不带“iqn.\"时，基本名将不会自动添加。"
 
 #: services/models.py:565
 msgid "Target Alias"
-msgstr ""
+msgstr "目标别名"
 
 #: services/models.py:566
 msgid "Optional user-friendly string of the target."
-msgstr ""
+msgstr "可选用户 - 目标机友好界面字符串。"
 
 #: services/models.py:569 storage/views.py:157
 #, fuzzy
@@ -1706,29 +1708,29 @@
 
 #: services/models.py:578
 msgid "Logical Unit Type mapped to LUN."
-msgstr ""
+msgstr "逻辑单元类型映射为LUN"
 
 #: services/models.py:584
 msgid "Target Flags"
-msgstr ""
+msgstr "目标标识"
 
 #: services/models.py:592
 msgid "Initiator Group ID"
-msgstr ""
+msgstr "初始组ID"
 
 #: services/models.py:598 services/models.py:610
 msgid "Auth Method"
-msgstr ""
+msgstr "认证方式"
 
 #: services/models.py:599 services/models.py:611
 msgid ""
 "The method can be accepted by the target. Auto means both none and "
 "authentication."
-msgstr ""
+msgstr "此方式可被目标接受。Auto表示所有的空以及认证。"
 
 #: services/models.py:603
 msgid "Authentication Group ID"
-msgstr ""
+msgstr "认证组ID"
 
 #: services/models.py:616
 msgid "Queue Depth"
@@ -1738,7 +1740,7 @@
 msgid ""
 "0=disabled, 1-255=enabled command queuing with specified depth. The "
 "recommended queue depth is 32."
-msgstr ""
+msgstr "0=禁用，1-255=允许特指的命令队列深度。推荐的队列深度为32。"
 
 #: services/models.py:622
 msgid "Logical Block Size"
@@ -1760,19 +1762,19 @@
 
 #: services/models.py:642
 msgid "Target this extent belongs to"
-msgstr ""
+msgstr "目标为扩展属于"
 
 #: services/models.py:650
 msgid "Target / Extent"
-msgstr ""
+msgstr "目标/扩展"
 
 #: services/models.py:651
 msgid "Targets / Extents"
-msgstr ""
+msgstr "目标机/扩展"
 
 #: services/models.py:666
 msgid "Provider"
-msgstr ""
+msgstr "提供者"
 
 #: services/models.py:670
 msgid "Domain name"
@@ -1782,23 +1784,23 @@
 msgid ""
 "A host name alias. This option can appear multiple times, for each domain "
 "that has the same IP. Use a space to separate multiple alias names."
-msgstr ""
+msgstr "主机别名.多个域名对应同一个IP的时候会多次出现。使用空格键分开多个主机别名."
 
 #: services/models.py:684
 msgid "Update period"
-msgstr ""
+msgstr "更新期间"
 
 #: services/models.py:686
 msgid "Time in milliseconds"
-msgstr ""
+msgstr "时间为毫秒"
 
 #: services/models.py:690
 msgid "Forced update period"
-msgstr ""
+msgstr "强制更新期间"
 
 #: services/models.py:696 services/models.py:730 services/models.py:762
 msgid "These parameters will be added to global settings in inadyn.conf."
-msgstr ""
+msgstr "这些参数将会被增加到全局设置文件inadyn.conf中"
 
 #: services/models.py:700 services/models.py:701
 #: templates/services/index.html:40
@@ -1823,15 +1825,15 @@
 msgid ""
 "Contact information, e.g. name or email of the person responsible for this "
 "system: 'admin@...'."
-msgstr ""
+msgstr "联系方式，例如：系统管理员名字或者邮件地址'admin@...'."
 
 #: services/models.py:722
 msgid "Community"
-msgstr ""
+msgstr "社区"
 
 #: services/models.py:723
 msgid "In most cases, 'public' is used here."
-msgstr ""
+msgstr "在大多数情况下，在此使用'public'。"
 
 #: services/models.py:726
 msgid "Send SNMP Traps"
@@ -2337,7 +2339,7 @@
 
 #: services/models.py:1141 sharing/models.py:85
 msgid "Auxiliary Parameters"
-msgstr ""
+msgstr "附加参数"
 
 #: services/models.py:1143
 msgid "These parameters are added to ldap.conf."
@@ -2383,7 +2385,7 @@
 
 #: services/models.py:1198
 msgid "Maximum number of simultaneous connections. Default is 0 (unlimited)"
-msgstr ""
+msgstr "最大并发连接数。默认值是0 (无限制)"
 
 #: services/models.py:1204
 msgid ""
@@ -2401,7 +2403,7 @@
 
 #: services/models.py:1215
 msgid "Hosts allow"
-msgstr ""
+msgstr "允许的主机"
 
 #: services/models.py:1216
 msgid ""
@@ -2412,7 +2414,7 @@
 
 #: services/models.py:1220
 msgid "Hosts deny"
-msgstr ""
+msgstr "限制的主机"
 
 #: services/models.py:1221
 msgid ""
@@ -2425,10 +2427,9 @@
 msgstr ""
 
 #: services/models.py:1226
-#, fuzzy
 msgid ""
 "These parameters will be added to the module configuration in rsyncd.conf"
-msgstr "这些参数已经添加到 smb.conf 的 [Global] 小节"
+msgstr "这些参数已经添加到 rsyncd.conf 的模块配置部分"
 
 #: services/models.py:1231
 msgid "Rsync Module"
@@ -2445,15 +2446,15 @@
 #: services/models.py:1244
 msgid ""
 "Sets the interval between disk checks to N minutes. The default is 30 minutes"
-msgstr ""
+msgstr "设置硬盘检查间隔时间（分钟）。默认是30分钟。"
 
 #: services/models.py:1250
 msgid "Power mode"
-msgstr ""
+msgstr "电源模式"
 
 #: services/models.py:1254
 msgid "Difference"
-msgstr ""
+msgstr "差异"
 
 #: services/models.py:1255
 msgid ""
@@ -2470,11 +2471,11 @@
 msgid ""
 "Report if the temperature is greater or equal than N degrees Celsius. 0 to "
 "disable"
-msgstr ""
+msgstr "当温度高于或等于N摄氏度的时候报告。0是禁用。"
 
 #: services/models.py:1264
 msgid "Critical"
-msgstr ""
+msgstr "关键的"
 
 #: services/models.py:1268
 msgid "Email to report"
@@ -2482,7 +2483,7 @@
 
 #: services/models.py:1271
 msgid "Destination email address. Separate email addresses by semi-colon"
-msgstr ""
+msgstr "目标邮件地址。多个邮件地址使用分号做间隔。"
 
 #: services/models.py:1274 services/models.py:1275
 #: templates/services/index.html:108
@@ -2524,7 +2525,7 @@
 
 #: services/nav.py:136
 msgid "ISCSI"
-msgstr ""
+msgstr "ISCSI"
 
 #: services/nav.py:147 system/models.py:430 templates/services/index.html:86
 msgid "Rsync"
@@ -2565,7 +2566,7 @@
 #: templates/services/rsyncmod.html:5 templates/sharing/apple.html:13
 #: templates/sharing/windows.html:13
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #: sharing/models.py:51
 msgid "Export Read Only"
@@ -2573,7 +2574,7 @@
 
 #: sharing/models.py:53
 msgid "Browsable to Network Clients"
-msgstr ""
+msgstr "可浏览网络终端"
 
 #: sharing/models.py:55
 msgid "Inherit Permissions"
@@ -2620,7 +2621,7 @@
 "This option is a comma, space, or tab delimited set of hosts which are "
 "permitted to access this share. You can specify the hosts by name or IP "
 "number. Leave this field empty to use default settings."
-msgstr ""
+msgstr "这个选项是一个逗号，空格或者Tab键来确定可以设置共享权限的主机。你可以通过名称或者IP来指定主机。或者留空使用默认值。"
 
 #: sharing/models.py:80
 msgid "Hosts Deny"
@@ -2638,7 +2639,7 @@
 
 #: sharing/models.py:87
 msgid "These parameters are added to [Share] section of smb.conf"
-msgstr ""
+msgstr "这些参数增加到 smb.conf 的[共享]部分"
 
 #: sharing/models.py:93
 msgid "Windows Share"
@@ -2665,7 +2666,7 @@
 
 #: sharing/models.py:116
 msgid "Share password"
-msgstr ""
+msgstr "共享密码"
 
 #: sharing/models.py:118
 msgid ""
@@ -2682,11 +2683,11 @@
 msgid ""
 "Specifies the share character set. For example UTF8, UTF8-MAC, ISO-8859-15, "
 "etc."
-msgstr ""
+msgstr "指定共享编码设置。例如UTF8，UTF8-MAC, ISO-8859-15, 等等。"
 
 #: sharing/models.py:128
 msgid "Allow List"
-msgstr ""
+msgstr "允许列表"
 
 #: sharing/models.py:130
 msgid ""
@@ -2697,17 +2698,17 @@
 
 #: sharing/models.py:134
 msgid "Deny List"
-msgstr ""
+msgstr "拒绝列表"
 
 #: sharing/models.py:136
 msgid ""
 "The deny option specifies users and groups who are not allowed access to the "
 "share. It follows the same format as the allow option."
-msgstr ""
+msgstr "这个拒绝选项特指哪些用户和群组不能存取一个共享空间。它的格式和允许选项相同。"
 
 #: sharing/models.py:140
 msgid "Read-only Access"
-msgstr ""
+msgstr "只读操作"
 
 #: sharing/models.py:142
 msgid ""
@@ -2717,13 +2718,13 @@
 
 #: sharing/models.py:146
 msgid "Read-write Access"
-msgstr ""
+msgstr "读写操作"
 
 #: sharing/models.py:148
 msgid ""
 "Allows certain users and groups to have read/write access to a share. This "
 "follows the allow option format."
-msgstr ""
+msgstr "允许确定的用户和群组拥有对共享的读写权限。格式和允许选项相同。"
 
 #: sharing/models.py:151
 msgid "Disk Discovery"
@@ -2744,7 +2745,7 @@
 "Note! Selecting 'Time Machine' on multiple shares may cause unpredictable "
 "behavior in MacOS. Default mode exports the volume as a data volume for "
 "users."
-msgstr ""
+msgstr "警告! “时间机器”在多个共享空间可能会导致Mac OS的未知行为。默认模式导出卷为用户的数据卷。"
 
 #: sharing/models.py:163
 msgid "Database Path"
@@ -2758,7 +2759,7 @@
 
 #: sharing/models.py:168
 msgid "Cache CNID"
-msgstr ""
+msgstr "缓存CNID"
 
 #: sharing/models.py:169
 msgid ""
@@ -2812,7 +2813,7 @@
 
 #: sharing/models.py:188
 msgid "Disable File ID"
-msgstr ""
+msgstr "禁用文件 ID"
 
 #: sharing/models.py:189
 msgid "Don't advertise createfileid, resolveid, deleteid calls."
@@ -2820,7 +2821,7 @@
 
 #: sharing/models.py:192
 msgid "Disable :hex Names"
-msgstr ""
+msgstr "禁用: 十六进制名称"
 
 #: sharing/models.py:193
 msgid ""
@@ -2830,11 +2831,11 @@
 
 #: sharing/models.py:196
 msgid "ProDOS"
-msgstr ""
+msgstr "ProDOS"
 
 #: sharing/models.py:197
 msgid "Provide compatibility with Apple II clients."
-msgstr ""
+msgstr "提供与Apple II客户端的兼容性。"
 
 #: sharing/models.py:200
 msgid "No Stat"
@@ -2844,7 +2845,7 @@
 msgid ""
 "Don't stat volume path when enumerating volumes list, useful for "
 "automounting or volumes created by a preexec script."
-msgstr ""
+msgstr "不要在列举卷清单的时候统计卷路径，这是对预执行脚本挂载或者创建卷是有益的。"
 
 #: sharing/models.py:204
 msgid "AFP3 Unix Privs"
@@ -2856,7 +2857,7 @@
 
 #: sharing/models.py:212
 msgid "Apple Share"
-msgstr ""
+msgstr "苹果机下的共享"
 
 #: sharing/models.py:213
 msgid "Apple Shares"
@@ -2864,7 +2865,7 @@
 
 #: sharing/models.py:230
 msgid "Authorized network or IP addresses"
-msgstr ""
+msgstr "认证的网络或者IP地址"
 
 #: sharing/models.py:231
 msgid ""
@@ -2907,7 +2908,7 @@
 
 #: sharing/models.py:252
 msgid "User to map root to"
-msgstr ""
+msgstr "用户映射到管理员"
 
 #: sharing/models.py:256
 msgid "Maproot Group"
@@ -2915,7 +2916,7 @@
 
 #: sharing/models.py:260
 msgid "Group to map root to"
-msgstr ""
+msgstr "群组映射到管理员"
 
 #: sharing/models.py:264
 msgid "Mapall User"
@@ -2923,7 +2924,7 @@
 
 #: sharing/models.py:268
 msgid "User to map all users to"
-msgstr ""
+msgstr "用户映射到所有用户"
 
 #: sharing/models.py:272
 msgid "Mapall Group"
@@ -2931,11 +2932,11 @@
 
 #: sharing/models.py:276
 msgid "Group to map all users to"
-msgstr ""
+msgstr "群组映射到所有用户"
 
 #: sharing/models.py:283
 msgid "UNIX Share"
-msgstr ""
+msgstr "Unix下的共享"
 
 #: sharing/models.py:284
 msgid "UNIX Shares"
@@ -3890,19 +3891,19 @@
 
 #: system/views.py:243
 msgid "Test message from"
-msgstr ""
+msgstr "测试消息来自"
 
 #: system/views.py:244
 msgid "This is a message test from"
-msgstr ""
+msgstr "这是一个信息测试来自"
 
 #: templates/404.html:7
 msgid "Page Not Found"
-msgstr ""
+msgstr "页面未找到"
 
 #: templates/base.html:32
 msgid "expand all"
-msgstr ""
+msgstr "全部展开"
 
 #: templates/base.html:33
 msgid "collapse all"
@@ -4153,7 +4154,7 @@
 
 #: templates/freeadmin/index.html:87
 msgid "Announce"
-msgstr ""
+msgstr "声明"
 
 #: templates/freeadmin/index.html:88
 msgid "Commit"
@@ -4481,11 +4482,11 @@
 #: templates/services/iscsi_dextents.html:6
 #: templates/services/iscsi_targets.html:6
 msgid "Alias"
-msgstr ""
+msgstr "别名"
 
 #: templates/services/iscsi_portals.html:6
 msgid "Listen"
-msgstr ""
+msgstr "监听"
 
 #: templates/services/iscsi_portals.html:20
 msgid "Edit Portal"
@@ -4503,7 +4504,7 @@
 #: templates/services/iscsi_targets.html:40
 #: templates/services/iscsi_targets.html:42
 msgid "Add Target"
-msgstr ""
+msgstr "增加目标机"
 
 #: templates/services/rsyncmod.html:8 templates/sharing/apple.html:15
 #: templates/sharing/windows.html:16 templates/storage/replications.html:17
@@ -4524,32 +4525,32 @@
 #: templates/sharing/apple.html:6 templates/sharing/unix.html:6
 #: templates/sharing/windows.html:6
 msgid "Active Shares"
-msgstr ""
+msgstr "活动的共享"
 
 #: templates/sharing/apple.html:8
 msgid "There are no active Apple Shares."
-msgstr ""
+msgstr "没有活动的Mac 共享"
 
 #: templates/sharing/apple.html:30
 msgid "Edit Apple Share"
-msgstr ""
+msgstr "编辑Mac共享"
 
 #: templates/sharing/apple.html:36
 msgid "Delete Apple Share"
-msgstr ""
+msgstr "删除Mac 系统共享"
 
 #: templates/sharing/apple.html:43 templates/sharing/unix.html:43
 #: templates/sharing/windows.html:47
 msgid "No shares defined"
-msgstr ""
+msgstr "没有定义共享"
 
 #: templates/sharing/apple.html:50
 msgid "Add Apple Share"
-msgstr ""
+msgstr "增加Mac系统共享"
 
 #: templates/sharing/apple.html:52
 msgid "Add Apple Share (AFP)"
-msgstr ""
+msgstr "增加Mac 系统共享 (AFP)"
 
 #: templates/sharing/index.html:3
 msgid "Apple"
@@ -4565,7 +4566,7 @@
 
 #: templates/sharing/unix.html:8
 msgid "There are no active UNIX Shares."
-msgstr ""
+msgstr "无活动的Unix共享"
 
 #: templates/sharing/unix.html:13
 msgid "Mountpoint"
@@ -4589,7 +4590,7 @@
 
 #: templates/sharing/windows.html:8
 msgid "There are no active Windows Shares."
-msgstr ""
+msgstr "无活动的Windows共享"
 
 #: templates/sharing/windows.html:34
 msgid "Edit Windows Share"
@@ -4753,7 +4754,7 @@
 
 #: templates/storage/tasks.html:24
 msgid "How"
-msgstr ""
+msgstr "怎样"
 
 #: templates/storage/tasks.html:25
 msgid "Keep snapshot for"

Modified: trunk/gui/locale/zh_TW/LC_MESSAGES/django.po
===================================================================
--- trunk/gui/locale/zh_TW/LC_MESSAGES/django.po	2011-10-07 08:22:34 UTC (rev 8176)
+++ trunk/gui/locale/zh_TW/LC_MESSAGES/django.po	2011-10-07 11:16:30 UTC (rev 8177)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-09 13:49-0700\n"
-"PO-Revision-Date: 2011-08-06 02:06+0200\n"
+"PO-Revision-Date: 2011-10-04 19:05+0200\n"
 "Last-Translator: ahaoa <ahaoa@..."
 "Language-Team: LANGUAGE <LL@..."
 "Language: zh_TW\n"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8173
          http://freenas.svn.sourceforge.net/freenas/?rev=8173&view=rev
Author:   yaberauneya
Date:     2011-10-07 00:36:38 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Remove half-baked work introduced in the original patch provided by imp@, so that we're more in line with what's _actually_ done in the netatalk port. This partially resolves ticket 847.

Modified Paths:
--------------
    trunk/patches/ports-netatalk.patch

Modified: trunk/patches/ports-netatalk.patch
===================================================================
--- trunk/patches/ports-netatalk.patch	2011-10-06 21:49:10 UTC (rev 8172)
+++ trunk/patches/ports-netatalk.patch	2011-10-07 00:36:38 UTC (rev 8173)
@@ -4,7 +4,7 @@
 retrieving revision 1.96
 diff -u -r1.96 Makefile
 --- net/netatalk/Makefile	3 Jul 2011 11:40:45 -0000	1.96
-+++ net/netatalk/Makefile	25 Aug 2011 17:11:29 -0000
++++ net/netatalk/Makefile	6 Oct 2011 23:55:52 -0000
 @@ -2,15 +2,15 @@
  # Date created:         23 Jul 1997
  # Whom:                 stb
@@ -118,7 +118,7 @@
 retrieving revision 1.30
 diff -u -r1.30 distinfo
 --- net/netatalk/distinfo	29 Dec 2010 04:36:17 -0000	1.30
-+++ net/netatalk/distinfo	25 Aug 2011 17:08:39 -0000
++++ net/netatalk/distinfo	6 Oct 2011 23:55:52 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (netatalk-2.1.5.tar.bz2) = 11fcce36cc5179de60c5c0b10032ff9e042ed8b8c6e0b99d2d7200c8d0749038
 -SIZE (netatalk-2.1.5.tar.bz2) = 1125946
@@ -130,7 +130,7 @@
 retrieving revision 1.31
 diff -u -r1.31 pkg-plist
 --- net/netatalk/pkg-plist	2 Jun 2010 14:46:42 -0000	1.31
-+++ net/netatalk/pkg-plist	25 Aug 2011 17:08:39 -0000
++++ net/netatalk/pkg-plist	6 Oct 2011 23:55:52 -0000
 @@ -1,20 +1,15 @@
 -bin/achfile
 -bin/ad
@@ -237,78 +237,26 @@
 retrieving revision 1.3
 diff -u -r1.3 netatalk.in
 --- net/netatalk/files/netatalk.in	27 Mar 2010 00:13:49 -0000	1.3
-+++ net/netatalk/files/netatalk.in	29 Aug 2011 21:53:06 -0000
-@@ -3,7 +3,7 @@
- # $FreeBSD: ports/net/netatalk/files/netatalk.in,v 1.3 2010/03/27 00:13:49 dougb Exp $
++++ net/netatalk/files/netatalk.in	6 Oct 2011 23:55:52 -0000
+@@ -1,9 +1,9 @@
+ #!/bin/sh
  #
+-# $FreeBSD: ports/net/netatalk/files/netatalk.in,v 1.3 2010/03/27 00:13:49 dougb Exp $
++# $FreeBSD: ports/net/netatalk/files/netatalk.in,v 1.4 2011/08/14 17:17:28 marcus Exp $
+ #
  # PROVIDE: atalkd papd cnid_metad timelord afpd
 -# REQUIRE: DAEMON %%SRVLOC%%
-+# REQUIRE: DAEMON %%SRVLOC%% avahi_dnsconfd
++# REQUIRE: DAEMON %%SRVLOC%% %%ZEROCONF%%
  # KEYWORD: shutdown
  #
  # AppleTalk daemons. Make sure not to start atalkd in the background:
-@@ -11,16 +11,6 @@
- # other processes.
- #
- 
--# Set defaults. Please overide these in %%PREFIX%%/etc/netatalk.conf
--ATALK_ZONE=
--ATALK_NAME="`/bin/hostname -s`"
--AFPD_UAMLIST=
--AFPD_MAX_CLIENTS=50
--AFPD_GUEST=nobody
--
--# Load user config
--if [ -f %%PREFIX%%/etc/netatalk.conf ]; then . %%PREFIX%%/etc/netatalk.conf; fi
--
- netatalk_enable=${netatalk_enable-"NO"}
- atalkd_enable=${atalkd_enable-"NO"}
- papd_enable=${papd_enable-"NO"}
-@@ -33,6 +23,7 @@
- name=netatalk
- rcvar=`set_rcvar`
- hostname=`hostname -s`
-+pidfile="/var/run/afpd.pid"
- 
- start_cmd=netatalk_start
- stop_cmd=netatalk_stop
-@@ -46,19 +37,20 @@
-     checkyesno papd_enable && %%PREFIX%%/sbin/papd
-     checkyesno cnid_metad_enable && %%PREFIX%%/sbin/cnid_metad
-     checkyesno timelord_enable && %%PREFIX%%/sbin/timelord
--    checkyesno afpd_enable && \
--    	%%PREFIX%%/sbin/afpd -n "${ATALK_NAME}${ATALK_ZONE}" \
--		-s %%PREFIX%%/etc/AppleVolumes.system \
--		-f %%PREFIX%%/etc/AppleVolumes.default \
--		-g ${AFPD_GUEST} \
--		-c ${AFPD_MAX_CLIENTS} \
--		${AFPD_UAMLIST}
-+    checkyesno afpd_enable && %%PREFIX%%/sbin/afpd -P ${pidfile} -F /etc/afpd.conf
- }
- 
- netatalk_stop() {
-     checkyesno timelord_enable && killall timelord
--    checkyesno afpd_enable && killall afpd
--    checkyesno cnid_metad_enable && killall cnid_metad
-+    if [ -f ${pidfile} ]; then
-+        kill `cat ${pidfile}`
-+        if [ $? -ne 0 ]; then
-+            kill -9 `cat ${pidfile}`
-+        fi
-+    else
-+        killall afpd
-+    fi
-+    killall cnid_metad
-     checkyesno papd_enable && killall papd
-     checkyesno atalkd_enable && killall atalkd
- }
 Index: net/netatalk/files/patch-config_netatalk.conf
 ===================================================================
 RCS file: /home/ncvs/ports/net/netatalk/files/patch-config_netatalk.conf,v
 retrieving revision 1.3
 diff -u -r1.3 patch-config_netatalk.conf
 --- net/netatalk/files/patch-config_netatalk.conf	30 May 2010 17:03:17 -0000	1.3
-+++ net/netatalk/files/patch-config_netatalk.conf	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-config_netatalk.conf	6 Oct 2011 23:55:52 -0000
 @@ -1,43 +1,20 @@
 ---- config/netatalk.conf.orig	2010-04-19 11:35:26.000000000 +0000
 -+++ config/netatalk.conf	2010-05-20 19:14:32.000000000 +0000
@@ -371,7 +319,7 @@
 retrieving revision 1.17
 diff -u -r1.17 patch-configure
 --- net/netatalk/files/patch-configure	25 Jul 2010 01:37:08 -0000	1.17
-+++ net/netatalk/files/patch-configure	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-configure	6 Oct 2011 23:55:52 -0000
 @@ -1,11 +1,37 @@
 ---- configure.orig	2010-07-10 06:18:22.000000000 -0400
 -+++ configure	2010-07-24 21:33:50.000000000 -0400
@@ -420,7 +368,7 @@
 RCS file: net/netatalk/files/patch-etc__afpd__afp_avahi.c
 diff -N net/netatalk/files/patch-etc__afpd__afp_avahi.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc__afpd__afp_avahi.c	29 Aug 2011 22:04:04 -0000
++++ net/netatalk/files/patch-etc__afpd__afp_avahi.c	6 Oct 2011 23:55:52 -0000
 @@ -0,0 +1,149 @@
 +--- ./etc/afpd/afp_avahi.c.orig	2011-07-21 21:30:42.000000000 -0700
 ++++ ./etc/afpd/afp_avahi.c	2011-08-29 15:03:14.926315200 -0700
@@ -576,7 +524,7 @@
 RCS file: net/netatalk/files/patch-etc__afpd__afp_avahi.h
 diff -N net/netatalk/files/patch-etc__afpd__afp_avahi.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc__afpd__afp_avahi.h	29 Aug 2011 22:04:04 -0000
++++ net/netatalk/files/patch-etc__afpd__afp_avahi.h	6 Oct 2011 23:55:52 -0000
 @@ -0,0 +1,13 @@
 +--- ./etc/afpd/afp_avahi.h.orig	2011-07-21 21:30:42.000000000 -0700
 ++++ ./etc/afpd/afp_avahi.h	2011-08-29 15:03:14.926315200 -0700
@@ -596,7 +544,7 @@
 RCS file: net/netatalk/files/patch-etc__afpd__afp_options.c
 diff -N net/netatalk/files/patch-etc__afpd__afp_options.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc__afpd__afp_options.c	29 Aug 2011 22:04:04 -0000
++++ net/netatalk/files/patch-etc__afpd__afp_options.c	6 Oct 2011 23:55:52 -0000
 @@ -0,0 +1,13 @@
 +--- ./etc/afpd/afp_options.c.orig	2011-07-27 04:55:39.000000000 -0700
 ++++ ./etc/afpd/afp_options.c	2011-08-29 15:00:45.043756687 -0700
@@ -616,7 +564,7 @@
 RCS file: net/netatalk/files/patch-etc__afpd__afp_zeroconf.c
 diff -N net/netatalk/files/patch-etc__afpd__afp_zeroconf.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc__afpd__afp_zeroconf.c	29 Aug 2011 22:04:05 -0000
++++ net/netatalk/files/patch-etc__afpd__afp_zeroconf.c	6 Oct 2011 23:55:52 -0000
 @@ -0,0 +1,20 @@
 +--- ./etc/afpd/afp_zeroconf.c.orig	2011-07-21 21:30:42.000000000 -0700
 ++++ ./etc/afpd/afp_zeroconf.c	2011-08-29 15:03:14.926315200 -0700
@@ -643,7 +591,7 @@
 RCS file: net/netatalk/files/patch-etc__afpd__main.c
 diff -N net/netatalk/files/patch-etc__afpd__main.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc__afpd__main.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc__afpd__main.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,139 @@
 +--- ./etc/afpd/main.c.orig	2011-07-27 04:55:39.000000000 -0700
 ++++ ./etc/afpd/main.c	2011-08-19 14:43:45.042815401 -0700
@@ -789,7 +737,7 @@
 RCS file: net/netatalk/files/patch-etc_afpd_acls.c
 diff -N net/netatalk/files/patch-etc_afpd_acls.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc_afpd_acls.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc_afpd_acls.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,63 @@
 +--- etc/afpd/acls.c.orig	2011-07-30 18:08:35.000000000 -0400
 ++++ etc/afpd/acls.c	2011-07-30 18:19:19.000000000 -0400
@@ -859,7 +807,7 @@
 RCS file: net/netatalk/files/patch-etc_afpd_afp_asp.c
 diff -N net/netatalk/files/patch-etc_afpd_afp_asp.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc_afpd_afp_asp.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc_afpd_afp_asp.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,13 @@
 +--- etc/afpd/afp_asp.c.orig	2011-07-30 23:13:47.000000000 -0400
 ++++ etc/afpd/afp_asp.c	2011-07-30 23:14:22.000000000 -0400
@@ -880,7 +828,7 @@
 retrieving revision 1.1
 diff -u -r1.1 patch-etc_apfd_Makefile.in
 --- net/netatalk/files/patch-etc_apfd_Makefile.in	8 May 2011 23:08:21 -0000	1.1
-+++ net/netatalk/files/patch-etc_apfd_Makefile.in	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc_apfd_Makefile.in	6 Oct 2011 23:55:53 -0000
 @@ -1,11 +1,11 @@
 ---- etc/afpd/Makefile.in.orig	2011-05-08 19:04:22.000000000 -0400
 -+++ etc/afpd/Makefile.in	2011-05-08 19:04:34.000000000 -0400
@@ -908,7 +856,7 @@
 RCS file: net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c
 diff -N net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,10 @@
 +--- etc/cnid_dbd/cnid_metad.c.orig	2011-07-30 18:28:32.000000000 -0400
 ++++ etc/cnid_dbd/cnid_metad.c	2011-07-30 18:29:01.000000000 -0400
@@ -925,7 +873,7 @@
 RCS file: net/netatalk/files/patch-etc_cnid_dbd_comm.c
 diff -N net/netatalk/files/patch-etc_cnid_dbd_comm.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-etc_cnid_dbd_comm.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-etc_cnid_dbd_comm.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,12 @@
 +--- etc/cnid_dbd/comm.c.orig	2011-07-30 18:27:55.000000000 -0400
 ++++ etc/cnid_dbd/comm.c	2011-07-30 18:28:04.000000000 -0400
@@ -944,7 +892,7 @@
 RCS file: net/netatalk/files/patch-include__atalk__globals.h
 diff -N net/netatalk/files/patch-include__atalk__globals.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-include__atalk__globals.h	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-include__atalk__globals.h	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,39 @@
 +--- ./include/atalk/globals.h.orig	2011-07-27 04:55:39.000000000 -0700
 ++++ ./include/atalk/globals.h	2011-08-19 14:43:45.046204676 -0700
@@ -990,7 +938,7 @@
 RCS file: net/netatalk/files/patch-libatalk__util__server_child.c
 diff -N net/netatalk/files/patch-libatalk__util__server_child.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-libatalk__util__server_child.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-libatalk__util__server_child.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,14 @@
 +--- ./libatalk/util/server_child.c.orig	2011-07-27 04:55:39.000000000 -0700
 ++++ ./libatalk/util/server_child.c	2011-08-19 14:42:28.704028827 -0700
@@ -1011,7 +959,7 @@
 RCS file: net/netatalk/files/patch-libatalk__util__server_ipc.c
 diff -N net/netatalk/files/patch-libatalk__util__server_ipc.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ net/netatalk/files/patch-libatalk__util__server_ipc.c	29 Aug 2011 21:53:06 -0000
++++ net/netatalk/files/patch-libatalk__util__server_ipc.c	6 Oct 2011 23:55:53 -0000
 @@ -0,0 +1,61 @@
 +--- ./libatalk/util/server_ipc.c.orig	2011-07-27 04:55:39.000000000 -0700
 ++++ ./libatalk/util/server_ipc.c	2011-08-19 14:42:28.728518099 -0700

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8175
          http://freenas.svn.sourceforge.net/freenas/?rev=8175&view=rev
Author:   yaberauneya
Date:     2011-10-07 01:50:23 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
pfsync isn't available on FreeNAS [yet].

Modified Paths:
--------------
    trunk/nanobsd/FREENAS.amd64
    trunk/nanobsd/FREENAS.i386

Modified: trunk/nanobsd/FREENAS.amd64
===================================================================
--- trunk/nanobsd/FREENAS.amd64	2011-10-07 01:29:31 UTC (rev 8174)
+++ trunk/nanobsd/FREENAS.amd64	2011-10-07 01:50:23 UTC (rev 8175)
@@ -82,7 +82,7 @@
 options		DDB			# Support DDB.
 
 # FreeNAS modifications
-makeoptions	MODULES_OVERRIDE="ext2fs geom ntfs smbfs libiconv libmchain pf pflog pfsync udf zfs opensolaris usb/xhci"
+makeoptions	MODULES_OVERRIDE="ext2fs geom ntfs smbfs libiconv libmchain pf pflog udf zfs opensolaris usb/xhci"
 options		GEOM_UZIP
 options		GEOM_ELI
 options		NULLFS

Modified: trunk/nanobsd/FREENAS.i386
===================================================================
--- trunk/nanobsd/FREENAS.i386	2011-10-07 01:29:31 UTC (rev 8174)
+++ trunk/nanobsd/FREENAS.i386	2011-10-07 01:50:23 UTC (rev 8175)
@@ -82,7 +82,7 @@
 options		DDB			# Support DDB.
 
 # FreeNAS modifications
-makeoptions	MODULES_OVERRIDE="ext2fs geom ntfs smbfs libiconv libmchain pf pflog pfsync udf zfs opensolaris usb/xhci"
+makeoptions	MODULES_OVERRIDE="ext2fs geom ntfs smbfs libiconv libmchain pf pflog udf zfs opensolaris usb/xhci"
 options		GEOM_UZIP
 options		GEOM_ELI
 options		NULLFS

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8174
          http://freenas.svn.sourceforge.net/freenas/?rev=8174&view=rev
Author:   yaberauneya
Date:     2011-10-07 01:29:31 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
- Consolidate imports.
- Remove unused imports.
- Use os.unlink instead of os.system('rm ...')

Modified Paths:
--------------
    trunk/gui/services/forms.py

Modified: trunk/gui/services/forms.py
===================================================================
--- trunk/gui/services/forms.py	2011-10-07 00:36:38 UTC (rev 8173)
+++ trunk/gui/services/forms.py	2011-10-07 01:29:31 UTC (rev 8174)
@@ -25,15 +25,14 @@
 # $FreeBSD$
 #####################################################################
 
-import base64
+import glob
+import os
 import re
-import os
+import subprocess
 
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import QueryDict
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
-from django.core.urlresolvers import reverse
 from django.core.validators import email_re
 
 import choices
@@ -45,7 +44,6 @@
 from freenasUI.common import humanize_size
 from freenasUI.middleware.notifier import notifier
 from dojango import forms
-from dojango.forms import widgets
 from freeadmin.forms import DirectoryBrowser
 from ipaddr import IPAddress, IPNetwork, AddressValueError, NetmaskValueError
 
@@ -301,7 +299,6 @@
             'ups_driver': forms.widgets.FilteringSelect(),
         }
     def __init__(self, *args, **kwargs):
-        import glob
         super(UPSForm, self).__init__(*args, **kwargs)
         ports = glob.glob('/dev/cua*') + glob.glob('/dev/ugen*')
         self.fields['ups_port'] = forms.ChoiceField(label=_("Port"))
@@ -676,8 +673,6 @@
         self.fields['iscsi_extent_disk'].choices.sort()
     # TODO: This is largely the same with disk wizard.
     def _populate_disk_choices(self, exclude=None):
-        from os import popen
-        import re
 
         diskchoices = dict()
 
@@ -693,11 +688,12 @@
                     diskchoices["zvol/"+zvol] = "%s (%s)" % (zvol, attrs['volsize'])
         # Grab disk list
         # NOTE: This approach may fail if device nodes are not accessible.
-        pipe = popen("/usr/sbin/diskinfo ` /sbin/sysctl -n kern.disks` | /usr/bin/cut -f1,3")
+        pipe = os.popen("/usr/sbin/diskinfo `/sbin/sysctl -n kern.disks` | "
+                        "/usr/bin/cut -f1,3")
         diskinfo = pipe.read().strip().split('\n')
         # HAST Devices through GEOM GATE
-        gate_pipe = popen("""/usr/sbin/diskinfo `/sbin/geom gate status -s """
-                          """| /usr/bin/cut -d" " -f1` | /usr/bin/cut -f1,3""")
+        gate_pipe = os.popen("/usr/sbin/diskinfo `/sbin/geom gate status -s | "
+                             "/usr/bin/cut -d" " -f1` | /usr/bin/cut -f1,3")
         gate_diskinfo = gate_pipe.read().strip().split('\n')
         for item in gate_diskinfo:
             if item != "":
@@ -707,7 +703,10 @@
             capacity = humanize_size(capacity)
             diskchoices[devname] = "%s (%s)" % (devname, capacity)
         # Exclude the root device
-        rootdev = popen("""glabel status | grep `mount | awk '$3 == "/" {print $1}' | sed -e 's/\/dev\///'` | awk '{print $3}'""").read().strip()
+        rootdev = os.popen("glabel status | grep `mount | "
+                           "awk '$3 == \"/\" {print $1}' | "
+                           "sed -e 's/\/dev\///'` | "
+                           "awk '{print $3}'").read().strip()
         rootdev_base = re.search(r'[a-z/]*[0-9]*', rootdev)
         if rootdev_base != None:
             diskchoices.pop(rootdev_base.group(0), None)
@@ -830,10 +829,14 @@
     def __init__(self, *args, **kwargs):
         super(iSCSITargetForm, self).__init__(*args, **kwargs)
         if not kwargs.has_key("instance"):
-            from subprocess import Popen, PIPE
             try:
-                nic = list(choices.NICChoices(nolagg=True,novlan=True,exclude_configured=False))[0][0]
-                mac = Popen("ifconfig %s ether|grep \"ether\"|awk '{print $2}'|tr -d \":\"" % nic, shell=True, stdout=PIPE).communicate()[0]
+                nic = list(choices.NICChoices(nolagg=True,
+                                              novlan=True,
+                                              exclude_configured=False))[0][0]
+                mac = subprocess.Popen("ifconfig %s ether| grep ether | "
+                                       "awk '{print $2}'|tr -d :" % (nic, ),
+                                       shell=True,
+                                       stdout=subprocess.PIPE).communicate()[0]
                 ltg = models.iSCSITarget.objects.order_by('-id')
                 if ltg.count() > 0:
                     lid = ltg[0].id
@@ -882,7 +885,7 @@
     def done(self):
         if self.cleaned_data['delete'] and \
             self.instance.iscsi_target_extent_type == 'File':
-            os.system("rm \"%s\"" % self.instance.iscsi_target_extent_path)
+            os.unlink(self.instance.iscsi_target_extent_path)
 
 class SMARTForm(ModelForm):
     class Meta:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.