Remove unused resources, update translations

* Brazilian Portuguese (paulohora)
* Russian (xtsrsdn)
pull/46/head
Alex Baker 11 years ago
parent 274e79b725
commit 264686d966

@ -92,10 +92,6 @@ dependencies {
testCompile 'junit:junit:4.10'
testCompile 'org.robolectric:robolectric:2.3-SNAPSHOT'
// hack to get android studio to import libraries
instrumentTestCompile('junit:junit:4.10') {
transitive = false
}
instrumentTestCompile('org.robolectric:robolectric:2.3-SNAPSHOT') {
transitive = false
}
instrumentTestCompile group: 'junit', name: 'junit', version: '4.10', transitive: false
instrumentTestCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT', transitive: false
}

@ -118,19 +118,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
}
}
public static Filter getAssignedByMeFilter(Resources r) {
int themeFlags = ThemeService.getFilterThemeFlags();
Filter f = new Filter(r.getString(R.string.BFE_Assigned),
r.getString(R.string.BFE_Assigned),
new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
Criterion.or(Task.CREATOR_ID.eq(0), Task.CREATOR_ID.eq(ActFmPreferenceService.userId())),
Task.USER_ID.neq(0))),
null);
f.listingIcon = ((BitmapDrawable)r.getDrawable(
ThemeService.getDrawable(R.drawable.filter_assigned, themeFlags))).getBitmap();
return f;
}
/**
* Simple activity for deleting stuff
*

@ -189,16 +189,6 @@ public class ThemeService {
return R.drawable.icn_menu_filters_dark;
case R.drawable.icn_menu_sort_by_size:
return R.drawable.icn_menu_sort_by_size_dark;
case R.drawable.icn_menu_search:
return R.drawable.icn_menu_search_dark;
case R.drawable.icn_menu_friends:
return R.drawable.icn_menu_friends_dark;
case R.drawable.icn_menu_lists:
return R.drawable.icn_menu_lists_dark;
case R.drawable.icn_menu_settings:
return R.drawable.icn_menu_settings_dark;
case R.drawable.filter_assigned:
return R.drawable.filter_assigned_dark;
case R.drawable.filter_calendar:
return R.drawable.filter_calendar_dark;
case R.drawable.filter_inbox:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 817 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="false"
android:drawable="@drawable/header_background"/>
<item android:state_pressed="true" android:state_enabled="true"
android:drawable="@drawable/header_background_pressed"/>
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="true" android:drawable="@drawable/header_background_pressed"/>
</selector>

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="false"
android:drawable="@drawable/header_background_white"/>
<item android:state_pressed="true" android:state_enabled="true"
android:drawable="@drawable/header_background_pressed"/>
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="true" android:drawable="@drawable/header_background_pressed"/>
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 897 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 798 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 924 B

@ -205,7 +205,6 @@
</string-array>
<string name="BFE_Active">Tasques actives</string>
<string name="BFE_Recent">Modificades fa poc</string>
<string name="BFE_Assigned">Assignades</string>
<string name="BFE_Saved_delete">Esborra el filtre</string>
<string name="CFA_filterName_hint">Dona nom al filtre per desar-lo...</string>
<string name="CFA_universe_all">Tasques actives</string>

@ -240,7 +240,6 @@
</string-array>
<string name="BFE_Active">Aktivní úkoly</string>
<string name="BFE_Recent">Nedávno upravené</string>
<string name="BFE_Assigned">Přidělil jsem</string>
<string name="BFE_Saved_delete">Smazat filtr</string>
<string name="CFA_filterName_hint">Pojmenujte tento filtr pro jeho uložení</string>
<string name="CFA_universe_all">Aktivní úkoly</string>

@ -315,7 +315,6 @@
</string-array>
<string name="BFE_Active">Meine Aufgaben</string>
<string name="BFE_Recent">Kürzlich bearbeitet</string>
<string name="BFE_Assigned">Ich habe zugeordnet</string>
<string name="BFE_Saved_delete">Filter löschen</string>
<string name="CFA_filterName_hint">Benennen Sie den Filter, um ihn zu speichern …</string>
<string name="CFA_universe_all">Aktuelle Aufgaben</string>

@ -311,7 +311,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n</string>
</string-array>
<string name="BFE_Active">Mis Tareas</string>
<string name="BFE_Recent">Recién modificadas</string>
<string name="BFE_Assigned">Yo he asignado</string>
<string name="BFE_Saved_delete">Borrar filtro</string>
<string name="CFA_filterName_hint">Da nombre al filtro para grabarlo...</string>
<string name="CFA_universe_all">Tareas activas</string>

@ -324,7 +324,6 @@
</string-array>
<string name="BFE_Active">Mes tâches</string>
<string name="BFE_Recent">Récemment modifié</string>
<string name="BFE_Assigned">J\'ai attribué</string>
<string name="BFE_Saved_delete">Supprimer le filtre</string>
<string name="CFA_filterName_hint">Donnez un nom à ce filtre pour le sauver...</string>
<string name="CFA_universe_all">Tâches actives</string>

@ -275,7 +275,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
</string-array>
<string name="BFE_Active">Le mie attività</string>
<string name="BFE_Recent">Modificate di recente</string>
<string name="BFE_Assigned">Assegnate da me</string>
<string name="BFE_Saved_delete">Cancella Filtro</string>
<string name="CFA_filterName_hint">Dai un nome al filtro per salvarlo...</string>
<string name="CFA_universe_all">Attività in corso</string>

@ -313,7 +313,6 @@
</string-array>
<string name="BFE_Active">המשימות שלי</string>
<string name="BFE_Recent">עודכנו לאחרונה</string>
<string name="BFE_Assigned">משימות שהטלתי</string>
<string name="BFE_Saved_delete">מַחֲקִי מַסְנֵן</string>
<string name="CFA_filterName_hint">בחר שם לַמַּסְנֵן כדי לשמור אותו...</string>
<string name="CFA_universe_all">משימות פעילות</string>

@ -335,7 +335,6 @@
</string-array>
<string name="BFE_Active">나의 일정</string>
<string name="BFE_Recent">최근에 수정한 일정</string>
<string name="BFE_Assigned">내가 할당한 일정</string>
<string name="BFE_Saved_delete">필터 삭제</string>
<string name="CFA_filterName_hint">저장할 필터 이름을 정하세요...</string>
<string name="CFA_universe_all">실행중인 일정</string>

@ -323,7 +323,6 @@
</string-array>
<string name="BFE_Active">Mijn taken</string>
<string name="BFE_Recent">Onlangs aangepast</string>
<string name="BFE_Assigned">Ik heb toegekend</string>
<string name="BFE_Saved_delete">Filter verwijderen</string>
<string name="CFA_filterName_hint">Naam geven om op te slaan...</string>
<string name="CFA_universe_all">Actieve taken</string>

@ -313,7 +313,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
</string-array>
<string name="BFE_Active">Moje zadania</string>
<string name="BFE_Recent">Niedawno zmodyfikowane</string>
<string name="BFE_Assigned">Przypisałem</string>
<string name="BFE_Saved_delete">Usuń filtr</string>
<string name="CFA_filterName_hint">Nazwij filtr w celu zapisania...</string>
<string name="CFA_universe_all">Aktywne zadania</string>

@ -210,6 +210,7 @@
<string name="EPr_fontSize_desc">Tamanho do texto nas listagens</string>
<string name="EPr_showNotes_title">Mostrar descrição na tarefa</string>
<string name="EPr_edit_screen_options">Editar opções da tela</string>
<string name="EPr_time_increment">Incrementos de 5 minutos</string>
<string name="EPr_use_date_shortcuts">Usar atalhos de data</string>
<string name="EPr_beastMode_desc">Personalize o layout da tela de edição</string>
<string name="EPr_beastMode_reset">Restaurar valores padrão</string>
@ -288,7 +289,6 @@
</string-array>
<string name="BFE_Active">Minhas Tarefas</string>
<string name="BFE_Recent">Modificadas recentemente</string>
<string name="BFE_Assigned">Atribuídas por mim</string>
<string name="BFE_Saved_delete">Excluir Filtro</string>
<string name="CFA_filterName_hint">Nome do filtro a salvar...</string>
<string name="CFA_universe_all">Tarefas ativas</string>

@ -42,6 +42,7 @@
<string name="DLG_error_sdcard">Нет доступа к папке:%s</string>
<string name="DLG_error_sdcard_general">Нет доступа к карте памяти!</string>
<string name="import_file_prompt">Выберите файл для восстановления</string>
<string name="app_name">Разрешенные задачи</string>
<string name="read_permission_label">Право Tasks</string>
<string name="read_permission_desc">чтение и отображение фильтров задач</string>
<string name="write_permission_label">Право Tasks</string>
@ -262,6 +263,8 @@
<string name="AOA_internal_author">Команда Tasks</string>
<string name="TWi_loading">Загрузка...</string>
<string name="WCA_title">Выберите задачи для просмотра…</string>
<string name="feedback_positive_title">Уровень задачи</string>
<string name="feedback_banner_text">Как задачи работают для Вас?</string>
<string name="task_killer_help">Возможно вы используете менеджер задач (%s). По возможности добавьте Tasks в список исключений иначе возможны сложности с напоминаниями.\n</string>
<string name="task_killer_help_ok">Я не хочу убивать Tasks!</string>
<string name="DB_corrupted_title">Поврежденная база данных</string>
@ -312,7 +315,6 @@
</string-array>
<string name="BFE_Active">Мои задания</string>
<string name="BFE_Recent">Недавно изменённые</string>
<string name="BFE_Assigned">Назначенные мной</string>
<string name="BFE_Saved_delete">Удалить фильтр</string>
<string name="CFA_filterName_hint">Задайте имя фильтра для его сохранения…</string>
<string name="CFA_universe_all">Активные задачи</string>
@ -321,6 +323,7 @@
<string name="CFA_type_intersect">и</string>
<string name="CFA_context_chain">%s содержит критерий</string>
<string name="CFA_context_delete">Удалить строку</string>
<string name="CFA_help">Долгое нажатие на пункт для дополнительных опций</string>
<string name="CFA_button_add">Добавить критерий</string>
<string name="CFA_button_view">Просмотр</string>
<string name="CFA_button_save">Сохранить и просмотреть</string>
@ -440,6 +443,7 @@
<string name="TEA_reminder_mode_once">раз</string>
<string name="TEA_reminder_mode_five">Пять раз</string>
<string name="TEA_reminder_mode_nonstop">Пока я не отключу сигнал</string>
<string name="TEA_reminder_when">Когда</string>
<string name="TEA_reminder_overdue_short">просрочена</string>
<string-array name="TEA_reminder_random">
<item>час</item>
@ -602,6 +606,7 @@
<string name="repeat_enabled">Повторения</string>
<string name="repeat_every">С интервалом в %d</string>
<string name="repeat_interval_prompt">Интервал повтора</string>
<string name="repeat_never">Не повторять</string>
<string name="repeat_dont">Не повторять</string>
<string-array name="repeat_interval_short">
<item>д.</item>
@ -688,4 +693,5 @@
<string name="EPr_voiceRemindersEnabled_title">Голосовые напоминания</string>
<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks должен произносить название задач во время напоминаний</string>
<string name="EPr_voiceRemindersEnabled_desc_disabled">Оповещение звуком во время напоминания</string>
<string name="EPr_use_dark_theme_widget">Темная тема виджета</string>
</resources>

@ -283,7 +283,6 @@ och återställer dina aktuella uppgifter från en backup
<item>Vid eller efter förfallodagen</item>
</string-array>
<string name="BFE_Recent">Nyligen ändrade</string>
<string name="BFE_Assigned">Jag har delat ut</string>
<string name="BFE_Saved_delete">Radera filter</string>
<string name="CFA_filterName_hint">Spara detta filter genom att ge det ett namn</string>
<string name="CFA_universe_all">Aktiva uppgifter</string>

@ -267,7 +267,6 @@
<item>Son tarihte ya da aşıldığında</item>
</string-array>
<string name="BFE_Recent">Yakında Değiştirilenler</string>
<string name="BFE_Assigned">Atanmış bulunuyorum</string>
<string name="BFE_Saved_delete">Süzgeci Sil</string>
<string name="CFA_filterName_hint">Süzgeci kaydetmek için ad yazın...</string>
<string name="CFA_universe_all">Etkin Görevler</string>

@ -332,7 +332,6 @@
</string-array>
<string name="BFE_Active">Мої завдання</string>
<string name="BFE_Recent">Недавно змінені</string>
<string name="BFE_Assigned">Призначено мною</string>
<string name="BFE_Saved_delete">Видалити фільтр</string>
<string name="CFA_filterName_hint">Задайте ім\'я фільтра для його збереження ...</string>
<string name="CFA_universe_all">Активні завдання</string>

@ -255,7 +255,6 @@
<item>截止期限或过期时</item>
</string-array>
<string name="BFE_Recent">最近修改过的</string>
<string name="BFE_Assigned">我已经安排</string>
<string name="BFE_Saved_delete">删除筛选</string>
<string name="CFA_filterName_hint">命名筛选并保存...</string>
<string name="CFA_universe_all">进行中的任务</string>

@ -274,7 +274,6 @@
<item>在截止期限或過期時</item>
</string-array>
<string name="BFE_Recent">最近修改過</string>
<string name="BFE_Assigned">我已經安排</string>
<string name="BFE_Saved_delete">刪除篩選</string>
<string name="CFA_filterName_hint">命名篩選並儲存...</string>
<string name="CFA_universe_all">進行中的工作</string>

@ -10,8 +10,6 @@
<attr name="asContentBackground" format="color"/>
<attr name="asEditBackground" format="color"/>
<attr name="asEditRowBackground" format="reference"/>
<attr name="asHeaderBackground" format="reference"/>
<attr name="asHeaderButtonBackground" format="reference"/>
<attr name="asTextColor" format="color"/>
<attr name="asTextColorInverse" format="color"/>
<attr name="asDetailsColor" format="color"/>
@ -19,9 +17,6 @@
<attr name="asDueDateOverdueColor" format="color"/>
<attr name="asDueDateCompletedColor" format="color"/>
<attr name="asFilterHeaderColor" format="color"/>
<attr name="asFilterHeaderBackground" format="reference"/>
<attr name="asFilterCountColor" format="color"/>
<attr name="asMembersHeaderBackground" format="color"/>
<attr name="asSeparatorBackground" format="color"/>
<attr name="asListDividerColor" format="color"/>

@ -6,21 +6,13 @@
-->
<resources>
<color name="task_list_overdue">#FFFB6666</color>
<color name="task_list_normal">#FFFFFFFF</color>
<color name="task_list_done">#ff777777</color>
<!-- font colors when colored by importance -->
<color name="task_list_importance_1">#ffffffff</color>
<color name="task_list_importance_2">#ffcfcfcf</color>
<color name="task_list_importance_3">#ffb8b8b8</color>
<color name="task_list_importance_4">#ffa0a0a0</color>
<color name="task_edit_deadline_gray">#888888</color>
<color name="blue_theme_color">#33b5e5</color>
<color name="red_theme_color">#d90000</color>
<color name="dark_blue_theme_color">#1f78b4</color>
<color name="tablet_list_selected">#000000</color>
<color name="reminder_background">#262626</color>
<color name="task_edit_selected">#385487</color>
@ -32,6 +24,5 @@
<color name="widget_body_dark">#dd000000</color>
<color name="task_row_bg_dark_pressed">#303030</color>
<color name="task_row_bg_white_pressed">#dde1eb</color>
</resources>

@ -1,25 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Resources for built-in filter plug-in -->
<!-- ================================================= Filter Exposer == -->
<!-- Active Tasks Filter -->
<string name="BFE_Active">My Tasks</string>
<!-- Search Filter -->
<!-- slide 10b: Recently Modified -->
<string name="BFE_Recent">Recently Modified</string>
<!-- slide 10c: I've assigned -->
<string name="BFE_Assigned">I\'ve Assigned</string>
<!-- Build Your Own Filter -->
<!-- Saved Filters Header -->
<!-- Saved Filters Context Menu: delete -->
<string name="BFE_Saved_delete">Delete Filter</string>
@ -28,8 +17,6 @@
<!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
<string name="CFA_filterName_hint">Name this filter to save it...</string>
<!-- Filter Name default for copied filters (%s => old filter name) -->
<!-- slide 30a: Filter Starting Universe: all tasks -->
<string name="CFA_universe_all">Active Tasks</string>

@ -11,7 +11,6 @@
<style name="Theme" parent="@style/Theme.Sherlock">
<item name="android:windowBackground">@null</item>
<item name="asContentBackground">@android:color/black</item>
<item name="asHeaderButtonBackground">@drawable/header_button</item>
<item name="asTextColor">#ffffff</item>
<item name="asTextColorInverse">#000000</item>
<item name="asDetailsColor">#777777</item>
@ -19,8 +18,6 @@
<item name="asDueDateOverdueColor">#ee5555</item>
<item name="asDueDateCompletedColor">#ff777777</item>
<item name="asFilterHeaderColor">#cccccc</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">#909090</item>
<item name="asSeparatorBackground">#888888</item>
<item name="asListDividerColor">#555555</item>
<item name="asEditTextBackground">@null</item>
@ -67,14 +64,11 @@
<style name="Theme.White" parent="@style/Theme.Sherlock.Light">
<item name="asContentBackground">@android:color/white</item>
<item name="asEditBackground">#e5e5e5</item>
<item name="asHeaderButtonBackground">@drawable/header_button_white</item>
<item name="asTextColor">#000000</item>
<item name="asTextColorInverse">#ffffff</item>
<item name="asDetailsColor">#6666aa</item>
<item name="asDueDateColor">#878787</item>
<item name="asFilterHeaderColor">#ffffff</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
<item name="asMembersHeaderBackground">#d0d0d0</item>
<item name="asListDividerColor">#dddddd</item>
<item name="asEditRowBackground">@drawable/task_edit_background_white</item>
<item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
@ -124,15 +118,12 @@
<style name="Theme.Dialog" parent="@android:style/Theme.Dialog">
<!--<item name="android:windowBackground">@null</item>-->
<item name="asContentBackground">@android:color/black</item>
<item name="asHeaderButtonBackground">@drawable/header_button</item>
<item name="asTextColor">#ffffffff</item>
<item name="asDetailsColor">#ff777777</item>
<item name="asDueDateColor">#ff7777aa</item>
<item name="asDueDateOverdueColor">#ffee5555</item>
<item name="asDueDateCompletedColor">#ff777777</item>
<item name="asFilterHeaderColor">#ffcccccc</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">#d0d0d0</item>
<item name="asSeparatorBackground">#888888</item>
<!-- actionbar-styling -->
<item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog</item>
@ -169,13 +160,10 @@
<style name="Theme.Dialog.White">
<item name="asContentBackground">@android:color/white</item>
<item name="asHeaderButtonBackground">@drawable/header_button_white</item>
<item name="asTextColor">#ff000000</item>
<item name="asDetailsColor">#ff6666aa</item>
<item name="asDueDateColor">#878787</item>
<item name="asFilterHeaderColor">#ffffff</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
<item name="asMembersHeaderBackground">#d0d0d0</item>
<!-- actionbar-styling -->
<item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog.White</item>
<item name="actionBarStyle">@style/AstridActionBarStyle.Dialog.White</item>

@ -3,11 +3,16 @@ files.each do |path|
file = File.new(path)
file.read.scan(/<string name="(.*)">/) do |match|
result = `git grep R.string.#{match[0]} astrid api` + `git grep string\/#{match[0]} astrid api`
puts "#{path} - #{match}" if result.empty?
puts "#{path} - #{match[0]}" if result.empty?
end
file = File.new(path)
file.read.scan(/<string-array name="(.*)">/) do |match|
result = `git grep R.array.#{match[0]} astrid api` + `git grep array\/#{match[0]} astrid api`
puts "#{path} - #{match}" if result.empty?
puts "#{path} - #{match[0]}" if result.empty?
end
end
file = File.new('astrid/src/main/res/values/attrs.xml')
file.read.scan(/<attr name="(.*)" format=".*"\/>/) do |match|
result = `git grep R.attr.#{match[0]} astrid api` + `git grep "?attr/#{match[0]}" astrid api`
puts "#{file.path} - #{match[0]}" if result.empty?
end

Loading…
Cancel
Save