fix gradle config

app/build.gradle

@@ -122,11 +122,7 @@ android {
 
         // Changing the build config can cause files that depend on BuildConfig.java to recompile
         // so we only set the vcs hash in release builds to avoid possible recompilation in debug builds.
-        if (gradle.ext.vcsHashFileContent) {
-            buildConfigField "String", "VCS_HASH", "\"hg-${gradle.ext.vcsHashFileContent}\""
-        } else {
-            buildConfigField "String", "VCS_HASH", "\"${Config.vcsHash}\""
-        }
+        buildConfigField "String", "VCS_HASH", "\"${Config.vcsHash}\""
 
         if (gradle.hasProperty("localProperties.autosignReleaseWithDebugKey")) {
             signingConfig signingConfigs.debug

app/src/main/res/values-gl/strings.xml

@@ -122,12 +122,6 @@
     <!-- Text for the message displayed in the contextual feature recommendation popup promoting the tablet navigation bar. -->
     <string name="tablet_nav_bar_cfr_message" moz:removedIn="132" tools:ignore="UnusedResources">Goce dunha navegación máis rápida, sempre está ao alcance dos seus dedos.</string>
 
-    <!-- Tablet navigation bar "contextual feature recommendation" (CFR) -->
-    <!-- Text for the title displayed in the contextual feature recommendation popup promoting the tablet navigation bar. -->
-    <string name="tablet_nav_bar_cfr_title">Novo: frechas cara atrás e cara adiante cun só toque</string>
-    <!-- Text for the message displayed in the contextual feature recommendation popup promoting the tablet navigation bar. -->
-    <string name="tablet_nav_bar_cfr_message">Goza dunha navegación máis rápida que sempre está ao teu alcance.</string>
-
     <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
     <string name="camera_permissions_needed_message">Necesítase acceso á cámara. Vai á configuración de Android, toque nos permisos e toque en permitir.</string>
     <!-- Text for the positive action button to go to Android Settings to grant permissions. -->