diff options
| author | Scott Kennedy <skennedy@google.com> | 2014-03-31 17:59:30 -0700 |
|---|---|---|
| committer | Scott Kennedy <skennedy@google.com> | 2014-03-31 17:59:30 -0700 |
| commit | 3f055167ba75c240c547d56057e3c4f9348dd15f (patch) | |
| tree | 0c8b186d3e6c8340500982d9310e6a29a003f001 /res/values-de/strings.xml | |
| parent | 62bdefc0a6b74796b39789da1ab377ddac96e6b3 (diff) | |
| parent | afcfdeae8a3a3f62c78d6271287fa69c5ecc002d (diff) | |
| download | android_frameworks_opt_datetimepicker-3f055167ba75c240c547d56057e3c4f9348dd15f.tar.gz android_frameworks_opt_datetimepicker-3f055167ba75c240c547d56057e3c4f9348dd15f.tar.bz2 android_frameworks_opt_datetimepicker-3f055167ba75c240c547d56057e3c4f9348dd15f.zip | |
resolved conflicts for merge of afcfdeae to master
Change-Id: Ide2dbe6b77b927d5c6b7c529c8f24e24a5f6d49e
Diffstat (limited to 'res/values-de/strings.xml')
| -rw-r--r-- | res/values-de/strings.xml | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml deleted file mode 100644 index 92f49c8..0000000 --- a/res/values-de/strings.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="done_label" msgid="7007948707597430919">"Fertig"</string> - <string name="hour_picker_description" msgid="7586639618712934060">"Kreisförmiger Schieberegler für Stunden"</string> - <string name="minute_picker_description" msgid="6024811202872705251">"Kreisförmiger Schieberegler für Minuten"</string> - <string name="select_hours" msgid="7651068754188418859">"Stunden auswählen"</string> - <string name="select_minutes" msgid="8327182090226828481">"Minuten auswählen"</string> - <string name="day_picker_description" msgid="3968620852217927702">"Monatsraster mit einzelnen Tagen"</string> - <string name="year_picker_description" msgid="6963340404644587098">"Jahresliste"</string> - <string name="select_day" msgid="3973338219107019769">"Monat und Tag auswählen"</string> - <string name="select_year" msgid="2603330600102539372">"Jahr auswählen"</string> - <string name="item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> ausgewählt"</string> - <string name="deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> gelöscht"</string> -</resources> |