Merge pull request #11731 from nextcloud/nmc/splashTextMergeFix

Moved splash screen setup strings to avoid merge issue during build process

app/src/main/res/values/setup.xml

@@ -6,8 +6,6 @@
 
     <!-- App name  and other strings-->
     <string name="app_name">Nextcloud</string>
-    <string name="splashScreenBold"></string>
-    <string name="splashScreenNormal"></string>
     <string name="account_type">nextcloud</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud</string>    <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
@@ -118,6 +116,10 @@
     <!-- Push server url -->
     <string name="push_server_url" translatable="false"></string>
 
+    <!-- if contains values, will be used to show branding title below app icon in splash screen -->
+    <string name="splashScreenBold"></string>
+    <string name="splashScreenNormal"></string>
+
     <!-- Dev settings -->
     <string name="dev_link">https://download.nextcloud.com/android/dev/nextcloud-dev-</string>
     <string name="dev_latest">https://download.nextcloud.com/android/dev/latest</string>