[vlma-devel] commit: Typos / not translated tokens. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Mon Jun 30 00:26:25 2008 +0200| [e80d4a8804f043b2a4192b70095d5208287f17a8]

Typos / not translated tokens.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=e80d4a8804f043b2a4192b70095d5208287f17a8
---

 .../java/org/videolan/vlma/OrderGiverImpl.java     |    4 ++--
 .../videolan/vlma/model/adapter/FilesAdapter.java  |    4 ++--
 .../videolan/vlma/model/adapter/StreamAdapter.java |    4 ++--
 .../videolan/vlma/model/media/FilesChannel.java    |    2 +-
 .../videolan/vlma/model/media/StreamChannel.java   |    2 +-
 .../org/videolan/vlma/model/media/TNTChannel.java  |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vlma-core/src/main/java/org/videolan/vlma/OrderGiverImpl.java b/vlma-core/src/main/java/org/videolan/vlma/OrderGiverImpl.java
index 4f00b33..8adb638 100644
--- a/vlma-core/src/main/java/org/videolan/vlma/OrderGiverImpl.java
+++ b/vlma-core/src/main/java/org/videolan/vlma/OrderGiverImpl.java
@@ -84,7 +84,7 @@ public class OrderGiverImpl implements OrderGiver {
      */
     private Runnable orderComputer = new Runnable() {
         public void run() {
-            logger.log(Level.DEBUG, "Starting computing channels assignement.");
+            logger.log(Level.DEBUG, "Starting computing channels assignment.");
             Map<Integer, List<Order>> orders = vlmaService.getOrders(); // Streaming orders
             List<Media> medias = vlmaService.getMedias(); // Media list
             List<Server> servers = vlmaService.getServers(); // Servers list
@@ -164,7 +164,7 @@ public class OrderGiverImpl implements OrderGiver {
             logger.log(Level.DEBUG, nbMedias + " media to stream.");
 
             // One assings a program group by adapter
-            logger.log(Level.DEBUG, "Assigning programms to adapters.");
+            logger.log(Level.DEBUG, "Assigning programs to adapters.");
             for (Integer c : readyAdapters.keySet()) {
                 logger.log(Level.DEBUG, "Media type: " + c.toString());
                 List<MediaGroup> sameHashTypeGroupList = programGroups.get(c);
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/adapter/FilesAdapter.java b/vlma-model/src/main/java/org/videolan/vlma/model/adapter/FilesAdapter.java
index 64ea190..b838563 100644
--- a/vlma-model/src/main/java/org/videolan/vlma/model/adapter/FilesAdapter.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/adapter/FilesAdapter.java
@@ -47,9 +47,9 @@ public class FilesAdapter extends AbstractAdapter {
     public void setParameter(String parameter, Object value)
             throws AdapterParameterDoesNotExistException {
         {
-            throw new AdapterParameterDoesNotExistException("Le paramètre "
+            throw new AdapterParameterDoesNotExistException("Parameter "
                     + parameter
-                    + " n'existe pas dans les périphériques du type "
+                    + " doesn't existe among adapters whose type is "
                     + this.getClass().getSimpleName());
         }
     }
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/adapter/StreamAdapter.java b/vlma-model/src/main/java/org/videolan/vlma/model/adapter/StreamAdapter.java
index dfaffeb..682e705 100755
--- a/vlma-model/src/main/java/org/videolan/vlma/model/adapter/StreamAdapter.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/adapter/StreamAdapter.java
@@ -47,9 +47,9 @@ public class StreamAdapter extends AbstractAdapter {
     public void setParameter(String parameter, Object value)
             throws AdapterParameterDoesNotExistException {
         {
-            throw new AdapterParameterDoesNotExistException("Le paramètre "
+            throw new AdapterParameterDoesNotExistException("Parameter "
                     + parameter
-                    + " n'existe pas dans les périphériques du type "
+                    + " doesn't exist among adapters whose type is "
                     + this.getClass().getSimpleName());
         }
     }
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/media/FilesChannel.java b/vlma-model/src/main/java/org/videolan/vlma/model/media/FilesChannel.java
index b5bfee7..0b3cca2 100644
--- a/vlma-model/src/main/java/org/videolan/vlma/model/media/FilesChannel.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/media/FilesChannel.java
@@ -129,7 +129,7 @@ public class FilesChannel extends AbstractMedia {
     public boolean equals(Object o) {
         if (o.getClass().equals(FilesChannel.class)) {
             FilesChannel c = (FilesChannel) o;
-            logger.log(Level.DEBUG, "Comparaison de " + getName() + " et "
+            logger.log(Level.DEBUG, "Comparison of " + getName() + " with "
                     + c.getName());
             return (c.name.equals(this.name));
         }
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/media/StreamChannel.java b/vlma-model/src/main/java/org/videolan/vlma/model/media/StreamChannel.java
index e6da99d..43efa64 100755
--- a/vlma-model/src/main/java/org/videolan/vlma/model/media/StreamChannel.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/media/StreamChannel.java
@@ -126,7 +126,7 @@ public class StreamChannel extends AbstractMedia {
     public boolean equals(Object o) {
         if (o.getClass().equals(StreamChannel.class)) {
             StreamChannel c = (StreamChannel) o;
-            logger.log(Level.DEBUG, "Comparaison de " + getName() + " et "
+            logger.log(Level.DEBUG, "Comparison of " + getName() + " with "
                     + c.getName());
             return (c.streamURL.equals(this.streamURL) &&
                     (c.name.equals(this.name)));
diff --git a/vlma-model/src/main/java/org/videolan/vlma/model/media/TNTChannel.java b/vlma-model/src/main/java/org/videolan/vlma/model/media/TNTChannel.java
index 691310f..2fce207 100644
--- a/vlma-model/src/main/java/org/videolan/vlma/model/media/TNTChannel.java
+++ b/vlma-model/src/main/java/org/videolan/vlma/model/media/TNTChannel.java
@@ -133,7 +133,7 @@ public class TNTChannel extends AbstractMedia {
     public boolean equals(Object o) {
         if (o.getClass().equals(TNTChannel.class)) {
             TNTChannel c = (TNTChannel) o;
-            logger.log(Level.DEBUG, "Comparaison de " + getName() + " et "
+            logger.log(Level.DEBUG, "Comparison of " + getName() + " with "
                     + c.getName());
             return (c.getFrequency() == this.frequency && c.getSid() == sid && c.name
                     .equals(this.name));