diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-24 10:03:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-24 10:03:38 +0200 |
| commit | 51c0835bcdd793bb01a4e013feb6d0892488f2d4 (patch) | |
| tree | 3da4878d6148feb99e81b0472483b39d806e8f6c /app/src/main | |
| parent | a05b227b44f9f4ff6100bc3cead7bacd74ba1a93 (diff) | |
| parent | c228f481090a468106b57593117d95d9e3dda3f3 (diff) | |
Merge branch 'bug/link-to-tracker-in-about-page-#5808' into develop
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/layout/about.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 4b3f16e0..ccb1ea26 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -37,6 +37,12 @@ android:autoLink="all" android:text="@string/repository_url_text" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/leap_tracker" /> + <Space android:layout_width="match_parent" android:layout_height="10sp" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6a9cce29..ec8c21ff 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -6,4 +6,6 @@ <string name="routes_info6">Rutas IPv6: %s</string> <string name="error_empty_username">El nombre de usuario no debe estar vacío.</string> <string name="cert_from_keystore">Conseguido el certificado de \'%s\' de almacén de claves</string> + <string name="repository_url_text">Código fuente disponible en https://github.com/leapcode/bitmask_android/</string> + <string name="leap_tracker">Tracker disponible en https://leap.se/code</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62d54981..bb68b942 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,8 @@ <resources> <string name="retry">Retry</string> - <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string> + <string name="repository_url_text">Source code available at https://github.com/leapcode/bitmask_android/</string> + <string name="leap_tracker">Tracker available at https://leap.se/code</string> <string name="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string> <string name="switch_provider_menu_option">Switch provider</string> <string name="info">info</string> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 6bffb192..f956b6bd 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -892,4 +892,5 @@ -</resources> + +</resources>
\ No newline at end of file |