Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask_android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cyberta
bitmask_android
Commits
3fd35b1e
Commit
3fd35b1e
authored
Nov 1, 2017
by
cyberta
Browse files
Options
Downloads
Patches
Plain Diff
add licence note for okhttp to about page
parent
957fd3d9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/res/layout/about.xml
+15
-0
15 additions, 0 deletions
app/src/main/res/layout/about.xml
app/src/main/res/values/untranslatable.xml
+4
-3
4 additions, 3 deletions
app/src/main/res/values/untranslatable.xml
with
19 additions
and
3 deletions
app/src/main/res/layout/about.xml
+
15
−
0
View file @
3fd35b1e
...
@@ -134,6 +134,21 @@
...
@@ -134,6 +134,21 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/copyright_openssl"
/>
android:text=
"@string/copyright_openssl"
/>
<Space
android:layout_width=
"match_parent"
android:layout_height=
"20sp"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/okhttp"
android:textAppearance=
"?android:attr/textAppearanceMedium"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/copyright_okhttp"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>
This diff is collapsed.
Click to expand it.
app/src/main/res/values/untranslatable.xml
+
4
−
3
View file @
3fd35b1e
...
@@ -4,21 +4,22 @@
...
@@ -4,21 +4,22 @@
<string
name=
"app_name"
translatable=
"false"
>
Bitmask
</string>
<string
name=
"app_name"
translatable=
"false"
>
Bitmask
</string>
<string
name=
"notifcation_title_bitmask"
>
Bitmask - %s
</string>
<string
name=
"notifcation_title_bitmask"
>
Bitmask - %s
</string>
<string
name=
"copyright_leapgui"
translatable=
"false"
>
Copyright 2012-201
4
\nLEAP Encryption Access Project
<
info@leap.se>
</string>
<string
name=
"copyright_leapgui"
translatable=
"false"
>
Copyright 2012-201
7
\nLEAP Encryption Access Project
<
info@leap.se>
</string>
<string
name=
"opevpn_copyright"
translatable=
"false"
>
Copyright © 2002–2010 OpenVPN Technologies, Inc.
<
sales@openvpn.net>\n
<string
name=
"opevpn_copyright"
translatable=
"false"
>
Copyright © 2002–2010 OpenVPN Technologies, Inc.
<
sales@openvpn.net>\n
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.
</string>
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.
</string>
<string
name=
"lzo_copyright"
translatable=
"false"
>
Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer
</string>
<string
name=
"lzo_copyright"
translatable=
"false"
>
Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer
</string>
<string
name=
"copyright_openssl"
translatable=
"false"
>
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
<string
name=
"copyright_openssl"
translatable=
"false"
>
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
</string>
Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
</string>
<string
name=
"copyright_okhttp"
translatable=
"false"
>
Copyright Copyright 2016 Square, Inc.
</string>
<string
name=
"okhttp"
translatable=
"false"
>
OkHttp
</string>
<string
name=
"openvpn"
translatable=
"false"
>
OpenVPN
</string>
<string
name=
"openvpn"
translatable=
"false"
>
OpenVPN
</string>
<string
name=
"lzo"
translatable=
"false"
>
LZO
</string>
<string
name=
"lzo"
translatable=
"false"
>
LZO
</string>
<string
name=
"openssl"
translatable=
"false"
>
OpenSSL
</string>
<string
name=
"openssl"
translatable=
"false"
>
OpenSSL
</string>
<string
name=
"unknown_state"
translatable=
"false"
>
Unknown state
</string>
<string
name=
"unknown_state"
translatable=
"false"
>
Unknown state
</string>
<string
name=
"copyright_blinktgui"
translatable=
"false"
>
Copyright 2012–201
4
Arne Schwabe
<
arne@rfc2549.org>
</string>
<string
name=
"copyright_blinktgui"
translatable=
"false"
>
Copyright 2012–201
7
Arne Schwabe
<
arne@rfc2549.org>
</string>
<string
name=
"defaultserver"
translatable=
"false"
>
openvpn.uni-paderborn.de
</string>
<string
name=
"defaultserver"
translatable=
"false"
>
openvpn.uni-paderborn.de
</string>
<string
name=
"defaultport"
translatable=
"false"
>
1194
</string>
<string
name=
"defaultport"
translatable=
"false"
>
1194
</string>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment