Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dup-strings' into 'master'

Browse Source 
Removed duplicate string resource for string ("Swap apps")

Removed duplicate string resource for string ("Swap apps")

See merge request !264
This commit is contained in:
Peter Serwylo 2016-04-20 22:58:35 +00:00
commit 8ce4cad7ef
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -383,7 +383,7 @@
android:excludeFromRecents="true"
android:finishOnTaskLaunch="true" />
<activity
android:label="@string/menu_swap"
android:label="@string/swap"
android:name=".views.swap.SwapWorkflowActivity"
android:parentActivityName=".FDroid"
android:theme="@style/SwapTheme.Wizard"

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

@ -301,7 +301,6 @@
<string name="swap_join_same_wifi">Join the same Wi-Fi as your friend</string>
<string name="swap_join_same_wifi_desc">To swap using Wi-Fi, ensure you are on the same network. If you don\'t have access to the same network, one of you can create a Wi-Fi Hotspot.</string>
<string name="swap_join_this_hotspot">Help your friend join your hotspot</string>
<string name="menu_swap">Swap apps</string>
<string name="swap">Swap apps</string>
<string name="swap_success">Swap success!</string>
<string name="swap_no_wifi_network">No network yet</string>