diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-21 00:38:00 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-21 00:38:00 +0100 |
| commit | b2efaf181fb7833206e97f64eb29400057a7d7ed (patch) | |
| tree | e7a2715313e7a9b7786606280081f7dace026a5f /res | |
| parent | 31e0ee7819ff6e852bc40f66858f0ac02659bf04 (diff) | |
| parent | 16ac5c300e21ce4c8b380013735f2c17d2e34768 (diff) | |
Merge branch 'bug/more-detailed-response-to-CW-errors' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/client_dashboard.xml | 4 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml index 16e152be..9bda6d2e 100644 --- a/res/layout/client_dashboard.xml +++ b/res/layout/client_dashboard.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context=".Dashboard" > - + <LinearLayout android:id="@+id/providerLine" android:layout_width="match_parent" @@ -68,4 +68,4 @@ android:orientation="vertical" > </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8a5bb49f..609310b8 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9,6 +9,7 @@ <string name="select">Select</string> <string name="cancel">Cancel</string> <string name="ok">OK</string> + <string name="retry">Retry</string> <string name="no_data">No Data</string> <string name="useLZO">LZO Compression</string> <string name="client_no_certificate">No Certificate</string> |