Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5165d374 authored by Walter Jang's avatar Walter Jang Committed by Android Git Automerger
Browse files

am 73b3d648: Merge "Don\'t translate the export contacts destination filename" into mnc-dev 

* commit '73b3d6481e255cd62ccb769c7b792d9ce24e75eb':
  Don't translate the export contacts destination filename
parents efd1d7ce 1f6cb6b2

res-common/values/donottranslate_config.xml

+4 −1
Original line number Diff line number Diff line
@@ -58,7 +58,10 @@ 
    <string name="config_export_file_suffix" translatable="false"></string>



    <!-- Extension for exported VCard files -->

    <string name="config_export_file_extension" translatable="false">vcf</string>

    <string name="config_export_file_extension">vcf</string>



    <!-- The filename that is suggested that users use when exporting vCards. Should include the .vcf extension. -->

    <string name="exporting_vcard_filename" translatable="false">contacts.vcf</string>



    <!-- Minimum number of exported VCard file index -->

    <integer name="config_export_file_min_index">1</integer>

res-common/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -510,9 +510,6 @@ a ren't members of any other group. [CHAR LIMIT=25] --> 
    <!-- The title shown when exporting vCard has finished successfully but the destination filename could not be resolved. [CHAR LIMIT=NONE] -->

    <string name="exporting_vcard_finished_title_fallback">Finished exporting contacts.</string>



    <!-- The filename that is suggested that users use when exporting vCards. Should include the .vcf extension. CHAR LIMIT=40] -->

    <string name="exporting_vcard_filename">contacts.vcf</string>



    <!-- The title shown when exporting vCard is canceled (probably by a user)

         The argument is file name the user canceled importing.

         [CHAR LIMIT=40] -->