diff options
38 files changed, 25 insertions, 49 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 875bba64..ce57564d 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -36,11 +36,29 @@ android:autoLink="all" android:text="@string/repository_url_text" /> + <Space + android:layout_width="match_parent" + android:layout_height="10sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/translation_project_text" /> + + <Space + android:layout_width="match_parent" + android:layout_height="10sp" /> + <TextView - android:id="@+id/translation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:autoLink="all" /> + android:autoLink="all" + android:text="@string/translationby" /> + + <Space + android:layout_width="match_parent" + android:layout_height="10sp" /> <TextView android:layout_width="match_parent" diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index abef84cc..2b250da1 100755 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Cancel·la</string> <string name="about">Quan a</string> diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-cs/arrays.xml +++ b/res/values-cs/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index cfb27325..68c5aeaf 100755 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Storno</string> <string name="repository_url_text">Zdrojové kódy a seznam problémů je na https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 17b398a0..84d93cfe 100755 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Abbrechen</string> <string name="repository_url_text">Quellcode und Issue Tracker sind verfügbar unter https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 1c5ea231..f8046a3f 100755 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Cancelar</string> <string name="repository_url_text">Codigo fuente y sistema de reporte de errores disponibles en https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-et/arrays.xml +++ b/res/values-et/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index c4aadd0f..04dc9572 100755 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Tühista</string> <string name="repository_url_text">Lähtetekst ja probleemihaldur asuvad veebilehel https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4b822aff..79e4d70c 100755 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">"Annuler"</string> <string name="repository_url_text">"Le code source et le tracker de bugs est disponible ici: https://github.com/leapcode/bitmask_android/ "</string> diff --git a/res/values-id/arrays.xml b/res/values-id/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-id/arrays.xml +++ b/res/values-id/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index 61f753e9..ad893b75 100755 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Batal</string> <string name="repository_url_text">Kode program dan perekam masalah tersedia di</string> diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-it/arrays.xml +++ b/res/values-it/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 2eb6515d..788dbcc5 100755 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">Annulla</string> <string name="repository_url_text">Il codice sorgente e il bug tracker sono disponibili all\'indirizzo https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-ja/arrays.xml +++ b/res/values-ja/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index fa62b669..4503c227 100755 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="cancel">キャンセル</string> <string name="repository_url_text">ソースコードと問題管理は以下で： https://github.com/leapcode/bitmask_android/</string> diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index fe5db09b..8a725bad 100755 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="repository_url_text">소스 코드와 문제 추적기는 https://github.com/leapcode/bitmask_android/에서 사용할 수 있습니다</string> <string name="copyright_others">프로그램은 다음 구성 요소를 사용합니다. 라이선스에 대 한 자세한 내용은 소스를 참조 하십시오</string> diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 8dc13847..0442b054 100755 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="about">Over</string> <string name="no_error_found">Geen fout.</string> diff --git a/res/values-no/arrays.xml b/res/values-no/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-no/arrays.xml +++ b/res/values-no/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml index 728b2fca..a363b2f9 100755 --- a/res/values-no/strings.xml +++ b/res/values-no/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="about">Om</string> <string name="no_error_found">Ingen feil funnet</string> diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-ro/arrays.xml +++ b/res/values-ro/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 91d9c0e0..22496320 100755 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="repository_url_text">Cod sursă şi tracker probleme disponibile la https://github.com/leapcode/bitmask_android/</string> <string name="copyright_others">Acest program utilizează următoarele componente; a se vedea codul sursă pentru mai multe detalii despre licente</string> diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4ecf881a..aaa42690 100755 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="copyright_others">Данная программа использует следующие компоненты; смотрите исходный код для получения подробной информации о лицензии</string> <string name="about">О программе</string> diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-uk/arrays.xml +++ b/res/values-uk/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 354f50ed..dab28b48 100755 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="repository_url_text">Початковий код і відстеження проблем доступні по https://github.com/leapcode/bitmask_android/</string> <string name="copyright_others">Ця програма використовує такі компоненти; перегляньте вихідний код для повної інформації про ліцензії</string> diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 5610e8d9..ae57d277 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="repository_url_text">请前往 https://github.com/leapcode/bitmask_android/ 源码或提供问题反馈</string> <string name="copyright_others">本程序使用以下组件，请在 Licenses 查看源码获取更详细内容。</string> diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index 03dcda8c..045e125f 100755 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 05056f07..880fb4ad 100755 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> <resources> <string name="repository_url_text">取得原始碼與個案追蹤，可上 https://github.com/leapcode/bitmask_android/</string> <string name="copyright_others">本程序使用了以下元件，其作者和授權資訊如下</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9a603d68..bcb6ecc9 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generated by crowdin.net --> <resources> <string name="cancel">Cancel</string> <string name="ok">OK</string> <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="translation_project_text">Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string> <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string> <string name="about">About Bitmask</string> <string name="switch_provider_menu_option">Switch provider</string> @@ -57,7 +57,7 @@ <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string> <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string> <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string> - <string name="translationby">English translation by Arne Schwabe<arne@rfc2549.org></string> + <string name="translationby">English translation by Arne Schwabe <arne@rfc2549.org></string> <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string> <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string> <string name="getproxy_error">Error getting proxy settings: %s</string> diff --git a/src/se/leap/bitmaskclient/AboutActivity.java b/src/se/leap/bitmaskclient/AboutActivity.java index a3320c81..6d025422 100644 --- a/src/se/leap/bitmaskclient/AboutActivity.java +++ b/src/se/leap/bitmaskclient/AboutActivity.java @@ -18,7 +18,7 @@ public class AboutActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + super.onCreate(savedInstanceState); setContentView(R.layout.about); TextView ver = (TextView) findViewById(R.id.version); @@ -34,15 +34,7 @@ public class AboutActivity extends Activity { ver.setText(getString(R.string.version_info,name,version)); - - TextView translation = (TextView) findViewById(R.id.translation); - - // Don't print a text for myself - if ( getString(R.string.translationby).contains("Arne Schwabe")) - translation.setVisibility(TextView.INVISIBLE); - else - translation.setText(R.string.translationby); - setResult(VIEWED); + setResult(VIEWED); } } diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index b4d06f23..65fd2d5b 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -110,7 +110,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE); startService(updateEIP); buildDashboard(); - + invalidateOptionsMenu(); if(data != null && data.hasExtra(LogInDialog.VERB)) { View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0); logInDialog(view, Bundle.EMPTY); |