archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge from tcl branch: fixed bug with -1 size in tag list when 0 tasks,

Browse Source 
turned several text edit preferences into more-sensical list
  preferences. Updated spanish translation.
pull/14/head
Tim Su 16 years ago
parent c6f899e67d
commit 578c9ba579
7 changed files with 395 additions and 212 deletions
Show Stats Download Patch File Download Diff File

31
res/values-es/arrays.xml
Unescape Escape View File

@ -114,4 +114,35 @@
<item>302400</item>
<item>604800</item>
</string-array>
<string-array name="EPr_quiet_hours_start">
<!-- quiet_hours_start: options for preference menu -->
<item>desactivar</item>
<item>20:00</item>
<item>21:00</item>
<item>22:00</item>
<item>23:00</item>
<item>00:00</item>
<item>01:00</item>
<item>02:00</item>
<item>03:00</item>
<item>04:00</item>
<item>05:00</item>
<item>06:00</item>
<item>07:00</item>
<item>08:00</item>
<item>09:00</item>
<item>10:00</item>
<item>10:00</item>
<item>11:00</item>
<item>12:00</item>
<item>13:00</item>
<item>14:00</item>
<item>15:00</item>
<item>16:00</item>
<item>17:00</item>
<item>18:00</item>
<item>19:00</item>
</string-array>
</resources>

17
res/values-es/strings.xml
Unescape Escape View File

@ -161,7 +161,7 @@
<!-- i.e. Deleted: <delete date> -->
<string name="taskList_deleted">Borrado</string>
<string name="quick_add_hint">Add New Task</string>
<string name="quick_add_hint">Añadir nueva tarea</string>
<!-- menu items -->
<string name="taskList_menu_insert">Nueva Tarea</string>
@ -372,7 +372,7 @@ Astrid might not let you know when your tasks are due.\n
<string name="notif_preferredDueDate">¡Fecha límite deseada!</string>
<string name="notif_timerStarted">Trabajando en:</string>
<!-- $NUM is replaced with # of tasks + units, i.e. "1 task", $TAG is replaced with tag name -->
<string name="notif_tagNotification">¡Tienes $NUM etiquetada(s) $TAG!</string>
<string name="notif_tagNotification">Tienes $NUM etiquetada $TAG!</string>
<!-- Error Messages -->
<skip/>
@ -385,13 +385,13 @@ Astrid might not let you know when your tasks are due.\n
<string name="prefs_category_alerts">Notificaciones</string>
<string name="prefs_quietStart_title">Inicio del horario en silencio</string>
<string name="prefs_quietStart_desc">Hora de inicio para que Astrid esté en silencio (ej. 22)</string>
<string name="prefs_quietStart_desc">Hora de inicio para que notificaciones esté en silencio</string>
<string name="prefs_quietEnd_title">Fin del horario en silencio</string>
<string name="prefs_quietEnd_desc">Hora de finalización para que Astrid esté en silencio (ej. 08)</string>
<string name="prefs_quietEnd_desc">Hora de finalización para que notificaciones esté en silencio</string>
<string name="prefs_defaultRemind_title">Recordatorios por defecto</string>
<string name="prefs_defaultRemind_desc">Para nuevas tareas, en días (ej. 7). Vacío para desactivar</string>
<string name="prefs_defaultRemind_desc">Para nuevas tareas, defecto en días (ej. 7). Vacío para desactivar</string>
<string name="prefs_annoy_title">Modo persistente</string>
<string name="prefs_annoy_desc">Si está activado, el LED y las notificaciones deberán ser desactivados uno por uno</string>
@ -402,8 +402,8 @@ Astrid might not let you know when your tasks are due.\n
<string name="prefs_notificon_title">Iconos de notificación</string>
<string name="prefs_notificon_desc">Elige el icono para la barra de notificación de Astrid</string>
<string name="prefs_vibrate_title">Vibrate on Alert</string>
<string name="prefs_vibrate_desc">If checked, Astrid will vibrate when sounding an alarm</string>
<string name="prefs_vibrate_title">Vibración</string>
<string name="prefs_vibrate_desc">Si está activado, Astrid vibrará con las alertas</string>
<string name="prefs_category_appearance">Apariencia</string>
@ -411,7 +411,7 @@ Astrid might not let you know when your tasks are due.\n
<string name="prefs_colorize_desc">Diferentes colores para diferentes prioridades</string>
<string name="prefs_fontSize_title">Fuente para la lista de tareas</string>
<string name="prefs_fontSize_desc">Fuente en el listado principal (ej. 22)</string>
<string name="prefs_fontSize_desc">Tamaño de la fuente en el listado principal</string>
<string name="prefs_category_other">Otro</string>
@ -455,6 +455,7 @@ Astrid might not let you know when your tasks are due.\n
Jon Paris https://launchpad.net/~jon-todoroo
Pablo Ledesma https://launchpad.net/~venraiker
Tim Su https://launchpad.net/~tim-todoroo
Victor Herrero https://launchpad.net/~victorhera
ninor https://launchpad.net/~subifrisks</string>
<!-- Widget text when loading tasks -->

133
res/values/arrays.xml
Unescape Escape View File

@ -116,5 +116,138 @@
<item>86400</item>
<item>302400</item>
<item>604800</item>
</string-array>
<string-array name="EPr_quiet_hours_start">
<!-- quiet_hours_start: options for preference menu -->
<item>disabled</item>
<item>20:00</item>
<item>21:00</item>
<item>22:00</item>
<item>23:00</item>
<item>00:00</item>
<item>01:00</item>
<item>02:00</item>
<item>03:00</item>
<item>04:00</item>
<item>05:00</item>
<item>06:00</item>
<item>07:00</item>
<item>08:00</item>
<item>09:00</item>
<item>10:00</item>
<item>10:00</item>
<item>11:00</item>
<item>12:00</item>
<item>13:00</item>
<item>14:00</item>
<item>15:00</item>
<item>16:00</item>
<item>17:00</item>
<item>18:00</item>
<item>19:00</item>
</string-array>
<string-array name="EPr_quiet_hours_start_values">
<!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
<item></item>
<item>20</item>
<item>21</item>
<item>22</item>
<item>23</item>
<item>00</item>
<item>01</item>
<item>02</item>
<item>03</item>
<item>04</item>
<item>05</item>
<item>06</item>
<item>07</item>
<item>08</item>
<item>09</item>
<item>10</item>
<item>11</item>
<item>12</item>
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
<item>17</item>
<item>18</item>
<item>19</item>
</string-array>
<string-array name="EPr_quiet_hours_end">
<!-- quiet_hours_end: options for preference menu -->
<item>09:00</item>
<item>10:00</item>
<item>10:00</item>
<item>11:00</item>
<item>12:00</item>
<item>13:00</item>
<item>14:00</item>
<item>15:00</item>
<item>16:00</item>
<item>17:00</item>
<item>18:00</item>
<item>19:00</item>
<item>20:00</item>
<item>21:00</item>
<item>22:00</item>
<item>23:00</item>
<item>00:00</item>
<item>01:00</item>
<item>02:00</item>
<item>03:00</item>
<item>04:00</item>
<item>05:00</item>
<item>06:00</item>
<item>07:00</item>
<item>08:00</item>
</string-array>
<string-array name="EPr_quiet_hours_end_values">
<!-- quiet_hours_end_values: 24-hour representation of quiet_hours_end -->
<item>09</item>
<item>10</item>
<item>11</item>
<item>12</item>
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
<item>17</item>
<item>18</item>
<item>19</item>
<item>20</item>
<item>21</item>
<item>22</item>
<item>23</item>
<item>00</item>
<item>01</item>
<item>02</item>
<item>03</item>
<item>04</item>
<item>05</item>
<item>06</item>
<item>07</item>
<item>08</item>
</string-array>
<string-array name="EPr_font_size">
<!-- font_size: options for preference menu -->
<item>14</item>
<item>16</item>
<item>18</item>
<item>20</item>
<item>22</item>
<item>24</item>
<item>26</item>
<item>28</item>
<item>30</item>
<item>32</item>
<item>36</item>
<item>48</item>
</string-array>
</resources>

10
res/values/strings.xml
Unescape Escape View File

@ -407,13 +407,13 @@ Astrid might not let you know when your tasks are due.\n
<string name="prefs_category_alerts">Notifications</string>
<string name="prefs_quietStart_title">Quiet Hours Start</string>
<string name="prefs_quietStart_desc">Starting hour when Astrid should be quiet (e.g. 22)</string>
<string name="prefs_quietStart_desc">Start time to silence notifications for periodic reminders</string>
<string name="prefs_quietEnd_title">Quiet Hours End</string>
<string name="prefs_quietEnd_desc">Ending hour when Astrid should be quiet (e.g. 08)</string>
<string name="prefs_quietEnd_desc">End time to silence notifications</string>
<string name="prefs_defaultRemind_title">Default Reminders</string>
<string name="prefs_defaultRemind_desc">For new tasks, in days (i.e. 7). Blank to disable</string>
<string name="prefs_defaultRemind_desc">For new tasks, default reminder in days (i.e. 7). Blank to disable</string>
<string name="prefs_annoy_title">Persistent Mode</string>
<string name="prefs_annoy_desc">If checked, LED and notifications must be cleared one at a time</string>
@ -432,8 +432,8 @@ Astrid might not let you know when your tasks are due.\n
<string name="prefs_colorize_title">Colorize Task List</string>
<string name="prefs_colorize_desc">Different colors for different priorities</string>
<string name="prefs_fontSize_title">Task List Font</string>
<string name="prefs_fontSize_desc">Font on the main listing page (i.e. 22)</string>
<string name="prefs_fontSize_title">Task List Size</string>
<string name="prefs_fontSize_desc">Font size on the main listing page</string>
<string name="prefs_category_other">Other</string>

14
res/xml/preferences.xml
Unescape Escape View File

@ -4,12 +4,16 @@
<PreferenceCategory
android:title="@string/prefs_category_alerts">
<EditTextPreference
<ListPreference
android:key="@string/p_notif_quietStart"
android:entries="@array/EPr_quiet_hours_start"
android:entryValues="@array/EPr_quiet_hours_start_values"
android:title="@string/prefs_quietStart_title"
android:summary="@string/prefs_quietStart_desc" />
<EditTextPreference
<ListPreference
android:key="@string/p_notif_quietEnd"
android:entries="@array/EPr_quiet_hours_end"
android:entryValues="@array/EPr_quiet_hours_end_values"
android:title="@string/prefs_quietEnd_title"
android:summary="@string/prefs_quietEnd_desc" />
<CheckBoxPreference
@ -46,8 +50,10 @@
android:key="@string/p_colorize"
android:title="@string/prefs_colorize_title"
android:summary="@string/prefs_colorize_desc" />
<EditTextPreference
android:key="@string/p_fontSize"
<ListPreference
android:key="@string/p_fontSize"
android:entries="@array/EPr_font_size"
android:entryValues="@array/EPr_font_size"
android:title="@string/prefs_fontSize_title"
android:summary="@string/prefs_fontSize_desc" />
<PreferenceScreen

2
src/com/timsu/astrid/activities/TagListSubActivity.java
Unescape Escape View File

@ -244,7 +244,7 @@ public class TagListSubActivity extends SubActivity {
// set up the title
Resources r = getResources();
int tags = tagArray.size();
if(untaggedTagDisplayed)
if(untaggedTagDisplayed && tags > 0)
tags--;
StringBuilder title = new StringBuilder().
append(r.getString(R.string.tagList_titlePrefix)).

400
translations/strings-es.po
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save