Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51da6168 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of... 

Merge branch 'eclair' of git://android.git.kernel.org/platform/packages/apps/DeskClock into eclair-backport

Conflicts:
	res/values/strings.xml
	src/com/android/deskclock/DeskClock.java
parents 7bacb818 5553de61

res/menu/desk_clock_menu.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
    <item android:id="@+id/menu_item_add_alarm"

        android:title="@string/add_alarm"

        android:icon="@drawable/ic_menu_add"/>

    <item android:id="@+id/menu_item_dock_settings"

        android:title="@string/menu_item_dock_settings"

        android:icon="@android:drawable/ic_menu_preferences"/>

</menu>

res/values-cs/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Zobrazení hodin"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Informace o počasí aktuálně nejsou k dispozici."</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Nastavení doku"</string>

</resources>

res/values-da/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Urvisning"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Oplysninger om vejret er ikke tilgængelige i øjeblikket."</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Indstillinger for dockingstation"</string>

</resources>

res/values-de/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Uhrendisplay"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Wetterinformationen derzeit nicht verfügbar"</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Dock-Einstellungen"</string>

</resources>

res/values-el/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Οθόνη ρολογιού"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Οι πληροφορίες καιρού δεν είναι διαθέσιμες αυτή τη στιγμή."</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Ρυθμίσεις βάσης σύνδεσης"</string>

</resources>