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

Commit 1ba8b6fe authored by Katherine Kuan's avatar Katherine Kuan
Browse files

Finish string changes 

Bug: 5147284
Bug: 5144069
Bug: 5150725
Bug: 5149819
Bug: 5144900

Change-Id: Ib3495e1ef7847eb2c01d7609c1524024123c993c
parent eb1835ab

res/values/strings.xml

+12 −11
Original line number Diff line number Diff line
@@ -143,13 +143,11 @@ 
    <!-- Menu item (in the action bar) that creates a new group [CHAR LIMIT=12] -->

    <string name="menu_new_group_action_bar">New</string>



    <!-- Title of the confirmation dialog for separating contacts into multiple instances  -->

    <string name="splitConfirmation_title">Separate Contact</string>

    <!-- Title of the confirmation dialog for separating contacts into multiple instances [CHAR LIMIT=20] -->

    <string name="splitConfirmation_title">Separate contact</string>



    <!-- Confirmation dialog for separating contacts into multiple instances  -->

    <string name="splitConfirmation">Are you sure you want to separate this single contact

        into multiple contacts: one for each set of contact information that was joined into it?

    </string>

    <!-- Confirmation dialog for separating contacts into multiple instances [CHAR LIMIT=NONE] -->

    <string name="splitConfirmation">Are you sure you want to separate this single contact into multiple contacts?</string>



    <!-- Menu item that joins an aggregate with another aggregate -->

    <string name="menu_joinAggregate">Join</string>
@@ -903,8 +901,8 @@ 
    <!-- Dialog title shown when a user confirms whether he/she export Contact data -->

    <string name="confirm_export_title">Confirm export</string>



    <!-- Dialog message shown when a user confirms whether he/she export Contact data -->

    <string name="confirm_export_message">Are you sure you want to export your contact list to \"<xliff:g id="vcard_filename">%s</xliff:g>\"?</string>

    <!-- Dialog message shown when a user confirms whether he/she export Contact data [CHAR LIMIT=NONE] -->

    <string name="confirm_export_message">Export your contact list to file \"<xliff:g id="vcard_filename">%s</xliff:g>\"?</string>



    <!-- Dialog title shown when exporting Contact data failed -->

    <string name="exporting_contact_failed_title">Failed to export contact data</string>
@@ -1265,10 +1263,10 @@ 
    <string name="name_phonetic">Phonetic name</string>



    <!-- Title for the list of all contact details that come from third-party sources (including a corporate directory) [CHAR LIMIT=20] -->

    <string name="network">Network</string>

    <string name="connections">Connections</string>



    <!-- Label of the button to open the "more networks" popup where the user can invite a contact to other social networks or services [CHAR LIMIT=32] -->

    <string name="more_networks_button">More networks</string>

    <!-- Label of the button to open the "add connection" popup where the user can invite a contact to other social networks or services [CHAR LIMIT=32] -->

    <string name="add_connection_button">Add connection</string>



    <!-- Section title for the page containing the contact's social updates on the contact card [CHAR LIMIT=20]-->

    <string name="recent_updates">Recent</string>
@@ -1498,6 +1496,9 @@ 
    <!-- Button to add a phone number to contacts [CHAR LIMIT=25] -->

    <string name="non_phone_add_to_contacts">Add to contacts</string>



    <!-- Title of the activity that allows the user to confirm the addition of a detail to 1 existing contact [CHAR LIMIT=25] -->

    <string name="activity_title_confirm_add_detail">Add to contact</string>



    <!-- Button to close without add a phone number to contacts [CHAR LIMIT=25] -->

    <string name="non_phone_close">Close</string>

src/com/android/contacts/detail/ContactDetailFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen 
        }



        // Add a title

        String networkKindTitle = mContext.getString(R.string.network);

        String networkKindTitle = mContext.getString(R.string.connections);

        mAllEntries.add(new KindTitleViewEntry(networkKindTitle.toUpperCase()));



        // Add the attribution if applicable
@@ -1149,7 +1149,7 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen 
            // TODO Icon is temporary.  Need proper one.

            return new NetworkTitleViewEntry(

                    context.getResources().getDrawable(R.drawable.ic_menu_add_field_holo_light),

                    context.getString(R.string.more_networks_button),

                    context.getString(R.string.add_connection_button),

                    onClickListener);

        }

src/com/android/contacts/editor/ContactEditorFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ public class ContactEditorFragment extends Fragment implements 
                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setTitle(R.string.cancel_confirmation_dialog_title)

                    .setMessage(R.string.cancel_confirmation_dialog_message)

                    .setPositiveButton(R.string.discard,

                    .setPositiveButton(android.R.string.ok,

                        new DialogInterface.OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialog, int whichButton) {

src/com/android/contacts/group/GroupEditorFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog 
                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setTitle(R.string.cancel_confirmation_dialog_title)

                    .setMessage(R.string.cancel_confirmation_dialog_message)

                    .setPositiveButton(R.string.discard,

                    .setPositiveButton(android.R.string.ok,

                        new DialogInterface.OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialog, int whichButton) {