Merge tag 'v1.3.3' into dev

Version 1.3.3
pull/69/head
Alinson S. Xavier 10 years ago
commit a0582b65d5

@ -1,8 +1,14 @@
# Changelog # Changelog
### 1.3.3 (March 20, 2016)
* Add Spanish and Korean translations
* Make small corrections to other translations
* Fix incorrect date in history calendar
### 1.3.2 (March 18, 2016) ### 1.3.2 (March 18, 2016)
* Arabic, Italian, Polish, Russian and Swedish translations * Add Arabic, Italian, Polish, Russian and Swedish translations
* Minor fixes to German and French translations * Minor fixes to German and French translations
* Minor bug fixes * Minor bug fixes
@ -16,7 +22,7 @@
* New frequency plot: view total repetitions per day of week * New frequency plot: view total repetitions per day of week
* New history editor: put checkmarks in the past * New history editor: put checkmarks in the past
* German, French and Japanese translations * Add German, French and Japanese translations
* Add about screen, with credits to all contributors * Add about screen, with credits to all contributors
* Fix small bug that prevented habit from being reordered * Fix small bug that prevented habit from being reordered
* Fix small bug caused by rotating the device * Fix small bug caused by rotating the device

@ -21,8 +21,8 @@
<manifest <manifest
package="org.isoron.uhabits" package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="12" android:versionCode="13"
android:versionName="1.3.2"> android:versionName="1.3.3">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

@ -101,12 +101,11 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
private void updateDate() private void updateDate()
{ {
baseDate = new GregorianCalendar(); baseDate = DateHelper.getStartOfTodayCalendar();
baseDate.setTimeInMillis(DateHelper.getLocalTime());
baseDate.add(Calendar.DAY_OF_YEAR, -(getDataOffset() - 1) * 7); baseDate.add(Calendar.DAY_OF_YEAR, -(getDataOffset() - 1) * 7);
nDays = (nColumns - 1) * 7; nDays = (nColumns - 1) * 7;
todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7; todayWeekday = DateHelper.getStartOfTodayCalendar().get(Calendar.DAY_OF_WEEK) % 7;
baseDate.add(Calendar.DAY_OF_YEAR, -nDays); baseDate.add(Calendar.DAY_OF_YEAR, -nDays);
baseDate.add(Calendar.DAY_OF_YEAR, -todayWeekday); baseDate.add(Calendar.DAY_OF_YEAR, -todayWeekday);
@ -309,8 +308,11 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
private void drawColumnHeader(Canvas canvas, Rect location, GregorianCalendar date) private void drawColumnHeader(Canvas canvas, Rect location, GregorianCalendar date)
{ {
String month = dfMonth.format(date.getTime()); GregorianCalendar forwardDate = (GregorianCalendar) date.clone();
String year = dfYear.format(date.getTime()); forwardDate.add(Calendar.DAY_OF_YEAR, 6);
String month = dfMonth.format(forwardDate.getTime());
String year = dfYear.format(forwardDate.getTime());
String text = null; String text = null;
if (!month.equals(previousMonth)) if (!month.equals(previousMonth))

@ -1,22 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Al Alloush
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<!-- There is no letter P in arabic so the name is unfortunately translated to "Loob" --> <!-- There is no letter P in arabic so the name is unfortunately translated to "Loob" -->

@ -1,23 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Matthias Meisser
~ Copyright (C) 2016 Can Altas
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"Loop Habit Tracker"</string> <string name="app_name">"Loop Habit Tracker"</string>
<string name="main_activity_title">"Gewohnheiten"</string> <string name="main_activity_title">"Gewohnheiten"</string>

@ -1,23 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 François Mahé
~ Copyright (C) 2016 Thibaut Girka
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"Loop - Suivi d'habitudes"</string> <string name="app_name">"Loop - Suivi d'habitudes"</string>
<string name="main_activity_title">"Habitude"</string> <string name="main_activity_title">"Habitude"</string>

@ -1,35 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Marco Cavazza
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<!-- Fuzzy --> <!-- Fuzzy -->
<string name="app_name">"Loop"</string> <string name="app_name">"Loop"</string>
<string name="main_activity_title">"Abitudine"</string> <string name="main_activity_title">"Abitudini"</string>
<string name="action_settings">"Impostazioni"</string> <string name="action_settings">"Impostazioni"</string>
<string name="edit">"Modifica"</string> <string name="edit">"Modifica"</string>
<string name="delete">"Elimina"</string> <string name="delete">"Elimina"</string>
<string name="archive">"Archivia"</string> <string name="archive">"Archivia"</string>
<string name="unarchive">"Ripristina"</string> <string name="unarchive">"Ripristina"</string>
<string name="add_habit">"Aggiungi abitudine"</string> <string name="add_habit">"Aggiungi"</string>
<string name="color_picker_default_title">"Cambia il colore"</string> <string name="color_picker_default_title">"Cambia colore"</string>
<string name="toast_habit_created">"Abitudine creata."</string> <string name="toast_habit_created">"Abitudine creata."</string>
<string name="toast_habit_deleted">"Abitudine rimossa."</string> <string name="toast_habit_deleted">"Abitudine rimossa."</string>
<string name="toast_habit_restored">"Abitudine ripristinata."</string> <string name="toast_habit_restored">"Abitudine ripristinata."</string>

@ -1,23 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 naofumi
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"ループ習慣トラッカー"</string> <string name="app_name">"ループ習慣トラッカー"</string>
<string name="main_activity_title">"習慣"</string> <string name="main_activity_title">"習慣"</string>
@ -130,5 +111,5 @@ Android Wear 端末から直接、リマインダーをチェック、スヌー
<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". --> <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
<string name="version_n">"バージョン %s"</string> <string name="version_n">"バージョン %s"</string>
<string name="frequency">周波数</string> <string name="frequency">"周波数"</string>
</resources> </resources>

@ -1,22 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Adam Jurkiewicz
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"Śledzenie Nawyków Loop"</string> <string name="app_name">"Śledzenie Nawyków Loop"</string>
<string name="main_activity_title">"Nawyki"</string> <string name="main_activity_title">"Nawyki"</string>
@ -108,9 +90,9 @@
<!-- Short description used on the Google Play store. There is an 80-character limit. --> <!-- Short description used on the Google Play store. There is an 80-character limit. -->
<string name="store_short_description">"Twórz dobre nawyki i śledź ich postęp (bez reklam)"</string> <string name="store_short_description">"Twórz dobre nawyki i śledź ich postęp (bez reklam)"</string>
<string name="store_description_1">"Loop pozwala Ci na tworzenie i utrzymywanie dobrych nawyków, pozwala na Ci na osiągnięcie Twoich długoterminowych celów. Szczegółowe grafiki i statystyki pozwalają na zobaczenie jak Twoje nawyki polepszyły się. Jest całkowicie wolna od reklam i open source."</string> <string name="store_description_1">"Loop pozwala Ci na tworzenie i utrzymywanie dobrych nawyków, dzięki czemu pomoże osiągnąć Twoje długoterminowe cele. Szczegółowe grafiki i statystyki pozwalają na zobaczenie jak Twoje nawyki polepszyły się. Jest całkowicie wolna od reklam i open source."</string>
<string name="store_feature_interface">"&lt;b&gt;Prosty, piękny i nowoczesny interfejs&lt;/b&gt; <string name="store_feature_interface">"&lt;b&gt;Prosty, piękny i nowoczesny interfejs&lt;/b&gt;
Loop posiada minimalistyczny interfejs, który jest prosty do użycia i przestrzega zasad material design."</string> Loop posiada minimalistyczny interfejs, który jest prosty do użycia i przestrzega zasad Material Design."</string>
<string name="store_feature_score">"&lt;b&gt;Punkty nawyku&lt;/b&gt; <string name="store_feature_score">"&lt;b&gt;Punkty nawyku&lt;/b&gt;
Oprócz pokazywania Twojej aktualnej serii, Loop posiada zaawansowany algorytm obliczania siły Twoich nawyków. Każde powtórzenie nawyku czyni go silniejszymi a każdy opuszczony dzień słabszym. Jednakże kilka opuszczonych dni po dłuższej serii nie zrujnuje Twojego całego postępu."</string> Oprócz pokazywania Twojej aktualnej serii, Loop posiada zaawansowany algorytm obliczania siły Twoich nawyków. Każde powtórzenie nawyku czyni go silniejszymi a każdy opuszczony dzień słabszym. Jednakże kilka opuszczonych dni po dłuższej serii nie zrujnuje Twojego całego postępu."</string>
<string name="store_feature_statistics">"&lt;b&gt;Szczegółowe grafiki i statystyki&lt;/b&gt; <string name="store_feature_statistics">"&lt;b&gt;Szczegółowe grafiki i statystyki&lt;/b&gt;

@ -1,110 +1,116 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">Loop Habit Tracker</string> <string name="app_name">"Hábitos"</string>
<string name="action_settings">Configurações</string> <string name="main_activity_title">"Hábitos"</string>
<string name="add_habit">Adicionar hábito</string> <string name="action_settings">"Configurações"</string>
<string name="archive">Arquivar</string> <string name="edit">"Editar"</string>
<string name="check">Marcar</string> <string name="delete">"Deletar"</string>
<string name="clear">Limpar</string> <string name="archive">"Arquivar"</string>
<string name="clear_label">Limpar</string> <string name="unarchive">"Desarquivar"</string>
<string name="color_picker_default_title">Mudar cor</string> <string name="add_habit">"Adicionar hábito"</string>
<string name="create_habit">Criar hábito</string> <string name="color_picker_default_title">"Mudar cor"</string>
<string name="days">dias</string> <string name="toast_habit_created">"Hábito criado."</string>
<string name="delete">Deletar</string> <string name="toast_habit_deleted">"Hábito deletado."</string>
<string name="description_hint">Pergunta (por ex., \"você meditou hoje?\")</string> <string name="toast_habit_restored">"Hábitos restaurados."</string>
<string name="discard">Cancelar</string> <string name="toast_nothing_to_undo">"Nada para desfazer."</string>
<string name="edit">Editar</string> <string name="toast_nothing_to_redo">"Nada para refazer."</string>
<string name="edit_habit">Editar hábito</string> <string name="toast_habit_changed">"Hábito modificado."</string>
<string name="habit_strength">Estabilidade</string>
<string name="history">Histórico</string> <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
<string name="interval_15_minutes">15 minutos</string> <string name="toast_habit_changed_back">"Hábito restaurado."</string>
<string name="interval_1_hour">1 hora</string> <string name="toast_habit_archived">"Hábitos arquivados."</string>
<string name="interval_2_hour">2 horas</string> <string name="toast_habit_unarchived">"Hábitos restaurados."</string>
<string name="interval_30_minutes">30 minutos</string> <string name="overview">"Visão geral"</string>
<string name="interval_4_hour">4 horas</string> <string name="habit_strength">"Estabilidade"</string>
<string name="interval_8_hour">8 horas</string> <string name="history">"Histórico"</string>
<string name="intro_title_1">Bem vindo</string> <string name="clear">"Limpar"</string>
<string name="long_press_to_toggle">Sustente por um segundo para marcar ou desmarcar</string> <string name="description_hint">"Pergunta (por ex., \"você meditou hoje?\")"</string>
<string name="main_activity_title">Hábitos</string>
<string name="overview">Visão geral</string> <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
<string name="reminder">Lembrete</string> <string name="repeat">"Repetir"</string>
<string name="reminder_off">Desligado</string> <string name="times_every">"vezes em"</string>
<string name="repeat">Repetir</string> <string name="days">"dias"</string>
<string name="save">Salvar</string> <string name="reminder">"Lembrete"</string>
<string name="select_day">Selecionar mês e dia</string> <string name="discard">"Cancelar"</string>
<string name="select_hours">Selecionar horas</string> <string name="save">"Salvar"</string>
<string name="select_minutes">Selecionar minutos</string> <string name="streaks">"Correntes"</string>
<string name="select_year">Selecionar ano</string> <string name="no_habits_found">"Você não tem nenhum hábito ativo"</string>
<string name="snooze">Mais tarde</string> <string name="long_press_to_toggle">"Sustente por um segundo para marcar ou desmarcar"</string>
<string name="streaks">Correntes</string> <string name="reminder_off">"Desligado"</string>
<string name="no_habits_found">Você não tem nenhum hábito ativo</string> <string name="validation_name_should_not_be_blank">"Nome não pode ficar em branco."</string>
<string name="toast_habit_archived">Hábitos arquivados.</string> <string name="validation_number_should_be_positive">"Número precisa ser positivo."</string>
<string name="toast_habit_changed">Hábito modificado.</string> <string name="validation_at_most_one_rep_per_day">"Você pode ter no máximo uma repetição por dia."</string>
<string name="toast_habit_changed_back">Hábito restaurado.</string> <string name="create_habit">"Criar hábito"</string>
<string name="toast_habit_created">Hábito criado.</string> <string name="edit_habit">"Editar hábito"</string>
<string name="toast_habit_deleted">Hábito deletado.</string> <string name="check">"Marcar"</string>
<string name="toast_habit_unarchived">Hábitos restaurados.</string> <string name="snooze">"Mais tarde"</string>
<string name="toast_nothing_to_redo">Nada para refazer.</string>
<string name="toast_nothing_to_undo">Nada para desfazer.</string> <!-- App introduction -->
<string name="unarchive">Desarquivar</string> <string name="intro_title_1">"Bem vindo"</string>
<string name="validation_at_most_one_rep_per_day">Você pode ter no máximo uma repetição por dia.</string> <string name="intro_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos."</string>
<string name="validation_name_should_not_be_blank">Nome não pode ficar em branco.</string> <string name="intro_title_2">"Adicione alguns hábitos"</string>
<string name="validation_number_should_be_positive">Número precisa ser positivo.</string> <string name="intro_description_2">"Todo dia, depois de praticar o seu hábito, marque no aplicativo."</string>
<string name="done_label">Pronto</string> <string name="intro_title_3">"Continue praticando"</string>
<string name="pref_view_source_code">Ver código-fonte no GitHub</string> <string name="intro_description_3">"Hábitos praticados regularmente por um longo período recebem uma estrela."</string>
<string name="pref_view_app_introduction">Assistir introdução ao aplicativo</string> <string name="intro_title_4">"Acompanhe o seu progresso"</string>
<string name="pref_toggle_title">Marcar repetições com um toque curto</string> <string name="intro_description_4">"Veja como seus hábitos estão progredindo através de diagramas."</string>
<string name="pref_toggle_description">Mais conveniente, mas pode causar marcações acidentais</string> <string name="interval_15_minutes">"15 minutos"</string>
<string name="pref_snooze_interval_title">Duração do \"mais tarde\" nos lembretes</string> <string name="interval_30_minutes">"30 minutos"</string>
<string name="pref_send_feedback">Mandar sugestões para o desenvolvedor</string> <string name="interval_1_hour">"1 hora"</string>
<string name="pref_rate_this_app">Avaliar esse app no Google Play</string> <string name="interval_2_hour">"2 horas"</string>
<string name="links">Links</string> <string name="interval_4_hour">"4 horas"</string>
<string name="behavior">Interação</string> <string name="interval_8_hour">"8 horas"</string>
<string name="name">Nome</string> <string name="pref_toggle_title">"Marcar repetições com um toque curto"</string>
<string name="times_every">vezes em</string> <string name="pref_toggle_description">"Mais conveniente, mas pode causar marcações acidentais"</string>
<string name="show_archived">Mostrar hábitos arquivados</string> <string name="pref_snooze_interval_title">"Duração do \"mais tarde\" nos lembretes"</string>
<string name="snooze_interval">Duração do \"mais tarde\"</string> <string name="pref_rate_this_app">"Avaliar esse app no Google Play"</string>
<string name="settings">Configurações</string> <string name="pref_send_feedback">"Mandar sugestões para o desenvolvedor"</string>
<string name="intro_description_1">Loop é um aplicativo que te ajuda a criar e manter bons hábitos.</string> <string name="pref_view_source_code">"Ver código-fonte no GitHub"</string>
<string name="intro_title_2">Adicione alguns hábitos</string> <string name="pref_view_app_introduction">"Assistir introdução ao aplicativo"</string>
<string name="intro_description_2">Todo dia, depois de praticar o seu hábito, marque no aplicativo.</string> <string name="links">"Links"</string>
<string name="intro_description_3">Hábitos praticados regularmente por um longo período recebem uma estrela.</string> <string name="behavior">"Interação"</string>
<string name="intro_title_3">Continue praticando</string> <string name="name">"Nome"</string>
<string name="intro_title_4">Acompanhe o seu progresso</string> <string name="show_archived">"Mostrar hábitos arquivados"</string>
<string name="intro_description_4">Veja como seus hábitos estão progredindo através de diagramas.</string> <string name="settings">"Configurações"</string>
<string name="hint_title">Dica</string> <string name="snooze_interval">"Duração do \"mais tarde\""</string>
<string name="hint_drag">Para mudar a ordem dos hábitos, aperte no nome do hábito, sustente e arraste.</string> <string name="hint_title">"Dica"</string>
<string name="hint_landscape">Para ver mais dias, coloque seu aparelho em modo paisagem.</string> <string name="hint_drag">"Para mudar a ordem dos hábitos, aperte no nome do hábito, sustente e arraste."</string>
<string name="delete_habits">Deletar hábitos</string> <string name="hint_landscape">"Para ver mais dias, coloque seu aparelho em modo paisagem."</string>
<string name="toast_habit_restored">Hábitos restaurados.</string> <string name="delete_habits">"Deletar hábitos"</string>
<string name="delete_habits_message">Os hábitos escolhidos serão deletados permanentemente. Esta ação não pode ser desfeita.</string> <string name="delete_habits_message">"Os hábitos escolhidos serão deletados permanentemente. Esta ação não pode ser desfeita."</string>
<string name="weekends">Fim de semana</string> <string name="weekends">"Fim de semana"</string>
<string name="any_weekday">Segunda a sexta</string> <string name="any_weekday">"Segunda a sexta"</string>
<string name="any_day">Qualquer dia</string> <string name="any_day">"Qualquer dia"</string>
<string name="select_weekdays">Selecionar dias</string> <string name="select_weekdays">"Selecionar dias"</string>
<string name="export_to_csv">Exportar dados</string> <string name="export_to_csv">"Exportar dados"</string>
<string name="about">Sobre</string> <string name="done_label">"Pronto"</string>
<string name="developers">Desenvolvedores</string> <string name="clear_label">"Limpar"</string>
<string name="translators">Tradutores</string> <string name="select_hours">"Selecionar horas"</string>
<string name="version_n">Versão %s</string> <string name="select_minutes">"Selecionar minutos"</string>
<string name="frequency">Frequência</string>
<!-- Short description used on the Google Play store. There is an 80-character limit. -->
<string name="store_short_description">"Acompanhe o progresso dos seus hábitos com o passar do tempo (sem anúncios)"</string>
<string name="store_description_1">"Loop é um aplicativo que te ajuda a criar e manter bons hábitos, permitindo que você alcance os seus objetivos de longo prazo. Gráficos e estatísticas te mostram em detalhe como os teus hábitos progrediram ao passar do tempo. Este aplicativo não tem propagandas e é Open Source."</string>
<string name="store_feature_interface">"&lt;b&gt;Interface bonita, moderna e simples&lt;/b&gt;
Loop tem uma interface minimalista bem simples de se usar, e segue o novo visual Material Design."</string>
<string name="store_feature_score">"&lt;b&gt;Estabilidade dos hábitos&lt;/b&gt;
Além de mostrar quantos dias seguidos você praticou cada rotina, Loop também conta com um avançado algoritmo para calcular a estabilidade dos seus hábitos. Cada repetição melhora a estabilidade do hábito, e cada dia de folga piora a estabilidade. Alguns dias de folga após um longo período perfeito, no entanto, não destruirá por completo o teu progresso."</string>
<string name="store_feature_statistics">"&lt;b&gt;Gráficos e estatísticas detalhadas&lt;/b&gt;
Veja claramente como os teus hábitos estão progredindo com o passar do tempo, através de bonitos e detalhados diagramas. O histórico completo de cada hábito fica arquivado."</string>
<string name="store_feature_schedules">"&lt;b&gt;Rotina flexível&lt;/b&gt;
Loop aceita tanto hábitos diários, quanto hábitos com rotinas mais complexas, como 3 vezes por semana; uma vez a cada duas semanas; ou uma vez a cada dois dias."</string>
<string name="store_feature_reminders">"&lt;b&gt;Lembretes&lt;/b&gt;
É possível criar lembretes individuais para cada hábito, na hora do dia em que você escolher. Marque como completado diretamente da barra de notificação, sem precisar abrir o aplicativo."</string>
<string name="store_feature_opensource">"&lt;b&gt;Completamente sem propagandas e Open Source&lt;/b&gt;
Não há nenhum anúncio neste aplicativo, nem notificações chatas ou permissões intrusivas; e será assim para sempre. O código fonte completo está disponível sob a licença livre GPLv3."</string>
<string name="store_feature_wear">"&lt;b&gt;Otimizado para relógios inteligentes&lt;/b&gt;
Lembretes podem ser marcados ou ignorados diretamente a partir do seu relógio Android Wear."</string>
<string name="about">"Sobre"</string>
<string name="translators">"Tradutores"</string>
<string name="developers">"Desenvolvedores"</string>
<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
<!-- Fuzzy -->
<string name="version_n">"Versão %s"</string>
<string name="frequency">"Frequência"</string>
</resources> </resources>

@ -1,23 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Dmitriy Bogdanov
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"Трекер привычек Loop"</string> <string name="app_name">"Трекер привычек Loop"</string>
<string name="main_activity_title">"Привычки"</string> <string name="main_activity_title">"Привычки"</string>

@ -1,24 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 dalecarlian
~ Copyright (C) 2016 Robin
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">"Loop Habit Tracker"</string> <string name="app_name">"Loop Habit Tracker"</string>
<string name="main_activity_title">"Vanor"</string> <string name="main_activity_title">"Vanor"</string>
@ -47,13 +27,16 @@
<string name="description_hint">"Fråga (Har du ... idag?)"</string> <string name="description_hint">"Fråga (Har du ... idag?)"</string>
<!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. --> <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
<string name="repeat">"Repetera"</string> <string name="repeat">"Upprepa"</string>
<!-- A bit unclear on where this is going in. Is it a part of a sentence? --> <!-- A bit unclear on where this is going in. Is it a part of a sentence? -->
<string name="times_every">"gånger varje"</string> <!-- Fuzzy -->
<string name="days">"dagar"</string> <string name="times_every">"gånger var"</string>
<!-- Fuzzy -->
<string name="days">"dag"</string>
<string name="reminder">"Påminnelse"</string> <string name="reminder">"Påminnelse"</string>
<string name="discard">"Kasta bort"</string> <string name="discard">"Avbryt"</string>
<string name="save">"Spara"</string> <string name="save">"Spara"</string>
<string name="streaks">"Framgångar"</string> <string name="streaks">"Framgångar"</string>
<string name="no_habits_found">"Du har inga aktiva vanor"</string> <string name="no_habits_found">"Du har inga aktiva vanor"</string>
@ -61,7 +44,7 @@
<string name="reminder_off">"Av"</string> <string name="reminder_off">"Av"</string>
<string name="validation_name_should_not_be_blank">"Namn får inte vara blank."</string> <string name="validation_name_should_not_be_blank">"Namn får inte vara blank."</string>
<string name="validation_number_should_be_positive">"Nummer måste vara positiv."</string> <string name="validation_number_should_be_positive">"Nummer måste vara positiv."</string>
<string name="validation_at_most_one_rep_per_day">"Du har som mest en repetition per dag"</string> <string name="validation_at_most_one_rep_per_day">"Du kan ha max en upprepning per dag"</string>
<string name="create_habit">"Skapa vana"</string> <string name="create_habit">"Skapa vana"</string>
<string name="edit_habit">"Redigera vana"</string> <string name="edit_habit">"Redigera vana"</string>
<string name="check">"Markera"</string> <string name="check">"Markera"</string>

@ -1,120 +1,115 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Limin Lu
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources> <resources>
<string name="app_name">循环习惯记录</string> <string name="app_name">"循环习惯记录"</string>
<string name="main_activity_title">习惯</string> <string name="main_activity_title">"习惯"</string>
<string name="action_settings">设置</string> <string name="action_settings">"设置"</string>
<string name="edit">编辑</string> <string name="edit">"编辑"</string>
<string name="delete">删除</string> <string name="delete">"删除"</string>
<string name="archive">存档</string> <string name="archive">"存档"</string>
<string name="unarchive">取消存档</string> <string name="unarchive">"取消存档"</string>
<string name="add_habit">添加新习惯</string> <string name="add_habit">"添加新习惯"</string>
<string name="color_picker_default_title">选择颜色</string> <string name="color_picker_default_title">"选择颜色"</string>
<string name="toast_habit_created">"习惯建成."</string>
<string name="toast_habit_created">习惯建成.</string> <string name="toast_habit_deleted">"习惯删除."</string>
<string name="toast_habit_deleted">习惯删除.</string> <string name="toast_habit_restored">"习惯恢复成功"</string>
<string name="toast_nothing_to_undo">Nothing to undo.</string> <string name="toast_nothing_to_undo">"Nothing to undo."</string>
<string name="toast_nothing_to_redo">Nothing to redo.</string> <string name="toast_nothing_to_redo">"Nothing to redo."</string>
<string name="toast_habit_changed">习惯修改了.</string> <string name="toast_habit_changed">"习惯修改了."</string>
<string name="toast_habit_changed_back">取消了修改.</string>
<string name="toast_habit_archived">习惯存档成功.</string>
<string name="toast_habit_unarchived">习惯取消存档成功.</string>
<!-- Date and time picker --> <!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
<string name="done_label">完陈</string> <string name="toast_habit_changed_back">"取消了修改."</string>
<string name="clear_label">取消</string> <string name="toast_habit_archived">"习惯存档成功."</string>
<string name="select_hours">选择小时</string> <string name="toast_habit_unarchived">"习惯取消存档成功."</string>
<string name="select_minutes">选择分钟</string> <string name="overview">"总览"</string>
<string name="habit_strength">"习惯强度"</string>
<string name="history">"历史"</string>
<string name="clear">"取消"</string>
<string name="description_hint">"提醒问题你xxx了吗"</string>
<string name="overview">总览</string> <!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
<string name="habit_strength">习惯强度</string> <string name="repeat">"重复"</string>
<string name="history">历史</string> <string name="times_every">"次每"</string>
<string name="clear">取消</string> <string name="days">"天"</string>
<string name="description_hint">提醒问题你xxx了吗</string> <string name="reminder">"提醒"</string>
<string name="repeat">重复</string> <string name="discard">"丢弃"</string>
<string name="times_every">次每</string> <string name="save">"保存"</string>
<string name="days"></string> <string name="streaks">"链条"</string>
<string name="reminder">提醒</string> <string name="no_habits_found">"你没有习惯"</string>
<string name="discard">丢弃</string> <string name="long_press_to_toggle">"长按 标记/取消标记"</string>
<string name="save">保存</string> <string name="reminder_off">"关"</string>
<string name="streaks">链条</string> <string name="validation_name_should_not_be_blank">"名字不能是空白."</string>
<string name="no_habits_found">你没有习惯</string> <string name="validation_number_should_be_positive">"数字必须大于零."</string>
<string name="long_press_to_toggle">长按 标记/取消标记</string> <string name="validation_at_most_one_rep_per_day">"每天最多重复一次"</string>
<string name="reminder_off"></string> <string name="create_habit">"新建习惯"</string>
<string name="validation_name_should_not_be_blank">名字不能是空白.</string> <string name="edit_habit">"编辑习惯"</string>
<string name="validation_number_should_be_positive">数字必须大于零.</string> <string name="check">"标记"</string>
<string name="validation_at_most_one_rep_per_day">每天最多重复一次</string> <string name="snooze">"以后再说"</string>
<string name="create_habit">新建习惯</string>
<string name="edit_habit">编辑习惯</string>
<string name="check">标记</string>
<string name="snooze">以后再说</string>
<!-- App introduction --> <!-- App introduction -->
<string name="intro_title_1">欢迎</string> <string name="intro_title_1">"欢迎"</string>
<string name="intro_description_1">循环习惯记录器帮助你建立和维持好习惯.</string> <string name="intro_description_1">"循环习惯记录器帮助你建立和维持好习惯."</string>
<string name="intro_title_2">"建立一些新习惯"</string>
<string name="intro_title_2">建立一些新习惯</string> <string name="intro_description_2">"每天,你完成一项习惯后,在应用上做一个标记"</string>
<string name="intro_description_2">每天,你完成一项习惯后,在应用上做一个标记</string> <string name="intro_title_3">"保持习惯"</string>
<string name="intro_description_3">"你可以得到一个完整的星星在连续性的完成习惯达到一定时间"</string>
<string name="intro_title_3">保持习惯</string> <string name="intro_title_4">"记录你的进步"</string>
<string name="intro_description_3">你可以得到一个完整的星星在连续性的完成习惯达到一定时间</string> <string name="intro_description_4">"详细的图形显示你的进步"</string>
<string name="interval_15_minutes">"15分钟"</string>
<string name="intro_title_4">记录你的进步</string> <string name="interval_30_minutes">"30分钟"</string>
<string name="intro_description_4">详细的图形显示你的进步</string> <string name="interval_1_hour">"1小时"</string>
<string name="interval_2_hour">"2小时"</string>
<string name="interval_4_hour">"4小时"</string>
<string name="interval_8_hour">"8小时"</string>
<string name="pref_toggle_title">"短时间按来记录习惯"</string>
<string name="pref_toggle_description">"更加方便,但有可能造成意外记录"</string>
<string name="pref_snooze_interval_title">"提醒延迟间隔"</string>
<string name="pref_rate_this_app">"评价这个应用在Play商店"</string>
<string name="pref_send_feedback">"发送反馈给开发者"</string>
<string name="pref_view_source_code">"看源代码在GitHub"</string>
<string name="pref_view_app_introduction">"阅读应用介绍"</string>
<string name="links">"链接"</string>
<string name="behavior">"功能"</string>
<string name="name">"名字"</string>
<string name="show_archived">"显示存档的习惯"</string>
<string name="settings">"设置"</string>
<string name="snooze_interval">"延迟时间间隔"</string>
<string name="hint_title">"你知道吗?"</string>
<string name="hint_drag">"如果要重新排列习惯,按住习惯的名字拖到想要的位置"</string>
<string name="hint_landscape">"横过来手机可以看到更多天数的习惯"</string>
<string name="delete_habits">"删除"</string>
<string name="delete_habits_message">"习惯会永久的删除,操作不可恢复"</string>
<string name="weekends">"周末"</string>
<string name="any_weekday">"工作日"</string>
<string name="any_day">"任意"</string>
<string name="select_weekdays">"选择天数"</string>
<string name="export_to_csv">"导出数据"</string>
<string name="done_label">"完成"</string>
<string name="clear_label">"取消"</string>
<string name="select_hours">"选择小时"</string>
<string name="select_minutes">"选择分钟"</string>
<string name="interval_15_minutes">15分钟</string> <!-- Short description used on the Google Play store. There is an 80-character limit. -->
<string name="interval_30_minutes">30分钟</string> <string name="store_short_description">"建立好习惯且随着时间记录你的进步(无广告)"</string>
<string name="interval_1_hour">1小时</string> <string name="store_description_1">"循环帮助你建立和维持好习惯,达到长期目标。详细的图片和数据显示你的进步。完全无广告和开源软件。"</string>
<string name="interval_2_hour">2小时</string> <string name="store_feature_interface">"&lt;b&gt;简单,美观,现代的界面&lt;/b&gt;
<string name="interval_4_hour">4小时</string> 微型界面易于应用。"</string>
<string name="interval_8_hour">8小时</string> <string name="store_feature_score">"&lt;b&gt; 习惯分数&lt;/b&gt;
<string name="pref_toggle_title">短时间按来记录习惯</string> 除了显示你目前的习惯连胜,循环习惯记录有高级的算法计算你的习惯强度。每重复一次习惯能使你的习惯强度加强,每次错过会使习惯强度减弱。然而,几次错过并不会完全破坏你整个的进步。"</string>
<string name="pref_toggle_description">更加方便,但有可能造成意外记录</string> <string name="store_feature_statistics">"&lt;b&gt; 详细的图片和数据分析&lt;/b&gt;
<string name="pref_snooze_interval_title">提醒延迟间隔</string> 详细的图片能清晰的显示随着时间你习惯的进步。往后滚动屏幕可以看完整的历史纪录。"</string>
<string name="pref_rate_this_app">评价这个应用在Play商店</string> <string name="store_feature_schedules">"&lt;b&gt; 灵活的时间表&lt;/b&gt;
<string name="pref_send_feedback">发送反馈给开发者</string> 支持日常习惯或者更加复杂时间间隔的习惯例如每周3次每周1次"</string>
<string name="pref_view_source_code">看源代码在GitHub</string> <string name="store_feature_reminders">"&lt;b&gt;提醒&lt;/b&gt;
<string name="pref_view_app_introduction">阅读应用介绍</string> 在可以选择为每个习惯设置特定的个人提醒。不需要打开应用就可以记录,忽略,或者推迟的习惯。"</string>
<string name="store_feature_opensource">"&lt;b&gt;完全无广告和开源软件&lt;/b&gt;
完全无广告和烦人的提醒并且永远也不会有。完整的代码在GPLv3。"</string>
<string name="store_feature_wear">"&lt;b&gt;可以用在智能手表上&lt;/b&gt;
提醒可以直接在安卓手表上 记录,忽略,或者推迟。"</string>
<string name="about">"关于应用"</string>
<string name="translators">"翻译者"</string>
<string name="developers">"开发者"</string>
<string name="links">链接</string> <!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
<string name="behavior">功能</string> <string name="version_n">"%s版"</string>
<string name="name">名字</string> <string name="frequency">"频率"</string>
<string name="show_archived">显示存档的习惯</string>
<string name="settings">设置</string>
<string name="snooze_interval">延迟时间间隔</string>
<string name="any_day">任意</string>
<string name="any_weekday">工做日</string>
<string name="delete_habits">删除</string>
<string name="delete_habits_message">习惯会永久的删除,操作不可恢复</string>
<string name="hint_drag">如果要重新排列习惯,按住习惯的名字拖到想要的位置</string>
<string name="hint_landscape">横过来手机可以看到更多天数的习惯</string>
<string name="hint_title">你知道吗?</string>
<string name="select_weekdays">选择天数</string>
<string name="toast_habit_restored">习惯恢复成功</string>
<string name="weekends">周末</string>
<string name="about">关于应用</string>
<string name="developers">开发者</string>
<string name="translators">翻译者</string>
<string name="export_to_csv">导出数据</string>
<string name="version_n">%s版</string>
<string name="frequency">频率</string>
</resources> </resources>
Loading…
Cancel
Save