Permalink
Browse files

update networkbrowerpli

  • Loading branch information...
1 parent 9fb1066 commit 1b39041d5cf6c91811ab072b1db8594a38c0ae91 atvcaptain committed Aug 5, 2013
Showing with 121 additions and 119 deletions.
  1. +82 −76 networkbrowserpli/po/fr.po
  2. +26 −26 networkbrowserpli/po/sv.po
  3. +13 −17 networkbrowserpli/src/AutoMount.py
View
158 networkbrowserpli/po/fr.po
@@ -3,249 +3,255 @@ msgstr ""
"Project-Id-Version: enigma 2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-01-28 16:39+0100\n"
-"PO-Revision-Date: 2008-05-16 17:15+0100\n"
-"Last-Translator: mimi74 <remi.jarrige0293@wanadoo.fr>\n"
+"PO-Revision-Date: 2012-12-16 12:35+0100\n"
+"Last-Translator: thelexia <thelexia@hotmail.fr>\n"
"Language-Team: french\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: FRENCH\n"
-"X-Poedit-SourceCharset: iso-8859-15\n"
msgid ""
"A mount entry with this name already exists!\n"
"Update existing entry and continue?\n"
msgstr ""
+"Une entrée de montage avec ce nom existe déjà !\n"
+"Voulez-vous mettre à jour l'entrée existante et continuer ?\n"
msgid "Active"
-msgstr ""
+msgstr "Actif"
msgid ""
"Active/\n"
"Inactive"
msgstr ""
+"Actif/\n"
+"Inactif"
msgid "Add a new NFS or CIFS mount point to your Dreambox."
-msgstr ""
+msgstr "Ajouter un nouveau point de montage NFS ou CIFS à votre récepteur."
msgid "Add new network mount point"
-msgstr ""
+msgstr "Ajouter un nouveau réseau point de montage"
msgid ""
"Are you sure you want to save this network mount?\n"
"\n"
msgstr ""
+"Êtes-vous sûr de vouloir sauver ce montage réseau ?\n"
+"\n"
msgid "Attempt to mount shares again"
-msgstr ""
+msgstr "Tenter de monter les partages à nouveau"
msgid "Attempt to recover lost mounts (in background)"
-msgstr ""
+msgstr "Tenter de récupérer les montages perdus (en arrière-plan)"
msgid "Browse network neighbourhood"
-msgstr ""
+msgstr "Parcourir voisinage réseau"
msgid "CIFS share"
-msgstr ""
+msgstr "Partage CIFS"
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
msgid "Change hostname"
-msgstr ""
+msgstr "Changer le nom d'hôte"
msgid "Change the hostname of your Dreambox."
-msgstr ""
+msgstr "Changer le nom d'hôte de votre récepteur."
msgid "Close"
msgstr "Fermer"
msgid "Delete"
-msgstr ""
+msgstr "Effacer"
msgid "Delete mount"
-msgstr ""
+msgstr "Supprimer montage"
msgid "Dir:"
-msgstr ""
+msgstr "Dir :"
msgid "Do you want to enter a username and password for this host?\n"
-msgstr ""
+msgstr "Voulez-vous entrer un nom d'utilisateur et mot de passe pour cet hôte ?\n"
msgid "Enter IP to scan..."
-msgstr ""
+msgstr "Entrer l'adresse IP à scanner ..."
msgid "Enter new hostname for your Dreambox"
-msgstr ""
+msgstr "Saisisser nouveau nom d'hôte pour votre récepteur"
msgid "Enter options:"
-msgstr ""
+msgstr "Entrer les options :"
msgid "Enter password:"
-msgstr ""
+msgstr "Entrer mot de passe :"
msgid "Enter share directory:"
-msgstr ""
+msgstr "Entrer répertoire de partage :"
msgid "Enter share name:"
-msgstr ""
+msgstr "Entrer le nom de partage :"
msgid "Enter user and password for host: "
-msgstr ""
+msgstr "Entrer utilisateur et mot de passe pour l'hôte :"
msgid "Enter username:"
-msgstr ""
+msgstr "Entrer le nom d'utilisateur :"
msgid "Expert"
-msgstr ""
+msgstr "Expert"
msgid "Finished restarting your network"
-msgstr ""
+msgstr "Terminé le redémarrage de votre réseau"
msgid "IP Address"
-msgstr ""
+msgstr "Adresse IP"
msgid "IP:"
-msgstr ""
+msgstr "IP :"
msgid "Local share name"
-msgstr ""
+msgstr "Nom du partage local"
msgid "Manage network shares"
-msgstr ""
+msgstr "Gérer les partages réseau"
msgid "Manage your network shares..."
-msgstr ""
+msgstr "Gérer vos partages réseau ..."
msgid "Mount again"
-msgstr ""
+msgstr "Monter à nouveau"
msgid "Mount informations"
-msgstr ""
+msgstr "Monter informations"
msgid "Mount options"
-msgstr ""
+msgstr "Options de montage"
msgid "Mount type"
-msgstr ""
+msgstr "Type de montage"
msgid "MountManager"
-msgstr ""
+msgstr "Gestionnaire de montage"
msgid ""
"Mounted/\n"
"Unmounted"
msgstr ""
+"Monter/ \n"
+"démonter"
msgid "Mountpoints management"
-msgstr ""
+msgstr "Gestion des points de montage"
msgid "Mounts editor"
-msgstr ""
+msgstr "Editeur de montage"
msgid "Mounts management"
-msgstr ""
+msgstr "Gestion des montages"
msgid "NFS share"
-msgstr ""
+msgstr "Partage NFS"
msgid "NetworkBrowser"
-msgstr ""
+msgstr "Explorateur réseau"
msgid "No network devices found!"
-msgstr ""
+msgstr "Aucun périphérique réseau trouvé !"
msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
msgid "Please wait for activation of your network mount..."
-msgstr ""
+msgstr "Veuillez attendre pour l'activation de votre montage réseau ..."
msgid "Please wait while removing your network mount..."
-msgstr ""
+msgstr "Veuillez patienter pendant la suppression de votre montage réseau ..."
msgid "Please wait while updating your network mount..."
-msgstr ""
+msgstr "Veuillez patienter pendant la mise à jour de votre montage réseau ..."
msgid "Please wait while your network is restarting..."
-msgstr ""
+msgstr "Veuillez patienter pendant le redémarrage de votre réseau ..."
msgid "Press OK to activate the settings."
-msgstr ""
+msgstr "Pressez OK pour activer les paramètres."
msgid "Press OK to collapse this host"
-msgstr ""
+msgstr "Pressez OK pour replier ce hôte"
msgid "Press OK to edit selected settings."
-msgstr ""
+msgstr "Pressez OK pour modifier les paramètres sélectionnés."
msgid "Press OK to edit the settings."
-msgstr ""
+msgstr "Pressez OK pour modifier les paramètres."
msgid "Press OK to expand this host"
-msgstr ""
+msgstr "Pressez OK pour étendre cet hôte"
msgid "Press OK to mount this share!"
-msgstr ""
+msgstr "Pressez OK pour monter ce partage !"
msgid "Press OK to mount!"
-msgstr ""
+msgstr "Pressez OK pour monter !"
msgid "Press OK to save settings."
-msgstr ""
+msgstr "Pressez OK pour enregistrer les paramètres."
msgid "Press OK to select."
-msgstr ""
+msgstr "Pressez OK pour sélectionner."
msgid "Rescan"
-msgstr ""
+msgstr "Re-scan"
msgid "Scan NFS share"
-msgstr ""
+msgstr "Scan partage NFS"
msgid "Scan range"
-msgstr ""
+msgstr "Scan rang"
msgid "Search for network shares"
-msgstr ""
+msgstr "Rechercher les partages réseau"
msgid "Search for network shares..."
-msgstr ""
+msgstr "Rechercher les partages réseau ..."
msgid "Searching your network. Please wait..."
-msgstr ""
+msgstr "Recherche de votre réseau. Veuillez patienter ..."
msgid "Server IP"
-msgstr ""
+msgstr "IP serveur"
msgid "Server share"
-msgstr ""
+msgstr "Nom du dossier à partager"
msgid "User management"
-msgstr ""
+msgstr "Gestion utilisateur"
msgid "Usermanager"
-msgstr ""
+msgstr "Gestionnaire utilisateur"
msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
msgid "View, edit or delete mountpoints on your Dreambox."
-msgstr ""
+msgstr "Afficher, modifier ou supprimer des points de montage sur votre récepteur."
msgid "View, edit or delete usernames and passwords for your network."
-msgstr ""
+msgstr "Afficher, modifier ou supprimer des noms d'utilisateur et mots de passe pour votre réseau."
msgid "Your network mount has been activated."
-msgstr ""
+msgstr "Votre montage réseau a été activé."
msgid "Your network mount has been removed."
-msgstr ""
+msgstr "Votre montage réseau a été supprimé."
msgid "Your network mount has been updated."
-msgstr ""
+msgstr "Votre montage réseau a été mis à jour."
msgid "use as HDD replacement"
-msgstr ""
+msgstr "Utiliser comme remplacement du disque dur"
View
52 networkbrowserpli/po/sv.po
@@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: tuxbox-enigma 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-01-28 16:39+0100\n"
-"PO-Revision-Date: 2012-08-05 15:41+0100\n"
+"PO-Revision-Date: 2012-12-16 12:05+0100\n"
"Last-Translator: Magnus Nilsson <mag_nilsson@hotmail.com>\n"
"Language-Team: WeeGull <weegull@hotmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Swedish\n"
-"X-Poedit-Country: SWEDEN\n"
"X-Poedit-SourceCharset: iso-8859-15\n"
+"Language: sv_SE\n"
+"X-Generator: Poedit 1.5.4\n"
msgid ""
"A mount entry with this name already exists!\n"
@@ -40,7 +40,7 @@ msgid "Add a new NFS or CIFS mount point to your Dreambox."
msgstr "Lägg till ny NFS eller CIFS monteringspunkt i din mottagare."
msgid "Add new network mount point"
-msgstr "Lägg till ny nätverks monteringspunkt"
+msgstr "Lägg till ny nätverksmonteringspunkt"
msgid ""
"Are you sure you want to save this network mount?\n"
@@ -50,10 +50,10 @@ msgstr ""
"\n"
msgid "Attempt to mount shares again"
-msgstr "Försök att montera delning igen"
+msgstr "Försök att montera nätverksdelning igen"
msgid "Attempt to recover lost mounts (in background)"
-msgstr "Försök att återställa förlorade monteringar (i bakgrunden)"
+msgstr "Försök att återfå förlorade monteringspunkter (i bakgrunden)"
msgid "Browse network neighbourhood"
msgstr "Bläddra i nätverket"
@@ -65,10 +65,10 @@ msgid "Cancel"
msgstr "Avbryt"
msgid "Change hostname"
-msgstr "Byt hostnamn"
+msgstr "Byt värdnamn"
msgid "Change the hostname of your Dreambox."
-msgstr "Byt hostnamn på din mottagare."
+msgstr "Byt värdnamn på din mottagare."
msgid "Close"
msgstr "Stäng"
@@ -77,19 +77,19 @@ msgid "Delete"
msgstr "Ta bort"
msgid "Delete mount"
-msgstr "Ta bort montering"
+msgstr "Ta bort monteringspunkt"
msgid "Dir:"
msgstr "Dir:"
msgid "Do you want to enter a username and password for this host?\n"
-msgstr "Vill du ange ett användarnamn och lösenord för den här hosten?\n"
+msgstr "Vill du ange ett användarnamn och lösenord för den här värden?\n"
msgid "Enter IP to scan..."
-msgstr "Ange IP för att skanna ..."
+msgstr "Ange IP att skanna..."
msgid "Enter new hostname for your Dreambox"
-msgstr "Ange nytt hostnamn för din mottagare"
+msgstr "Ange nytt värdnamn för din mottagare"
msgid "Enter options:"
msgstr "Ange optioner:"
@@ -104,7 +104,7 @@ msgid "Enter share name:"
msgstr "Ange delningsnamn:"
msgid "Enter user and password for host: "
-msgstr "Ange användare och lösenord för host: "
+msgstr "Ange användare och lösenord för värd: "
msgid "Enter username:"
msgstr "Ange användarnamn:"
@@ -131,7 +131,7 @@ msgid "Manage your network shares..."
msgstr "Hantera dina nätverksdelningar..."
msgid "Mount again"
-msgstr "Montera på nytt"
+msgstr "Montera igen"
msgid "Mount informations"
msgstr "Monteringsinformation"
@@ -143,7 +143,7 @@ msgid "Mount type"
msgstr "Monteringstyp"
msgid "MountManager"
-msgstr "MonteringsHanterare"
+msgstr "Monteringshanterare"
msgid ""
"Mounted/\n"
@@ -153,7 +153,7 @@ msgstr ""
"Omonterad"
msgid "Mountpoints management"
-msgstr "Monteringspunkts hantering"
+msgstr "Monteringspunktshantering"
msgid "Mounts editor"
msgstr "Monteringseditor"
@@ -174,13 +174,13 @@ msgid "Password"
msgstr "Lösenord"
msgid "Please wait for activation of your network mount..."
-msgstr "Vänligen vänta på aktivering av dina nätverksmontering..."
+msgstr "Vänligen vänta på aktivering av din nätverksmontering..."
msgid "Please wait while removing your network mount..."
-msgstr "Vänligen vänta medans dina nätverksmontering tas bort..."
+msgstr "Vänligen vänta medans din nätverksmontering tas bort..."
msgid "Please wait while updating your network mount..."
-msgstr "Vänligen vänta medans dina nätverksmontering uppdateras..."
+msgstr "Vänligen vänta medans din nätverksmontering uppdateras..."
msgid "Please wait while your network is restarting..."
msgstr "Vänligen vänta medans ditt nätverk omstartas..."
@@ -189,7 +189,7 @@ msgid "Press OK to activate the settings."
msgstr "Tryck OK för att aktivera inställningarna."
msgid "Press OK to collapse this host"
-msgstr "Tryck OK för att stänga denna host."
+msgstr "Tryck OK för att stänga denna värd"
msgid "Press OK to edit selected settings."
msgstr "Tryck OK för att ändra vald inställning."
@@ -198,10 +198,10 @@ msgid "Press OK to edit the settings."
msgstr "Tryck OK för att ändra inställning."
msgid "Press OK to expand this host"
-msgstr "Tryck OK för att utvidga denna host."
+msgstr "Tryck OK för att expandera denna värd"
msgid "Press OK to mount this share!"
-msgstr "Tryck OK för att montera denna delning!"
+msgstr "Tryck OK för att montera denna nätverksdelning!"
msgid "Press OK to mount!"
msgstr "Tryck OK för att montera!"
@@ -213,13 +213,13 @@ msgid "Press OK to select."
msgstr "Tryck OK för att välja."
msgid "Rescan"
-msgstr "Ny sökning"
+msgstr "Sök igenom igen"
msgid "Scan NFS share"
msgstr "Skanna NFS delning"
msgid "Scan range"
-msgstr "Skanna området"
+msgstr "Skanna område"
msgid "Search for network shares"
msgstr "Söker efter nätverksutdelningar"
@@ -234,7 +234,7 @@ msgid "Server IP"
msgstr "Server IP"
msgid "Server share"
-msgstr "Server delning"
+msgstr "Serverdelning"
msgid "User management"
msgstr "Användarhantering"
@@ -261,7 +261,7 @@ msgid "Your network mount has been updated."
msgstr "Din nätverksmontering har uppdaterats."
msgid "use as HDD replacement"
-msgstr "Använd som HDD ersättning"
+msgstr "använd som HDD ersättning"
#~ msgid "Delete selected mount"
#~ msgstr "Ta bort vald montering"
View
30 networkbrowserpli/src/AutoMount.py
@@ -118,47 +118,43 @@ def CheckMountPoint(self, item, callback):
data = self.automounts[item]
if not self.MountConsole:
self.MountConsole = Console()
- self.command = None
+ command = None
path = os.path.join('/media/net', data['sharename'])
if self.activeMountsCounter == 0:
print "self.automounts without active mounts",self.automounts
if data['active'] == 'False' or data['active'] is False:
- umountcmd = 'umount -fl '+ path
+ umountcmd = "umount -fl '%s'" % path
print "[AutoMount.py] UMOUNT-CMD--->",umountcmd
self.MountConsole.ePopen(umountcmd, self.CheckMountPointFinished, [data, callback])
else:
if data['active'] == 'False' or data['active'] is False:
- self.command = 'umount -fl '+ path
+ command = "umount -fl '%s'" % path
elif data['active'] == 'True' or data['active'] is True:
try:
if not os.path.exists(path):
os.makedirs(path)
- tmpsharedir = data['sharedir'].replace(" ", "\\ ")
- if tmpsharedir[-1:] == "$":
- tmpdir = tmpsharedir.replace("$", "\\$")
- tmpsharedir = tmpdir
-
if data['mounttype'] == 'nfs':
if not os.path.ismount(path):
if data['options']:
options = "tcp,noatime," + data['options']
else:
options = "tcp,noatime"
- tmpcmd = 'mount -t nfs -o ' + options + ' ' + data['ip'] + ':/' + tmpsharedir + ' ' + path
- self.command = tmpcmd.encode("UTF-8")
+ tmpcmd = "mount -t nfs -o %s '%s' '%s'" % (options, data['ip'] + ':/' + data['sharedir'], path)
+ command = tmpcmd.encode("UTF-8")
elif data['mounttype'] == 'cifs':
if not os.path.ismount(path):
tmpusername = data['username'].replace(" ", "\\ ")
- tmpcmd = 'mount -t cifs -o '+ data['options'] +',noatime,noserverino,iocharset=utf8,username='+ tmpusername + ',password='+ data['password'] + ' //' + data['ip'] + '/' + tmpsharedir + ' ' + path
- self.command = tmpcmd.encode("UTF-8")
+ options = data['options'] + ',noatime,noserverino,iocharset=utf8,username='+ tmpusername + ',password='+ data['password']
+ tmpcmd = "mount -t cifs -o %s '//%s/%s' '%s'" % (options, data['ip'], data['sharedir'], path)
+ command = tmpcmd.encode("UTF-8")
except Exception, ex:
print "[AutoMount.py] Failed to create", path, "Error:", ex
- self.command = None
- if self.command is not None:
- print "[AutoMount.py] U/MOUNTCMD--->",self.command
- self.MountConsole.ePopen(self.command, self.CheckMountPointFinished, [data, callback])
+ command = None
+ if command:
+ print "[AutoMount.py] U/MOUNTCMD--->",command
+ self.MountConsole.ePopen(command, self.CheckMountPointFinished, [data, callback])
else:
self.CheckMountPointFinished(None,None, [data, callback])
@@ -280,7 +276,7 @@ def removeMount(self, mountpoint, callback = None):
if not self.removeConsole:
self.removeConsole = Console()
path = '/media/net/'+ mountpoint
- umountcmd = 'umount -fl '+ path
+ umountcmd = "umount -fl '%s'" % path
print "[AutoMount.py] UMOUNT-CMD--->",umountcmd
self.removeConsole.ePopen(umountcmd, self.removeMountPointFinished, [path, callback])

0 comments on commit 1b39041

Please sign in to comment.