Merge change Ic0d82ef1 into eclair

    <string name="orgTypeCustom">Custom</string>

    <string name="orgTypeCustom">Custom</string>

    <!-- Attbution of a contact status update, when the time of update is unknown -->

    <!-- Attbution of a contact status update, when the time of update is unknown -->

    <string name="contact_status_update_attribution">Via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>

    <string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>

    <!-- Attbution of a contact status update, when the time of update is known -->

    <!-- Attbution of a contact status update, when the time of update is known -->

    <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>

    <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>