undo 17914, 915, 916

diff --git a/po/de.gmo b/po/de.gmo
index 5386e51fdb78785cda40715dfed15e8729a1223f..909168959f0ed688e6f0c5689a1127446e6eb8e6 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index b44575b0cc051e034ac24e4a149e285e2c55e717..4e94209ea98baf3d2610471580035daa2bb8924d 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -4312,16 +4312,16 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"

diff --git a/po/es.gmo b/po/es.gmo
index a96b498ef85821e3fee56933e62cc237c8ee57dc..510f0216501ae85d982b218a016621767910b7a5 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ

diff --git a/po/es.po b/po/es.po
index 6dce235edb1d5214d54540629ff2bad866d97345..620d191e3ae7e64171ca3a45ea61eb8a3560dd45 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <miguel.13@telefonica.net>\n"
 "Language-Team: Spanish\n"
@@ -4291,16 +4291,16 @@ msgstr "Probando transporte(s) %s\n"
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"

diff --git a/po/gnunet.pot b/po/gnunet.pot
index a4bc6714713c4f84a1d494a8f4bccc42447359a9..ced32f6ec216f1f13b0c17290d2d223f55312b67 100644 (file)
--- a/po/gnunet.pot
+++ b/po/gnunet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4049,15 +4049,15 @@ msgstr ""
 msgid "Failed to load block plugin `%s'\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr ""
 

diff --git a/po/sv.gmo b/po/sv.gmo
index 69c4e75bbff07200f45750b8776b376f3569dccb..b69af23b1df422f0424118d80711aecb48612732 100644 (file)
Binary files a/po/sv.gmo and b/po/sv.gmo differ

diff --git a/po/sv.po b/po/sv.po
index 4538965cb3e0cb9ea35d8378e13c9a891fdfdbac..33ae789132f9b8aac06f953bac0be2c92175c3af 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -4238,16 +4238,16 @@ msgstr "Testar transport(er) %s\n"
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"

diff --git a/po/vi.gmo b/po/vi.gmo
index 483b038c1b9f5043ec51f0de5afc4978c7cd7be6..2702b540bf7939ebcbce25258a152b6bce83d2f7 100644 (file)
Binary files a/po/vi.gmo and b/po/vi.gmo differ

diff --git a/po/vi.po b/po/vi.po
index 1cb3bbdd801be968427e506f3941994d8575cf6d..dbbe026faac3a719edf85e92ff2f4ab987d76331 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -4311,16 +4311,16 @@ msgstr "Đang nạp các truyền tải « %s »\n"
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 29dfffab25cfa3988e3468758217c620ceb7ef4f..34e55a957976fbc2a253772e3dad4e191559c249 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-10-31 18:51+0100\n"
+"POT-Creation-Date: 2011-10-31 18:55+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -4099,16 +4099,16 @@ msgstr ""
 msgid "Failed to load block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4161
+#: src/mesh/gnunet-service-mesh.c:4170
 msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4365
+#: src/mesh/gnunet-service-mesh.c:4374
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:4374
+#: src/mesh/gnunet-service-mesh.c:4383
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"

diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index d080f54da5b244c1b0e0e8c0639ae404fa828cfb..b07f2040772819249b9f137683cb00940adb0a23 100644 (file)
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -536,8 +536,6 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
   {
     delay = GNUNET_TIME_UNIT_ZERO;
   }
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
     GNUNET_SCHEDULER_cancel (mc->ack_task);
   mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc);

diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index fc69b8a3afd83d984f2603bafa47338d5f06a62a..ef3a57a87b618f7f4f670f88e6c85b3dfcf7b99b 100644 (file)
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -160,8 +160,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize);
   else
     delay = GNUNET_TIME_UNIT_ZERO;
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   if (delay.rel_value > 0)
   {
     fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc);
@@ -210,8 +208,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     fc->last_round = GNUNET_TIME_absolute_get ();
     fc->wack = GNUNET_YES;
   }
-  if (NULL != getenv ("infinitebandwidth"))
-    delay = GNUNET_TIME_UNIT_ZERO;
   fc->proc_busy = GNUNET_YES;
   fc->delay_until = GNUNET_TIME_relative_to_absolute (delay);
   fc->proc (fc->proc_cls, &fh->header);

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 0f35afc0cca07c598db437cc67866465563965ec..a1ce1364f2a1dd719821d96aeb8b42ae812362e6 100644 (file)
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -1583,11 +1583,6 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity
   struct NeighbourMapEntry *n;
   struct GNUNET_TIME_Relative ret;
 
-  if (NULL != getenv ("infinitebandwidth"))
-    {
-      *do_forward = GNUNET_YES;
-      return GNUNET_TIME_UNIT_ZERO;
-    }
   GNUNET_assert (neighbours != NULL);
 
   n = lookup_neighbour (sender);

diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 894618986c3b188a4d00f36f18bc2da08bb3a455..2ececc10da107a7822d48f45c9bbd80a2268d37c 100644 (file)
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -681,7 +681,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
     }
     th = n->th;
     if (th->notify_size + sizeof (struct OutboundMessage) > size)
-      break;                    /* does not fit */    
+      break;                    /* does not fit */
     if (GNUNET_BANDWIDTH_tracker_get_delay
         (&n->out_tracker, th->notify_size).rel_value > 0)
       break;                    /* too early */
@@ -708,8 +708,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
       memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage));
       ret += (mret + sizeof (struct OutboundMessage));
       size -= (mret + sizeof (struct OutboundMessage));
-      if (NULL == getenv ("infinitebandwidth"))
-       GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret);
+      GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret);
     }
     GNUNET_free (th);
   }