Skip to content

Commit

Permalink
Merge branch 'release/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
bassosimone committed Mar 26, 2017
2 parents 3a27ce0 + 84f71f7 commit fae3cbd
Show file tree
Hide file tree
Showing 53 changed files with 1,910 additions and 746 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
/ooniprobe.xcodeproj/xcuserdata
/ooniprobe.xcworkspace/xcuserdata/
/Pods/

ooniprobe.xcworkspace/xcuserdata/lorenzo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
14 changes: 14 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[main]
host = https://www.transifex.com

[ooniprobe.localizablestrings]
file_filter = ooniprobe/<lang>.lproj/Localizable.strings
source_file = ooniprobe/Base.lproj/Localizable.strings
source_lang = en
type = STRINGS

[ooniprobe.description]
file_filter = description/<lang>.xlf
source_file = description/source.xlf
source_lang = en
type = XLIFF
22 changes: 22 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# ooniprobe-ios 1.1.3 [2017-03-25]

New Languages:

* Added multilingual support and Spanish, French, Italian and Hindi translations

Bugfixes:

* Various GUI fixing

* Expose app version number in app

* Empty screen in "Past Tests" on init

* Delete all tests button

* Render failed "NDT Speed Test"

measurement-kit version: 0.4.3

ooniprobe-wui version: 2.2.0-rc.6

# ooniprobe-ios 1.1.2 [2017-02-11]

Bugfixes:
Expand Down
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ platform :ios, '8.0'
target 'ooniprobe' do
pod 'measurement_kit',
:git => 'https://github.com/measurement-kit/measurement-kit.git',
:tag => 'v0.4.0-beta.4'
:tag => 'v0.4.3'
pod 'Toast'
pod 'PBRevealViewController'
pod 'UIBarButtonItem-Badge-Coding'
pod 'Fabric'
pod 'Crashlytics'
pod 'MBProgressHUD'
pod 'DZNEmptyDataSet'
end
19 changes: 11 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
PODS:
- Crashlytics (3.8.3):
- Crashlytics (3.8.4):
- Fabric (~> 1.6.3)
- DZNEmptyDataSet (1.8.1)
- Fabric (1.6.11)
- MBProgressHUD (1.0.0)
- measurement_kit (0.4.0-beta.4)
- measurement_kit (0.4.3)
- PBRevealViewController (1.1.3)
- Toast (3.1.0)
- UIBarButtonItem-Badge-Coding (0.0.1)

DEPENDENCIES:
- Crashlytics
- DZNEmptyDataSet
- Fabric
- MBProgressHUD
- measurement_kit (from `https://github.com/measurement-kit/measurement-kit.git`, tag `v0.4.0-beta.4`)
- measurement_kit (from `https://github.com/measurement-kit/measurement-kit.git`, tag `v0.4.3`)
- PBRevealViewController
- Toast
- UIBarButtonItem-Badge-Coding

EXTERNAL SOURCES:
measurement_kit:
:git: https://github.com/measurement-kit/measurement-kit.git
:tag: v0.4.0-beta.4
:tag: v0.4.3

CHECKOUT OPTIONS:
measurement_kit:
:git: https://github.com/measurement-kit/measurement-kit.git
:tag: v0.4.0-beta.4
:tag: v0.4.3

SPEC CHECKSUMS:
Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
Crashlytics: 79e236942ca1e7fc641df1feb9a275360a78ab6a
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6
MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a
measurement_kit: 56c9b080bd74584967fef53c62b2cc1880bbc434
measurement_kit: ac95efa0480b803bb83555e0005b6cd9e239adf5
PBRevealViewController: 22aa8fdcbe3eca1bdcfdd1613695b66ac37f6dc9
Toast: 14a93686d6c8bfe2727afd342414e35660a8a1f3
UIBarButtonItem-Badge-Coding: 3f8e96f75f7d7c7516c1a1706b566892bf2db134

PODFILE CHECKSUM: 5ad24c13551b81b369309f80ff4c810eb857be02
PODFILE CHECKSUM: 681608787594aa281f8cd79e426517a80a0f1504

COCOAPODS: 1.1.1
47 changes: 47 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,57 @@ Similarly, you can use a specific tag, e.g.:
Then type `pod install` and open `.xcworkspace` file (beware not to open the
`.xcodeproj` file instead, because that alone won't compile).

## Managing translations

To manage translations ensure you have installed the [transifex command line
tools](https://docs.transifex.com/client/installing-the-client).

### Pushing source text

To push the source of the translation run:

```
tx push -s
```

### Pulling translations

To pull in translations run:

```
tx pull
```

or

```
tx pull -l [lang_code]
```

to pull only a specific language


### Generating descriptions for market

To generate translated descriptions for the markets run:

```
python scripts/gen-descriptions.py [lang_code]
```

Where `lang_code` is the language code for the description you want to
generate.

This will print to standard output the translated text that you can then copy
and paste into the market descriptions.

If a string is not translated it will print the source for the text.

## Contributing

* Write some code

* Open a pull request

* Have fun!

114 changes: 114 additions & 0 deletions description/es.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
<?xml version="1.0" ?><xliff version="1.2">
<file datatype="plaintext" original="source.xlf" source-language="en" target-language="es">
<header>
<note from="developer">Google places strick character limits on the various text fields in Google Play. The title is 30 characters, the short description is 80 characters, and the rest of the strings, which all go together in the description, are limited to 4000 characters.</note>
</header>
<body>
<trans-unit id="title" maxwidth="30" size-unit="char">
<source>ooniprobe</source>
<target>ooniprobe</target>
<note from="developer">This is limited by Google to 30 characters</note>
</trans-unit>
<trans-unit id="shortdescription" maxwidth="80" size-unit="char">
<source>Measure Internet Censorship, Speed &amp; Performance</source>
<target>Mide la censura, velocidad y rendimiento de Internet</target>
<note from="developer">This is limited by Google to 80 characters</note>
</trans-unit>
<trans-unit id="intro">
<source>Collect evidence of Internet censorship. Measure the speed and performance of your network. Play an active role in increasing transparency of information controls around the world.</source>
<target>Recopila evidencias de censura de Internet. Mide la velocidad y rendimiento de su red. Juega un papel activo en el incremento de la transparencia sobre el control de la información por todo el mundo.</target>
</trans-unit>
<trans-unit id="intro2">
<source>By running ooniprobe, you will examine the blocking of websites, your network's speed and performance, and whether systems that could be responsible for censorship and surveillance are in your network.</source>
<target>Al ejecutar ooniprobe, examinará el bloqueo de sitios web, la velocidad y rendimiento de su red, y si los sistemas que podrían ser responsables de censura y vigilancia están en su red.</target>
</trans-unit>
<trans-unit id="intro3">
<source>These tests have been developed by the Open Observatory of Network Interference (OONI), a free software project (under The Tor Project) that aims to uncover Internet censorship around the world.</source>
<target>Estos tests han sido desarrollados por el Open Observatory of Network Interference (OONI, observatorio abierto de interferencia de red), un proyecto de software libre (bajo The Tor Project) que se orienta a desvelar la censura por todo el mundo.</target>
</trans-unit>
<trans-unit id="intro4">
<source>Since 2012, OONI has collected millions of network measurements across more than 190 countries, shedding light on multiple cases of network interference. By running ooniprobe, you will help increase transparency of Internet censorship around the world.</source>
<target>Desde 2012, OONI ha recopilado millones de mediciones por más de 190 países, arrojando luz sobre múltiples casos de interferencia de red. Al ejecutar ooniprobe, ayudará a incrementar la transparencia sobre la censura de Internet por todo el mundo.</target>
</trans-unit>
<trans-unit id="evidence-title">
<source>Collecting evidence of Internet censorship</source>
<target>Recopilar evidencias de censura de Internet</target>
</trans-unit>
<trans-unit id="evidence-description">
<source>OONI's Web Connectivity test is designed to examine whether access to sites is blocked through DNS tampering, TCP/IP blocking, or by a transparent HTTP proxy. By running this test, you will collect data that can serve as evidence of Internet censorship, and you will be provided with circumvention tips.</source>
<target>El test Web Connectivity (conectividad web) de OONI está diseñado para examinar si el acceso a los sitios está bloqueado mediante alteración de DNS, bloqueo TCP/IP, o por un proxy HTTP transparente. Al ejecutar este test, recopilará datos que pueden servir como evidencia de censura de Internet, y se le proporcionarán sugerencias para la elusión.</target>
</trans-unit>
<trans-unit id="systems-title">
<source>Detecting systems responsible for censorship and surveillance</source>
<target>Detectar sistemas responsables de censura y vigilancia</target>
</trans-unit>
<trans-unit id="systems-description">
<source>OONI's HTTP Invalid Request Line test is designed to uncover the presence of systems that could be responsible for censorship and surveillance.</source>
<target>El test HTTP Invalid Request Line (línea de petición HTTP no válida) de OONI está diseñado para revelar la presencia de sistemas que podrían ser responsables de censura y vigilancia.</target>
</trans-unit>
<trans-unit id="speed-title">
<source>Measuring the speed and performance of your network</source>
<target>Medir la velocidad y rendimiento de su red</target>
</trans-unit>
<trans-unit id="speed-description">
<source>OONI's implementation of the Network Diagnostic Test (NDT) measures the speed of your network by connecting to mLab servers near you and by collecting low level TCP/IP information that can help characterize the speed and performance of your network.</source>
<target>La implementación de OONI del Network Diagnostic Test (NDT, test de diagnóstico de red) mide la velocidad de su red al conectarse a los servidores de mLab cercanos a usted y recopilar información TCP/IP de bajo nivel que puede ayudar a caracterizar la velocidad y rendimiento de su red.</target>
</trans-unit>
<trans-unit id="opendata-title">
<source>Open data</source>
<target>Datos abiertos</target>
</trans-unit>
<trans-unit id="opendata-description">
<source>OONI publishes all network measurement data that it collects because open data allows third parties to conduct independent studies, verify OONI findings and/or to answer other research questions. Such data also helps increase transparency of Internet censorship around the world. All data is published on OONI Explorer: https://explorer.ooni.torproject.org/</source>
<target>OONI publica todos los datos de mediciones de red que recopila porque los datos abiertos permiten a terceros llevar a cabo estudios independientes, verificar los hallazgos de OONI, y/o responder a otras preguntas de investigación. Tales datos también ayudan a incrementar la transparencia de la censura de Internet por todo el mundo. Todos los datos se publican en OONI Explorer: https://explorer.ooni.torproject.org/</target>
</trans-unit>
<trans-unit id="freesoftware-title">
<source>Free software</source>
<target>Software libre</target>
</trans-unit>
<trans-unit id="freesoftware-description">
<source>All OONI tests, as well as its NDT implementation, are based on free and open source software. You can find the source code through the following link: https://github.com/thetorproject/ooniprobe-android</source>
<target>Todos los tests de OONI, así como su implementación NDT, están basados en software libre y de código abierto. Puede encontrar el código fuente a través del siguiente enlace: https://github.com/thetorproject/ooniprobe-android</target>
</trans-unit>

<trans-unit id="social-links">
<source>Follow us on Twitter: https://twitter.com/OpenObservatory</source>
<target>Síganos en Twitter: https://twitter.com/OpenObservatory</target>
</trans-unit>

<trans-unit id="disclaimer">
<source>Please note: Running ooniprobe might be against the terms of service of your ISP or legally questionable in your country. By running ooniprobe you will connect to web services which may be banned, and use web censorship circumvention methods such as Tor. The OONI project will publish data submitted by probes, possibly including your IP address or other identifying information. In addition, your use of ooniprobe will be clear to anyone who has access to your computer, and to anyone who can monitor your Internet connection (such as your employer, ISP or government).</source>
<target>Por favor, observe que: Ejecutar ooniprobe podría ir en contra de las condiciones de servicio de su ISP o ser legalmente cuestionable en su país. Al ejecutar ooniprobe conectará con servicios web que pueden estar prohibidos, y usará métodos de elusión de censura web como Tor. El proyecto OONI publicará los datos enviados por las sondas (probes), posiblemente incluyendo su dirección IP u otra información con capacidad de identificarle. Además, su uso de ooniprobe será evidente para cualquiera que tenga acceso a su computadora, y para cualquiera que pueda monitorizar su conexión a Internet (como su empleador, ISP o gobierno).</target>
</trans-unit>

<trans-unit id="screenshot1">
<source>Detect Internet censorship and test your network's speed and performance</source>
<target>Detectar censura de Internet y probar la velocidad y rendimiento de su red</target>
</trans-unit>
<trans-unit id="screenshot2">
<source>Undercover evidence of Internet censorship and learn how to circumvent it</source>
<target>Revelar evidencias de censura de Internet y conocer cómo eludirla</target>
</trans-unit>
<trans-unit id="screenshot3">
<source>Run a sophisticated network speed and diagnostics test</source>
<target>Ejecutar un sofisticado test de velocidad y diagnóstico de red</target>
</trans-unit>
<trans-unit id="screenshot4">
<source>Easily discover which websites are blocked on your network</source>
<target>Descubrir fácilmente qué sitios web están bloqueados en su red</target>
</trans-unit>
<trans-unit id="screenshot5">
<source>Testing your network is fun with a friendly octopus!</source>
<target>¡Probar su red es divertido con un pulpo amigable!</target>
</trans-unit>
<trans-unit id="feature-graphic">
<source>The Open Observatory of Network Interference is a global observation network for detecting censorship, surveillance and treffic manipulation on the Internet.</source>
<target>El Open Observatory of Network Interference (OONI, observatorio abierto de interferencia de red) es una red de observación global para detectar la censura, la vigilancia y la manipulación del tráfico en Internet.</target>
</trans-unit>
<trans-unit id="keywords">
<source>network,speedtest,measurement,net,wifi,networking,scan,bandwidth,bench,dns,mobile,ooni,research,tool</source>
<target>red, test, velocidad, medición, red, wifi, conexión, escaneado, ancho, banda, prueba, dns, móvil, ooni, investigación, herramienta</target>
</trans-unit>
</body>
</file>
</xliff>
Loading

0 comments on commit fae3cbd

Please sign in to comment.