- merge; service API change

1 files changed, 15 insertions, 10 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b3cc2b3ee..eb78c2ec6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,6 +28,10 @@ src/ats-tests/ats-testing-traffic.c
 src/ats-tests/gnunet-ats-sim.c
 src/ats-tests/gnunet-solver-eval.c
 src/ats-tool/gnunet-ats.c
+src/auction/gnunet-auction-create.c
+src/auction/gnunet-auction-info.c
+src/auction/gnunet-auction-join.c
+src/auction/gnunet-service-auction.c
 src/block/block.c
 src/block/plugin_block_template.c
 src/block/plugin_block_test.c
@@ -62,10 +66,8 @@ src/conversation/gnunet-service-conversation.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
-src/core/core_api_2.c
 src/core/core_api.c
 src/core/core_api_monitor_peers.c
-src/core/core_api_mq.c
 src/core/gnunet-core.c
 src/core/gnunet-service-core.c
 src/core/gnunet-service-core_kx.c
@@ -241,23 +243,25 @@ src/namestore/plugin_namestore_flat.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
 src/namestore/plugin_rest_namestore.c
+src/nat-auto/gnunet-nat-auto.c
+src/nat-auto/gnunet-nat-auto_legacy.c
+src/nat-auto/gnunet-nat-server.c
+src/nat-auto/gnunet-service-nat-auto.c
+src/nat-auto/gnunet-service-nat-auto_legacy.c
+src/nat-auto/nat_auto_api.c
+src/nat-auto/nat_auto_api_test.c
 src/nat/gnunet-helper-nat-client.c
 src/nat/gnunet-helper-nat-client-windows.c
 src/nat/gnunet-helper-nat-server.c
 src/nat/gnunet-helper-nat-server-windows.c
 src/nat/gnunet-nat.c
-src/nat/gnunet-nat-server.c
 src/nat/gnunet-service-nat.c
+src/nat/gnunet-service-nat_externalip.c
 src/nat/gnunet-service-nat_helper.c
+src/nat/gnunet-service-nat_mini.c
 src/nat/gnunet-service-nat_stun.c
 src/nat/nat_api.c
 src/nat/nat_api_stun.c
-src/nat/nat_api_test.c
-src/nat/nat_auto.c
-src/nat/nat.c
-src/nat/nat_mini.c
-src/nat/nat_stun.c
-src/nat/nat_test.c
 src/nse/gnunet-nse.c
 src/nse/gnunet-nse-profiler.c
 src/nse/gnunet-service-nse.c
@@ -422,7 +426,7 @@ src/tun/regex.c
 src/tun/tun.c
 src/util/bandwidth.c
 src/util/bio.c
-src/util/client_new.c
+src/util/client.c
 src/util/common_allocation.c
 src/util/common_endian.c
 src/util/common_logging.c
@@ -493,6 +497,7 @@ src/vpn/gnunet-helper-vpn-windows.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
+src/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
 src/include/gnunet_common.h
 src/include/gnunet_mq_lib.h