November 2014 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Set the SOCKS listen port to 9152 instead of 9150
by sukhbir＠torproject.org 17 Nov '14

17 Nov '14

commit 67cd0cf19befc59b192695e65aa3d90572e8a0d6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Nov 17 22:46:17 2014 +0530 Set the SOCKS listen port to 9152 instead of 9150 --- projects/instantbird/preferences.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 832deb2..06fbf28 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/… [View More]

1 0

[tor/master] Remove Support022HiddenServices
by nickm＠torproject.org 17 Nov '14

17 Nov '14

commit b3bd7a736c7a54406c087bfaa2bae3dec03ec7bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 17 11:52:10 2014 -0500 Remove Support022HiddenServices This has been already disabled in the directory consensus for a while; it didn't seem to break anything. Finally closes #7803. --- changes/bug7803 | 5 +++++ src/or/config.c | 2 +- src/or/or.h | 3 --- src/or/rendclient.c | 20 ++------------------ 4 files changed, 8 … [View More]insertions(+), 22 deletions(-) diff --git a/changes/bug7803 b/changes/bug7803 new file mode 100644 index 0000000..7a2bba7 --- /dev/null +++ b/changes/bug7803 @@ -0,0 +1,5 @@ + o Removed features: + - Tor clients no longer support connecting to hidden services running on + Tor 0.2.2.x and earlier; the Support022HiddenServices option has been + removed. (There shouldn't be any hidden services running these + versions on the network.) diff --git a/src/or/config.c b/src/or/config.c index 4b8c683..a0351d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -377,7 +377,7 @@ static config_var_t option_vars_[] = { OBSOLETE("StrictEntryNodes"), OBSOLETE("StrictExitNodes"), V(StrictNodes, BOOL, "0"), - V(Support022HiddenServices, AUTOBOOL, "auto"), + OBSOLETE("Support022HiddenServices"), V(TestSocks, BOOL, "0"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), diff --git a/src/or/or.h b/src/or/or.h index 5ebe7bf..8a9c1cf 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4229,9 +4229,6 @@ typedef struct { /** How long (seconds) do we keep a guard before picking a new one? */ int GuardLifetime; - /** Should we send the timestamps that pre-023 hidden services want? */ - int Support022HiddenServices; - } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5e5a09e..f351ae7 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -130,16 +130,6 @@ rend_client_reextend_intro_circuit(origin_circuit_t *circ) return result; } -/** Return true iff we should send timestamps in our INTRODUCE1 cells */ -static int -rend_client_should_send_timestamp(void) -{ - if (get_options()->Support022HiddenServices >= 0) - return get_options()->Support022HiddenServices; - - return networkstatus_get_param(NULL, "Support022HiddenServices", 1, 0, 1); -} - /** Called when we're trying to connect an ap conn; sends an INTRODUCE1 cell * down introcirc if possible. */ @@ -251,14 +241,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc, REND_DESC_COOKIE_LEN); v3_shift += 2+REND_DESC_COOKIE_LEN; } - if (rend_client_should_send_timestamp()) { - uint32_t now = (uint32_t)time(NULL); - now += 300; - now -= now % 600; - set_uint32(tmp+v3_shift+1, htonl(now)); - } else { - set_uint32(tmp+v3_shift+1, 0); - } + /* Once this held a timestamp. */ + set_uint32(tmp+v3_shift+1, 0); v3_shift += 4; } /* if version 2 only write version number */ else if (entry->parsed->protocols & (1<<2)) { [View Less]

1 0

[tor/master] Rewriting comment for control_event_hs_descriptor_failed().
by nickm＠torproject.org 17 Nov '14

17 Nov '14

commit 620e251dccf2e040ffbd9669016a22f6a774aef1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 16 16:06:00 2014 +0200 Rewriting comment for control_event_hs_descriptor_failed(). --- src/or/control.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index d9dc1ba..54464cc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5139,9 +5139,10 @@ control_event_hs_descriptor_received(const rend_data_t *… [View More]

1 0

[tor/master] Adding REASON field to HS_DESC FAILED controller event.
by nickm＠torproject.org 17 Nov '14

17 Nov '14

commit 0db96d023b9a927d55c18c06f57b6cc0a9bd34de Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 16 15:51:23 2014 +0200 Adding REASON field to HS_DESC FAILED controller event. --- src/or/control.c | 25 +++++++++++++++++++------ src/or/control.h | 6 ++++-- src/or/directory.c | 13 +++++++------ src/test/test_hs.c | 10 ++++++---- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index e3f9131..d9dc1ba 100644 -… [View More]-- a/src/or/control.c +++ b/src/or/control.c @@ -5096,20 +5096,30 @@ control_event_hs_descriptor_requested(const rend_data_t *rend_query, void control_event_hs_descriptor_receive_end(const char *action, const rend_data_t *rend_query, - const char *id_digest) + const char *id_digest, + const char *reason) { + char *reason_field = NULL; + if (!action || !rend_query || !id_digest) { log_warn(LD_BUG, "Called with action==%p, rend_query==%p, " "id_digest==%p", action, rend_query, id_digest); return; } + if (reason) { + tor_asprintf(&reason_field, " REASON=%s", reason); + } + send_control_event(EVENT_HS_DESC, ALL_FORMATS, - "650 HS_DESC %s %s %s %s\r\n", + "650 HS_DESC %s %s %s %s%s\r\n", action, rend_query->onion_address, rend_auth_type_to_string(rend_query->auth_type), - node_describe_longname_by_id(id_digest)); + node_describe_longname_by_id(id_digest), + reason_field ? reason_field : ""); + + tor_free(reason_field); } /** send HS_DESC RECEIVED event @@ -5125,7 +5135,8 @@ control_event_hs_descriptor_received(const rend_data_t *rend_query, rend_query, id_digest); return; } - control_event_hs_descriptor_receive_end("RECEIVED", rend_query, id_digest); + control_event_hs_descriptor_receive_end("RECEIVED", rend_query, + id_digest, NULL); } /** send HS_DESC FAILED event @@ -5134,14 +5145,16 @@ control_event_hs_descriptor_received(const rend_data_t *rend_query, */ void control_event_hs_descriptor_failed(const rend_data_t *rend_query, - const char *id_digest) + const char *id_digest, + const char *reason) { if (!rend_query || !id_digest) { log_warn(LD_BUG, "Called with rend_query==%p, id_digest==%p", rend_query, id_digest); return; } - control_event_hs_descriptor_receive_end("FAILED", rend_query, id_digest); + control_event_hs_descriptor_receive_end("FAILED", rend_query, + id_digest, reason); } /** Free any leftover allocated memory of the control.c subsystem. */ diff --git a/src/or/control.h b/src/or/control.h index 0c92d55..f62084b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -108,11 +108,13 @@ void control_event_hs_descriptor_requested(const rend_data_t *rend_query, const char *hs_dir); void control_event_hs_descriptor_receive_end(const char *action, const rend_data_t *rend_query, - const char *hs_dir); + const char *hs_dir, + const char *reason); void control_event_hs_descriptor_received(const rend_data_t *rend_query, const char *hs_dir); void control_event_hs_descriptor_failed(const rend_data_t *rend_query, - const char *hs_dir); + const char *hs_dir, + const char *reason); void control_free_all(void); diff --git a/src/or/directory.c b/src/or/directory.c index df9e7f8..e1f5964 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2073,9 +2073,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } if (conn->base_.purpose == DIR_PURPOSE_FETCH_RENDDESC_V2) { - #define SEND_HS_DESC_FAILED_EVENT() ( \ + #define SEND_HS_DESC_FAILED_EVENT(reason) ( \ control_event_hs_descriptor_failed(conn->rend_data, \ - conn->identity_digest) ) + conn->identity_digest, \ + reason) ) tor_assert(conn->rend_data); log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d " "(%s))", @@ -2090,7 +2091,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) "Retrying at another directory."); /* We'll retry when connection_about_to_close_connection() * cleans this dir conn up. */ - SEND_HS_DESC_FAILED_EVENT(); + SEND_HS_DESC_FAILED_EVENT("BAD_DESC"); break; case RCS_OKAY: default: @@ -2109,14 +2110,14 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * connection_about_to_close_connection() cleans this conn up. */ log_info(LD_REND,"Fetching v2 rendezvous descriptor failed: " "Retrying at another directory."); - SEND_HS_DESC_FAILED_EVENT(); + SEND_HS_DESC_FAILED_EVENT("NOT_FOUND"); break; case 400: log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: " "http status 400 (%s). Dirserver didn't like our " "v2 rendezvous query? Retrying at another directory.", escaped(reason)); - SEND_HS_DESC_FAILED_EVENT(); + SEND_HS_DESC_FAILED_EVENT("QUERY_REJECTED"); break; default: log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: " @@ -2125,7 +2126,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) "Retrying at another directory.", status_code, escaped(reason), conn->base_.address, conn->base_.port); - SEND_HS_DESC_FAILED_EVENT(); + SEND_HS_DESC_FAILED_EVENT("UNEXPECTED"); break; } } diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 2db88a4..a5cd841 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -99,18 +99,20 @@ test_hs_desc_event(void *arg) /* test failed event */ rend_query.auth_type = 2; - control_event_hs_descriptor_failed(&rend_query, HSDIR_NONE_EXIST_ID); + control_event_hs_descriptor_failed(&rend_query, HSDIR_NONE_EXIST_ID, + "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" STEALTH_AUTH "\ - STR_HSDIR_NONE_EXIST_LONGNAME"\r\n"; + STR_HSDIR_NONE_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n"; tt_assert(received_msg); tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); /* test invalid auth type */ rend_query.auth_type = 999; - control_event_hs_descriptor_failed(&rend_query, HSDIR_EXIST_ID); + control_event_hs_descriptor_failed(&rend_query, HSDIR_EXIST_ID, + "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\ - STR_HSDIR_EXIST_LONGNAME"\r\n"; + STR_HSDIR_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n"; tt_assert(received_msg); tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); [View Less]

1 0

[tor/master] Changes file for 13212.
by nickm＠torproject.org 17 Nov '14

17 Nov '14

commit a68b90fc7af401220f11f4f9e39f08a8548a6957 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 16 16:12:08 2014 +0200 Changes file for 13212. --- changes/feature13212 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/feature13212 b/changes/feature13212 new file mode 100644 index 0000000..6f1bce7 --- /dev/null +++ b/changes/feature13212 @@ -0,0 +1,4 @@ + o Minor features (hidden services): + - Inform Tor controller about nature of failure to retrieve +… [View More]

1 0

[torspec/master] Writing down possible values of reason string for 13212.
by nickm＠torproject.org 17 Nov '14

17 Nov '14

commit 7908c8dc96897c26c445c5047f487e49e3447d9c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 16 16:27:35 2014 +0200 Writing down possible values of reason string for 13212. --- control-spec.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 70ddf3b..c17ce9b 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2447,12 +2447,14 @@ The syntax is: "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType … [View More]

1 0

[onionoo/master] Switch from Tomcat to embedded Jetty.
by karsten＠torproject.org 17 Nov '14

17 Nov '14

commit b4d4121bdac56636c3d48669e2e5cec1379f514e Author: iwakeh <iwakeh(a)users.ourproject.org> Date: Mon Sep 22 19:00:00 2014 +0000 Switch from Tomcat to embedded Jetty. Running the servlet inside Tomcat works okay, but it's not really convenient for deployment. Let's switch to running from the command line and using our own embedded Jetty server. Related to this change, switch to running hourly update process from previously generated .jar file … [View More]rather than using Ant. Implements #13089. --- .gitignore | 3 +- CONTRIB.md | 25 ----- INSTALL | 101 ++++++++--------- bin/update.sh | 3 - build.xml | 114 ++++++++++++++++---- etc/jetty.xml | 45 ++++++++ etc/logback.xml | 47 ++++++-- etc/web.xml.template | 23 ++++ logback.xml | 66 ------------ .../org/torproject/onionoo/server/ServerMain.java | 31 ++++++ vagrant/bootstrap.sh | 3 - 11 files changed, 275 insertions(+), 186 deletions(-) diff --git a/.gitignore b/.gitignore index f45b088..80c5ae5 100755 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,7 @@ etc/context.xml etc/web.xml geoip/ in/ -log -onionoo.war +dist/ out/ status/ diff --git a/CONTRIB.md b/CONTRIB.md index 3daf91a..d971ec4 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -87,31 +87,6 @@ host system, which performs not really well. Read the INSTALL file and make the appropriate changes to adapt everything to your setup, e.g., memory settings. -Compile Onionoo, run the unit tests and then the cron part of it: - -``` -ant compile -ant test -ant run -``` - -This step may take an hour or more. Onionoo downloads the last three days -of Tor descriptors, which is about 2 GiB, and processes them. - -Once these steps are done, deploy the servlet to the local Tomcat server: - -``` -ant war -``` - -Test the Onionoo service using a browser on the host (port 8080 on the -guest is forwarded to the host). Sample URL: - -http://localhost:8080/onionoo/summary?limit=2 - -Note that Tomcat's default server.xml needs no changing for running in the -development environment. -See the INSTALL file for necessary changes in the production environment. ## Documentation overview diff --git a/INSTALL b/INSTALL index ff638d1..89f4db9 100644 --- a/INSTALL +++ b/INSTALL @@ -11,8 +11,8 @@ $ git clone https://git.torproject.org/onionoo.git /srv/onionoo/ $ cd /srv/onionoo -Install Java 1.7 or higher, ant 1.8 or higher, and Tomcat 6 ------------------------------------------------------------ +Install Java 1.7 or higher and ant 1.8 or higher +------------------------------------------------ $ javac -version javac 1.7.0_65 @@ -67,73 +67,62 @@ Test the hourly data processing process --------------------------------------- Run the data processing process that will afterwards be run once per hour. -Currently, memory is set to 4G. If you have more or less RAM to spare, -change the value for the maxmemory.value property near the top of the -build.xml file. + +Create a .jar file: + +$ ant jar + The initial run may take a while: -$ ant run +$ java -DLOGBASE=/path/to/logfiles -Xmx4g -jar dist/onionoo-<version>.jar Set up an hourly cronjob ------------------------ -Check the contents of bin/update.sh and whether they match the commands -that worked for you. Once they do, add a crontab line similar to this -one: - -15 * * * * cd /srv/onionoo/ && bin/update.sh - - -Configure Tomcat ----------------- - -The following file may be a useful Tomcat configuration file. -Make changes according to your server setup, i.e. replace ${your-host-ip} -with your ip address and the like (ports, lognames and paths). -Put it in /etc/tomcat6/server.xml: - -<Server port="8005" shutdown="SHUTDOWN"> - <Service name="Catalina"> - <Connector port="8080" maxHttpHeaderSize="8192" - maxThreads="150" minSpareThreads="25" maxSpareThreads="75" - enableLookups="false" redirectPort="8443" acceptCount="100" - connectionTimeout="20000" disableUploadTimeout="true" - compression="on" compressionMinSize="2048" - noCompressionUserAgents="gozilla, traviata" - compressableMimeType="text/html,application/json" /> - <Engine name="Catalina" defaultHost="${your-host-ip}"> - <Host name="${your-host-ip}" appBase="webapps" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - <Alias>${your-host-ip}</Alias> - <Valve className="org.apache.catalina.valves.AccessLogValve" - directory="logs" prefix="onionoo_access_log." suffix=".txt" - pattern="%l %u %t %r %s %b" resolveHosts="false"/> - </Host> - </Engine> - </Service> -</Server> - -It may also be necessary to increase Tomcat's maximum heap space. Do this -by editing JAVA_OPTS in /etc/default/tomcat6 and change "-Xmx128m" to -"-Xmx512m". - - -Deploy the Tomcat application ------------------------------ +Add a crontab line similar to the command above: + +15 * * * * cd /srv/onionoo/ && java -DLOGBASE=/path/to/logfiles \ + -Xmx4g -jar dist/onionoo-<version>.jar + + +Run the web server +------------------ Create a .war file: $ ant war -Create a symbolic link to the .war file, so that non-root users can -re-deploy the application in the future. Run the following commands as -root: +Start the Onionoo server -# cd /var/lib/tomcat6/webapps/ -# ln -s /srv/onionoo/onionoo.war onionoo.war +$ java -DLOGBASE=/path/to/logfiles -Xmx4g -jar dist/onionoo-<version>.war The Onionoo server should now be available at -http://localhost:8080/onionoo/. +http://localhost:8080/. + + +Configure Embedded Jetty +------------------------ + +Settings for the embedded jetty can be found in etc/jetty.xml +If you change anything, run + +$ ant clean war + +again. + + +Configure logging +----------------- + +Logging can be configured inside etc/logback.xml +If you change anything, run + +$ ant clean war jar + +again. + +The command line option LOGBASE is the path for the log files. +In case you forget to set it, you'll find the logs in the current +path in the folder LOGBASE_IS_UNDEFINED/ diff --git a/bin/update.sh b/bin/update.sh deleted file mode 100755 index 9294f41..0000000 --- a/bin/update.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -ant run >> log && cat errors - diff --git a/build.xml b/build.xml index 8f71f4d..0bea931 100644 --- a/build.xml +++ b/build.xml @@ -1,8 +1,12 @@ -<project default="run" name="onionoo" basedir="."> - <property name="maxmemory.value" value="4g"/> +<project default="dist" name="onionoo" basedir="."> + + <property name="onionoo.protocol.version" value="2.0"/> + <property name="release.version" + value="${onionoo.protocol.version}.0"/> <property name="javasources" value="src/main/java"/> <property name="tests" value="src/test/java"/> <property name="classes" value="classes"/> + <property name="dist" value="dist"/> <property name="config" value="etc"/> <property name="webxmlfile" value="${config}/web.xml"/> <property name="contextxmltemplate" @@ -11,8 +15,12 @@ <property name="webxmltemplate" value="${config}/web.xml.template"/> <property name="webxml" value="${config}/web.xml"/> - <property name="warfile" value="onionoo.war"/> + <property name="warfile" + value="${dist}/onionoo-${release.version}.war"/> + <property name="jarfile" + value="${dist}/onionoo-${release.version}.jar"/> <property name="source-and-target-java-version" value="1.7" /> + <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="/usr/share/java"> @@ -25,12 +33,22 @@ <include name="logback-classic-1.0.4.jar"/> <include name="logback-core-1.0.4.jar"/> <include name="slf4j-api-1.6.5.jar"/> + <include name="jetty8-server-8.1.3.v20120416.jar"/> + <include name="jetty8-servlets-8.1.3.v20120416.jar"/> + <include name="jetty8-servlet-8.1.3.v20120416.jar"/> + <include name="jetty8-util-8.1.3.v20120416.jar"/> + <include name="jetty8-http-8.1.3.v20120416.jar"/> + <include name="jetty8-io-8.1.3.v20120416.jar"/> + <include name="jetty8-xml-8.1.3.v20120416.jar"/> + <include name="jetty8-webapp-8.1.3.v20120416.jar"/> + <include name="jetty8-continuation-8.1.3.v20120416.jar"/> + <include name="jetty8-security-8.1.3.v20120416.jar"/> </fileset> <fileset dir="deps/metrics-lib"> <include name="descriptor.jar"/> </fileset> <fileset dir="${config}"> - <include name="logback.xml"/> + <include name="logback.xml,jetty.xml"/> </fileset> </path> @@ -38,13 +56,14 @@ <copy file="${contextxmltemplate}" tofile="${contextxml}"/> <copy file="${webxmltemplate}" tofile="${webxml}"/> <mkdir dir="${classes}"/> + <mkdir dir="${dist}"/> </target> <target name="clean" > <delete includeEmptyDirs="true"> <fileset dir="${classes}" defaultexcludes="false" includes="**" /> + <fileset dir="${dist}" defaultexcludes="false" includes="**" /> </delete> - <delete file="${warfile}"/> </target> <target name="metrics-lib"> @@ -87,38 +106,93 @@ </batchtest> </junit> </target> + <target name="war" depends="compile"> <war destfile="${warfile}" webxml="${webxmlfile}"> <fileset dir="web"/> - <lib dir="deps/metrics-lib"> + <zipgroupfileset dir="deps/metrics-lib"> <include name="descriptor.jar"/> - </lib> - <lib dir="/usr/share/java"> - <include name="slf4j-api-1.6.5.jar"/> - <include name="logback-classic-1.0.4.jar"/> - <include name="logback-core-1.0.4.jar"/> + </zipgroupfileset> + <zipgroupfileset dir="/usr/share/java"> <include name="commons-codec-1.6.jar"/> <include name="commons-compress-1.4.1.jar"/> <include name="commons-lang3-3.1.jar"/> <include name="gson-2.1.jar"/> - </lib> - <classes dir="${classes}"/> + <include name="servlet-api-3.0.jar"/> + <include name="jetty8-server-8.1.3.v20120416.jar"/> + <include name="jetty8-servlet-8.1.3.v20120416.jar"/> + <include name="jetty8-servlets-8.1.3.v20120416.jar"/> + <include name="jetty8-util-8.1.3.v20120416.jar"/> + <include name="jetty8-http-8.1.3.v20120416.jar"/> + <include name="jetty8-io-8.1.3.v20120416.jar"/> + <include name="jetty8-xml-8.1.3.v20120416.jar"/> + <include name="jetty8-webapp-8.1.3.v20120416.jar"/> + <include name="jetty8-continuation-8.1.3.v20120416.jar"/> + <include name="jetty8-security-8.1.3.v20120416.jar"/> + <include name="logback-classic-1.0.4.jar"/> + <include name="logback-core-1.0.4.jar"/> + <include name="slf4j-api-1.6.5.jar"/> + </zipgroupfileset> + <fileset dir="${classes}" + includes="**/*" + excludes="**/Test*.class"/> + <fileset dir="${config}" includes="jetty.xml" /> + <zipfileset dir="${config}" + prefix="" + includes="logback.xml"/> <zipfileset dir="${config}" prefix="WEB-INF/classes" includes="logback.xml"/> <metainf dir="${config}" includes="context.xml"/> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="Onionoo Server"/> + <attribute name="Implementation-Version" + value="${release.version}"/> + <attribute name="Onionoo-Protocol-Version" + value="${onionoo.protocol.version}" /> + <attribute name="Main-Class" + value="org.torproject.onionoo.server.ServerMain" /> + </manifest> </war> </target> - <target name="run" depends="compile"> - <copy file="logback.xml" todir="${classes}" /> - <java fork="true" - maxmemory="${maxmemory.value}" - classname="org.torproject.onionoo.cron.Main"> - <classpath refid="classpath"/> - </java> + + <target name="jar" depends="compile"> + <jar destfile="${jarfile}" + basedir="${classes}"> + <zipgroupfileset dir="/usr/share/java"> + <include name="commons-codec-1.6.jar"/> + <include name="commons-compress-1.4.1.jar"/> + <include name="commons-lang3-3.1.jar"/> + <include name="gson-2.1.jar"/> + <include name="logback-classic-1.0.4.jar"/> + <include name="logback-core-1.0.4.jar"/> + <include name="slf4j-api-1.6.5.jar"/> + </zipgroupfileset> + <zipgroupfileset dir="deps/metrics-lib"> + <include name="descriptor.jar"/> + </zipgroupfileset> + <fileset dir="${classes}" + excludes="org/torproject/onionoo/server/" /> + <fileset dir="${config}" includes="logback.xml" /> + <exclude name="**/Test*.class"/> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="Onionoo Server"/> + <attribute name="Implementation-Version" + value="${release.version}"/> + <attribute name="Onionoo-Protocol-Version" + value="${onionoo.protocol.version}" /> + <attribute name="Main-Class" + value="org.torproject.onionoo.cron.Main" /> + </manifest> + </jar> </target> + + <target name="dist" depends="test, war, jar"/> + </project> diff --git a/etc/jetty.xml b/etc/jetty.xml new file mode 100644 index 0000000..c172902 --- /dev/null +++ b/etc/jetty.xml @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure id="server" class="org.eclipse.jetty.server.Server" > + <Set name="dumpAfterStart">false</Set> + + <Set name="threadPool"> + <New class="org.eclipse.jetty.util.thread.QueuedThreadPool"> + <Set name="minThreads">25</Set> + <Set name="maxThreads">250</Set> + <Set name="detailedDump">false</Set> + </New> + </Set> + + <New id="webAppContext" class="org.eclipse.jetty.webapp.WebAppContext"> + <Set name="logUrlOnStart">true</Set> + <Set name="war"> + <Call class="java.lang.System" name="getProperty"> + <Arg>java.class.path</Arg> + </Call> + </Set> + </New> + + <Call name="addConnector"> + <Arg> + <New class="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <Set name="port">8080</Set> + </New> + </Arg> + </Call> + + <Set name="handler"> +  + <New class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> + <Call name="addHandler"> + <Arg> + <Ref id="webAppContext"/> + </Arg> + </Call> + </New> + </Set> + +</Configure> + diff --git a/etc/logback.xml b/etc/logback.xml index 812c7c9..ac41b64 100644 --- a/etc/logback.xml +++ b/etc/logback.xml @@ -1,17 +1,25 @@ <configuration debug="false"> -  - <property name="logfile-base" value="/var/log/tomcat6/" /> +  + <property name="logfile-base" value="${LOGBASE}/onionoo-" /> + +  + <property name="fileall-logname" value="${logfile-base}all" /> + <property name="fileerr-logname" value="${logfile-base}err" /> + <property name="filestatistics-logname" value="${logfile-base}statistics" /> + +  <property name="utc-date-pattern" value="%date{yyyy-MM-dd HH:mm:ss, UTC}" /> +  <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logfile-base}onionoo-all.log</file> + <file>${fileall-logname}.log</file> <encoder> - <pattern>${utc-date-pattern} %level %logger{25}:%line %msg%n</pattern> + <pattern>${utc-date-pattern} %level [runtime: %r] %logger{20}:%line %msg%n</pattern> </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  - <FileNamePattern>${logfile-base}onionoo-all.%d{yyyy-MM-dd}.%i.log</FileNamePattern> + <FileNamePattern>${fileall-logname}.%d{yyyy-MM-dd}.%i.log</FileNamePattern> <maxHistory>10</maxHistory> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> @@ -22,36 +30,53 @@ </appender> <appender name="FILEERR" class="ch.qos.logback.core.FileAppender"> - <file>${logfile-base}onionoo-err.log</file> + <file>${fileerr-logname}.log</file> <encoder> - <pattern>%date %level %logger{30}(%line): %msg%n</pattern> + <pattern>${utc-date-pattern} %level %logger{30}(%line): %msg%n</pattern> </encoder> + +  <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>ERROR</level> </filter> </appender> + <appender name="FILESTATISTICS" class="ch.qos.logback.core.FileAppender"> - <file>${logfile-base}onionoo-statistics.log</file> + <file>${filestatistics-logname}.log</file> <encoder> - <pattern>${utc-date-pattern} %msg%n</pattern> + <pattern>${utc-date-pattern} [runtime: %r] %msg%n</pattern> </encoder> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + +  + <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>INFO</level> + <onMatch>ACCEPT</onMatch> + <onMismatch>DENY</onMismatch> </filter> </appender> +  <logger name="org.torproject" > <appender-ref ref="FILEERR" /> </logger> + + <logger name="org.eclipse" level="INFO" /> + + <logger name="org.torproject.onionoo.cron.Main" > + <appender-ref ref="FILESTATISTICS" /> + </logger> + <logger name="org.torproject.onionoo.server.PerformanceMetrics" > <appender-ref ref="FILESTATISTICS" /> </logger> - <logger name="statistics" > + + <logger name="statistics" > <appender-ref ref="FILESTATISTICS" /> </logger> <root level="ALL"> <appender-ref ref="FILEALL" /> </root> + </configuration> diff --git a/etc/web.xml.template b/etc/web.xml.template index 2c0b280..cefdfae 100644 --- a/etc/web.xml.template +++ b/etc/web.xml.template @@ -51,5 +51,28 @@ org.torproject.onionoo.server.NodeIndexer </listener-class> </listener> + + <filter> + <filter-name>GzipFilter</filter-name> + <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class> + <init-param> + <param-name>mimeTypes</param-name> + <param-value>text/html,text/xml,text/plain,application/json</param-value> + </init-param> + <init-param> + <param-name>excludedAgents</param-name> + <param-value>gozilla,traviata</param-value> + </init-param> + <init-param> + <param-name>minGzipSize</param-name> + <param-value>2048</param-value> + </init-param> + </filter> + + <filter-mapping> + <filter-name>GzipFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + </web-app> diff --git a/logback.xml b/logback.xml deleted file mode 100644 index fcf278c..0000000 --- a/logback.xml +++ /dev/null @@ -1,66 +0,0 @@ -<configuration debug="false"> - -  - <property name="logfile-base" value="/srv/onionoo.torproject.org/onionoo/" /> - <property name="utc-date-pattern" value="%date{ISO8601, UTC}" /> - - <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logfile-base}onionoo-all.log</file> - <encoder> - <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> - </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -  - <FileNamePattern>${logfile-base}onionoo-all.%d{yyyy-MM-dd}.%i.log</FileNamePattern> - <maxHistory>10</maxHistory> - <timeBasedFileNamingAndTriggeringPolicy - class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -  - <maxFileSize>1MB</maxFileSize> - </timeBasedFileNamingAndTriggeringPolicy> - </rollingPolicy> - </appender> - - <appender name="FILEERR" class="ch.qos.logback.core.FileAppender"> - <file>${logfile-base}onionoo-err.log</file> - <encoder> - <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> - </encoder> - -  - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>ERROR</level> - </filter> - </appender> - - <appender name="FILESTATISTICS" class="ch.qos.logback.core.FileAppender"> - <file>${logfile-base}onionoo-statistics.log</file> - <encoder> - <pattern>${utc-date-pattern} %msg%n</pattern> - </encoder> - -  - <filter class="ch.qos.logback.classic.filter.LevelFilter"> - <level>INFO</level> - <onMatch>ACCEPT</onMatch> - <onMismatch>DENY</onMismatch> - </filter> - </appender> - - <logger name="org.torproject" > - <appender-ref ref="FILEERR" /> - </logger> - <logger name="org.torproject.onionoo.cron.Main" > - <appender-ref ref="FILESTATISTICS" /> - </logger> - -  - <logger name="statistics" > - <appender-ref ref="FILESTATISTICS" /> - </logger> - - <root level="ALL"> - <appender-ref ref="FILEALL" /> - </root> -</configuration> - diff --git a/src/main/java/org/torproject/onionoo/server/ServerMain.java b/src/main/java/org/torproject/onionoo/server/ServerMain.java new file mode 100644 index 0000000..d109a32 --- /dev/null +++ b/src/main/java/org/torproject/onionoo/server/ServerMain.java @@ -0,0 +1,31 @@ +/* Copyright 2014 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.onionoo.server; + +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ServerMain { + + private static final Logger log = LoggerFactory.getLogger( + ServerMain.class); + + public static void main(String[] args) { + try { + Resource onionooXml = Resource.newSystemResource("jetty.xml"); + log.info("Reading configuration from '" + onionooXml + "'."); + XmlConfiguration configuration = new XmlConfiguration( + onionooXml.getInputStream()); + Server server = (Server) configuration.configure(); + server.start(); + server.join(); + } catch (Exception ex) { + log.error("Exiting, because of: " + ex.getMessage(), ex); + System.exit(1); + } + } +} + diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 08d0ac5..ad4507a 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -25,9 +25,6 @@ ln -s /vagrant/etc ln -s /vagrant/geoip ln -s /vagrant/src ln -s /vagrant/web -ln -s /vagrant/logback.xml -ln -s /srv/onionoo.torproject.org/onionoo/onionoo.war \ -/var/lib/tomcat6/webapps/onionoo.war chown -R vagrant:vagrant /srv/onionoo.torproject.org/ echo "Done provisioning." [View Less]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit a8fa402ef1ec9c2b24167a9cbf4d0bbdf87ef739 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 09:15:42 2014 +0000 Update translations for tails-misc --- fo.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fo.po b/fo.po index 2ada71f..d0e3c59 100644 --- a/fo.po +++ b/fo.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-… [View More]

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit 4f91cff3321b072e45221201a82b63c0b90f32ab Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 09:15:32 2014 +0000 Update translations for mat-gui_completed --- fo.po | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/fo.po b/fo.po new file mode 100644 index 0000000..801dab9 --- /dev/null +++ b/fo.po @@ -0,0 +1,200 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S … [View More]COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Translators: +# Sigmund Jørgensen <sigmund(a)systemlyklar.fo>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-19 14:48+0000\n" +"PO-Revision-Date: 2014-11-17 09:10+0000\n" +"Last-Translator: Sigmund Jørgensen <sigmund(a)systemlyklar.fo>\n" +"Language-Team: Faroese (http://www.transifex.com/projects/p/torproject/language/fo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fo\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:61 mat-gui:403 mat-gui:422 +msgid "Ready" +msgstr "Klárt" + +#: mat-gui:128 +msgid "Choose files" +msgstr "Vel fílu" + +#: mat-gui:135 +msgid "All files" +msgstr "Allar fílur" + +#: mat-gui:142 +msgid "Supported files" +msgstr "Gildugar fílur" + +#: mat-gui:157 +msgid "No metadata found" +msgstr "Eingin metadáta funnin" + +#: mat-gui:158 mat-gui:398 mat-gui:420 +msgid "Clean" +msgstr "Reint" + +#: mat-gui:160 mat-gui:400 +msgid "Dirty" +msgstr "Skitið" + +#: mat-gui:165 +#, python-format +msgid "%s's metadata" +msgstr "Metadáta hjá %s" + +#: mat-gui:176 +msgid "Trash your meta, keep your data" +msgstr "Tveit burtur meta, hald upp á dátu" + +#: mat-gui:181 +msgid "Website" +msgstr "Vevsíða" + +#: mat-gui:207 data/mat.ui:107 +msgid "Preferences" +msgstr "Stillingar" + +#: mat-gui:220 +msgid "Reduce PDF quality" +msgstr "Lækka góðskuna á PDF" + +#: mat-gui:223 +msgid "Reduce the produced PDF size and quality" +msgstr "Minka um støddina og góðskuna á PDF" + +#: mat-gui:226 +msgid "Add unsupported file to archives" +msgstr "Legg ógildugar fílur til goymsluna" + +#: mat-gui:229 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Legg ógilduga (og ikki-dulnevnda) fílu til úttaksgoymsluna" + +#: mat-gui:268 +msgid "Unknown" +msgstr "Ókent" + +#: mat-gui:310 +msgid "Not-supported" +msgstr "Ógildugt" + +#: mat-gui:324 +msgid "Harmless fileformat" +msgstr "Óskaðiligt fílusnið" + +#: mat-gui:326 +msgid "Fileformat not supported" +msgstr "Fílusnið ikki gildugt" + +#: mat-gui:329 +msgid "These files can not be processed:" +msgstr "Hesar fílur kunnu ikki viðgerast:" + +#: mat-gui:334 mat-gui:363 data/mat.ui:292 +msgid "Filename" +msgstr "Fílunavn" + +#: mat-gui:336 +msgid "Reason" +msgstr "Orsøk" + +#: mat-gui:348 +msgid "Non-supported files in archive" +msgstr "Ógildugar fílur í goymslu" + +#: mat-gui:349 data/mat.ui:227 +msgid "Scour" +msgstr "Skúra" + +#: mat-gui:362 +msgid "Include" +msgstr "Tak við" + +#: mat-gui:378 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT fær ikki reinsað hesar fílur, funnar í %s-goymsluni" + +#: mat-gui:394 +#, python-format +msgid "Checking %s" +msgstr "Kannar %s" + +#: mat-gui:409 +#, python-format +msgid "Cleaning %s" +msgstr "Reinsar %s" + +#: data/mat.ui:63 +msgid "_File" +msgstr "_Fíla" + +#: data/mat.ui:99 +msgid "_Edit" +msgstr "_Broyt" + +#: data/mat.ui:118 data/mat.ui:253 +msgid "Clear" +msgstr "Rudda" + +#: data/mat.ui:134 +msgid "_Process" +msgstr "_Viðger" + +#: data/mat.ui:168 +msgid "_Help" +msgstr "_Hjálp" + +#: data/mat.ui:214 +msgid "Add" +msgstr "Legg afturat" + +#: data/mat.ui:240 +msgid "Check" +msgstr "Kanna" + +#: data/mat.ui:309 +msgid "State" +msgstr "Støða" + +#: data/mat.ui:347 data/mat.ui:499 +msgid "Metadata" +msgstr "Metadáta" + +#: data/mat.ui:376 +msgid "Name" +msgstr "Navn" + +#: data/mat.ui:390 +msgid "Content" +msgstr "Innihald" + +#: data/mat.ui:452 +msgid "Supported formats" +msgstr "Gildug snið" + +#: data/mat.ui:486 +msgid "Support" +msgstr "Vegleiðing" + +#: data/mat.ui:512 +msgid "Method" +msgstr "Háttalag" + +#: data/mat.ui:525 +msgid "Remaining" +msgstr "Eftirstandandi" + +#: data/mat.ui:560 +msgid "Fileformat" +msgstr "Fìlusnið" [View Less]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit 807d9799e5d8271454b4735e12526c4c13bde70d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 09:15:29 2014 +0000 Update translations for mat-gui --- fo.po | 91 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/fo.po b/fo.po index 5e13e0c..801dab9 100644 --- a/fo.po +++ b/fo.po @@ -4,13 +4,14 @@ # # Translators: # Translators: +# Sigmund Jørgensen <sigmund(a)… [View More]systemlyklar.fo>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-11-16 21:31+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-17 09:10+0000\n" +"Last-Translator: Sigmund Jørgensen <sigmund(a)systemlyklar.fo>\n" "Language-Team: Faroese (http://www.transifex.com/projects/p/torproject/language/fo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,84 +21,84 @@ msgstr "" #: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" -msgstr "" +msgstr "Klárt" #: mat-gui:128 msgid "Choose files" -msgstr "" +msgstr "Vel fílu" #: mat-gui:135 msgid "All files" -msgstr "" +msgstr "Allar fílur" #: mat-gui:142 msgid "Supported files" -msgstr "" +msgstr "Gildugar fílur" #: mat-gui:157 msgid "No metadata found" -msgstr "" +msgstr "Eingin metadáta funnin" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" -msgstr "" +msgstr "Reint" #: mat-gui:160 mat-gui:400 msgid "Dirty" -msgstr "" +msgstr "Skitið" #: mat-gui:165 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "Metadáta hjá %s" #: mat-gui:176 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Tveit burtur meta, hald upp á dátu" #: mat-gui:181 msgid "Website" -msgstr "" +msgstr "Vevsíða" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "Stillingar" #: mat-gui:220 msgid "Reduce PDF quality" -msgstr "" +msgstr "Lækka góðskuna á PDF" #: mat-gui:223 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Minka um støddina og góðskuna á PDF" #: mat-gui:226 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Legg ógildugar fílur til goymsluna" #: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "" +msgstr "Legg ógilduga (og ikki-dulnevnda) fílu til úttaksgoymsluna" #: mat-gui:268 msgid "Unknown" -msgstr "" +msgstr "Ókent" #: mat-gui:310 msgid "Not-supported" -msgstr "" +msgstr "Ógildugt" #: mat-gui:324 msgid "Harmless fileformat" -msgstr "" +msgstr "Óskaðiligt fílusnið" #: mat-gui:326 msgid "Fileformat not supported" -msgstr "" +msgstr "Fílusnið ikki gildugt" #: mat-gui:329 msgid "These files can not be processed:" -msgstr "" +msgstr "Hesar fílur kunnu ikki viðgerast:" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" @@ -105,95 +106,95 @@ msgstr "Fílunavn" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "Orsøk" #: mat-gui:348 msgid "Non-supported files in archive" -msgstr "" +msgstr "Ógildugar fílur í goymslu" #: mat-gui:349 data/mat.ui:227 msgid "Scour" -msgstr "" +msgstr "Skúra" #: mat-gui:362 msgid "Include" -msgstr "" +msgstr "Tak við" #: mat-gui:378 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "MAT fær ikki reinsað hesar fílur, funnar í %s-goymsluni" #: mat-gui:394 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Kannar %s" #: mat-gui:409 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Reinsar %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Fíla" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Broyt" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" -msgstr "" +msgstr "Rudda" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Viðger" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Hjálp" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "Legg afturat" #: data/mat.ui:240 msgid "Check" -msgstr "" +msgstr "Kanna" #: data/mat.ui:309 msgid "State" -msgstr "" +msgstr "Støða" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" -msgstr "" +msgstr "Metadáta" #: data/mat.ui:376 msgid "Name" -msgstr "Name" +msgstr "Navn" #: data/mat.ui:390 msgid "Content" -msgstr "" +msgstr "Innihald" #: data/mat.ui:452 msgid "Supported formats" -msgstr "" +msgstr "Gildug snið" #: data/mat.ui:486 msgid "Support" -msgstr "" +msgstr "Vegleiðing" #: data/mat.ui:512 msgid "Method" -msgstr "" +msgstr "Háttalag" #: data/mat.ui:525 msgid "Remaining" -msgstr "" +msgstr "Eftirstandandi" #: data/mat.ui:560 msgid "Fileformat" -msgstr "" +msgstr "Fìlusnið" [View Less]

1 0