mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Merge conflict

Browse source
This commit is contained in:
tanvidadu 2018-03-11 19:34:46 +05:30
parent 757a198c99
commit a6a30e1e77
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/AboutActivity.java
View file

@ -93,4 +93,5 @@ public class AboutActivity extends NavigationBaseActivity {
Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\")); Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -245,5 +245,6 @@
<string name="about_rate_us"><u>Rate Us</u></string> <string name="about_rate_us"><u>Rate Us</u></string>
<string name="about_faq">Frequently Asked Questions</string> <string name="about_faq">Frequently Asked Questions</string>
<string name="welcome_skip_button">Skip Tutorial</string> <string name="welcome_skip_button">Skip Tutorial</string>
<string name="about_translate"><u>Translate</u></string>
</resources> </resources>