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

Commit d90caa40 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Explain purpose of string. Also noting unused." into jb-mr1-dev

parents 799c62fa f57aebc0
Loading
Loading
Loading
Loading

res/layout/desk_clock_buttons.xml

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 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.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="horizontal"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_weight="0"
    >
    <ImageButton android:id="@+id/alarm_button"
		style="@style/ButtonStripLeft"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:layout_weight=".25"
        android:src="@drawable/ic_clock_strip_alarm"
        android:contentDescription="@string/alarm_button_description"
        />
    <ImageButton android:id="@+id/gallery_button"
		style="@style/ButtonStripMiddle"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:layout_weight=".25"
        android:src="@drawable/ic_clock_strip_gallery"
        android:contentDescription="@string/gallery_button_description"
        />
    <ImageButton android:id="@+id/music_button"
		style="@style/ButtonStripMiddle"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:layout_weight=".25"
        android:src="@drawable/ic_clock_strip_music"
        android:contentDescription="@string/music_button_description"
        />
    <ImageButton android:id="@+id/home_button"
		style="@style/ButtonStripRight"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:layout_weight=".25"
        android:src="@drawable/ic_clock_strip_home"
        android:contentDescription="@string/home_button_description"
        />
</LinearLayout>
+55 −41
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- -->
    <!-- Label shown on launcher icon -->
    <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
    <string name="app_label">Clock</string>

    <!-- Title for AlarmClock activity -->
    <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
    <string name="alarm_list_title">Alarms</string>

    <!-- Menu item on Alarm Clock screen: Add alarm -->
@@ -56,6 +58,7 @@
    <string name="default_label">Alarm</string>

    <!-- Preference category on Alarm Settings screen: Set alarm -->
    <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
    <string name="set_alarm">Set alarm</string>

    <!-- Setting labels on Set alarm screen: Vibration on or off -->
@@ -156,13 +159,14 @@
         select a clock to display -->
    <string name="clock_instructions">Choose a clock</string>

    <!-- Label for analog clock gadget, shown in list of all gadgets -->
    <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
    <string name="analog_gadget">Analog clock</string>

    <!-- Help activity name -->
    <string name="help">help</string>

    <!-- Settings activity name -->
    <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
    <string name="settings">Settings</string>

    <!-- Setting title for changing the snooze duration. -->
@@ -263,14 +267,6 @@
    <!-- Title of the ringtone setting. -->
    <string name="default_ringtone_setting_title">Set default ringtone</string>

    <!-- Accessibility labels for Clock activity buttons --><skip/>
    <string name="alarm_button_description">Alarms</string>
    <string name="gallery_button_description">Gallery</string>
    <string name="music_button_description">Music</string>
    <string name="nightmode_button_description">Dim</string>
    <string name="home_button_description">Launcher</string>
    <string name="desk_clock_button_description">Clock display</string>

    <!-- A short representation of charging information, e.g "34%" -->
    <string name="battery_charging_level"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>

@@ -298,62 +294,72 @@
    <string name="control_set_alarm_with_existing"><xliff:g id="time">%s</xliff:g></string>

    <!--  ActionBar strings -->
    <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
    <string name="menu_timer">Timer</string>
    <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
    <string name="menu_clock">Clock</string>
    <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
    <string name="menu_stopwatch">Stopwatch</string>

    <!--- Clock view buttons strings-->
    <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
    <string name="button_alarms">Alarms</string>
    <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
    <string name="button_cities">Cities</string>
    <!-- Describes the purpose of the button which pops up a menu of setting choices -->
    <string name="button_menu">Menu</string>
    <string name="menu_item_settings">Settings</string>
    <string name="menu_item_help">Help</string>

    <!-- Stop Watch strings -->
    <string name="sw_pause_button">Pause</string>
    <!-- Describes the purpose of the button to resume running a stopwatch -->
    <string name="sw_resume_button">Resume</string>
    <!-- Describes the purpose of the button to begin running a stopwatch -->
    <string name="sw_start_button">Start</string>
    <!-- Describes the purpose of the button to pause a stopwatch. -->
    <string name="sw_stop_button">Stop</string>
    <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
    <string name="sw_lap_button">Lap</string>
    <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
    <string name="sw_reset_button">Reset</string>
    <string name="sw_share_button">Share</string>
    <string name="sw_lap_number">\#</string>
    <string name="sw_lap_time">Lap Time</string>
    <string name="sw_lap_total">Total</string>
    <string name="sw_current_lap_number"><xliff:g id="number">%d</xliff:g></string>

    <!-- Abbreviation for temporal hours -->
    <string name="hours_label">h</string>
    <!-- Abbreviation for temporal minutes -->
    <string name="minutes_label">m</string>
    <!-- Abbreviation for temporal seconds -->
    <string name="seconds_label">s</string>

    <string name="zero">0</string>

    <!--  Stopwatch share strings -->
    <string name="sw_share_title">Sharing my times:</string>
    <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
    <string name="sw_share_main">My time is <xliff:g id="time">%s</xliff:g></string>
    <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
    <string name="sw_share_laps">Lap times:</string>
    <string name="sw_notification_label">Stopwatch</string>
    <string name="sw_notification_lap">Lap <xliff:g id="number">%d</xliff:g> - <xliff:g id="time">%s</xliff:g></string>
    <!-- Label to enumerate the number of laps the user has counted -->
    <string name="sw_notification_lap_number">Lap <xliff:g id="number">%d</xliff:g></string>

    <!-- timer strings -->
    <string name="timer_add_one_button">Add 1 minute</string>
    <string name="timer_dismiss_button">Cancel</string>
    <!-- Describes the purpose of the button to add a new timer -->
    <string name="timer_add_timer">Add Timer</string>
    <string name="timer_clear">Clear</string>
    <!-- Describes the purpose of the button to begin or continue running a timer -->
    <string name="timer_start">Start</string>
    <!-- Describes the purpose of the button to delete a timer. -->
    <string name="timer_delete">Delete</string>
    <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
    <string name="timer_plus_one">+1 Min</string>
    <!-- Describes the purpose of the button to pause a timer. -->
    <string name="timer_stop">Stop</string>
    <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
    <string name="timer_reset">Reset</string>
    <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
    <string name="timer_cancel">Cancel</string>
    <string name="timer_delete_question">Delete this timer?</string>
    <!-- Notification content shown when a timer has completed and has no more time remaining -->
    <string name="timer_times_up">Time\'s up</string>
    <!-- Label associated with a notification for a Timer -->
    <string name="timer_notification_label">Timer</string>
    <string name="next_timer">>Next Timer: <xliff:g id="time">%s</xliff:g></string>
    <string name="more_timers">>And <xliff:g id="number">%d</xliff:g> timers</string>
    <string name="stopped_at">>Stopped at <xliff:g id="time">%s</xliff:g></string>

    <!-- Jocular content that user may append when sharing the lap times -->
    <string-array name="sw_share_strings" translatable="true">
        <item>You\'re quite the speed demon.</item>
        <item>Enjoy the fruits of your labor.</item>
@@ -374,31 +380,24 @@
        <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> timers</item>
    </plurals>

    <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
    <string name="home_label">Home</string>
    <string name="remove_question">Remove this city?</string>
    <string name="sort_by_name">By name</string>
    <string name="sort_by_time">By time</string>
    <string name="search_results">Results</string>
    <string name="no_cities_found">No cities found</string>
    <string name="search_city">Search</string>
    <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
    <string name="cities_activity_title">Cities</string>

    <string name="alarm_setup_music">Music</string>

    <!-- Text in a Toggle button indicating an alarm is enabled -->
    <string name="alarm_on">On</string>
    <!-- Text in a Toggle button indicating an alarm is disabled -->
    <string name="alarm_off">Off</string>

    <string name="alarm_night">Every night</string>
    <string name="Delete_selected_alarm">Delete selected alarm?</string>
    <string name="selected">Selected</string>
    <string name="alarm_dismiss_question">>Dismiss alarm now instead of at <xliff:g id="time">%s</xliff:g>?</string>
    <string name="alarm_snooze_until">>Snoozing until</string>


    <!-- Settings strings -->
    <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
    <string name="clock_settings">CLOCK</string>
    <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
    <string name="clock_style">Style</string>
    <string name="clock_style_title">Clock style</string>

    <!-- Entries listed in the ListPreference when invoking the clock style
         preference. -->
@@ -414,12 +413,18 @@
      <item>digital</item>
    </string-array>

    <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
    <string name="automatic_home_clock">Automatic home clock</string>
    <!-- Describes the functionality provided by the automatic_home_clock option -->
    <string name="automatic_home_clock_summary">While traveling outside regular time zone, add a clock for home</string>
    <!-- Title in the preferences change the time zone for the user's home -->
    <string name="home_time_zone">Home time zone</string>
    <!-- Title in a list dialog box to pick a time zone for the user's home -->
    <string name="home_time_zone_title">Home time zone</string>

    <!-- Textual content of the button to discard the current dialog values and close the dialog -->
    <string name="time_picker_cancel">Cancel</string>
    <!-- Textual content of the button to update an alarm with the current dialog values -->
    <string name="time_picker_set">Set</string>
    <string name="time_picker_time_seperator">:</string>
    <!--  place holder for am/pm label when it is not set -->
@@ -606,12 +611,14 @@
        <item>"Pacific/Tongatapu"</item>
    </string-array>

     <!-- Header in the preferences settings for the section pertaining to alarms -->
     <string name="alarm_settings">ALARMS</string>
     <!-- Describes the purpose of the button to show the remaining choices whenever there were too many -->
     <string name="see_all">See all&#8230;</string>
     <string name="desk_clock_help_url" translatable="false"></string>
     <!-- Describes the running service for the stopwatch -->
     <string name="stopwatch_service_desc">Stopwatch service to run the notification.</string>
     <string name="stopwatch_title">Stopwatch</string>
     <string name="swn_collapsed_laps_divider">" - "</string>
     <!-- Desription for the stopped stop watch -->
     <string name="swn_stopped">Stopped</string>

    <!-- Description of the right direction in the alarm alert screen. [CHAR LIMIT=NONE] -->
@@ -635,14 +642,21 @@
    <string name="next_timer_notif">Next timer: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>

    <!-- screensaver settings strings -->
    <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
    <string name="screensaver_settings">Dream settings</string>
    <!-- Title for check box to pick intensity of display diminuation during dream mode -->
    <string name="night_mode_title">Night mode</string>
    <!-- Describes intensity of display diminuation during dream mode -->
    <string name="night_mode_summary">Very dim display (for dark rooms)</string>

    <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
    <string name="expand_alarm">Expand alarm</string>
    <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
    <string name="collapse_alarm">Collapse alarm</string>

    <!-- Description of the button to undo change to alarm -->
    <string name="alarm_undo">undo</string>
    <!-- Toast content when an alarm was deleted  -->
    <string name="alarm_deleted">Alarm deleted.</string>
    <!-- slash between date and next alarm in the clock -->
    <string name="slash"> / </string>