Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Dehm
briar
Commits
18c41951
There was a problem fetching the pipeline mini graph.
Verified
Commit
18c41951
authored
6 years ago
by
Julian Dehm
Browse files
Options
Downloads
Patches
Plain Diff
fix region and title
parent
8bc28f99
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+1
-1
1 addition, 1 deletion
...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/res/values/strings.xml
+6
-6
6 additions, 6 deletions
briar-android/src/main/res/values/strings.xml
with
7 additions
and
7 deletions
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+
1
−
1
View file @
18c41951
...
...
@@ -202,7 +202,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
Locale
locale
=
Localizer
.
getLocaleFromTag
(
tag
);
if
(
locale
==
null
)
throw
new
IllegalStateException
();
String
nativeName
=
locale
.
getDisplay
Languag
e
(
locale
);
String
nativeName
=
locale
.
getDisplay
Nam
e
(
locale
);
// Fallback to English if the name is unknown in both native and
// current locale.
if
(
nativeName
.
equals
(
tag
))
{
...
...
This diff is collapsed.
Click to expand it.
briar-android/src/main/res/values/strings.xml
+
6
−
6
View file @
18c41951
...
...
@@ -323,6 +323,12 @@
<string
name=
"blogs_rss_feeds_manage_empty_state"
>
No RSS feeds to show\n\nTap the + icon to import a feed
</string>
<string
name=
"blogs_rss_feeds_manage_error"
>
There was a problem loading your feeds. Please try again later.
</string>
<!-- Settings Display -->
<string
name=
"pref_language_title"
>
Language
&
region
</string>
<string
name=
"pref_language_changed"
>
This setting will take effect when you restart Briar. Please sign out and restart Briar.
</string>
<string
name=
"pref_language_default"
>
System default
</string>
<string
name=
"display_settings_title"
>
Display
</string>
<!-- Settings Network -->
<string
name=
"network_settings_title"
>
Networks
</string>
<string
name=
"bluetooth_setting"
>
Connect via Bluetooth
</string>
...
...
@@ -421,10 +427,4 @@
<string
name=
"permission_camera_denied_toast"
>
Camera permission was not granted
</string>
<string
name=
"qr_code"
>
QR code
</string>
<string
name=
"show_qr_code_fullscreen"
>
Show QR code fullscreen
</string>
<!-- Languages -->
<string
name=
"pref_language_title"
>
Language
</string>
<string
name=
"pref_language_changed"
>
This setting will take effect when you restart Briar. Please sign out and restart Briar.
</string>
<string
name=
"pref_language_default"
>
System default
</string>
<string
name=
"display_settings_title"
>
Display
</string>
</resources>
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