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

Commit b94a52fa authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'donut' of git://github.com/plauclair/android_packages_apps_Contacts into donut

parents 4a2111c2 73f56a12

res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -310,5 +310,5 @@ 
    <string name="title_use_1_for_reg_vm">Touche 1 pour mess. voc. par défaut</string>

    <string name="summaryon_use_1_for_reg_vm">Touche 1 sera utilisée pour la mess. vocale par défaut</string>

    <string name="summaryoff_use_1_for_reg_vm">Touche 1 sera suivie par l\'application de mess. vocale personnalisée</string>

    <string name="recentCalls_removeAllFrom">"Suppr. tous de "</string>

    <string name="recentCalls_removeAllFrom">Suppr. tous de </string>

</resources>

src/com/android/contacts/RecentCallsListActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -922,10 +922,10 @@ public class RecentCallsListActivity extends ListActivity 
        menu.add(0, MENU_ITEM_DELETE, 0, R.string.recentCalls_removeFromRecentList);

        

        if (contactInfoPresent) {

        	menu.add(0, MENU_ITEM_DELETE_ALL_NAME, 0, R.string.recentCalls_removeAllFrom + info.name);

        	menu.add(0, MENU_ITEM_DELETE_ALL_NAME, 0, getString(R.string.recentCalls_removeAllFrom) + info.name);

        }

        

        menu.add(0, MENU_ITEM_DELETE_ALL_NUMBER, 0, R.string.recentCalls_removeAllFrom + number);

        menu.add(0, MENU_ITEM_DELETE_ALL_NUMBER, 0, getString(R.string.recentCalls_removeAllFrom) + number);

    }



    @Override