diff options
| author | Andrei Stingaceanu <stg@google.com> | 2015-06-10 15:46:44 +0100 |
|---|---|---|
| committer | Andrei Stingaceanu <stg@google.com> | 2015-06-10 15:46:44 +0100 |
| commit | 15f4dd72192f11982a41d2fd92b7c2302b521476 (patch) | |
| tree | daadc4510cc372b0f52d1e70119d13059f398854 /core/res/res/values-de | |
| parent | ad9141817fb42e1037675ee159c32a52e157782f (diff) | |
| parent | 1c96a9418447df1eee1d7323269b28bf9b3ccd66 (diff) | |
| download | frameworks_base-15f4dd72192f11982a41d2fd92b7c2302b521476.zip frameworks_base-15f4dd72192f11982a41d2fd92b7c2302b521476.tar.gz frameworks_base-15f4dd72192f11982a41d2fd92b7c2302b521476.tar.bz2 | |
resolved conflicts for merge of 1c96a941 to mnc-ub-dev
Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297
Diffstat (limited to 'core/res/res/values-de')
| -rw-r--r-- | core/res/res/values-de/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index c7ba199..90e5431 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1219,7 +1219,6 @@ <string name="storage_usb_drive" msgid="6261899683292244209">"USB-Speichergerät"</string> <string name="storage_usb_drive_label" msgid="4501418548927759953">"USB-Speichergerät von <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb" msgid="3017954059538517278">"USB-Speicher"</string> - <string name="extract_edit_menu_button" msgid="8940478730496610137">"Bearbeiten"</string> <string name="data_usage_warning_title" msgid="1955638862122232342">"Warnung zum Datenverbrauch"</string> <string name="data_usage_warning_body" msgid="2814673551471969954">"Für Verbrauch/Einstell. berühren"</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-/3G-Datenlimit erreicht"</string> |