/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/layout/mergeprompt.xml

  • Committer: Tim Marston
  • Date: 2016-03-28 18:13:50 UTC
  • Revision ID: tim@ed.am-20160328181350-ytxvox60fxj1tevm
fixed typo in strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
7
7
 *
8
8
 * This file is part of the Import Contacts program (hereafter referred
9
 
 * to as "this program"). For more information, see
 
9
 * to as "this program").  For more information, see
10
10
 * http://ed.am/dev/android/import-contacts
11
11
 *
12
12
 * This program is free software: you can redistribute it and/or modify
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="20dp" android:paddingRight="20dp">
27
27
 
28
28
        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mergeprompt_help" />
29
 
        <TextView android:layout_height="wrap_content" android:id="@+id/mergeprompt_name" android:textStyle="bold" android:gravity="center" android:layout_width="fill_parent"/>
30
 
        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
29
        <TextView android:layout_height="wrap_content" android:id="@+id/mergeprompt_name" android:textStyle="bold" android:gravity="center" android:layout_width="fill_parent" android:paddingBottom="10dp" />
31
30
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/merge_keep" android:text="@string/merge_keep"/>
32
31
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_merge" android:id="@+id/merge_merge" />
33
32
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_overwrite" android:id="@+id/merge_overwrite" />