diff options
Diffstat (limited to 'main/res')
206 files changed, 2092 insertions, 2455 deletions
diff --git a/main/res/drawable-hdpi/actionbar_home.png b/main/res/drawable-hdpi/actionbar_home.png Binary files differdeleted file mode 100644 index a5a1a8c..0000000 --- a/main/res/drawable-hdpi/actionbar_home.png +++ /dev/null diff --git a/main/res/drawable-hdpi/actionbar_map.png b/main/res/drawable-hdpi/actionbar_map.png Binary files differdeleted file mode 100644 index 0daa215..0000000 --- a/main/res/drawable-hdpi/actionbar_map.png +++ /dev/null diff --git a/main/res/drawable-hdpi/actionbar_mylocation_off.png b/main/res/drawable-hdpi/actionbar_mylocation_off.png Binary files differdeleted file mode 100644 index 17d61db..0000000 --- a/main/res/drawable-hdpi/actionbar_mylocation_off.png +++ /dev/null diff --git a/main/res/drawable-hdpi/actionbar_mylocation_on.png b/main/res/drawable-hdpi/actionbar_mylocation_on.png Binary files differdeleted file mode 100644 index 1f21901..0000000 --- a/main/res/drawable-hdpi/actionbar_mylocation_on.png +++ /dev/null diff --git a/main/res/drawable-hdpi/actionbar_search.png b/main/res/drawable-hdpi/actionbar_search.png Binary files differdeleted file mode 100644 index 59de344..0000000 --- a/main/res/drawable-hdpi/actionbar_search.png +++ /dev/null diff --git a/main/res/drawable-hdpi/ic_menu_account_list.png b/main/res/drawable-hdpi/ic_menu_account_list.png Binary files differindex f858d2c..0f17170 100644 --- a/main/res/drawable-hdpi/ic_menu_account_list.png +++ b/main/res/drawable-hdpi/ic_menu_account_list.png diff --git a/main/res/drawable-hdpi/ic_menu_add.png b/main/res/drawable-hdpi/ic_menu_add.png Binary files differindex 65cc01e..444e8a5 100644 --- a/main/res/drawable-hdpi/ic_menu_add.png +++ b/main/res/drawable-hdpi/ic_menu_add.png diff --git a/main/res/drawable-hdpi/ic_menu_agenda.png b/main/res/drawable-hdpi/ic_menu_agenda.png Binary files differindex 6bb5cc8..9e08c29 100644 --- a/main/res/drawable-hdpi/ic_menu_agenda.png +++ b/main/res/drawable-hdpi/ic_menu_agenda.png diff --git a/main/res/drawable-hdpi/ic_menu_clear_playlist.png b/main/res/drawable-hdpi/ic_menu_clear_playlist.png Binary files differindex 0c3e06d..84a4a5b 100644 --- a/main/res/drawable-hdpi/ic_menu_clear_playlist.png +++ b/main/res/drawable-hdpi/ic_menu_clear_playlist.png diff --git a/main/res/drawable-hdpi/ic_menu_compass.png b/main/res/drawable-hdpi/ic_menu_compass.png Binary files differindex 104270f..39760f8 100644 --- a/main/res/drawable-hdpi/ic_menu_compass.png +++ b/main/res/drawable-hdpi/ic_menu_compass.png diff --git a/main/res/drawable-hdpi/ic_menu_delete.png b/main/res/drawable-hdpi/ic_menu_delete.png Binary files differindex 2aed26a..24d8f6a 100644 --- a/main/res/drawable-hdpi/ic_menu_delete.png +++ b/main/res/drawable-hdpi/ic_menu_delete.png diff --git a/main/res/drawable-hdpi/ic_menu_edit.png b/main/res/drawable-hdpi/ic_menu_edit.png Binary files differindex 602dd10..9bdba1b 100644 --- a/main/res/drawable-hdpi/ic_menu_edit.png +++ b/main/res/drawable-hdpi/ic_menu_edit.png diff --git a/main/res/drawable-hdpi/ic_menu_emoticons.png b/main/res/drawable-hdpi/ic_menu_emoticons.png Binary files differindex 4a1f744..16ec4e4 100644 --- a/main/res/drawable-hdpi/ic_menu_emoticons.png +++ b/main/res/drawable-hdpi/ic_menu_emoticons.png diff --git a/main/res/drawable-hdpi/ic_menu_info_details.png b/main/res/drawable-hdpi/ic_menu_info_details.png Binary files differindex 7696ceb..6a7a1e9 100644 --- a/main/res/drawable-hdpi/ic_menu_info_details.png +++ b/main/res/drawable-hdpi/ic_menu_info_details.png diff --git a/main/res/drawable-hdpi/ic_menu_mapmode.png b/main/res/drawable-hdpi/ic_menu_mapmode.png Binary files differindex c895ccb..5ac4a02 100644 --- a/main/res/drawable-hdpi/ic_menu_mapmode.png +++ b/main/res/drawable-hdpi/ic_menu_mapmode.png diff --git a/main/res/drawable-hdpi/ic_menu_mark.png b/main/res/drawable-hdpi/ic_menu_mark.png Binary files differindex 724d787..95a3217 100644 --- a/main/res/drawable-hdpi/ic_menu_mark.png +++ b/main/res/drawable-hdpi/ic_menu_mark.png diff --git a/main/res/drawable-hdpi/ic_menu_mylocation.png b/main/res/drawable-hdpi/ic_menu_mylocation.png Binary files differnew file mode 100644 index 0000000..ba82ee0 --- /dev/null +++ b/main/res/drawable-hdpi/ic_menu_mylocation.png diff --git a/main/res/drawable-hdpi/ic_menu_myplaces.png b/main/res/drawable-hdpi/ic_menu_myplaces.png Binary files differindex 5f726d8..ade7532 100644 --- a/main/res/drawable-hdpi/ic_menu_myplaces.png +++ b/main/res/drawable-hdpi/ic_menu_myplaces.png diff --git a/main/res/drawable-hdpi/ic_menu_preferences.png b/main/res/drawable-hdpi/ic_menu_preferences.png Binary files differindex 81bca4a..5321f82 100644 --- a/main/res/drawable-hdpi/ic_menu_preferences.png +++ b/main/res/drawable-hdpi/ic_menu_preferences.png diff --git a/main/res/drawable-hdpi/ic_menu_recent_history.png b/main/res/drawable-hdpi/ic_menu_recent_history.png Binary files differindex 0dd1627..4101434 100644 --- a/main/res/drawable-hdpi/ic_menu_recent_history.png +++ b/main/res/drawable-hdpi/ic_menu_recent_history.png diff --git a/main/res/drawable-hdpi/ic_menu_refresh.png b/main/res/drawable-hdpi/ic_menu_refresh.png Binary files differindex 53cacca..e13315f 100644 --- a/main/res/drawable-hdpi/ic_menu_refresh.png +++ b/main/res/drawable-hdpi/ic_menu_refresh.png diff --git a/main/res/drawable-hdpi/ic_menu_rotate.png b/main/res/drawable-hdpi/ic_menu_rotate.png Binary files differindex 85115af..09efba4 100644 --- a/main/res/drawable-hdpi/ic_menu_rotate.png +++ b/main/res/drawable-hdpi/ic_menu_rotate.png diff --git a/main/res/drawable-hdpi/ic_menu_save.png b/main/res/drawable-hdpi/ic_menu_save.png Binary files differindex fc26c5d..36fc7f4 100644 --- a/main/res/drawable-hdpi/ic_menu_save.png +++ b/main/res/drawable-hdpi/ic_menu_save.png diff --git a/main/res/drawable-hdpi/ic_menu_set_as.png b/main/res/drawable-hdpi/ic_menu_set_as.png Binary files differindex 7e79c15..41f931b 100644 --- a/main/res/drawable-hdpi/ic_menu_set_as.png +++ b/main/res/drawable-hdpi/ic_menu_set_as.png diff --git a/main/res/drawable-hdpi/ic_menu_share.png b/main/res/drawable-hdpi/ic_menu_share.png Binary files differindex b41b348..2837615 100644 --- a/main/res/drawable-hdpi/ic_menu_share.png +++ b/main/res/drawable-hdpi/ic_menu_share.png diff --git a/main/res/drawable-hdpi/ic_menu_sort_alphabetically.png b/main/res/drawable-hdpi/ic_menu_sort_alphabetically.png Binary files differindex 5d68998..74e6b83 100644 --- a/main/res/drawable-hdpi/ic_menu_sort_alphabetically.png +++ b/main/res/drawable-hdpi/ic_menu_sort_alphabetically.png diff --git a/main/res/drawable-hdpi/ic_menu_sort_by_size.png b/main/res/drawable-hdpi/ic_menu_sort_by_size.png Binary files differdeleted file mode 100644 index c9388fd..0000000 --- a/main/res/drawable-hdpi/ic_menu_sort_by_size.png +++ /dev/null diff --git a/main/res/drawable-hdpi/ic_menu_start_conversation.png b/main/res/drawable-hdpi/ic_menu_start_conversation.png Binary files differindex d63d3a7..395a5ec 100644 --- a/main/res/drawable-hdpi/ic_menu_start_conversation.png +++ b/main/res/drawable-hdpi/ic_menu_start_conversation.png diff --git a/main/res/drawable-ldpi/actionbar_home.png b/main/res/drawable-ldpi/actionbar_home.png Binary files differdeleted file mode 100644 index 2334d7d..0000000 --- a/main/res/drawable-ldpi/actionbar_home.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_map.png b/main/res/drawable-ldpi/actionbar_map.png Binary files differdeleted file mode 100644 index afc108c..0000000 --- a/main/res/drawable-ldpi/actionbar_map.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_mylocation_off.png b/main/res/drawable-ldpi/actionbar_mylocation_off.png Binary files differdeleted file mode 100644 index be0c923..0000000 --- a/main/res/drawable-ldpi/actionbar_mylocation_off.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_mylocation_on.png b/main/res/drawable-ldpi/actionbar_mylocation_on.png Binary files differdeleted file mode 100644 index f137305..0000000 --- a/main/res/drawable-ldpi/actionbar_mylocation_on.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_search.png b/main/res/drawable-ldpi/actionbar_search.png Binary files differdeleted file mode 100644 index f3ce1d9..0000000 --- a/main/res/drawable-ldpi/actionbar_search.png +++ /dev/null diff --git a/main/res/drawable-ldpi/ic_menu_account_list.png b/main/res/drawable-ldpi/ic_menu_account_list.png Binary files differdeleted file mode 100644 index 04ededd..0000000 --- a/main/res/drawable-ldpi/ic_menu_account_list.png +++ /dev/null diff --git a/main/res/drawable-ldpi/ic_menu_clear_playlist.png b/main/res/drawable-ldpi/ic_menu_clear_playlist.png Binary files differdeleted file mode 100644 index f3e6b51..0000000 --- a/main/res/drawable-ldpi/ic_menu_clear_playlist.png +++ /dev/null diff --git a/main/res/drawable-ldpi/ic_menu_mark.png b/main/res/drawable-ldpi/ic_menu_mark.png Binary files differdeleted file mode 100644 index 19bcd03..0000000 --- a/main/res/drawable-ldpi/ic_menu_mark.png +++ /dev/null diff --git a/main/res/drawable-ldpi/ic_menu_more.png b/main/res/drawable-ldpi/ic_menu_more.png Binary files differdeleted file mode 100644 index 62983c6..0000000 --- a/main/res/drawable-ldpi/ic_menu_more.png +++ /dev/null diff --git a/main/res/drawable-ldpi/ic_menu_start_conversation.png b/main/res/drawable-ldpi/ic_menu_start_conversation.png Binary files differdeleted file mode 100644 index 1e39928..0000000 --- a/main/res/drawable-ldpi/ic_menu_start_conversation.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_home.png b/main/res/drawable-mdpi/actionbar_home.png Binary files differdeleted file mode 100644 index e109f0a..0000000 --- a/main/res/drawable-mdpi/actionbar_home.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_map.png b/main/res/drawable-mdpi/actionbar_map.png Binary files differdeleted file mode 100644 index 80287d7..0000000 --- a/main/res/drawable-mdpi/actionbar_map.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_mylocation_off.png b/main/res/drawable-mdpi/actionbar_mylocation_off.png Binary files differdeleted file mode 100644 index 1cdeeba..0000000 --- a/main/res/drawable-mdpi/actionbar_mylocation_off.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_mylocation_on.png b/main/res/drawable-mdpi/actionbar_mylocation_on.png Binary files differdeleted file mode 100644 index 1d1b625..0000000 --- a/main/res/drawable-mdpi/actionbar_mylocation_on.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_search.png b/main/res/drawable-mdpi/actionbar_search.png Binary files differdeleted file mode 100644 index cce7789..0000000 --- a/main/res/drawable-mdpi/actionbar_search.png +++ /dev/null diff --git a/main/res/drawable-mdpi/ic_launcher_browser.png b/main/res/drawable-mdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 0000000..9bc6817 --- /dev/null +++ b/main/res/drawable-mdpi/ic_launcher_browser.png diff --git a/main/res/drawable-mdpi/ic_menu_account_list.png b/main/res/drawable-mdpi/ic_menu_account_list.png Binary files differindex f0945b2..e4e717e 100644 --- a/main/res/drawable-mdpi/ic_menu_account_list.png +++ b/main/res/drawable-mdpi/ic_menu_account_list.png diff --git a/main/res/drawable-mdpi/ic_menu_add.png b/main/res/drawable-mdpi/ic_menu_add.png Binary files differindex 6752bfd..361c7c4 100644 --- a/main/res/drawable-mdpi/ic_menu_add.png +++ b/main/res/drawable-mdpi/ic_menu_add.png diff --git a/main/res/drawable-mdpi/ic_menu_agenda.png b/main/res/drawable-mdpi/ic_menu_agenda.png Binary files differindex 9f2c1dc..c63a12b 100644 --- a/main/res/drawable-mdpi/ic_menu_agenda.png +++ b/main/res/drawable-mdpi/ic_menu_agenda.png diff --git a/main/res/drawable-mdpi/ic_menu_attachment.png b/main/res/drawable-mdpi/ic_menu_attachment.png Binary files differnew file mode 100644 index 0000000..d3d4812 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_attachment.png diff --git a/main/res/drawable-mdpi/ic_menu_clear_playlist.png b/main/res/drawable-mdpi/ic_menu_clear_playlist.png Binary files differindex 750db62..9100a69 100644 --- a/main/res/drawable-mdpi/ic_menu_clear_playlist.png +++ b/main/res/drawable-mdpi/ic_menu_clear_playlist.png diff --git a/main/res/drawable-mdpi/ic_menu_compass.png b/main/res/drawable-mdpi/ic_menu_compass.png Binary files differindex 7717dde..25235cc 100644 --- a/main/res/drawable-mdpi/ic_menu_compass.png +++ b/main/res/drawable-mdpi/ic_menu_compass.png diff --git a/main/res/drawable-mdpi/ic_menu_copy.png b/main/res/drawable-mdpi/ic_menu_copy.png Binary files differnew file mode 100644 index 0000000..eee5540 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_copy.png diff --git a/main/res/drawable-mdpi/ic_menu_delete.png b/main/res/drawable-mdpi/ic_menu_delete.png Binary files differindex 7d95494..e2c8700 100644 --- a/main/res/drawable-mdpi/ic_menu_delete.png +++ b/main/res/drawable-mdpi/ic_menu_delete.png diff --git a/main/res/drawable-mdpi/ic_menu_edit.png b/main/res/drawable-mdpi/ic_menu_edit.png Binary files differindex 41a9c2e..d0314e9 100644 --- a/main/res/drawable-mdpi/ic_menu_edit.png +++ b/main/res/drawable-mdpi/ic_menu_edit.png diff --git a/main/res/drawable-mdpi/ic_menu_emoticons.png b/main/res/drawable-mdpi/ic_menu_emoticons.png Binary files differindex 765000b..8d1780f 100644 --- a/main/res/drawable-mdpi/ic_menu_emoticons.png +++ b/main/res/drawable-mdpi/ic_menu_emoticons.png diff --git a/main/res/drawable-mdpi/ic_menu_info_details.png b/main/res/drawable-mdpi/ic_menu_info_details.png Binary files differindex 1786d1e..18b15b5 100644 --- a/main/res/drawable-mdpi/ic_menu_info_details.png +++ b/main/res/drawable-mdpi/ic_menu_info_details.png diff --git a/main/res/drawable-mdpi/ic_menu_mapmode.png b/main/res/drawable-mdpi/ic_menu_mapmode.png Binary files differindex d85cab5..1b50b5a 100644 --- a/main/res/drawable-mdpi/ic_menu_mapmode.png +++ b/main/res/drawable-mdpi/ic_menu_mapmode.png diff --git a/main/res/drawable-mdpi/ic_menu_mark.png b/main/res/drawable-mdpi/ic_menu_mark.png Binary files differindex 5e95da7..0c55506 100644 --- a/main/res/drawable-mdpi/ic_menu_mark.png +++ b/main/res/drawable-mdpi/ic_menu_mark.png diff --git a/main/res/drawable-mdpi/ic_menu_my_calendar.png b/main/res/drawable-mdpi/ic_menu_my_calendar.png Binary files differnew file mode 100644 index 0000000..991dfb0 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_my_calendar.png diff --git a/main/res/drawable-mdpi/ic_menu_mylocation.png b/main/res/drawable-mdpi/ic_menu_mylocation.png Binary files differnew file mode 100644 index 0000000..2a61a97 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_mylocation.png diff --git a/main/res/drawable-mdpi/ic_menu_mylocation_off.png b/main/res/drawable-mdpi/ic_menu_mylocation_off.png Binary files differnew file mode 100644 index 0000000..00185b9 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_mylocation_off.png diff --git a/main/res/drawable-mdpi/ic_menu_myplaces.png b/main/res/drawable-mdpi/ic_menu_myplaces.png Binary files differindex 06f11ba..75f2c9b 100644 --- a/main/res/drawable-mdpi/ic_menu_myplaces.png +++ b/main/res/drawable-mdpi/ic_menu_myplaces.png diff --git a/main/res/drawable-mdpi/ic_menu_preferences.png b/main/res/drawable-mdpi/ic_menu_preferences.png Binary files differindex 60dbff6..ccc50e6 100644 --- a/main/res/drawable-mdpi/ic_menu_preferences.png +++ b/main/res/drawable-mdpi/ic_menu_preferences.png diff --git a/main/res/drawable-mdpi/ic_menu_recent_history.png b/main/res/drawable-mdpi/ic_menu_recent_history.png Binary files differindex 4ccae5d..e5f8e2d 100644 --- a/main/res/drawable-mdpi/ic_menu_recent_history.png +++ b/main/res/drawable-mdpi/ic_menu_recent_history.png diff --git a/main/res/drawable-mdpi/ic_menu_refresh.png b/main/res/drawable-mdpi/ic_menu_refresh.png Binary files differindex 77d70dd..30b660f 100644 --- a/main/res/drawable-mdpi/ic_menu_refresh.png +++ b/main/res/drawable-mdpi/ic_menu_refresh.png diff --git a/main/res/drawable-mdpi/ic_menu_rotate.png b/main/res/drawable-mdpi/ic_menu_rotate.png Binary files differindex 27368b2..35fa56d 100644 --- a/main/res/drawable-mdpi/ic_menu_rotate.png +++ b/main/res/drawable-mdpi/ic_menu_rotate.png diff --git a/main/res/drawable-mdpi/ic_menu_save.png b/main/res/drawable-mdpi/ic_menu_save.png Binary files differindex 36d50b3..5f66864 100644 --- a/main/res/drawable-mdpi/ic_menu_save.png +++ b/main/res/drawable-mdpi/ic_menu_save.png diff --git a/main/res/drawable-mdpi/ic_menu_send.png b/main/res/drawable-mdpi/ic_menu_send.png Binary files differnew file mode 100644 index 0000000..06b4717 --- /dev/null +++ b/main/res/drawable-mdpi/ic_menu_send.png diff --git a/main/res/drawable-mdpi/ic_menu_set_as.png b/main/res/drawable-mdpi/ic_menu_set_as.png Binary files differindex cb9dc49..98cc305 100644 --- a/main/res/drawable-mdpi/ic_menu_set_as.png +++ b/main/res/drawable-mdpi/ic_menu_set_as.png diff --git a/main/res/drawable-mdpi/ic_menu_share.png b/main/res/drawable-mdpi/ic_menu_share.png Binary files differindex 44db9b1..d89ca5f 100644 --- a/main/res/drawable-mdpi/ic_menu_share.png +++ b/main/res/drawable-mdpi/ic_menu_share.png diff --git a/main/res/drawable-mdpi/ic_menu_sort_alphabetically.png b/main/res/drawable-mdpi/ic_menu_sort_alphabetically.png Binary files differindex 2583eb8..0c5ffad 100644 --- a/main/res/drawable-mdpi/ic_menu_sort_alphabetically.png +++ b/main/res/drawable-mdpi/ic_menu_sort_alphabetically.png diff --git a/main/res/drawable-mdpi/ic_menu_sort_by_size.png b/main/res/drawable-mdpi/ic_menu_sort_by_size.png Binary files differdeleted file mode 100644 index 65e2786..0000000 --- a/main/res/drawable-mdpi/ic_menu_sort_by_size.png +++ /dev/null diff --git a/main/res/drawable-mdpi/ic_menu_start_conversation.png b/main/res/drawable-mdpi/ic_menu_start_conversation.png Binary files differindex aadcc2f..24b6540 100644 --- a/main/res/drawable-mdpi/ic_menu_start_conversation.png +++ b/main/res/drawable-mdpi/ic_menu_start_conversation.png diff --git a/main/res/drawable-xhdpi/ic_launcher_browser.png b/main/res/drawable-xhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 0000000..9412fbe --- /dev/null +++ b/main/res/drawable-xhdpi/ic_launcher_browser.png diff --git a/main/res/drawable-xhdpi/ic_menu_account_list.png b/main/res/drawable-xhdpi/ic_menu_account_list.png Binary files differnew file mode 100644 index 0000000..ebe29b9 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_account_list.png diff --git a/main/res/drawable-xhdpi/ic_menu_add.png b/main/res/drawable-xhdpi/ic_menu_add.png Binary files differnew file mode 100644 index 0000000..7d498a9 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_add.png diff --git a/main/res/drawable-xhdpi/ic_menu_agenda.png b/main/res/drawable-xhdpi/ic_menu_agenda.png Binary files differnew file mode 100644 index 0000000..25e9f11 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_agenda.png diff --git a/main/res/drawable-xhdpi/ic_menu_clear_playlist.png b/main/res/drawable-xhdpi/ic_menu_clear_playlist.png Binary files differnew file mode 100644 index 0000000..8981d6f --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_clear_playlist.png diff --git a/main/res/drawable-xhdpi/ic_menu_compass.png b/main/res/drawable-xhdpi/ic_menu_compass.png Binary files differnew file mode 100644 index 0000000..1c2ad89 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_compass.png diff --git a/main/res/drawable-xhdpi/ic_menu_delete.png b/main/res/drawable-xhdpi/ic_menu_delete.png Binary files differnew file mode 100644 index 0000000..65b9cae --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_delete.png diff --git a/main/res/drawable-xhdpi/ic_menu_edit.png b/main/res/drawable-xhdpi/ic_menu_edit.png Binary files differnew file mode 100644 index 0000000..fcdd71e --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_edit.png diff --git a/main/res/drawable-xhdpi/ic_menu_emoticons.png b/main/res/drawable-xhdpi/ic_menu_emoticons.png Binary files differnew file mode 100644 index 0000000..af730fa --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_emoticons.png diff --git a/main/res/drawable-xhdpi/ic_menu_info_details.png b/main/res/drawable-xhdpi/ic_menu_info_details.png Binary files differnew file mode 100644 index 0000000..24ea543 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_info_details.png diff --git a/main/res/drawable-xhdpi/ic_menu_mapmode.png b/main/res/drawable-xhdpi/ic_menu_mapmode.png Binary files differnew file mode 100644 index 0000000..0b62d08 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_mapmode.png diff --git a/main/res/drawable-xhdpi/ic_menu_mark.png b/main/res/drawable-xhdpi/ic_menu_mark.png Binary files differnew file mode 100644 index 0000000..a5de6fb --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_mark.png diff --git a/main/res/drawable-xhdpi/ic_menu_mylocation.png b/main/res/drawable-xhdpi/ic_menu_mylocation.png Binary files differnew file mode 100644 index 0000000..b0a76a2 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_mylocation.png diff --git a/main/res/drawable-xhdpi/ic_menu_mylocation_off.png b/main/res/drawable-xhdpi/ic_menu_mylocation_off.png Binary files differnew file mode 100644 index 0000000..6e45c52 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_mylocation_off.png diff --git a/main/res/drawable-xhdpi/ic_menu_myplaces.png b/main/res/drawable-xhdpi/ic_menu_myplaces.png Binary files differnew file mode 100644 index 0000000..205848e --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_myplaces.png diff --git a/main/res/drawable-xhdpi/ic_menu_preferences.png b/main/res/drawable-xhdpi/ic_menu_preferences.png Binary files differnew file mode 100644 index 0000000..02cfbad --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_preferences.png diff --git a/main/res/drawable-xhdpi/ic_menu_recent_history.png b/main/res/drawable-xhdpi/ic_menu_recent_history.png Binary files differnew file mode 100644 index 0000000..fc5e1fc --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_recent_history.png diff --git a/main/res/drawable-xhdpi/ic_menu_refresh.png b/main/res/drawable-xhdpi/ic_menu_refresh.png Binary files differnew file mode 100644 index 0000000..9e9f10e --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_refresh.png diff --git a/main/res/drawable-xhdpi/ic_menu_rotate.png b/main/res/drawable-xhdpi/ic_menu_rotate.png Binary files differnew file mode 100644 index 0000000..98e19fe --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_rotate.png diff --git a/main/res/drawable-xhdpi/ic_menu_save.png b/main/res/drawable-xhdpi/ic_menu_save.png Binary files differnew file mode 100644 index 0000000..62a66d8 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_save.png diff --git a/main/res/drawable-xhdpi/ic_menu_set_as.png b/main/res/drawable-xhdpi/ic_menu_set_as.png Binary files differnew file mode 100644 index 0000000..8689766 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_set_as.png diff --git a/main/res/drawable-xhdpi/ic_menu_share.png b/main/res/drawable-xhdpi/ic_menu_share.png Binary files differnew file mode 100644 index 0000000..fce1d35 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_share.png diff --git a/main/res/drawable-xhdpi/ic_menu_sort_alphabetically.png b/main/res/drawable-xhdpi/ic_menu_sort_alphabetically.png Binary files differnew file mode 100644 index 0000000..5736ff8 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_sort_alphabetically.png diff --git a/main/res/drawable-xhdpi/ic_menu_start_conversation.png b/main/res/drawable-xhdpi/ic_menu_start_conversation.png Binary files differnew file mode 100644 index 0000000..d71ed17 --- /dev/null +++ b/main/res/drawable-xhdpi/ic_menu_start_conversation.png diff --git a/main/res/drawable-xxhdpi/ic_launcher_browser.png b/main/res/drawable-xxhdpi/ic_launcher_browser.png Binary files differnew file mode 100644 index 0000000..bd8c447 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_launcher_browser.png diff --git a/main/res/drawable-xxhdpi/ic_menu_account_list.png b/main/res/drawable-xxhdpi/ic_menu_account_list.png Binary files differnew file mode 100644 index 0000000..e072523 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_account_list.png diff --git a/main/res/drawable-xxhdpi/ic_menu_add.png b/main/res/drawable-xxhdpi/ic_menu_add.png Binary files differnew file mode 100644 index 0000000..18a83a1 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_add.png diff --git a/main/res/drawable-xxhdpi/ic_menu_agenda.png b/main/res/drawable-xxhdpi/ic_menu_agenda.png Binary files differnew file mode 100644 index 0000000..20f350b --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_agenda.png diff --git a/main/res/drawable-xxhdpi/ic_menu_clear_playlist.png b/main/res/drawable-xxhdpi/ic_menu_clear_playlist.png Binary files differnew file mode 100644 index 0000000..819e839 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_clear_playlist.png diff --git a/main/res/drawable-xxhdpi/ic_menu_compass.png b/main/res/drawable-xxhdpi/ic_menu_compass.png Binary files differnew file mode 100644 index 0000000..068678d --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_compass.png diff --git a/main/res/drawable-xxhdpi/ic_menu_delete.png b/main/res/drawable-xxhdpi/ic_menu_delete.png Binary files differnew file mode 100644 index 0000000..8e9e78d --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_delete.png diff --git a/main/res/drawable-xxhdpi/ic_menu_edit.png b/main/res/drawable-xxhdpi/ic_menu_edit.png Binary files differnew file mode 100644 index 0000000..2b6e967 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_edit.png diff --git a/main/res/drawable-xxhdpi/ic_menu_emoticons.png b/main/res/drawable-xxhdpi/ic_menu_emoticons.png Binary files differnew file mode 100644 index 0000000..eae564f --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_emoticons.png diff --git a/main/res/drawable-xxhdpi/ic_menu_info_details.png b/main/res/drawable-xxhdpi/ic_menu_info_details.png Binary files differnew file mode 100644 index 0000000..4414bea --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_info_details.png diff --git a/main/res/drawable-xxhdpi/ic_menu_mapmode.png b/main/res/drawable-xxhdpi/ic_menu_mapmode.png Binary files differnew file mode 100644 index 0000000..4d8c185 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_mapmode.png diff --git a/main/res/drawable-xxhdpi/ic_menu_mark.png b/main/res/drawable-xxhdpi/ic_menu_mark.png Binary files differnew file mode 100644 index 0000000..768aeb3 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_mark.png diff --git a/main/res/drawable-xxhdpi/ic_menu_mylocation.png b/main/res/drawable-xxhdpi/ic_menu_mylocation.png Binary files differnew file mode 100644 index 0000000..8ea61e1 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_mylocation.png diff --git a/main/res/drawable-xxhdpi/ic_menu_mylocation_off.png b/main/res/drawable-xxhdpi/ic_menu_mylocation_off.png Binary files differnew file mode 100644 index 0000000..8435579 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_mylocation_off.png diff --git a/main/res/drawable-xxhdpi/ic_menu_myplaces.png b/main/res/drawable-xxhdpi/ic_menu_myplaces.png Binary files differnew file mode 100644 index 0000000..85b3f20 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_myplaces.png diff --git a/main/res/drawable-xxhdpi/ic_menu_preferences.png b/main/res/drawable-xxhdpi/ic_menu_preferences.png Binary files differnew file mode 100644 index 0000000..b039537 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_preferences.png diff --git a/main/res/drawable-xxhdpi/ic_menu_recent_history.png b/main/res/drawable-xxhdpi/ic_menu_recent_history.png Binary files differnew file mode 100644 index 0000000..a3640a6 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_recent_history.png diff --git a/main/res/drawable-xxhdpi/ic_menu_refresh.png b/main/res/drawable-xxhdpi/ic_menu_refresh.png Binary files differnew file mode 100644 index 0000000..580f4cf --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_refresh.png diff --git a/main/res/drawable-xxhdpi/ic_menu_rotate.png b/main/res/drawable-xxhdpi/ic_menu_rotate.png Binary files differnew file mode 100644 index 0000000..fd6781f --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_rotate.png diff --git a/main/res/drawable-xxhdpi/ic_menu_save.png b/main/res/drawable-xxhdpi/ic_menu_save.png Binary files differnew file mode 100644 index 0000000..800da9a --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_save.png diff --git a/main/res/drawable-xxhdpi/ic_menu_set_as.png b/main/res/drawable-xxhdpi/ic_menu_set_as.png Binary files differnew file mode 100644 index 0000000..667d723 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_set_as.png diff --git a/main/res/drawable-xxhdpi/ic_menu_share.png b/main/res/drawable-xxhdpi/ic_menu_share.png Binary files differnew file mode 100644 index 0000000..7b90639 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_share.png diff --git a/main/res/drawable-xxhdpi/ic_menu_sort_alphabetically.png b/main/res/drawable-xxhdpi/ic_menu_sort_alphabetically.png Binary files differnew file mode 100644 index 0000000..bb925f2 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_sort_alphabetically.png diff --git a/main/res/drawable-xxhdpi/ic_menu_start_conversation.png b/main/res/drawable-xxhdpi/ic_menu_start_conversation.png Binary files differnew file mode 100644 index 0000000..bb26e49 --- /dev/null +++ b/main/res/drawable-xxhdpi/ic_menu_start_conversation.png diff --git a/main/res/drawable/ic_menu_myposition.xml b/main/res/drawable/ic_menu_myposition.xml new file mode 100644 index 0000000..b50eb1e --- /dev/null +++ b/main/res/drawable/ic_menu_myposition.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/ic_menu_mylocation" android:state_checked="true"/> + <item android:drawable="@drawable/ic_menu_mylocation_off" android:state_checked="false" /> +</selector>
\ No newline at end of file diff --git a/main/res/layout-land/compass_activity.xml b/main/res/layout-land/compass_activity.xml index 00e12bf..738f02e 100644 --- a/main/res/layout-land/compass_activity.xml +++ b/main/res/layout-land/compass_activity.xml @@ -3,121 +3,113 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="horizontal" > - <include layout="@layout/actionbar" /> - - <LinearLayout + <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="horizontal" > + android:layout_weight="1" + android:orientation="vertical" > - <RelativeLayout + <TextView + android:id="@+id/destination" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textColor="?text_color" + android:textSize="14sp" /> - <TextView - android:id="@+id/destination" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="false" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:gravity="center_horizontal" - android:textColor="?text_color" - android:textSize="14sp" /> - - <TextView - android:id="@+id/cacheinfo" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="false" - android:layout_alignParentTop="false" - android:layout_below="@+id/destination" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:gravity="center_horizontal" - android:textColor="?text_color" - android:textSize="14sp" /> + <TextView + android:id="@+id/cacheinfo" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:layout_below="@+id/destination" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textColor="?text_color" + android:textSize="14sp" /> - <TextView - android:id="@+id/heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_gravity="left" - android:layout_marginLeft="3dip" - android:text="@null" - android:textColor="?text_color" - android:textSize="26sp" /> + <TextView + android:id="@+id/heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_gravity="left" + android:layout_marginLeft="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26sp" /> - <TextView - android:id="@+id/distance" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_gravity="right" - android:layout_marginRight="3dip" - android:text="@null" - android:textColor="?text_color" - android:textSize="26sp" /> + <TextView + android:id="@+id/distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_gravity="right" + android:layout_marginRight="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26sp" /> - <TextView - android:id="@+id/nav_location" - style="@style/location_current" - android:layout_above="@+id/status" - android:layout_alignParentBottom="false" - android:layout_alignParentLeft="false" - android:layout_alignParentTop="false" - android:layout_marginLeft="0dp" - android:layout_marginTop="95dp" - android:text="@string/loc_trying" /> + <TextView + android:id="@+id/nav_location" + style="@style/location_current" + android:layout_above="@+id/status" + android:layout_alignParentBottom="false" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:layout_marginLeft="0dp" + android:layout_marginTop="95dp" + android:text="@string/loc_trying" /> - <RelativeLayout - android:id="@+id/status" - android:layout_width="fill_parent" - android:layout_height="16dip" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="false" - android:layout_alignParentTop="false" - android:longClickable="true" > + <RelativeLayout + android:id="@+id/status" + android:layout_width="fill_parent" + android:layout_height="16dip" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:longClickable="true" > - <TextView - android:id="@+id/nav_type" - style="@style/location_current_type" - android:textColor="?text_color_grey" /> + <TextView + android:id="@+id/nav_type" + style="@style/location_current_type" + android:textColor="?text_color_grey" /> - <TextView - android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" - android:textColor="?text_color_grey" /> + <TextView + android:id="@+id/nav_accuracy" + style="@style/location_current_accuracy" + android:textColor="?text_color_grey" /> - <TextView - android:id="@+id/nav_satellites" - style="@style/location_current_satellites" - android:textColor="?text_color_grey" /> - </RelativeLayout> + <TextView + android:id="@+id/nav_satellites" + style="@style/location_current_satellites" + android:textColor="?text_color_grey" /> </RelativeLayout> + </RelativeLayout> - <view - android:id="@+id/rose" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center_vertical" - android:layout_marginBottom="1dip" - android:layout_marginLeft="1dip" - android:layout_marginRight="1dip" - android:layout_marginTop="6dip" - android:layout_weight="1" - class="cgeo.geocaching.ui.CompassView" - android:gravity="center" - android:keepScreenOn="true" - android:padding="4dip" /> - </LinearLayout> + <view + android:id="@+id/rose" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center_vertical" + android:layout_marginBottom="1dip" + android:layout_marginLeft="1dip" + android:layout_marginRight="1dip" + android:layout_marginTop="6dip" + android:layout_weight="1" + class="cgeo.geocaching.ui.CompassView" + android:gravity="center" + android:keepScreenOn="true" + android:padding="4dip" /> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout-land/coordinatesinput_dialog.xml b/main/res/layout-land/coordinatesinput_dialog.xml index 88e5e76..202f1d3 100644 --- a/main/res/layout-land/coordinatesinput_dialog.xml +++ b/main/res/layout-land/coordinatesinput_dialog.xml @@ -1,183 +1,169 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/linearLayout1" + android:id="@+id/scroller" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > + android:layout_height="fill_parent" + android:fillViewport="true" > - <LinearLayout style="@style/action_bar" > + <LinearLayout + android:id="@+id/scroller_child" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > - <TextView - style="@style/action_bar_title" - android:text="@string/cache_coordinates" /> - </LinearLayout> + <Spinner + android:id="@+id/spinnerCoordinateFormats" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> - <ScrollView - android:id="@+id/scroller" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" > + <TableLayout + android:id="@+id/coordTable" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="0,1,3,5,7" > - <LinearLayout - android:id="@+id/scroller_child" + <TableRow android:id="@+id/tableRow1" > + + <Button + android:id="@+id/ButtonLat" + style="@style/button_full" /> + + <EditText + android:id="@+id/EditTextLatDeg" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator1" + android:text="°" + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatMin" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator2" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatSec" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator3" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatSecFrac" + style="@style/edittext_full" + android:inputType="number" + android:selectAllOnFocus="true" /> + </TableRow> + + <TableRow android:id="@+id/tableRow2" > + + <Button + android:id="@+id/ButtonLon" + style="@style/button_full" /> + + <EditText + android:id="@+id/EditTextLonDeg" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator1" + android:text="°" + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonMin" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator2" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonSec" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator3" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonSecFrac" + style="@style/edittext_full" + android:inputType="number" + android:selectAllOnFocus="true" /> + </TableRow> + </TableLayout> + + <EditText + android:id="@+id/latitude" + style="@style/edittext_full" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:hint="@string/latitude" /> - <Spinner - android:id="@+id/spinnerCoordinateFormats" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + <EditText + android:id="@+id/longitude" + style="@style/edittext_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/longitude" /> - <TableLayout - android:id="@+id/coordTable" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:stretchColumns="0,1,3,5,7" > - - <TableRow android:id="@+id/tableRow1" > - - <Button - android:id="@+id/ButtonLat" - style="@style/button_full" /> - - <EditText - android:id="@+id/EditTextLatDeg" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator1" - android:text="°" - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatMin" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator2" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatSec" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator3" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatSecFrac" - style="@style/edittext_full" - android:inputType="number" - android:selectAllOnFocus="true" /> - </TableRow> - - <TableRow android:id="@+id/tableRow2" > - - <Button - android:id="@+id/ButtonLon" - style="@style/button_full" /> - - <EditText - android:id="@+id/EditTextLonDeg" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator1" - android:text="°" - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonMin" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator2" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonSec" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator3" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonSecFrac" - style="@style/edittext_full" - android:inputType="number" - android:selectAllOnFocus="true" /> - </TableRow> - </TableLayout> - - <EditText - android:id="@+id/latitude" - style="@style/edittext_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:hint="@string/latitude" /> + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > - <EditText - android:id="@+id/longitude" - style="@style/edittext_full" + <Button + android:id="@+id/current" + style="@style/button_full" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:hint="@string/longitude" /> - - <LinearLayout - android:id="@+id/linearLayout2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <Button - android:id="@+id/current" - style="@style/button_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/waypoint_my_coordinates" /> - - <Button - android:id="@+id/cache" - style="@style/button_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/waypoint_cache_coordinates" /> - </LinearLayout> + android:layout_weight="1" + android:text="@string/waypoint_my_coordinates" /> <Button - android:id="@+id/done" + android:id="@+id/cache" style="@style/button_full" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/waypoint_done" /> + android:layout_weight="1" + android:text="@string/waypoint_cache_coordinates" /> </LinearLayout> - </ScrollView> -</LinearLayout>
\ No newline at end of file + <Button + android:id="@+id/done" + style="@style/button_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/waypoint_done" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout-v11/actionbar_maps.xml b/main/res/layout-v11/actionbar_maps.xml new file mode 100644 index 0000000..3e72717 --- /dev/null +++ b/main/res/layout-v11/actionbar_maps.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + + <!-- Empty layout, on 11+ we have a real action bar --> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="match_parent"> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/about_help_page.xml b/main/res/layout/about_help_page.xml index 8444094..0439e22 100644 --- a/main/res/layout/about_help_page.xml +++ b/main/res/layout/about_help_page.xml @@ -27,22 +27,6 @@ android:textSize="14sp" /> <TextView - android:id="@+id/nutshellmanual" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginBottom="5dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:clickable="true" - android:focusable="true" - android:linksClickable="false" - android:text="@string/nutshellmanual" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:textSize="14sp" /> - - <TextView android:id="@+id/website" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml deleted file mode 100644 index 098120c..0000000 --- a/main/res/layout/actionbar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_compass.xml b/main/res/layout/actionbar_button_compass.xml deleted file mode 100644 index 932444b..0000000 --- a/main/res/layout/actionbar_button_compass.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - android:id="@+id/defaultNavigation" - style="@style/action_bar_action" - android:longClickable="true" - android:onClick="goDefaultNavigation" - android:src="@drawable/actionbar_compass_dark" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_map.xml b/main/res/layout/actionbar_button_map.xml deleted file mode 100644 index 9b2138a..0000000 --- a/main/res/layout/actionbar_button_map.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goMap" - android:src="@drawable/actionbar_map" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml deleted file mode 100644 index 1e91419..0000000 --- a/main/res/layout/actionbar_button_myposition.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_search.xml b/main/res/layout/actionbar_button_search.xml deleted file mode 100644 index 2aa1a50..0000000 --- a/main/res/layout/actionbar_button_search.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goSearch" - android:src="@drawable/actionbar_search" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_maps.xml b/main/res/layout/actionbar_maps.xml new file mode 100644 index 0000000..0e3dc0e --- /dev/null +++ b/main/res/layout/actionbar_maps.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + style="@style/action_bar" > + + <!-- Add the up chevron to the icon --> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/abc_ic_ab_back_holo_dark" /> + + <ImageView + style="@style/action_bar_action" + android:layout_marginLeft="-13dp" + android:onClick="navigateUp" /> + + <View style="@style/action_bar_separator" /> + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" + tools:ignore="InconsistentLayout" /> + + <ProgressBar + android:id="@+id/actionbar_progress" + style="@style/action_bar_progress" + android:visibility="gone" + tools:ignore="InconsistentLayout" /> + + <View style="@style/action_bar_separator" /> + + <FrameLayout style="@style/action_bar_action" > + + <CheckBox + android:id="@+id/my_position" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:button="@drawable/ic_menu_myposition" + android:checked="false" + tools:ignore="InconsistentLayout" /> + </FrameLayout> + + <!-- + No overflow (...) button here since this menu is only shown on Gingerbread, which never + features an overflow menu + --> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_popup.xml b/main/res/layout/actionbar_popup.xml new file mode 100644 index 0000000..0cab165 --- /dev/null +++ b/main/res/layout/actionbar_popup.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/action_bar"> + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> + + <ProgressBar + android:id="@+id/actionbar_progress" + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + + <ImageView + android:id="@+id/defaultNavigation" + style="@style/action_bar_action" + android:longClickable="true" + android:src="@drawable/actionbar_compass_dark" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + android:id="@+id/overflowActionBar" + style="@style/action_bar_action" + android:longClickable="true" + android:src="@drawable/abc_ic_menu_moreoverflow_normal_holo_dark" /> + + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml deleted file mode 100644 index 54b5875..0000000 --- a/main/res/layout/actionbar_progress.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/actionbar_progress" - style="@style/action_bar_progress" - android:visibility="gone" /> diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml deleted file mode 100644 index 4fa5348..0000000 --- a/main/res/layout/actionbar_title.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView - android:id="@+id/actionbar_title" - style="@style/action_bar_title" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_title_no_home.xml b/main/res/layout/actionbar_title_no_home.xml deleted file mode 100644 index 6295bdc..0000000 --- a/main/res/layout/actionbar_title_no_home.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <TextView - android:id="@+id/actionbar_title" - style="@style/action_bar_title" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml index c48c28f..6bcbf79 100644 --- a/main/res/layout/addresslist_activity.xml +++ b/main/res/layout/addresslist_activity.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ListView android:id="@android:id/list" android:layout_width="fill_parent" @@ -14,6 +13,7 @@ android:background="?background_color" android:cacheColorHint="?background_color" android:dividerHeight="1dip" - android:padding="0dip" /> + android:padding="0dip" + tools:listitem="@layout/addresslist_item" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/authorization_activity.xml b/main/res/layout/authorization_activity.xml index 28c1987..2907286 100644 --- a/main/res/layout/authorization_activity.xml +++ b/main/res/layout/authorization_activity.xml @@ -1,55 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:visibility="visible" > + android:padding="4dip" > - <include layout="@layout/actionbar" /> - - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > + android:layout_height="wrap_content" + android:orientation="vertical" > - <LinearLayout + <TextView + android:id="@+id/auth_1" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/auth_1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" - android:layout_marginBottom="20dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:drawableLeft="@drawable/cgeo" - android:drawablePadding="15dip" - android:gravity="left|center_vertical" - android:textColor="?text_color" - android:textSize="14sp" /> - - <TextView - android:id="@+id/auth_2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" - android:layout_marginBottom="5dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:gravity="left|center_vertical" - android:textColor="?text_color" - android:textSize="14sp" /> - - <Button - android:id="@+id/start" - style="@style/button_full" - android:layout_margin="7dip" /> - - </LinearLayout> - </ScrollView> - -</LinearLayout>
\ No newline at end of file + android:layout_gravity="left|center_vertical" + android:layout_marginBottom="20dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:drawableLeft="@drawable/cgeo" + android:drawablePadding="15dip" + android:gravity="left|center_vertical" + android:textColor="?text_color" + android:textSize="14sp" /> + + <TextView + android:id="@+id/auth_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:gravity="left|center_vertical" + android:textColor="?text_color" + android:textSize="14sp" /> + + <Button + android:id="@+id/start" + style="@style/button_full" + android:layout_margin="7dip" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/cachedetail_activity.xml b/main/res/layout/cachedetail_activity.xml index 3afe5f6..d197bcd 100644 --- a/main/res/layout/cachedetail_activity.xml +++ b/main/res/layout/cachedetail_activity.xml @@ -1,18 +1,11 @@ <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?background_color"
android:orientation="vertical" >
- <LinearLayout style="@style/action_bar" >
-
- <include layout="@layout/actionbar_title" />
-
- <include layout="@layout/actionbar_button_compass" />
- </LinearLayout>
-
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="fill_parent"
diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml new file mode 100644 index 0000000..58e070e --- /dev/null +++ b/main/res/layout/cachelist_spinneritem.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="?attr/dropdownListPreferredItemHeight" + android:minHeight="?attr/dropdownListPreferredItemHeight" + android:layout_gravity="left|center_vertical" + style="?attr/spinnerDropDownItemStyle" + > + + + <TextView + android:id="@android:id/text1" + tools:text="This is the title" + android:singleLine="true" + android:ellipsize="marquee" + android:layout_width="match_parent" + style="?attr/titleTextStyle" + android:layout_height="wrap_content" /> + + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + style="?attr/subtitleTextStyle" + tools:text="This is the subtitle" + android:id="@android:id/text2" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheslist_activity.xml b/main/res/layout/cacheslist_activity.xml index c267f60..a12adad 100644 --- a/main/res/layout/cacheslist_activity.xml +++ b/main/res/layout/cacheslist_activity.xml @@ -4,15 +4,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_map" /> - </LinearLayout> - <include layout="@layout/filter_bar" /> <RelativeLayout diff --git a/main/res/layout/cacheslist_item.xml b/main/res/layout/cacheslist_item.xml index 744ca30..b43310e 100644 --- a/main/res/layout/cacheslist_item.xml +++ b/main/res/layout/cacheslist_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/one_cache" android:layout_width="fill_parent" @@ -111,7 +111,7 @@ android:minHeight="28px" android:minWidth="28px" android:visibility="gone" - cc:skin="?compass" + cgeo:skin="?compass" tools:ignore="PxUsage" /> <ImageView diff --git a/main/res/layout/compass_activity.xml b/main/res/layout/compass_activity.xml index f0ab5ef..ca61cc3 100644 --- a/main/res/layout/compass_activity.xml +++ b/main/res/layout/compass_activity.xml @@ -1,124 +1,115 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - - <RelativeLayout + <LinearLayout + android:id="@+id/info1" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:orientation="vertical" > - - <LinearLayout - android:id="@+id/info1" - android:layout_width="fill_parent" + + <TextView + android:id="@+id/destination" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textColor="?text_color" + android:textSize="14sp" /> + + <TextView + android:id="@+id/cacheinfo" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" > - + android:layout_gravity="center" + android:textColor="?text_color" + android:textSize="14sp" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + <TextView - android:id="@+id/destination" + android:id="@+id/heading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_alignParentLeft="true" + android:layout_gravity="left" + android:layout_marginLeft="3dip" + android:text="@null" android:textColor="?text_color" - android:textSize="14sp" /> - + android:textSize="26sp" /> + <TextView - android:id="@+id/cacheinfo" + android:id="@+id/distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_alignParentRight="true" + android:layout_gravity="right" + android:layout_marginRight="3dip" + android:text="@null" android:textColor="?text_color" - android:textSize="14sp" /> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <TextView - android:id="@+id/heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:layout_marginLeft="3dip" - android:text="@null" - android:textColor="?text_color" - android:textSize="26sp" /> - - <TextView - android:id="@+id/distance" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_gravity="right" - android:layout_marginRight="3dip" - android:text="@null" - android:textColor="?text_color" - android:textSize="26sp" /> - </RelativeLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/info2" + android:textSize="26sp" /> + </RelativeLayout> + </LinearLayout> + + <LinearLayout + android:id="@+id/info2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:orientation="vertical" > + + <TextView + android:id="@+id/nav_location" + style="@style/location_current" + android:text="@string/loc_trying" /> + + <RelativeLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginLeft="6dip" - android:layout_marginRight="6dip" - android:orientation="vertical" > - + android:layout_height="16dip" > + <TextView - android:id="@+id/nav_location" - style="@style/location_current" - android:text="@string/loc_trying" /> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="16dip" > - - <TextView - android:id="@+id/nav_type" - style="@style/location_current_type" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - - <TextView - android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - - <TextView - android:id="@+id/nav_satellites" - style="@style/location_current_satellites" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - </RelativeLayout> - </LinearLayout> - - <view - android:id="@+id/rose" - android:layout_width="fill_parent" - android:layout_height="295dip" - android:layout_above="@id/info2" - android:layout_below="@id/info1" - android:layout_centerInParent="true" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="1dip" - android:layout_marginLeft="1dip" - android:layout_marginRight="1dip" - android:layout_marginTop="6dip" - class="cgeo.geocaching.ui.CompassView" - android:gravity="center" - android:keepScreenOn="true" - android:minHeight="289dip" - android:minWidth="289dip" - android:padding="4dip" /> - - </RelativeLayout> + android:id="@+id/nav_type" + style="@style/location_current_type" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_accuracy" + style="@style/location_current_accuracy" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_satellites" + style="@style/location_current_satellites" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + </RelativeLayout> + </LinearLayout> + + <view + android:id="@+id/rose" + android:layout_width="fill_parent" + android:layout_height="295dip" + android:layout_above="@id/info2" + android:layout_below="@id/info1" + android:layout_centerInParent="true" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="1dip" + android:layout_marginLeft="1dip" + android:layout_marginRight="1dip" + android:layout_marginTop="6dip" + class="cgeo.geocaching.ui.CompassView" + android:gravity="center" + android:keepScreenOn="true" + android:minHeight="289dip" + android:minWidth="289dip" + android:padding="4dip" /> -</LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml index 4603360..9b5cb8d 100644 --- a/main/res/layout/coordinatesinput_dialog.xml +++ b/main/res/layout/coordinatesinput_dialog.xml @@ -1,175 +1,161 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/linearLayout1" + android:id="@+id/scroller" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > + android:layout_height="fill_parent" + android:fillViewport="true" > - <LinearLayout style="@style/action_bar" > + <LinearLayout + android:id="@+id/scroller_child" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > - <TextView - style="@style/action_bar_title" - android:text="@string/cache_coordinates" /> - </LinearLayout> + <Spinner + android:id="@+id/spinnerCoordinateFormats" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> - <ScrollView - android:id="@+id/scroller" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" > + <TableLayout + android:id="@+id/coordTable" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="0,1,3,5,7" > + + <TableRow android:id="@+id/tableRow1" > + + <Button + android:id="@+id/ButtonLat" + style="@style/button_full" /> + + <EditText + android:id="@+id/EditTextLatDeg" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator1" + android:text="°" + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatMin" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator2" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatSec" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LatSeparator3" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLatSecFrac" + style="@style/edittext_full" + android:inputType="number" + android:selectAllOnFocus="true" /> + </TableRow> + + <TableRow android:id="@+id/tableRow2" > + + <Button + android:id="@+id/ButtonLon" + style="@style/button_full" /> + + <EditText + android:id="@+id/EditTextLonDeg" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator1" + android:text="°" + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonMin" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator2" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonSec" + style="@style/edittext_full" + android:gravity="right" + android:inputType="number" + android:selectAllOnFocus="true" /> + + <TextView + android:id="@+id/LonSeparator3" + android:text="," + tools:ignore="HardcodedText" /> + + <EditText + android:id="@+id/EditTextLonSecFrac" + style="@style/edittext_full" + android:inputType="number" + android:selectAllOnFocus="true" /> + </TableRow> + </TableLayout> + + <EditText + android:id="@+id/latitude" + style="@style/edittext_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/latitude" /> + + <EditText + android:id="@+id/longitude" + style="@style/edittext_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/longitude" /> - <LinearLayout - android:id="@+id/scroller_child" + <Button + android:id="@+id/current" + style="@style/button_full" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - - <Spinner - android:id="@+id/spinnerCoordinateFormats" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> - - <TableLayout - android:id="@+id/coordTable" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:stretchColumns="0,1,3,5,7" > - - <TableRow android:id="@+id/tableRow1" > - - <Button - android:id="@+id/ButtonLat" - style="@style/button_full" /> - - <EditText - android:id="@+id/EditTextLatDeg" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator1" - android:text="°" - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatMin" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator2" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatSec" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LatSeparator3" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLatSecFrac" - style="@style/edittext_full" - android:inputType="number" - android:selectAllOnFocus="true" /> - </TableRow> - - <TableRow android:id="@+id/tableRow2" > - - <Button - android:id="@+id/ButtonLon" - style="@style/button_full" /> - - <EditText - android:id="@+id/EditTextLonDeg" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator1" - android:text="°" - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonMin" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator2" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonSec" - style="@style/edittext_full" - android:gravity="right" - android:inputType="number" - android:selectAllOnFocus="true" /> - - <TextView - android:id="@+id/LonSeparator3" - android:text="," - tools:ignore="HardcodedText" /> - - <EditText - android:id="@+id/EditTextLonSecFrac" - style="@style/edittext_full" - android:inputType="number" - android:selectAllOnFocus="true" /> - </TableRow> - </TableLayout> - - <EditText - android:id="@+id/latitude" - style="@style/edittext_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:hint="@string/latitude" /> - - <EditText - android:id="@+id/longitude" - style="@style/edittext_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:hint="@string/longitude" /> - - <Button - android:id="@+id/current" - style="@style/button_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_my_coordinates" /> - - <Button - android:id="@+id/cache" - style="@style/button_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_cache_coordinates" /> - - <Button - android:id="@+id/done" - style="@style/button_full" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_done" /> - </LinearLayout> - </ScrollView> - -</LinearLayout>
\ No newline at end of file + android:text="@string/waypoint_my_coordinates" /> + + <Button + android:id="@+id/cache" + style="@style/button_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/waypoint_cache_coordinates" /> + + <Button + android:id="@+id/done" + style="@style/button_full" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/waypoint_done" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/editwaypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml index cd0b46c..c21e25d 100644 --- a/main/res/layout/editwaypoint_activity.xml +++ b/main/res/layout/editwaypoint_activity.xml @@ -1,115 +1,107 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <include layout="@layout/actionbar" /> - - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > + android:layout_height="wrap_content" + android:orientation="vertical" > + + <Button + android:id="@+id/buttonLatitude" + style="@style/button_full" + android:freezesText="true" + android:hint="@string/latitude" /> + + <Button + android:id="@+id/buttonLongitude" + style="@style/button_full" + android:freezesText="true" + android:hint="@string/longitude" /> + + <EditText + android:id="@+id/bearing" + style="@style/edittext_full" + android:hint="@string/waypoint_bearing" + android:inputType="numberDecimal" /> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - - <Button - android:id="@+id/buttonLatitude" - style="@style/button_full" - android:hint="@string/latitude" - android:freezesText="true" /> - - <Button - android:id="@+id/buttonLongitude" - style="@style/button_full" - android:hint="@string/longitude" - android:freezesText="true" /> + android:orientation="horizontal" > <EditText - android:id="@+id/bearing" + android:id="@+id/distance" style="@style/edittext_full" - android:hint="@string/waypoint_bearing" + android:layout_width="0dip" + android:layout_weight="1" + android:hint="@string/waypoint_distance" android:inputType="numberDecimal" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <EditText - android:id="@+id/distance" - style="@style/edittext_full" - android:layout_width="0dip" - android:layout_weight="1" - android:hint="@string/waypoint_distance" - android:inputType="numberDecimal" /> - - <Spinner - android:id="@+id/distanceUnit" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:entries="@array/distance_units" /> - </LinearLayout> - - <AutoCompleteTextView - android:id="@+id/name" - style="@style/edittext_full" - android:hint="@string/waypoint_name" /> - <Spinner - android:id="@+id/type" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> - - <EditText - android:id="@+id/note" - style="@style/edittext_full" - android:layout_height="wrap_content" - android:hint="@string/waypoint_note" - android:inputType="textMultiLine|textCapSentences" - android:minLines="5" - android:singleLine="false" /> - - <CheckBox - android:id="@+id/wpt_visited_checkbox" - style="@style/checkbox_full" - android:text="@string/waypoint_visited" /> - - <RadioGroup - android:id="@+id/modify_cache_coordinates_group" + android:id="@+id/distanceUnit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" > - - <RadioButton - android:id="@+id/modify_cache_coordinates_nothing" - style="@style/radiobutton_wrap" - android:checked="true" - android:text="@string/waypoint_do_not_touch_cache_coordinates" /> - - <RadioButton - android:id="@+id/modify_cache_coordinates_local" - style="@style/radiobutton_wrap" - android:text="@string/waypoint_set_as_cache_coords" /> - - <RadioButton - android:id="@+id/modify_cache_coordinates_local_and_remote" - style="@style/radiobutton_wrap" - android:text="@string/waypoint_save_and_modify_on_website" - android:visibility="gone" /> - </RadioGroup> - - <Button - android:id="@+id/add_waypoint" - style="@style/button_full" - android:text="@string/waypoint_save" /> + android:entries="@array/distance_units" /> </LinearLayout> - </ScrollView> -</LinearLayout>
\ No newline at end of file + <AutoCompleteTextView + android:id="@+id/name" + style="@style/edittext_full" + android:hint="@string/waypoint_name" /> + + <Spinner + android:id="@+id/type" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + + <EditText + android:id="@+id/note" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/waypoint_note" + android:inputType="textMultiLine|textCapSentences" + android:minLines="5" + android:singleLine="false" /> + + <CheckBox + android:id="@+id/wpt_visited_checkbox" + style="@style/checkbox_full" + android:text="@string/waypoint_visited" /> + + <RadioGroup + android:id="@+id/modify_cache_coordinates_group" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" > + + <RadioButton + android:id="@+id/modify_cache_coordinates_nothing" + style="@style/radiobutton_wrap" + android:checked="true" + android:text="@string/waypoint_do_not_touch_cache_coordinates" /> + + <RadioButton + android:id="@+id/modify_cache_coordinates_local" + style="@style/radiobutton_wrap" + android:text="@string/waypoint_set_as_cache_coords" /> + + <RadioButton + android:id="@+id/modify_cache_coordinates_local_and_remote" + style="@style/radiobutton_wrap" + android:text="@string/waypoint_save_and_modify_on_website" + android:visibility="gone" /> + </RadioGroup> + + <Button + android:id="@+id/add_waypoint" + style="@style/button_full" + android:text="@string/waypoint_save" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 948c265..368f3ae 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -4,8 +4,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <Button android:id="@+id/select_dir" style="@style/button_full" diff --git a/main/res/layout/images_activity.xml b/main/res/layout/images_activity.xml index ccd8499..861fa7e 100644 --- a/main/res/layout/images_activity.xml +++ b/main/res/layout/images_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <include layout="@layout/cachedetail_images_page" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/imageselect_activity.xml b/main/res/layout/imageselect_activity.xml index fd8eaea..690baa2 100644 --- a/main/res/layout/imageselect_activity.xml +++ b/main/res/layout/imageselect_activity.xml @@ -1,115 +1,102 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <LinearLayout style="@style/action_bar" > + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > - <include layout="@layout/actionbar_title" /> + <RelativeLayout style="@style/separator_horizontal_layout" > - <include layout="@layout/actionbar_progress" /> - </LinearLayout> + <View style="@style/separator_horizontal" /> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/log_image" /> + </RelativeLayout> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/log_image" /> - </RelativeLayout> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:orientation="horizontal" > - - <Button - android:id="@+id/stored" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_image_stored" /> - - <Button - android:id="@+id/camera" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_image_camera" /> - </LinearLayout> - - <ImageView - android:id="@+id/image_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:layout_marginTop="5dip" - android:background="#000000" - android:padding="1dp" - android:visibility="gone" /> - - <EditText - android:id="@+id/caption" - style="@style/edittext_full" - android:layout_height="wrap_content" - android:hint="@string/log_image_caption" - android:inputType="textCapSentences" - android:maxLength="50" - android:minLines="1" - android:singleLine="false" /> - - <EditText - android:id="@+id/description" - style="@style/edittext_full" - android:layout_height="wrap_content" - android:hint="@string/log_image_description" - android:inputType="textMultiLine|textCapSentences" - android:maxLength="250" - android:minLines="5" - android:singleLine="false" /> - - <Spinner - android:id="@+id/logImageScale" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:entries="@array/log_image_scales" - android:prompt="@string/log_image_scale" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + android:layout_marginTop="10dip" + android:orientation="horizontal" > + + <Button + android:id="@+id/stored" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@string/log_image_stored" /> + + <Button + android:id="@+id/camera" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@string/log_image_camera" /> + </LinearLayout> - <Button - android:id="@+id/save" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@android:string/yes" /> + <ImageView + android:id="@+id/image_preview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:layout_marginTop="5dip" + android:background="#000000" + android:padding="1dp" + android:visibility="gone" /> + + <EditText + android:id="@+id/caption" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/log_image_caption" + android:inputType="textCapSentences" + android:maxLength="50" + android:minLines="1" + android:singleLine="false" /> + + <EditText + android:id="@+id/description" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/log_image_description" + android:inputType="textMultiLine|textCapSentences" + android:maxLength="250" + android:minLines="5" + android:singleLine="false" /> + + <Spinner + android:id="@+id/logImageScale" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:entries="@array/log_image_scales" + android:prompt="@string/log_image_scale" /> - <Button - android:id="@+id/cancel" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@android:string/no" /> - </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/save" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@android:string/yes" /> + + <Button + android:id="@+id/cancel" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@android:string/no" /> </LinearLayout> - </ScrollView> + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/internal_browser.xml b/main/res/layout/internal_browser.xml new file mode 100644 index 0000000..1e09ee0 --- /dev/null +++ b/main/res/layout/internal_browser.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <WebView + android:id="@+id/webview" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml index 4bbb441..5445285 100644 --- a/main/res/layout/logcache_activity.xml +++ b/main/res/layout/logcache_activity.xml @@ -1,202 +1,173 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - </LinearLayout> - - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > + android:layout_height="wrap_content" + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_marginTop="10dip" android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:orientation="vertical" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <Button - android:id="@+id/type" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" /> - - <Button - android:id="@+id/date" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" /> - </LinearLayout> - - <EditText - android:id="@+id/log" - style="@style/edittext_full" - android:layout_height="wrap_content" - android:hint="@string/log_new_log_text" - android:inputType="textMultiLine|textCapSentences" - android:maxLength="4000" - android:minLines="5" - android:singleLine="false" /> - - <LinearLayout - android:id="@+id/log_password_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:orientation="vertical" - android:visibility="gone" > - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="left" - android:padding="10dip" - android:text="@string/log_password_title" - android:textColor="?text_color" - android:textSize="22sp" /> - <EditText - android:id="@+id/log_password" - style="@style/edittext_full" - android:hint="@string/log_hint_log_password" - android:inputType="text" - android:singleLine="true" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/tweet_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:orientation="horizontal" - android:visibility="gone" > - - <CheckBox - android:id="@+id/tweet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:gravity="center" - android:padding="2sp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:text="@string/visit_tweet" - android:textColor="?text_color" - android:textSize="14sp" /> - </LinearLayout> + android:orientation="horizontal" > <Button - android:id="@+id/image_btn" + android:id="@+id/type" style="@style/button_full" - android:text="@string/log_image_attach" /> + android:layout_width="0dip" + android:layout_weight="1" /> <Button - android:id="@+id/post" + android:id="@+id/date" style="@style/button_full" - android:text="@string/log_post" /> - - <RelativeLayout style="@style/separator_horizontal_layout" > + android:layout_width="0dip" + android:layout_weight="1" /> + </LinearLayout> - <View style="@style/separator_horizontal" /> + <EditText + android:id="@+id/log" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/log_new_log_text" + android:inputType="textMultiLine|textCapSentences" + android:maxLength="4000" + android:minLines="5" + android:singleLine="false" /> - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/cache_log_offline" /> - </RelativeLayout> + <LinearLayout + android:id="@+id/log_password_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:orientation="vertical" + android:visibility="gone" > - <LinearLayout + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <Button - android:id="@+id/save" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_save" /> - - <Button - android:id="@+id/clear" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_clear" /> - </LinearLayout> + android:gravity="left" + android:padding="10dip" + android:text="@string/log_password_title" + android:textColor="?text_color" + android:textSize="22sp" /> + + <EditText + android:id="@+id/log_password" + style="@style/edittext_full" + android:hint="@string/log_hint_log_password" + android:inputType="text" + android:singleLine="true" /> </LinearLayout> + <RatingBar + android:id="@+id/gcvoteRating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:max="5" + android:numStars="5" + android:stepSize="0.5" + android:visibility="gone" /> + + <TextView + android:id="@+id/gcvoteLabel" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:padding="10dip" + android:text="@string/log_no_rating" + android:textColor="?text_color" + android:textSize="12sp" + android:visibility="gone" /> + <LinearLayout - android:id="@+id/inventory_box" + android:id="@+id/tweet_box" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dip" - android:layout_marginTop="10dip" - android:orientation="vertical" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:orientation="horizontal" android:visibility="gone" > - <RelativeLayout style="@style/separator_horizontal_layout" > + <CheckBox + android:id="@+id/tweet" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:gravity="center" + android:padding="2sp" /> - <View style="@style/separator_horizontal" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="left" + android:paddingRight="3dip" + android:text="@string/visit_tweet" + android:textColor="?text_color" + android:textSize="14sp" /> + </LinearLayout> + </LinearLayout> - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/cache_inventory" /> - </RelativeLayout> + <LinearLayout + android:id="@+id/inventory_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10dip" + android:layout_marginTop="10dip" + android:orientation="vertical" + android:visibility="gone" > - <LinearLayout - android:id="@+id/inventory" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> + <RelativeLayout style="@style/separator_horizontal_layout" > - <LinearLayout - android:id="@+id/inventory_changeall" - android:layout_width="fill_parent" - android:layout_height="wrap_content" + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/cache_inventory" /> + </RelativeLayout> + + <LinearLayout + android:id="@+id/inventory" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + + <LinearLayout + android:id="@+id/inventory_changeall" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:orientation="vertical" + android:visibility="gone" > + + <Button + android:id="@+id/changebutton" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:layout_weight="1" android:gravity="right" - android:orientation="vertical" - android:visibility="gone" > - - <Button - android:id="@+id/changebutton" - style="@style/button_full" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginBottom="5dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_weight="1" - android:gravity="right" - android:text="@string/log_tb_changeall" - android:textSize="14sp" /> - </LinearLayout> + android:text="@string/log_tb_changeall" + android:textSize="14sp" /> </LinearLayout> </LinearLayout> - </ScrollView> + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/logs_page.xml b/main/res/layout/logs_page.xml index 9aafd83..f0a5d31 100644 --- a/main/res/layout/logs_page.xml +++ b/main/res/layout/logs_page.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:cacheColorHint="?background_color"
@@ -8,6 +9,7 @@ android:focusable="false"
android:footerDividersEnabled="false"
android:headerDividersEnabled="false"
- android:listSelector="?background_color" >
+ android:listSelector="?background_color"
+ tools:listitem="@layout/logs_item" >
</ListView>
\ No newline at end of file diff --git a/main/res/layout/logtrackable_activity.xml b/main/res/layout/logtrackable_activity.xml index 7791409..a43e919 100644 --- a/main/res/layout/logtrackable_activity.xml +++ b/main/res/layout/logtrackable_activity.xml @@ -1,95 +1,82 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - </LinearLayout> - - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > + android:layout_height="wrap_content" + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + <Button + android:id="@+id/type" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> - <Button - android:id="@+id/type" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" /> + <Button + android:id="@+id/date" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> + </LinearLayout> - <Button - android:id="@+id/date" - style="@style/button_full" - android:layout_width="0dip" - android:layout_weight="1" /> - </LinearLayout> + <EditText + android:id="@+id/tracking" + style="@style/edittext_full" + android:hint="@string/trackable_code" + android:inputType="textCapCharacters" /> - <EditText - android:id="@+id/tracking" - style="@style/edittext_full" - android:hint="@string/trackable_code" - android:inputType="textCapCharacters" /> + <EditText + android:id="@+id/log" + style="@style/edittext_full" + android:hint="@string/log_new_log_text" + android:inputType="textMultiLine|textCapSentences" + android:lines="5" + android:maxLength="4000" + android:singleLine="false" /> - <EditText - android:id="@+id/log" - style="@style/edittext_full" - android:hint="@string/log_new_log_text" - android:inputType="textMultiLine|textCapSentences" - android:lines="5" - android:maxLength="4000" - android:singleLine="false" /> + <LinearLayout + android:id="@+id/tweet_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:orientation="horizontal" + android:visibility="gone" > - <LinearLayout - android:id="@+id/tweet_box" - android:layout_width="fill_parent" + <CheckBox + android:id="@+id/tweet" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:orientation="horizontal" - android:visibility="gone" > - - <CheckBox - android:id="@+id/tweet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:gravity="center" - android:padding="2sp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:text="@string/visit_tweet" - android:textColor="?text_color" - android:textSize="14sp" /> - </LinearLayout> + android:layout_gravity="left" + android:gravity="center" + android:padding="2sp" /> - <Button - android:id="@+id/post" - style="@style/button_full" - android:text="@string/log_post" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="left" + android:paddingRight="3dip" + android:text="@string/visit_tweet" + android:textColor="?text_color" + android:textSize="14sp" /> </LinearLayout> - </ScrollView> -</LinearLayout>
\ No newline at end of file + <Button + android:id="@+id/post" + style="@style/button_full" + android:text="@string/log_post" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml index 9e124a1..d2bd025 100644 --- a/main/res/layout/main_activity.xml +++ b/main/res/layout/main_activity.xml @@ -1,21 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/mainscreen" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_gravity="center" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_icon_cgeo" - android:onClick="showAbout" /> - - <TextView style="@style/action_bar_title" /> - - <include layout="@layout/actionbar_button_search" /> - </LinearLayout> - <fragment android:id="@+id/status" android:name="cgeo.geocaching.StatusFragment" @@ -24,7 +14,8 @@ android:layout_alignParentTop="true" android:layout_marginLeft="16dip" android:layout_marginRight="16dip" - android:layout_marginTop="60dip" /> + android:layout_marginTop="60dip" + tools:layout="@layout/status" /> <!-- ** --> <LinearLayout diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml index 5e4d82d..471c2b8 100644 --- a/main/res/layout/map_google.xml +++ b/main/res/layout/map_google.xml @@ -4,14 +4,9 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - <include layout="@layout/actionbar_title" /> - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml index f05ddb0..c44a3ee 100644 --- a/main/res/layout/map_mapsforge.xml +++ b/main/res/layout/map_mapsforge.xml @@ -4,14 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml index ff2b9af..daa5f74 100644 --- a/main/res/layout/map_mapsforge_old.xml +++ b/main/res/layout/map_mapsforge_old.xml @@ -4,14 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/navigateanypoint_activity.xml b/main/res/layout/navigateanypoint_activity.xml index baa568c..22a29af 100644 --- a/main/res/layout/navigateanypoint_activity.xml +++ b/main/res/layout/navigateanypoint_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ListView android:id="@+id/historyList" android:layout_width="match_parent" diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index 584eb58..de94d18 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -1,21 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color_transparent" - android:orientation="vertical" > - - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title_no_home" /> - - <include layout="@layout/actionbar_button_compass" /> - </LinearLayout> + android:orientation="vertical" + tools:context=".CachePopup"> + <include layout="@layout/actionbar_popup" /> <ScrollView android:id="@+id/details_list_box" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:orientation="vertical" android:padding="4dip" > @@ -50,6 +46,7 @@ <TextView android:id="@+id/offline_text" + tools:text="@string/cache_offline_not_ready" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" diff --git a/main/res/layout/search_activity.xml b/main/res/layout/search_activity.xml index 28256f1..894c461 100644 --- a/main/res/layout/search_activity.xml +++ b/main/res/layout/search_activity.xml @@ -1,178 +1,170 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <include layout="@layout/actionbar" /> - - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_coordinates" /> - </RelativeLayout> - - <Button - android:id="@+id/buttonLatitude" - style="@style/button_full" - android:hint="@string/latitude" /> - - <Button - android:id="@+id/buttonLongitude" - style="@style/button_full" - android:hint="@string/longitude" /> - - <Button - android:id="@+id/search_coordinates" - style="@style/button_full" - android:text="@string/search_coordinates_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_address" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/address" - style="@style/edittext_full" - android:hint="@string/search_address" - android:imeOptions="actionGo" /> - - <Button - android:id="@+id/search_address" - style="@style/button_full" - android:text="@string/search_address_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_geo" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/geocode" - style="@style/edittext_full" - android:hint="@string/search_geo" - android:imeOptions="actionGo" - android:inputType="textCapCharacters" - android:text="GC" - tools:ignore="HardcodedText" /> - - <Button - android:id="@+id/display_geocode" - style="@style/button_full" - android:text="@string/search_geo_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_kw" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/keyword" - style="@style/edittext_full" - android:hint="@string/search_kw_prefill" - android:imeOptions="actionGo" /> - - <Button - android:id="@+id/search_keyword" - style="@style/button_full" - android:text="@string/search_kw_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_fbu" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/finder" - style="@style/edittext_full" - android:hint="@string/search_fbu_prefill" - android:imeOptions="actionGo" /> - - <Button - android:id="@+id/search_finder" - style="@style/button_full" - android:text="@string/search_fbu_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_hbu" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/owner" - style="@style/edittext_full" - android:hint="@string/search_hbu_prefill" - android:imeOptions="actionGo" /> - - <Button - android:id="@+id/search_owner" - style="@style/button_full" - android:text="@string/search_hbu_button" /> - <!-- ** --> - - <RelativeLayout style="@style/separator_horizontal_layout" > - - <View style="@style/separator_horizontal" /> - - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/search_tb" /> - </RelativeLayout> - - <AutoCompleteTextView - android:id="@+id/trackable" - style="@style/edittext_full" - android:hint="@string/search_tb_hint" - android:imeOptions="actionGo" - android:inputType="textCapCharacters" /> - - <Button - android:id="@+id/display_trackable" - style="@style/button_full" - android:text="@string/search_tb_button" /> - </LinearLayout> - </ScrollView> - -</LinearLayout>
\ No newline at end of file + android:layout_height="wrap_content" + android:orientation="vertical" > + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_coordinates" /> + </RelativeLayout> + + <Button + android:id="@+id/buttonLatitude" + style="@style/button_full" + android:hint="@string/latitude" /> + + <Button + android:id="@+id/buttonLongitude" + style="@style/button_full" + android:hint="@string/longitude" /> + + <Button + android:id="@+id/search_coordinates" + style="@style/button_full" + android:text="@string/search_coordinates_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_address" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/address" + style="@style/edittext_full" + android:hint="@string/search_address" + android:imeOptions="actionGo" /> + + <Button + android:id="@+id/search_address" + style="@style/button_full" + android:text="@string/search_address_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_geo" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/geocode" + style="@style/edittext_full" + android:hint="@string/search_geo" + android:imeOptions="actionGo" + android:inputType="textCapCharacters" + android:text="GC" + tools:ignore="HardcodedText" /> + + <Button + android:id="@+id/display_geocode" + style="@style/button_full" + android:text="@string/search_geo_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_kw" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/keyword" + style="@style/edittext_full" + android:hint="@string/search_kw_prefill" + android:imeOptions="actionGo" /> + + <Button + android:id="@+id/search_keyword" + style="@style/button_full" + android:text="@string/search_kw_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_fbu" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/finder" + style="@style/edittext_full" + android:hint="@string/search_fbu_prefill" + android:imeOptions="actionGo" /> + + <Button + android:id="@+id/search_finder" + style="@style/button_full" + android:text="@string/search_fbu_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_hbu" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/owner" + style="@style/edittext_full" + android:hint="@string/search_hbu_prefill" + android:imeOptions="actionGo" /> + + <Button + android:id="@+id/search_owner" + style="@style/button_full" + android:text="@string/search_hbu_button" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/search_tb" /> + </RelativeLayout> + + <AutoCompleteTextView + android:id="@+id/trackable" + style="@style/edittext_full" + android:hint="@string/search_tb_hint" + android:imeOptions="actionGo" + android:inputType="textCapCharacters" /> + + <Button + android:id="@+id/display_trackable" + style="@style/button_full" + android:text="@string/search_tb_button" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml index ece29c7..1bf9a2d 100644 --- a/main/res/layout/simple_dir_chooser.xml +++ b/main/res/layout/simple_dir_chooser.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" @@ -42,20 +43,20 @@ android:paddingTop="10dip" > <Button - android:id="@+id/simple_dir_chooser_ok" + android:id="@+id/simple_dir_chooser_cancel" style="@style/button_full" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@android:string/ok" /> + android:text="@android:string/cancel" /> <Button - android:id="@+id/simple_dir_chooser_cancel" + android:id="@+id/simple_dir_chooser_ok" style="@style/button_full" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@android:string/cancel" /> + android:text="@android:string/ok" /> </LinearLayout> <ListView @@ -63,6 +64,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@id/buttonLayout" - android:layout_below="@+id/headerLayout" /> + android:layout_below="@+id/headerLayout" + tools:listitem="@layout/simple_dir_item" /> </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/staticmaps_activity.xml b/main/res/layout/staticmaps_activity.xml index 2ffa70d..c8806b4 100644 --- a/main/res/layout/staticmaps_activity.xml +++ b/main/res/layout/staticmaps_activity.xml @@ -1,23 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="4dip" > - <include layout="@layout/actionbar" /> - - <ScrollView + <LinearLayout + android:id="@+id/maps_list" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:padding="4dip" > - - <LinearLayout - android:id="@+id/maps_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </ScrollView> + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/text_preference.xml b/main/res/layout/text_preference.xml index 818b2f3..174a6d1 100644 --- a/main/res/layout/text_preference.xml +++ b/main/res/layout/text_preference.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp" - android:orientation="vertical" > + tools:context=".settings.SettingsActivity" > - <TextView + <TextView android:id="@+id/textPreferenceText" android:layout_width="fill_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" /> - <TextView + + <TextView android:id="@+id/textPreferenceSummary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="8dp" - android:visibility="gone" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" /> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml index 84bcf39..e15cd7a 100644 --- a/main/res/layout/usefulapps_activity.xml +++ b/main/res/layout/usefulapps_activity.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ListView android:id="@+id/apps_list" android:layout_width="fill_parent" @@ -17,7 +16,8 @@ android:footerDividersEnabled="false" android:headerDividersEnabled="false" android:listSelector="?background_color" - android:padding="4dip" > + android:padding="4dip" + tools:listitem="@layout/usefulapps_item" > </ListView> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/viewpager_activity.xml b/main/res/layout/viewpager_activity.xml index 14120e0..d197bcd 100644 --- a/main/res/layout/viewpager_activity.xml +++ b/main/res/layout/viewpager_activity.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar" />
-
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="fill_parent"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml index c8b257c..287fc3a 100644 --- a/main/res/layout/waypoint_popup.xml +++ b/main/res/layout/waypoint_popup.xml @@ -5,12 +5,7 @@ android:background="?background_color_transparent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title_no_home" /> - - <include layout="@layout/actionbar_button_compass" /> - </LinearLayout> + <include layout="@layout/actionbar_popup" /> <ScrollView android:id="@+id/details_list_box" diff --git a/main/res/layout/wp_threshold_preference.xml b/main/res/layout/wp_threshold_preference.xml index 22ffe9a..f3cbc86 100644 --- a/main/res/layout/wp_threshold_preference.xml +++ b/main/res/layout/wp_threshold_preference.xml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="16dp" android:paddingRight="16dp" - android:paddingTop="8dp" > - + android:paddingTop="8dp" + tools:context=".settings.SettingsActivity" > + <SeekBar android:id="@+id/wp_threshold_seekbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:paddingRight="8dp" - android:layout_weight="1" /> + android:layout_weight="1" + android:paddingRight="8dp" /> <TextView android:id="@+id/wp_threshold_value_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:gravity="center" - android:layout_weight="5" /> + android:layout_weight="5" + android:gravity="center" /> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml index b926dd1..586b93e 100644 --- a/main/res/menu/abstract_logging_activity.xml +++ b/main/res/menu/abstract_logging_activity.xml @@ -1,22 +1,49 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item - android:id="@+id/menu_signature" - android:icon="@drawable/ic_menu_edit" - android:title="@string/init_signature"> + android:id="@+id/menu_send" + android:enabled="true" + android:icon="@drawable/ic_menu_send" + android:title="@string/send" + cgeo:showAsAction="ifRoom|withText"> <!-- enabled=true, we show a message if logging is not possible --> </item> <item android:id="@+id/menu_templates" android:icon="@drawable/ic_menu_add" - android:title="@string/log_add"> + android:title="@string/log_add" + cgeo:showAsAction="ifRoom|withText"> + <menu /> <!-- filled dynamically --> + </item> + <item + android:id="@+id/menu_image" + android:icon="@drawable/ic_menu_attachment" + android:title="@string/log_image_attach" + android:visible="false" + cgeo:showAsAction="ifRoom|withText"> <menu /> <!-- filled dynamically --> </item> <item android:id="@+id/menu_smilies" android:icon="@drawable/ic_menu_emoticons" - android:title="@string/log_smilies"> + android:title="@string/log_smilies" + cgeo:showAsAction="ifRoom|withText"> <menu /> <!-- filled dynamically --> </item> + <item + android:id="@+id/save" + android:icon="@drawable/ic_menu_save" + android:title="@string/log_save" + android:visible="false" + cgeo:showAsAction="ifRoom|withText"> + </item> + <item + android:id="@+id/clear" + android:icon="@drawable/ic_menu_delete" + android:title="@string/log_clear" + android:visible="false" + cgeo:showAsAction="ifRoom|withText"> + </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml index 2767a2e..0c14241 100644 --- a/main/res/menu/cache_list_context.xml +++ b/main/res/menu/cache_list_context.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_default_navigation" @@ -9,40 +10,52 @@ <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/cache_menu_navigate"> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_cache_details" - android:title="@string/cache_menu_details"> + android:title="@string/cache_menu_details" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit_offline"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit"> </item> <item android:id="@+id/menu_drop_cache" + cgeo:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_menu_delete" android:title="@string/cache_offline_drop"> </item> <item android:id="@+id/menu_move_to_list" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_move_list"> </item> <item android:id="@+id/menu_export" + cgeo:showAsAction="ifRoom|withText" android:title="@string/export"> </item> <item android:id="@+id/menu_refresh" + cgeo:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_menu_refresh" android:title="@string/cache_menu_refresh"> </item> <item android:id="@+id/menu_store_cache" + cgeo:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_menu_save" android:title="@string/cache_offline_store"> </item> diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml index 418d2de..1ff0851 100644 --- a/main/res/menu/cache_list_options.xml +++ b/main/res/menu/cache_list_options.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/menu_show_on_map" + android:icon="@drawable/ic_menu_mapmode" + cgeo:showAsAction="ifRoom" + android:title="@string/caches_on_map"> + </item> + <item android:id="@+id/menu_filter" android:icon="@drawable/ic_menu_filter" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_filter"> </item> <item android:id="@+id/menu_sort" android:icon="@drawable/ic_menu_sort_alphabetically" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_sort"> </item> <item @@ -92,27 +101,15 @@ </menu> </item> <item - android:id="@+id/submenu_manage_lists" - android:icon="@drawable/ic_menu_more" - android:title="@string/list_menu"> - <menu> - <item - android:id="@+id/menu_create_list" - android:title="@string/list_menu_create"> - </item> - <item - android:id="@+id/menu_drop_list" - android:title="@string/list_menu_drop"> - </item> - <item - android:id="@+id/menu_rename_list" - android:title="@string/list_menu_rename"> - </item> - <item - android:id="@+id/menu_switch_list" - android:title="@string/list_menu_change"> - </item> - </menu> + android:id="@+id/menu_create_list" + android:title="@string/list_menu_create"> + </item> + <item + android:id="@+id/menu_drop_list" + android:title="@string/list_menu_drop"> + </item> + <item + android:id="@+id/menu_rename_list" + android:title="@string/list_menu_rename"> </item> - </menu>
\ No newline at end of file diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml index d2951f4..9610836 100644 --- a/main/res/menu/cache_options.xml +++ b/main/res/menu/cache_options.xml @@ -1,45 +1,76 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/menu_default_navigation" android:icon="@drawable/ic_menu_compass" - android:title="@string/cache_menu_navigate"> <!-- will be replaced --> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> <!-- will be replaced --> </item> <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/cache_menu_navigate"> - </item> - <item - android:id="@+id/menu_calendar" - android:icon="@drawable/ic_menu_agenda" - android:title="@string/cache_menu_event"> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" - android:title="@string/cache_menu_visit_offline"> + android:title="@string/cache_menu_visit_offline" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" - android:title="@string/cache_menu_visit"> + android:title="@string/cache_menu_visit" + cgeo:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_calendar" + android:icon="@drawable/ic_menu_my_calendar" + android:title="@string/cache_menu_event" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_caches_around" android:icon="@drawable/ic_menu_rotate" - android:title="@string/cache_menu_around"> + android:title="@string/cache_menu_around" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_show_in_browser" android:icon="@drawable/ic_menu_info_details" - android:title="@string/cache_menu_browser"> + android:title="@string/cache_menu_browser" + cgeo:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_store" + android:icon="@drawable/ic_menu_save" + android:title="@string/cache_offline_store" + android:visible="false" + cgeo:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_refresh" + android:icon="@drawable/ic_menu_refresh" + android:title="@string/cache_offline_refresh" + android:visible="false" + cgeo:showAsAction="ifRoom"> + </item> + <item + android:id="@+id/menu_delete" + android:icon="@drawable/ic_menu_delete" + android:title="@string/cache_offline_drop" + android:visible="false" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_share" android:icon="@drawable/ic_menu_share" - android:title="@string/cache_menu_share"> + android:title="@string/cache_menu_share" + cgeo:actionProviderClass="android.support.v7.widget.ShareActionProvider" + cgeo:showAsAction="ifRoom"> </item> - + </menu>
\ No newline at end of file diff --git a/main/res/menu/compass_activity_options.xml b/main/res/menu/compass_activity_options.xml index 01c7d36..e2c6c8a 100644 --- a/main/res/menu/compass_activity_options.xml +++ b/main/res/menu/compass_activity_options.xml @@ -1,36 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_switch_compass_gps" android:icon="@drawable/ic_menu_compass" + cgeo:showAsAction="never|withText" android:title="@string/use_gps"> <!-- will be replaced in code --> </item> <item android:id="@+id/menu_map" android:icon="@drawable/ic_menu_mapmode" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_on_map"> </item> <item android:id="@+id/menu_edit_destination" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/destination_set"> </item> <item android:id="@+id/menu_select_destination" android:icon="@drawable/ic_menu_myplaces" + cgeo:showAsAction="ifRoom|withText" android:title="@string/destination_select"> <menu /> <!-- filled dynamically --> </item> <item android:id="@+id/menu_tts_start" android:icon="@drawable/ic_menu_start_conversation" + cgeo:showAsAction="ifRoom|withText" android:title="@string/tts_start"> </item> <item android:id="@+id/menu_tts_stop" android:icon="@drawable/ic_menu_start_conversation" android:title="@string/tts_stop" + cgeo:showAsAction="ifRoom|withText" android:visible="false"> </item> diff --git a/main/res/menu/details_context.xml b/main/res/menu/details_context.xml index 3125459..fc61d5d 100644 --- a/main/res/menu/details_context.xml +++ b/main/res/menu/details_context.xml @@ -1,26 +1,34 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/menu_copy" - android:title="@android:string/copy"> + android:icon="@drawable/ic_menu_copy" + android:title="@android:string/copy" + cgeo:showAsAction="always|withText"> </item> <item android:id="@+id/menu_translate_to_sys_lang" - android:title="@string/translate_to_sys_lang"> + android:title="@string/translate_to_sys_lang" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_translate_to_english" - android:title="@string/translate_to_english"> + android:title="@string/translate_to_english" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_cache_share_field" - android:title="@string/cache_share_field"> + android:title="@string/cache_share_field" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_calendar" + android:icon="@drawable/ic_menu_my_calendar" android:title="@string/cache_menu_event" - android:visible="false"> + android:visible="false" + cgeo:showAsAction="ifRoom"> </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/images_list_context.xml b/main/res/menu/images_list_context.xml index 75d0ca0..0726267 100644 --- a/main/res/menu/images_list_context.xml +++ b/main/res/menu/images_list_context.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/image_open_file" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_image_open_file"> </item> <item android:id="@+id/image_open_browser" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_image_open_browser"> </item> diff --git a/main/res/menu/logging_ui.xml b/main/res/menu/logging_ui.xml index a8622c5..5baacfc 100644 --- a/main/res/menu/logging_ui.xml +++ b/main/res/menu/logging_ui.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit_offline"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit"> </item> diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml index fc949dc..6e5a198 100644 --- a/main/res/menu/main_activity_options.xml +++ b/main/res/menu/main_activity_options.xml @@ -1,34 +1,50 @@ <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
+ <!-- TODO: use ic_action_search -->
<item
- android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_preferences"
- android:title="@string/menu_settings">
- </item>
+ android:id="@+id/menu_gosearch"
+ style="@style/action_bar_action"
+ android:icon="@drawable/abc_ic_search"
+ android:title="@string/search_bar_hint"
+ cgeo:actionViewClass="android.support.v7.widget.SearchView"
+ cgeo:showAsAction="collapseActionView|always"/>
<item
android:id="@+id/menu_history"
android:icon="@drawable/ic_menu_recent_history"
- android:title="@string/menu_history">
+ android:title="@string/menu_history"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_pocket_queries"
android:icon="@drawable/ic_menu_account_list"
- android:title="@string/menu_pocket_queries">
+ android:title="@string/menu_pocket_queries"
+ cgeo:showAsAction="ifRoom">
+ </item>
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@drawable/ic_menu_preferences"
+ android:title="@string/menu_settings"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_helpers"
android:icon="@drawable/ic_menu_shopping"
- android:title="@string/menu_helpers">
+ android:title="@string/menu_helpers"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_scan"
android:icon="@drawable/ic_menu_barcode"
- android:title="@string/menu_scan_geo">
+ android:title="@string/menu_scan_geo"
+ cgeo:showAsAction="ifRoom">
</item>
<item
android:id="@+id/menu_about"
android:icon="@drawable/ic_menu_info_details"
- android:title="@string/menu_about">
+ android:title="@string/menu_about"
+ cgeo:showAsAction="ifRoom">
</item>
+
</menu>
\ No newline at end of file diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml index d81a49b..4c1dfd7 100644 --- a/main/res/menu/map_activity.xml +++ b/main/res/menu/map_activity.xml @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item + android:id="@+id/menu_toggle_mypos" + android:icon="@drawable/ic_menu_myposition" + android:showAsAction="always" + android:title="@string/menu_centerposition" + cgeo:showAsAction="always"/> + <item android:id="@+id/menu_select_mapview" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/map_view_map"> + android:title="@string/map_view_map" + cgeo:showAsAction="ifRoom|withText"> <menu> <group android:id="@+id/menu_group_map_sources" @@ -15,42 +23,51 @@ <item android:id="@+id/menu_map_live" android:icon="@drawable/ic_menu_refresh" - android:title="@string/map_live_disable"> + android:title="@string/map_live_disable" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_store_caches" - android:enabled="false" android:icon="@drawable/ic_menu_set_as" - android:title="@string/caches_store_offline"> + android:title="@string/caches_store_offline" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/submenu_modes" android:icon="@drawable/ic_menu_mark" - android:title="@string/map_modes"> + android:title="@string/map_modes" + cgeo:showAsAction="ifRoom|withText"> <menu> <item android:id="@+id/menu_trail_mode" + android:checkable="true" android:icon="@drawable/ic_menu_trail" - android:title="@string/map_trail_hide"> + android:title="@string/map_trail_show" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_circle_mode" + android:checkable="true" android:icon="@drawable/ic_menu_circle" - android:title="@string/map_circles_hide"> - </item> - <item - android:id="@+id/menu_mycaches_mode" - android:icon="@android:drawable/ic_menu_myplaces" - android:title="@string/map_mycaches_hide"> + android:title="@string/map_circles_show" + cgeo:showAsAction="ifRoom|withText"> </item> <item - android:id="@+id/menu_theme_mode" - android:icon="@drawable/ic_menu_preferences" - android:title="@string/map_theme_select"> + android:id="@+id/menu_mycaches_mode" + android:checkable="true" + android:icon="@android:drawable/ic_menu_myplaces" + android:title="@string/map_mycaches_hide" + cgeo:showAsAction="ifRoom|withText"> </item> </menu> </item> <item + android:id="@+id/menu_theme_mode" + android:icon="@drawable/ic_menu_preferences" + android:title="@string/map_theme_select" + cgeo:showAsAction="ifRoom|withText"> + </item> + <item android:id="@+id/submenu_strategy" android:icon="@drawable/ic_menu_preferences" android:title="@string/map_strategy"> diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml index 4f199e2..a17405b 100644 --- a/main/res/menu/navigate_any_point_activity_options.xml +++ b/main/res/menu/navigate_any_point_activity_options.xml @@ -1,25 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/cache_menu_navigate"> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_default_navigation" android:icon="@drawable/ic_menu_compass" - android:title="@string/cache_menu_navigate"> <!-- will be replaced in code --> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> <!-- will be replaced in code --> </item> <item android:id="@+id/menu_caches_around" android:icon="@drawable/ic_menu_rotate" - android:title="@string/cache_menu_around"> + android:title="@string/cache_menu_around" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_clear_history" android:icon="@drawable/ic_menu_delete" - android:title="@string/search_clear_history"> + android:title="@string/search_clear_history" + cgeo:showAsAction="ifRoom"> </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/search_activity_options.xml b/main/res/menu/search_activity_options.xml index fcd7401..c4ee62b 100644 --- a/main/res/menu/search_activity_options.xml +++ b/main/res/menu/search_activity_options.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_search_own_caches" android:icon="@drawable/ic_menu_myplaces" - android:title="@string/search_own_caches"> + android:title="@string/search_own_caches" + cgeo:showAsAction="ifRoom|withText" + > </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/static_maps_activity_options.xml b/main/res/menu/static_maps_activity_options.xml index 7850c92..8621153 100644 --- a/main/res/menu/static_maps_activity_options.xml +++ b/main/res/menu/static_maps_activity_options.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_refresh" android:icon="@drawable/ic_menu_refresh" + cgeo:showAsAction="ifRoom" android:title="@string/cache_offline_refresh"> </item> diff --git a/main/res/menu/trackable_activity.xml b/main/res/menu/trackable_activity.xml index ddf45f6..60eaa9e 100644 --- a/main/res/menu/trackable_activity.xml +++ b/main/res/menu/trackable_activity.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_log_touch" android:icon="@drawable/ic_menu_agenda" + cgeo:showAsAction="ifRoom|withText" android:title="@string/trackable_log_touch"> </item> <item android:id="@+id/menu_browser_trackable" android:icon="@drawable/ic_menu_info_details" + cgeo:showAsAction="ifRoom|withText" android:title="@string/trackable_browser_open"> </item> diff --git a/main/res/menu/waypoint_options.xml b/main/res/menu/waypoint_options.xml index f03cca6..5aaeac2 100644 --- a/main/res/menu/waypoint_options.xml +++ b/main/res/menu/waypoint_options.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_waypoint_reset_cache_coords" diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml index 527282c..cc4d880 100644 --- a/main/res/values-ca/strings.xml +++ b/main/res/values-ca/strings.xml @@ -18,6 +18,7 @@ <string name="letterbox">Letterbox</string> <string name="event">Trobada</string> <string name="mega">Mega</string> + <string name="giga">Giga</string> <string name="earth">Earthcatxé</string> <string name="cito">Trobada CITO</string> <string name="webcam">Webcam</string> @@ -79,21 +80,9 @@ <string name="log_saving_and_uploading">S\'està enviant el registre i pujant la imatge…</string> <string name="log_clear">Esborra</string> <string name="log_post">Envia el registre</string> - <string name="log_post_rate">Envia el registre i la valoració</string> - <string name="log_post_no_rate">Envia el registre sense valoració</string> <string name="log_post_not_possible">S\'està carregant la pàgina del registre…</string> <string name="log_add">Afegeix</string> - <string name="log_rating">Puntuació</string> <string name="log_no_rating">Sense puntuació</string> - <string name="log_stars_1">1 estrella</string> - <string name="log_stars_15">1,5 estrelles</string> - <string name="log_stars_2">2 estrelles</string> - <string name="log_stars_25">2,5 estrelles</string> - <string name="log_stars_3">3 estrelles</string> - <string name="log_stars_35">3,5 estrelles</string> - <string name="log_stars_4">4 estrelles</string> - <string name="log_stars_45">4,5 estrelles</string> - <string name="log_stars_5">5 estrelles</string> <string name="log_stars_1_description">Pobre</string> <string name="log_stars_15_description">Bastant pobre</string> <string name="log_stars_2_description">Per sota de la mitjana</string> @@ -112,7 +101,6 @@ <string name="log_smilies">Emoticones</string> <string name="log_image">Imatge</string> <string name="log_image_attach">Adjunta una imatge</string> - <string name="log_image_edit">Edita la imatge</string> <string name="log_image_stored">Existent</string> <string name="log_image_camera">Nou</string> <string name="log_image_caption">Títol</string> @@ -121,6 +109,13 @@ <string name="log_password_title">Contrasenya d\'accés:</string> <string name="log_hint_log_password">Introduïu la contrasenya d\'accés</string> <string name="log_oc_team_comment">Comentari de l\'equip OC</string> + <string-array name="log_image_scales"> + <item>Sense escala</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Tradueix a %s</string> <string name="translate_to_english">Tradueix a l\'anglès</string> <string name="translate_length_warning">La traducció pot fallar amb una gran quantitat de text.</string> @@ -241,6 +236,10 @@ <string name="caches_more_caches_currently">actualment</string> <string name="caches_downloading">S\'estan descarregant els catxés…\nETA: </string> <string name="caches_eta_ltm">Menys d\'un minut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minut</item> + <item quantity="other">minuts</item> + </plurals> <string name="caches_store_offline">Desa per usar fora de línia</string> <string name="caches_store_selected">Desa els seleccionats</string> <string name="caches_history">Historial</string> @@ -282,6 +281,7 @@ <string name="caches_move_all">Mou-ho tot</string> <string name="caches_map_locus">Locus</string> <string name="caches_map_locus_export">Exporta al Locus</string> + <string name="caches_map_mapswithme">MapsWithMe</string> <string name="caches_recaptcha_title">reCAPTCHA</string> <string name="caches_recaptcha_explanation">Introduïu el text de la imatge. Això permet la baixada de les coordenades del catxé, que es pot desactivar a la configuració.</string> <string name="caches_recaptcha_hint">Text de la imatge</string> @@ -301,10 +301,8 @@ <string name="caches_removing_from_history">S\'està eliminant de l\'historial…</string> <string name="caches_clear_offlinelogs">Neteja els registres fora de línea</string> <string name="caches_clear_offlinelogs_progress">S\'estan netejant els registres fora línia</string> - <string name="list_menu">Llista</string> <string name="list_menu_create">Crea una llista nova</string> <string name="list_menu_drop">Elimina la llista actual</string> - <string name="list_menu_change">Canvia de llista</string> <string name="list_menu_rename">Reanomena la llista actual</string> <string name="list_title">Trieu una llista</string> <string name="list_inbox">Desats</string> @@ -402,8 +400,8 @@ <string name="init_signature_template_log">Text del registre</string> <string name="init_ratingwanted">Valoració del GCvote</string> <string name="init_summary_ratingwanted">Descarrega la valoració des de GCvote.com</string> - <string name="init_friendlogswanted">Mostra els registres d\'amics</string> - <string name="init_summary_friendlogswanted">Mostra els registres dels amics a una altra pàgina</string> + <string name="init_friends_and_own_logs_wanted">Mostra els dels amics i els propis</string> + <string name="init_summary_friends_and_own_logs_wanted">Visualitza una pàgina addicional del llibre de registre pels registres dels amics i els propis</string> <string name="init_openlastdetailspage">Obre l\'última pàgina de detalls</string> <string name="init_summary_openlastdetailspage">Obre els detalls amb l\'última pàgina utilitzada</string> <string name="init_autoload">Descripció llarga</string> @@ -524,7 +522,7 @@ <string name="init_sendToCgeo_description"><b>Send2c:geo</b> us permet enviar els catxés al vostre aparell Android directament des de Geocaching.com utilitzant un complement especial per al Firefox o pel Chrome. Abans de registrar-vos veieu <a href="http://send2.cgeo.org/"> http://send2.cgeo.org/</a>. Només cal que us registreu si voleu utilitzar el send2c:geo.</string> <string name="init_sendToCgeo_register">Sol·licita registre</string> <string name="init_sendToCgeo_registering">S\'està registrant el dispositiu per Send2c:geo…</string> - <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és # # #. Utilitzeu-lo al web del c:geo per connectar aquest dispositiu al navegador.</string> + <string name="init_sendToCgeo_register_ok">Us heu registrat correctament. El codi PIN és ####. Utilitzeu-lo al web del c:geo per connectar aquest dispositiu al navegador.</string> <string name="init_sendToCgeo_register_fail">S\'ha produït un error en el registre del sendToCgeo.</string> <string name="sendToCgeo_download_fail">El c:geo ha fallat al descarregar els catxés. No hi ha connexió a Internet o el send2c:geo no funciona.</string> <string name="sendToCgeo_no_registration">S\'ha produït un error descarregant els catxés. El registre a send2c:geo ha caducat. Registreu-vos de nou a la configuració.</string> @@ -542,6 +540,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">El c:geo ara està autoritzat a interactuar amb %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Un catxé</item> + <item quantity="other">%1$d catxés</item> + </plurals> <string name="cache_offline">Fora de línia</string> <string name="cache_offline_refresh">Actualitza</string> <string name="cache_offline_drop">Esborra</string> @@ -568,8 +570,6 @@ <string name="cache_personal_note_uploading">S\'està pujant la nota personal</string> <string name="cache_personal_note_upload_done">S\'ha pujat la nota personal</string> <string name="cache_personal_note_upload_cancelled">S\'ha cancel·lat la pujada de la nota personal</string> - <string name="cache_personal_note_unstored">El catxé no s\'ha desat</string> - <string name="cache_personal_note_store">El catxé es desa en primer lloc per permetre una nota personal.</string> <string name="cache_description">Descripció</string> <string name="cache_description_long">Descripció llarga</string> <string name="cache_description_table_note">La descripció conté un format que pot necessitar visualitzar-se a %s per a veure\'s correctament.</string> @@ -586,10 +586,14 @@ <string name="cache_list_unknown">No està a cap llista</string> <string name="cache_images">Imatges</string> <string name="cache_waypoints">Fites</string> + <plurals name="waypoints"> + <item quantity="one">1 fita</item> + <item quantity="other">%d fites</item> + </plurals> <string name="cache_waypoints_add">Afegeix una fita</string> <string name="cache_hint">Pista</string> <string name="cache_logs">Llibre de registre</string> - <string name="cache_logsfriends">Llibre de registre (Amics)</string> + <string name="cache_logs_friends_and_own">Registres dels amics o propis</string> <string name="cache_dialog_loading_details">S\'està carregant els detalls del catxé…</string> <string name="cache_dialog_loading_details_status_loadpage">S\'està carregant la pàgina</string> <string name="cache_dialog_loading_details_status_details">S\'està processant els detalls</string> @@ -635,15 +639,16 @@ <string name="cache_menu_refresh">Actualitza</string> <string name="cache_menu_share">Comparteix el catxé</string> <string name="cache_menu_move_list">Mou a una llista diferent</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Catxé de balisa</string> <string name="cache_menu_navigon">Navigon</string> <string name="cache_menu_pebble">Pebble</string> + <string name="cache_menu_mapswithme">MapsWithMe</string> <string name="cache_status">Estat</string> <string name="cache_status_offline_log">Registre desat</string> <string name="cache_status_found">Trobat</string> + <string name="cache_not_status_found">No s\'ha trobat</string> <string name="cache_status_archived">Arxivat</string> <string name="cache_status_disabled">Desactivat</string> <string name="cache_status_premium">Només per membres Premium</string> @@ -755,10 +760,7 @@ <string name="map_view_map">Tria el mapa</string> <string name="map_modes">Configuració del mapa</string> <string name="map_trail_show">Mostra la ruta</string> - <string name="map_trail_hide">Amaga la ruta</string> <string name="map_circles_show">Mostra els cercles</string> - <string name="map_circles_hide">Amaga els cercles</string> - <string name="map_mycaches_show">Mostra els catxés propis/trobats</string> <string name="map_mycaches_hide">Amaga els catxés propis/trobats</string> <string name="map_theme_builtin">Per defecte</string> <string name="map_theme_select">Trieu els detalls del mapa</string> @@ -1112,7 +1114,6 @@ <string name="website">Lloc web: <a href=""> cgeo.org</a></string> <string name="facebook">Facebook: <a href="">Pàgina del c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">El c:geo a Google Play</a></string> <string name="about_twitter">Voleu que <b>el c:geo</b> publiqui un nou estatus al Twitter cada vegada que registreu un catxé?</string> <string name="faq">PMF: <a href=""> faq.cgeo.org</a></string> @@ -1128,50 +1129,28 @@ <string name="tts_stop">Deixa de parlar</string> <string name="err_tts_lang_not_supported">La llengua actual no és compatible amb la síntesi de veu.</string> <string name="tts_one_kilometer">un quilòmetre</string> - <string name="tts_one_meter">un metre</string> - <string name="tts_one_mile">una milla</string> - <string name="tts_one_foot">un peu</string> - <string name="tts_one_oclock">la una en punt</string> - <string name="tts_oclock">%s en punt</string> - <string name="clipboard_copy_ok">S\'ha copiat al portapapers</string> - <string name="percent_favorite_points">% \ preferits</string> - <string name="cgeo_shortcut">Drecera del c:geo</string> - <string name="create_shortcut">Crea una drecera</string> - <string-array name="log_image_scales"> - <item>Sense escala</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minut</item> - <item quantity="other">minuts</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un catxé</item> - <item quantity="other">%1$d catxés</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 fita</item> - <item quantity="other">%d fites</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s quilòmetre</item> <item quantity="other">%s quilòmetres</item> </plurals> + <string name="tts_one_meter">un metre</string> <plurals name="tts_meters"> <item quantity="one">%s metre</item> <item quantity="other">%s metres</item> </plurals> + <string name="tts_one_mile">una milla</string> <plurals name="tts_miles"> <item quantity="one">%s milla</item> <item quantity="other">%s milles</item> </plurals> + <string name="tts_one_foot">un peu</string> <plurals name="tts_feet"> <item quantity="one">%s peu</item> <item quantity="other">%s peus</item> </plurals> + <string name="tts_one_oclock">la una en punt</string> + <string name="tts_oclock">%s en punt</string> + <string name="clipboard_copy_ok">S\'ha copiat al portapapers</string> <plurals name="days_ago"> <item quantity="one">ahir</item> <item quantity="other">fa %d dies</item> @@ -1180,4 +1159,7 @@ <item quantity="one">%s preferit</item> <item quantity="other">%s preferits</item> </plurals> + <string name="percent_favorite_points">% \ preferits</string> + <string name="cgeo_shortcut">Drecera del c:geo</string> + <string name="create_shortcut">Crea una drecera</string> </resources> diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 3202869..356b45d 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -12,7 +12,7 @@ <string name="settings_titlebar">c:geo Nastavení</string> <string name="all_types">Všechny typy keší</string> <string name="traditional">Tradiční keš</string> - <string name="multi">Multi-keš</string> + <string name="multi">Multi keš</string> <string name="mystery">Mystery keš</string> <string name="letterbox">Dopisní schránka</string> <string name="event">Keš události</string> @@ -78,21 +78,9 @@ <string name="log_saving_and_uploading">Odesílání Logu a nahrávání obrázku…</string> <string name="log_clear">Vyčistit</string> <string name="log_post">Odeslat Log</string> - <string name="log_post_rate">Odeslat Log a hlasovat</string> - <string name="log_post_no_rate">Odeslat Log a nehlasovat</string> <string name="log_post_not_possible">Načítání stránky s Logovacím formulářem…</string> <string name="log_add">Přidat</string> - <string name="log_rating">Hodnocení</string> <string name="log_no_rating">Bez hodnocení</string> - <string name="log_stars_1">1 hvězdička</string> - <string name="log_stars_15">1,5 hvězdičky</string> - <string name="log_stars_2">2 hvězdičky</string> - <string name="log_stars_25">2,5 hvězdičky</string> - <string name="log_stars_3">3 hvězdičky</string> - <string name="log_stars_35">3,5 hvězdičky</string> - <string name="log_stars_4">4 hvězdičky</string> - <string name="log_stars_45">4,5 hvězdičky</string> - <string name="log_stars_5">5 hvězdiček</string> <string name="log_stars_1_description">Slabá</string> <string name="log_stars_15_description">Docela slabá</string> <string name="log_stars_2_description">Podprůměrná</string> @@ -111,7 +99,6 @@ <string name="log_smilies">Smajlíci</string> <string name="log_image">Obrázek</string> <string name="log_image_attach">Připojit obrázek</string> - <string name="log_image_edit">Upravit obrázek</string> <string name="log_image_stored">Existující</string> <string name="log_image_camera">Nový</string> <string name="log_image_caption">Titulek</string> @@ -120,6 +107,13 @@ <string name="log_password_title">Logovací heslo:</string> <string name="log_hint_log_password">Zadej své logovací heslo</string> <string name="log_oc_team_comment">Komentář týmu OC</string> + <string-array name="log_image_scales"> + <item>Bez měřítka</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Přeložit do %s</string> <string name="translate_to_english">Přeložit do angličtiny</string> <string name="translate_length_warning">Při velkém množství textu může překládání selhat.</string> @@ -240,6 +234,11 @@ <string name="caches_more_caches_currently">aktuálně</string> <string name="caches_downloading">Stahování keší…\nETA:</string> <string name="caches_eta_ltm">Méně než minutu</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="few">minuty</item> + <item quantity="other">minuty</item> + </plurals> <string name="caches_store_offline">Uložit pro offline</string> <string name="caches_store_selected">Uložit vybrané</string> <string name="caches_history">Historie</string> @@ -301,10 +300,8 @@ <string name="caches_removing_from_history">Čištění Historie…</string> <string name="caches_clear_offlinelogs">Smazat offline Logy</string> <string name="caches_clear_offlinelogs_progress">Mazání offline logů</string> - <string name="list_menu">Seznam</string> <string name="list_menu_create">Vytvořit nový seznam</string> <string name="list_menu_drop">Smazat aktuální seznam</string> - <string name="list_menu_change">Změnit seznam</string> <string name="list_menu_rename">Přejmenovat aktuální seznam</string> <string name="list_title">Vyber seznam</string> <string name="list_inbox">Uložené</string> @@ -402,8 +399,6 @@ <string name="init_signature_template_log">Text logu</string> <string name="init_ratingwanted">Načítat hodnocení keše z GCvote.com</string> <string name="init_summary_ratingwanted">Načítat hodnocení keše z GCvote.com</string> - <string name="init_friendlogswanted">Načítat doplňkový Logbook s logy od kámošů</string> - <string name="init_summary_friendlogswanted">Načítat doplňkový Logbook s logy od kámošů</string> <string name="init_openlastdetailspage">Otevřít detaily na naposledy použité stránce</string> <string name="init_summary_openlastdetailspage">Otevřít detaily na naposledy použité stránce</string> <string name="init_autoload">Automaticky načítat dlouhý popis</string> @@ -568,8 +563,6 @@ <string name="cache_personal_note_uploading">Nahrávání osobní poznámky</string> <string name="cache_personal_note_upload_done">Osobní poznámka nahrána</string> <string name="cache_personal_note_upload_cancelled">Nahrávání osobní poznámky přerušeno</string> - <string name="cache_personal_note_unstored">Keš neuložena</string> - <string name="cache_personal_note_store">Keš bude nejdříve uložena kvůli povolení osobních poznámek.</string> <string name="cache_description">Popis</string> <string name="cache_description_long">Dlouhý popis</string> <string name="cache_description_table_note">Popis obsahuje tabulkové formátování, které je pravděpodobně nutné prohlížet na %s, aby bylo správně zobrazené.</string> @@ -589,7 +582,6 @@ <string name="cache_waypoints_add">Přidat Bod trasy</string> <string name="cache_hint">Nápověda</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Logbook (Přátelé)</string> <string name="cache_dialog_loading_details">Načítání detailů keše…</string> <string name="cache_dialog_loading_details_status_loadpage">Načítání stránky</string> <string name="cache_dialog_loading_details_status_details">Zpracovávání podrobností</string> @@ -635,7 +627,6 @@ <string name="cache_menu_refresh">Obnovit</string> <string name="cache_menu_share">Sdílet keš</string> <string name="cache_menu_move_list">Přesunout do jiného seznamu</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -756,10 +747,7 @@ <string name="map_view_map">Vybrat typ mapy</string> <string name="map_modes">Režimy mapy</string> <string name="map_trail_show">Zobrazit záznam trasy</string> - <string name="map_trail_hide">Skrýt záznam trasy</string> <string name="map_circles_show">Zobrazit kruhy</string> - <string name="map_circles_hide">Skrýt kruhy</string> - <string name="map_mycaches_show">Zobrazovat vlastní/nalezené keše</string> <string name="map_mycaches_hide">Skrývat vlastní/nalezené keše</string> <string name="map_theme_builtin">Výchozí</string> <string name="map_theme_select">Vyber téma mapy</string> @@ -1113,7 +1101,6 @@ <string name="website">Stránka: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">Stránka c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Návod: <a href="">c:geo v Nutshell</a></string> <string name="market">Android: <a href="">c:geo na Google Play</a></string> <string name="about_twitter">Má <b>c:geo</b> publikovat nový status na Twitteru vždy, když zaloguješ keš?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1138,16 +1125,4 @@ <string name="percent_favorite_points">%\ oblíbené</string> <string name="cgeo_shortcut">c:geo zástupce</string> <string name="create_shortcut">Vytvořit zástupce</string> - <string-array name="log_image_scales"> - <item>Bez měřítka</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="few">minuty</item> - <item quantity="other">minuty</item> - </plurals> </resources> diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index e3d3ba4..76b60f0 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -71,17 +71,7 @@ <string name="log_save">Gem</string> <string name="log_clear">Fjern</string> <string name="log_add">Tilføj</string> - <string name="log_rating">Vurdering</string> <string name="log_no_rating">Ingen vurdering</string> - <string name="log_stars_1">1 stjerne</string> - <string name="log_stars_15">1,5 stjerner</string> - <string name="log_stars_2">2 stjerner</string> - <string name="log_stars_25">2,5 stjerner</string> - <string name="log_stars_3">3 stjerner</string> - <string name="log_stars_35">3,5 stjerner</string> - <string name="log_stars_4">4 stjerner</string> - <string name="log_stars_45">4,5 stjerner</string> - <string name="log_stars_5">5 stjerner</string> <string name="log_stars_15_description">Temmelig dårlig</string> <string name="log_stars_2_description">Under gennemsnittet</string> <string name="log_stars_25_description">Ikke så slemt</string> @@ -161,6 +151,10 @@ <string name="auth_authorize">Godkend c:geo</string> <string name="auth_start">Start godkendelse</string> <string name="auth_again">Start igen</string> + <plurals name="cache_counts"> + <item quantity="one">En cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Genindlæs</string> <string name="cache_offline_drop">Fjern</string> @@ -235,7 +229,6 @@ <string name="map_live">Live-kort</string> <string name="map_view_map">Kort-view</string> <string name="map_trail_show">Vis spor</string> - <string name="map_trail_hide">Skjul spor</string> <string name="map_live_enable">Aktivér live</string> <string name="map_live_disable">Deaktivér live</string> <string name="search_coordinates">Koordinater</string> @@ -264,8 +257,4 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="about_twitter">Skal <b>c:geo</b> sende status til Twitter hvergang du logger en cache?</string> - <plurals name="cache_counts"> - <item quantity="one">En cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> </resources> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 9180f5e..98cfd60 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -80,21 +80,9 @@ <string name="log_saving_and_uploading">Log und Bild werden gesendet…</string> <string name="log_clear">Leeren</string> <string name="log_post">Loggen</string> - <string name="log_post_rate">Loggen & bewerten</string> - <string name="log_post_no_rate">Loggen ohne Bewertung</string> <string name="log_post_not_possible">Lade Log-Seite…</string> <string name="log_add">Hinzufügen</string> - <string name="log_rating">Bewertung</string> <string name="log_no_rating">Keine Bewertung</string> - <string name="log_stars_1">1 Stern</string> - <string name="log_stars_15">1,5 Sterne</string> - <string name="log_stars_2">2 Sterne</string> - <string name="log_stars_25">2,5 Sterne</string> - <string name="log_stars_3">3 Sterne</string> - <string name="log_stars_35">3,5 Sterne</string> - <string name="log_stars_4">4 Sterne</string> - <string name="log_stars_45">4,5 Sterne</string> - <string name="log_stars_5">5 Sterne</string> <string name="log_stars_1_description">Schlecht</string> <string name="log_stars_15_description">Lohnt sich nicht</string> <string name="log_stars_2_description">Schwach</string> @@ -113,7 +101,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Bild</string> <string name="log_image_attach">Bild hinzufügen</string> - <string name="log_image_edit">Bild bearbeiten</string> <string name="log_image_stored">Vorhanden</string> <string name="log_image_camera">Neu</string> <string name="log_image_caption">Überschrift</string> @@ -122,6 +109,13 @@ <string name="log_password_title">Log-Passwort:</string> <string name="log_hint_log_password">Log-Passwort eingeben</string> <string name="log_oc_team_comment">OC Team Bemerkung</string> + <string-array name="log_image_scales"> + <item>Keine Skalierung</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Übersetze in %s</string> <string name="translate_to_english">Übersetze in Englisch</string> <string name="translate_length_warning">Die Übersetzung kann bei sehr langen Texten evtl. fehlschlagen.</string> @@ -214,6 +208,7 @@ <string name="info_select_logimage_cancelled">Fotoauswahl oder -erstellung abgebrochen.</string> <string name="info_stored_image">Neues Foto gespeichert nach:</string> <string name="info_storing_static_maps">Versuche, statische Karten zu speichern</string> + <string name="info_cache_saved">Der Cache wurde gespeichert</string> <string name="loc_last">Letzte Position</string> <string name="loc_net">Netzwerk</string> <string name="loc_gps">GPS</string> @@ -221,14 +216,15 @@ <string name="loc_trying">Lokalisierung</string> <string name="loc_no_addr">Adresse unbekannt</string> <string name="loc_gps_disabled">GPS nicht aktiv</string> - <string name="menu_about">über c:geo</string> + <string name="menu_centerposition">Zentriere meine Position</string> + <string name="menu_about">Über c:geo</string> <string name="menu_helpers">Nützliche Apps</string> <string name="menu_settings">Einstellungen</string> <string name="menu_history">Verlauf</string> <string name="menu_filter">Filter</string> <string name="menu_scan_geo">Geocode scannen</string> <string name="menu_pocket_queries">Pocket Queries</string> - <string name="menu_scan_description">c:geo kann Geocodes, die als QR code abgebildet sind scannen. Die dafür notwendige App ist nicht installiert. Wollen sie Google Play öffnen, um sie zu installieren?</string> + <string name="menu_scan_description">c:geo kann Geocodes scannen, die als QR-Code abgebildet sind. Die dafür notwendige App ist nicht installiert. Möchten Sie Google Play öffnen, um sie zu installieren?</string> <string name="live_map_button">Live-Karte</string> <string name="caches_nearby_button">In der Nähe</string> <string name="advanced_search_button">Suche</string> @@ -242,6 +238,10 @@ <string name="caches_more_caches_currently">aktuell</string> <string name="caches_downloading">Lade Caches…\nGeschätzte Zeit: </string> <string name="caches_eta_ltm">Weniger als eine Minute</string> + <plurals name="caches_eta_mins"> + <item quantity="one">Minute</item> + <item quantity="other">Minuten</item> + </plurals> <string name="caches_store_offline">Für Offline speichern</string> <string name="caches_store_selected">Ausgewählte speichern</string> <string name="caches_history">Verlauf</string> @@ -303,10 +303,8 @@ <string name="caches_removing_from_history">Lösche aus Verlauf…</string> <string name="caches_clear_offlinelogs">Offline-Logs löschen</string> <string name="caches_clear_offlinelogs_progress">Lösche Offline-Logs</string> - <string name="list_menu">Liste</string> <string name="list_menu_create">Neue Liste</string> <string name="list_menu_drop">Aktuelle Liste löschen</string> - <string name="list_menu_change">Andere Liste anzeigen</string> <string name="list_menu_rename">Aktuelle Liste umbenennen</string> <string name="list_title">Liste wählen</string> <string name="list_inbox">Standardliste</string> @@ -404,8 +402,8 @@ <string name="init_signature_template_log">Log text</string> <string name="init_ratingwanted">GCvote-Bewertung</string> <string name="init_summary_ratingwanted">Lade Cache-Bewertung von GCvote.com</string> - <string name="init_friendlogswanted">Logs von Freunden zeigen</string> - <string name="init_summary_friendlogswanted">Lade zusätzliche Logbuch-Seite für Logs von Freunden</string> + <string name="init_friends_and_own_logs_wanted">Eigene und Logs von Freunden zeigen</string> + <string name="init_summary_friends_and_own_logs_wanted">Lade zusätzliche Logbuch-Seiten für eigene und Logs von Freunden</string> <string name="init_openlastdetailspage">Zuletzt genutzte Seite</string> <string name="init_summary_openlastdetailspage">Öffne Details mit zuletzt genutzter Seite</string> <string name="init_autoload">Ausführliche Beschreibung</string> @@ -417,6 +415,8 @@ <string name="init_captcha">Zeige CAPTCHA</string> <string name="init_summary_captcha">Zeige CAPTCHA wenn notwendig (nur Basic Member)</string> <string name="init_useenglish">Auf Englisch</string> + <string name="init_showoverflowmenu">Menü-Symbol immer anzeigen</string> + <string name="init_showoverflow_summary">Zeigt das Menü-Symbol (Drei Punkte ⋮) auch an wenn das Gerät eine Menütaste hat (Neustart benötigt)</string> <string name="init_summary_useenglish">c:geo auf Englisch nutzen (Neustart erforderlich)</string> <string name="init_exclude">Eigene und gefundene Caches</string> <string name="init_summary_exclude">Eigene und gefundene Caches ausblenden</string> @@ -494,6 +494,9 @@ <string name="init_maintenance">Wartung</string> <string name="init_maintenance_directories_note">c:geo speichert Bilder, Log-Bilder und weitere Dateien zu einem Cache in einem separaten Verzeichnis. In manchen Fällen (z.B. bei Sichern und Wiederherstellen der Datenbank) kann dieses Verzeichnis unnötige Daten enthalten, die gelöscht werden können.</string> <string name="init_maintenance_directories">Verwaiste Daten löschen</string> + <string name="init_create_memory_dump">Erzeuge ein Speicherabbild</string> + <string name="init_memory_dump">Speicherabbild</string> + <string name="init_memory_dumped">Speicherabbild in %s gespeichert</string> <string name="settings_open_website">Webseite öffnen</string> <string name="settings_settings">Einstellungen</string> <string name="settings_information">Information</string> @@ -541,6 +544,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo ist nun autorisiert, Caches zu laden und auf %s zu loggen.</string> + <plurals name="cache_counts"> + <item quantity="one">Ein Cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Aktualisieren</string> <string name="cache_offline_drop">Löschen</string> @@ -567,8 +574,6 @@ <string name="cache_personal_note_uploading">Persönliche Notiz wird gesendet</string> <string name="cache_personal_note_upload_done">Persönliche Notiz wurde hochgeladen</string> <string name="cache_personal_note_upload_cancelled">Hochladen der Notiz abgebrochen</string> - <string name="cache_personal_note_unstored">Cache noch nicht gespeichert</string> - <string name="cache_personal_note_store">Der Cache wird zunächst gespeichert, damit die persönliche Notiz möglich ist.</string> <string name="cache_description">Beschreibung</string> <string name="cache_description_long">Ausführliche Beschreibung</string> <string name="cache_description_table_note">Diese Beschreibung enthält Tabellenelemente, die evtl. nur auf %s korrekt angezeigt werden.</string> @@ -585,10 +590,14 @@ <string name="cache_list_unknown">In keiner Liste</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Wegpunkte</string> + <plurals name="waypoints"> + <item quantity="one">1 Wegpunkt</item> + <item quantity="other">%d Wegpunkte</item> + </plurals> <string name="cache_waypoints_add">Wegpunkt hinzufügen</string> <string name="cache_hint">Hinweis</string> <string name="cache_logs">Logbuch</string> - <string name="cache_logsfriends">Logbuch (Freunde)</string> + <string name="cache_logs_friends_and_own">Logbuch (Freunde/Eigene)</string> <string name="cache_dialog_loading_details">Lade Cache-Details…</string> <string name="cache_dialog_loading_details_status_loadpage">Lade Seite</string> <string name="cache_dialog_loading_details_status_details">Verarbeite Details</string> @@ -634,7 +643,6 @@ <string name="cache_menu_refresh">Aktualisieren</string> <string name="cache_menu_share">Weiterleiten</string> <string name="cache_menu_move_list">Auf andere Liste verschieben</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -644,6 +652,7 @@ <string name="cache_status">Status</string> <string name="cache_status_offline_log">Gespeicherter Log</string> <string name="cache_status_found">Gefunden</string> + <string name="cache_not_status_found">Nicht gefunden</string> <string name="cache_status_archived">Archiviert</string> <string name="cache_status_disabled">Deaktiviert</string> <string name="cache_status_premium">Nur für Premium-Mitglieder</string> @@ -656,7 +665,7 @@ <string name="cache_size">Größe</string> <string name="cache_distance">Entfernung</string> <string name="cache_difficulty">Schwierigkeit</string> - <string name="cache_terrain">Terrain</string> + <string name="cache_terrain">Gelände</string> <string name="cache_rating">Bewertung</string> <string name="cache_own_rating">Eigene Bewertung</string> <string name="cache_rating_of">von</string> @@ -755,10 +764,7 @@ <string name="map_view_map">Karte</string> <string name="map_modes">Karteneinstellungen</string> <string name="map_trail_show">Spur einblenden</string> - <string name="map_trail_hide">Spur ausblenden</string> <string name="map_circles_show">Kreise anzeigen</string> - <string name="map_circles_hide">Kreise verbergen</string> - <string name="map_mycaches_show">Eigene/gefundene Caches anzeigen</string> <string name="map_mycaches_hide">Eigene/gefundene Caches ausblenden</string> <string name="map_theme_builtin">Standard</string> <string name="map_theme_select">Kartendarstellung wählen</string> @@ -970,8 +976,8 @@ <string name="attribute_skiis_no">Langlauf-Ski nicht erforderlich</string> <string name="attribute_s_tool_yes">Besondere Werkzeuge erforderlich</string> <string name="attribute_s_tool_no">Keine besonderen Werkzeuge erforderlich</string> - <string name="attribute_wirelessbeacon_yes">Cache mit Funk-Sender (Chirp)</string> - <string name="attribute_wirelessbeacon_no">Kein Cache mit Funk-Sender (Chirp)</string> + <string name="attribute_wirelessbeacon_yes">Funk-Sender</string> + <string name="attribute_wirelessbeacon_no">Ohne Funk-Sender</string> <string name="attribute_treeclimbing_yes">Auf Bäume klettern erforderlich</string> <string name="attribute_treeclimbing_no">Auf Bäume klettern nicht erforderlich</string> <string name="attribute_poisonoak_yes">Giftige Pflanzen</string> @@ -1112,7 +1118,6 @@ <string name="website">Webseite: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Benutzung: <a href="">c:geo Kurzanleitung</a></string> <string name="market">Android: <a href="">c:geo auf Google Play</a></string> <string name="about_twitter">Soll jeder neue Fund auf Twitter veröffentlicht werden, wenn er über <b>c:geo</b> geloggt wird?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1128,50 +1133,28 @@ <string name="tts_stop">Stoppe Sprache</string> <string name="err_tts_lang_not_supported">Die aktuelle Sprache wird von TTS nicht unterstützt.</string> <string name="tts_one_kilometer">ein Kilometer</string> - <string name="tts_one_meter">ein Meter</string> - <string name="tts_one_mile">eine Meile</string> - <string name="tts_one_foot">ein Fuß</string> - <string name="tts_one_oclock">ein Uhr</string> - <string name="tts_oclock">%s Uhr</string> - <string name="clipboard_copy_ok">In Zwischenablage kopiert</string> - <string name="percent_favorite_points">% Favoriten</string> - <string name="cgeo_shortcut">c:geo Shortcut</string> - <string name="create_shortcut">Shortcut erstellen</string> - <string-array name="log_image_scales"> - <item>Keine Skalierung</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">Minute</item> - <item quantity="other">Minuten</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Ein Cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Wegpunkt</item> - <item quantity="other">%d Wegpunkte</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s Kilometer</item> <item quantity="other">%s Kilometer</item> </plurals> + <string name="tts_one_meter">ein Meter</string> <plurals name="tts_meters"> <item quantity="one">%s Meter</item> <item quantity="other">%s Meter</item> </plurals> + <string name="tts_one_mile">eine Meile</string> <plurals name="tts_miles"> <item quantity="one">%s Meile</item> <item quantity="other">%s Meilen</item> </plurals> + <string name="tts_one_foot">ein Fuß</string> <plurals name="tts_feet"> <item quantity="one">%s Fuß</item> <item quantity="other">%s Fuß</item> </plurals> + <string name="tts_one_oclock">ein Uhr</string> + <string name="tts_oclock">%s Uhr</string> + <string name="clipboard_copy_ok">In Zwischenablage kopiert</string> <plurals name="days_ago"> <item quantity="one">gestern</item> <item quantity="other">vor %d Tagen</item> @@ -1180,4 +1163,8 @@ <item quantity="one">%s Favorit</item> <item quantity="other">%s Favoriten</item> </plurals> + <string name="percent_favorite_points">% Favoriten</string> + <string name="cgeo_shortcut">c:geo Shortcut</string> + <string name="create_shortcut">Shortcut erstellen</string> + <string name="send">Senden</string> </resources> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index e7da7a1..07f7a87 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -78,21 +78,9 @@ <string name="log_saving_and_uploading">Enviando registro y subiendo imagen…</string> <string name="log_clear">Limpiar</string> <string name="log_post">Enviar registro</string> - <string name="log_post_rate">Enviar registro y puntuación</string> - <string name="log_post_no_rate">Enviar registro sin puntuar</string> <string name="log_post_not_possible">Cargando página de registro…</string> <string name="log_add">Añadir</string> - <string name="log_rating">Puntuación</string> <string name="log_no_rating">Sin puntuación</string> - <string name="log_stars_1">1 estrella</string> - <string name="log_stars_15">1,5 estrellas</string> - <string name="log_stars_2">2 estrellas</string> - <string name="log_stars_25">2,5 estrellas</string> - <string name="log_stars_3">3 estrellas</string> - <string name="log_stars_35">3,5 estrellas</string> - <string name="log_stars_4">4 estrellas</string> - <string name="log_stars_45">4,5 estrellas</string> - <string name="log_stars_5">5 estrellas</string> <string name="log_stars_1_description">malísimo</string> <string name="log_stars_15_description">muy malo</string> <string name="log_stars_2_description">malo</string> @@ -111,7 +99,6 @@ <string name="log_smilies">Emoticonos</string> <string name="log_image">Imagen</string> <string name="log_image_attach">Adjuntar imagen</string> - <string name="log_image_edit">Editar imagen</string> <string name="log_image_stored">Galería</string> <string name="log_image_camera">Tomar foto</string> <string name="log_image_caption">Título</string> @@ -120,6 +107,13 @@ <string name="log_password_title">Contraseña:</string> <string name="log_hint_log_password">Introduzca su contraseña</string> <string name="log_oc_team_comment">Comentario equipo OC</string> + <string-array name="log_image_scales"> + <item>Sin redimensionar</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traducir al %s</string> <string name="translate_to_english">Traducir al inglés</string> <string name="translate_length_warning">La traducción podría fallar con un texto muy largo.</string> @@ -240,6 +234,10 @@ <string name="caches_more_caches_currently">actualmente</string> <string name="caches_downloading">Descargando escondites…\nFaltan: </string> <string name="caches_eta_ltm">Menos de un minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minutos</item> + </plurals> <string name="caches_store_offline">Usar sin conexión luego</string> <string name="caches_store_selected">Almacenamiento seleccionado</string> <string name="caches_history">Historial</string> @@ -300,10 +298,8 @@ <string name="caches_removing_from_history">Borrando del historial…</string> <string name="caches_clear_offlinelogs">Borrar registros sin conexión</string> <string name="caches_clear_offlinelogs_progress">Borrando registros sin conexión</string> - <string name="list_menu">Lista</string> <string name="list_menu_create">Crear nueva lista</string> <string name="list_menu_drop">Borrar lista actual</string> - <string name="list_menu_change">Cambiar lista</string> <string name="list_menu_rename">Renombrar la lista actual</string> <string name="list_title">Escoger lista</string> <string name="list_inbox">Guardadas</string> @@ -381,7 +377,6 @@ <string name="init_signature_template_name">Nombre</string> <string name="init_signature_template_url">URL</string> <string name="init_ratingwanted">Clasificación de GCvote</string> - <string name="init_friendlogswanted">Mostrar registros de amigos</string> <string name="init_openlastdetailspage">Detalles de la última página</string> <string name="init_autoload">Autocargar descripción larga</string> <string name="init_summary_autoload">Autocargar descripción larga</string> @@ -463,6 +458,10 @@ <string name="auth_again">Volver a iniciar</string> <string name="auth_dialog_waiting">Esperando a %s…</string> <string name="auth_ocde">Opencaching.de</string> + <plurals name="cache_counts"> + <item quantity="one">Un escondite</item> + <item quantity="other">%1$d Escondites</item> + </plurals> <string name="cache_offline">Desconectado</string> <string name="cache_offline_refresh">Actualizar</string> <string name="cache_offline_drop">Tirar</string> @@ -521,7 +520,6 @@ <string name="cache_menu_refresh">Actualizar</string> <string name="cache_menu_share">Compartir escondite</string> <string name="cache_menu_move_list">Mover a otra lista</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_status">Estado</string> @@ -595,9 +593,7 @@ <string name="map_view_map">Ver mapa</string> <string name="map_modes">Configuración del mapa</string> <string name="map_trail_show">Mostrar rastro</string> - <string name="map_trail_hide">Ocultar rastro</string> <string name="map_circles_show">Mostrar círculos</string> - <string name="map_circles_hide">Ocultar círculos</string> <string name="map_theme_builtin">Por defecto</string> <string name="map_live_enable">Activar en vivo</string> <string name="map_live_disable">Desactivar en vivo</string> @@ -837,7 +833,6 @@ <string name="website">Web: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo en breve</a></string> <string name="about_twitter">¿Debe <b>c:geo</b> publicar el nuevo estado en Twitter cuando registras un escondite?</string> <string name="status_new_release" tools:ignore="UnusedResources">Nueva versión disponible. \nClick para instalar.</string> <string name="tts_start">Empezar a hablar</string> @@ -849,19 +844,4 @@ <string name="tts_oclock">%s en punto</string> <string name="clipboard_copy_ok">Copiado al portapapeles</string> <string name="percent_favorite_points">% \ favoritos</string> - <string-array name="log_image_scales"> - <item>Sin redimensionar</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minutos</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un escondite</item> - <item quantity="other">%1$d Escondites</item> - </plurals> </resources> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index e8487bf..0357e71 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -18,6 +18,7 @@ <string name="letterbox">Boîtes aux lettres hybrides</string> <string name="event">Événements</string> <string name="mega">Méga-événements</string> + <string name="giga">Giga-événements</string> <string name="earth">Earthcache</string> <string name="cito">Cache in trash out</string> <string name="webcam">Webcams</string> @@ -79,21 +80,9 @@ <string name="log_saving_and_uploading">Envoi de la note et de l\'image…</string> <string name="log_clear">Effacer</string> <string name="log_post">Envoyer</string> - <string name="log_post_rate">Envoyer & noter</string> - <string name="log_post_no_rate">Envoyer & ne pas noter</string> <string name="log_post_not_possible">Chargement de la page…</string> <string name="log_add">Ajouter</string> - <string name="log_rating">Note</string> <string name="log_no_rating">Pas de note</string> - <string name="log_stars_1">1 étoile</string> - <string name="log_stars_15">1,5 étoiles</string> - <string name="log_stars_2">2 étoiles</string> - <string name="log_stars_25">2,5 étoiles</string> - <string name="log_stars_3">3 étoiles</string> - <string name="log_stars_35">3,5 étoiles</string> - <string name="log_stars_4">4 étoiles</string> - <string name="log_stars_45">4,5 étoiles</string> - <string name="log_stars_5">5 étoiles</string> <string name="log_stars_1_description">faible</string> <string name="log_stars_15_description">plutôt faible</string> <string name="log_stars_2_description">en dessous de la moyenne</string> @@ -112,7 +101,6 @@ <string name="log_smilies">Sourillards</string> <string name="log_image">Image</string> <string name="log_image_attach">Ajouter une image</string> - <string name="log_image_edit">Éditer l\'image</string> <string name="log_image_stored">Existante</string> <string name="log_image_camera">Nouvelle</string> <string name="log_image_caption">Légende</string> @@ -121,6 +109,13 @@ <string name="log_password_title">Mot de passe du carnet :</string> <string name="log_hint_log_password">Entrez votre mot de passe pour le carnet</string> <string name="log_oc_team_comment">Commentaire de l\'équipe OC</string> + <string-array name="log_image_scales"> + <item>Taille originale</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduire en %s</string> <string name="translate_to_english">Traduire en anglais</string> <string name="translate_length_warning">La traduction d\'un texte trop long peut échouer.</string> @@ -220,6 +215,7 @@ <string name="loc_trying">Localisation en cours…</string> <string name="loc_no_addr">Adresse inconnue</string> <string name="loc_gps_disabled">GPS désactivé</string> + <string name="menu_centerposition">Centrer sur ma position</string> <string name="menu_about">À propos de c:geo</string> <string name="menu_helpers">Utilitaires</string> <string name="menu_settings">Paramètres</string> @@ -241,6 +237,10 @@ <string name="caches_more_caches_currently">actuellement</string> <string name="caches_downloading">Téléchargement des caches…\nRestant: </string> <string name="caches_eta_ltm">Moins d\'une minute</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minute</item> + <item quantity="other">minutes</item> + </plurals> <string name="caches_store_offline">Stocker localement</string> <string name="caches_store_selected">Stocker la sélection</string> <string name="caches_history">Historique</string> @@ -301,10 +301,8 @@ <string name="caches_removing_from_history">Effacer de l\'historique…</string> <string name="caches_clear_offlinelogs">Effacer les entrées de carnet hors-ligne</string> <string name="caches_clear_offlinelogs_progress">Effacement des entrées de carnet hors-ligne</string> - <string name="list_menu">Listes</string> <string name="list_menu_create">Nouvelle liste</string> <string name="list_menu_drop">Effacer la liste courante</string> - <string name="list_menu_change">Changer de liste</string> <string name="list_menu_rename">Renommer la liste courante</string> <string name="list_title">Choisir une liste</string> <string name="list_inbox">Enregistrées</string> @@ -402,8 +400,8 @@ <string name="init_signature_template_log">Texte du journal</string> <string name="init_ratingwanted">Charger la note depuis GCvote.com</string> <string name="init_summary_ratingwanted">Charger la note depuis GCvote.com</string> - <string name="init_friendlogswanted">Charger le carnet (amis)</string> - <string name="init_summary_friendlogswanted">Charger le carnet (amis)</string> + <string name="init_friends_and_own_logs_wanted">Montrer vos entrées / amis</string> + <string name="init_summary_friends_and_own_logs_wanted">Afficher une page de carnet supplémentaire avec vos entrées de carnet et celles de vos amis</string> <string name="init_openlastdetailspage">Réouvrir les détails à la dernière page ouverte</string> <string name="init_summary_openlastdetailspage">Réouvrir les détails à la dernière page ouverte</string> <string name="init_autoload">Afficher automatiquement les descriptions longues</string> @@ -415,6 +413,8 @@ <string name="init_captcha">Afficher le CAPTCHA si nécessaire</string> <string name="init_summary_captcha">Afficher le CAPTCHA si nécessaire</string> <string name="init_useenglish">Utiliser l\'anglais dans c:geo\n(redémarrage nécessaire)</string> + <string name="init_showoverflowmenu">Toujours afficher le menu</string> + <string name="init_showoverflow_summary">Toujours afficher le symbole pour obtenir le menu (trois points⋮) même si l\'appareil a un bouton menu (redémarrage nécessaire)</string> <string name="init_summary_useenglish">Utiliser l\'anglais dans c:geo\n(redémarrage nécessaire)</string> <string name="init_exclude">Exclure mes caches et les caches trouvées</string> <string name="init_summary_exclude">Exclure mes caches et les caches trouvées</string> @@ -492,6 +492,9 @@ <string name="init_maintenance">Maintenance</string> <string name="init_maintenance_directories_note">c:geo stocke les images et les autres fichiers associés à une géocache dans un dossier dédié. Dans certains cas (comme l\'importation/exportation de la base de données), ce dossier peut contenir des fichiers obsolètes, qui peuvent être supprimés ici.</string> <string name="init_maintenance_directories">Supprimer les fichiers orphelins</string> + <string name="init_create_memory_dump">Créer une image mémoire</string> + <string name="init_memory_dump">Image mémoire</string> + <string name="init_memory_dumped">Mémoire copiée dans %s</string> <string name="settings_open_website">Ouvrir le site dans un navigateur</string> <string name="settings_settings">Paramètres</string> <string name="settings_information">Information</string> @@ -539,6 +542,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo est désormais autorisé à interagir avec %s.</string> + <plurals name="cache_counts"> + <item quantity="one">%1$d cache</item> + <item quantity="other">%1$d caches</item> + </plurals> <string name="cache_offline">Hors ligne</string> <string name="cache_offline_refresh">Recharger</string> <string name="cache_offline_drop">Effacer</string> @@ -565,8 +572,6 @@ <string name="cache_personal_note_uploading">Envoi de la note personnelle</string> <string name="cache_personal_note_upload_done">Note personnelle envoyée</string> <string name="cache_personal_note_upload_cancelled">Envoi de la note personnelle annulé</string> - <string name="cache_personal_note_unstored">Cache non sauvegardée localement</string> - <string name="cache_personal_note_store">La cache va être sauvegardée localement avant d\'autoriser les notes personnelles.</string> <string name="cache_description">Description</string> <string name="cache_description_long">Description longue</string> <string name="cache_description_table_note">La description contient des informations de formattages qui nécessitent possiblement d\'être vues sur le site %s pour être affichées correctement.</string> @@ -583,10 +588,14 @@ <string name="cache_list_unknown">Dans aucune liste</string> <string name="cache_images">Images</string> <string name="cache_waypoints">Étapes</string> + <plurals name="waypoints"> + <item quantity="one">1 étape</item> + <item quantity="other">%d étapes</item> + </plurals> <string name="cache_waypoints_add">Ajouter une étape</string> <string name="cache_hint">Indice</string> <string name="cache_logs">Carnet de bord</string> - <string name="cache_logsfriends">Carnet (amis)</string> + <string name="cache_logs_friends_and_own">Vous / amis</string> <string name="cache_dialog_loading_details">Chargement des détails…</string> <string name="cache_dialog_loading_details_status_loadpage">Chargement de la page</string> <string name="cache_dialog_loading_details_status_details">Analyse</string> @@ -632,7 +641,6 @@ <string name="cache_menu_refresh">Recharger</string> <string name="cache_menu_share">Partager la cache</string> <string name="cache_menu_move_list">Déplacer dans une autre liste</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -641,6 +649,7 @@ <string name="cache_status">Statut</string> <string name="cache_status_offline_log">Visite sauvée hors-ligne</string> <string name="cache_status_found">Trouvée</string> + <string name="cache_not_status_found">Pas trouvée</string> <string name="cache_status_archived">Archivée</string> <string name="cache_status_disabled">Désactivée</string> <string name="cache_status_premium">Membres privilégiés seulement</string> @@ -752,10 +761,7 @@ <string name="map_view_map">Voir carte</string> <string name="map_modes">Marqueurs</string> <string name="map_trail_show">Afficher le parcours</string> - <string name="map_trail_hide">Cacher le parcours</string> <string name="map_circles_show">Afficher les cercles</string> - <string name="map_circles_hide">Cacher les cercles</string> - <string name="map_mycaches_show">Montrer les caches placées/trouvées</string> <string name="map_mycaches_hide">Cacher les caches placées/trouvées</string> <string name="map_theme_builtin">Défault</string> <string name="map_theme_select">Sélectionner le thème</string> @@ -1109,7 +1115,6 @@ <string name="website">site: <a href="">cgeo.org</a></string> <string name="facebook">facebook: <a href="">page c:geo</a></string> <string name="twitter">twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manuel: <a href="">c:geo en bref</a></string> <string name="market">Android: <a href="">c:geo sur Google Play</a></string> <string name="about_twitter">Voulez-vous publier un nouveau statut sur Twitter à chaque nouvelle cache découverte sous <b>c:geo</b>?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1125,50 +1130,28 @@ <string name="tts_stop">Arrêter de parler</string> <string name="err_tts_lang_not_supported">La langue courante n\'est pas prise en charge par la synthèse vocale.</string> <string name="tts_one_kilometer">un kilomètre</string> - <string name="tts_one_meter">un mètre</string> - <string name="tts_one_mile">un mille</string> - <string name="tts_one_foot">un pied</string> - <string name="tts_one_oclock">une heure</string> - <string name="tts_oclock">%s heures</string> - <string name="clipboard_copy_ok">Copié dans le presse-papiers</string> - <string name="percent_favorite_points">%\ favoris</string> - <string name="cgeo_shortcut">c:geo raccourci</string> - <string name="create_shortcut">Créer un raccourci</string> - <string-array name="log_image_scales"> - <item>Taille originale</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minute</item> - <item quantity="other">minutes</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">une cache</item> - <item quantity="other">%1$d caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 étape</item> - <item quantity="other">%d étapes</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilomètre</item> <item quantity="other">%s kilomètres</item> </plurals> + <string name="tts_one_meter">un mètre</string> <plurals name="tts_meters"> <item quantity="one">%s mètre</item> <item quantity="other">%s mètres</item> </plurals> + <string name="tts_one_mile">un mille</string> <plurals name="tts_miles"> <item quantity="one">%s mille</item> <item quantity="other">%s milles</item> </plurals> + <string name="tts_one_foot">un pied</string> <plurals name="tts_feet"> <item quantity="one">%s pied</item> <item quantity="other">%s pieds</item> </plurals> + <string name="tts_one_oclock">une heure</string> + <string name="tts_oclock">%s heures</string> + <string name="clipboard_copy_ok">Copié dans le presse-papiers</string> <plurals name="days_ago"> <item quantity="one">hier</item> <item quantity="other">il y a %d jours</item> @@ -1177,4 +1160,7 @@ <item quantity="one">%s favori</item> <item quantity="other">%s favoris</item> </plurals> + <string name="percent_favorite_points">%\ favoris</string> + <string name="cgeo_shortcut">c:geo raccourci</string> + <string name="create_shortcut">Créer un raccourci</string> </resources> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 7e66ed5..4861657 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -69,21 +69,9 @@ <string name="log_saving">Log mentése…</string> <string name="log_clear">Törlés</string> <string name="log_post">Log beküldése</string> - <string name="log_post_rate">Log beküldése & értékelés</string> - <string name="log_post_no_rate">Log beküldése & nincs értékelés</string> <string name="log_post_not_possible">Log oldal betöltése…</string> <string name="log_add">Hozzáadás</string> - <string name="log_rating">Értékelés</string> <string name="log_no_rating">Nincs értékelés</string> - <string name="log_stars_1">1 csillag</string> - <string name="log_stars_15">1.5 csillag</string> - <string name="log_stars_2">2 csillag</string> - <string name="log_stars_25">2.5 csillag</string> - <string name="log_stars_3">3 csillag</string> - <string name="log_stars_35">3.5 csillag</string> - <string name="log_stars_4">4 csillag</string> - <string name="log_stars_45">4.5 csillag</string> - <string name="log_stars_5">5 csillag</string> <string name="log_stars_1_description">nagyon rossz</string> <string name="log_stars_15_description">elég rossz</string> <string name="log_stars_2_description">átlagon aluli</string> @@ -258,10 +246,8 @@ <string name="caches_filter_clear">szűrők törlése</string> <string name="caches_filter_modified">Módosított koordinátákkal</string> <string name="caches_removing_from_history">Eltávolítás a Előzményekből…</string> - <string name="list_menu">Lista</string> <string name="list_menu_create">Új lista létrehozása</string> <string name="list_menu_drop">Jelenlegi lista elvetése</string> - <string name="list_menu_change">Lista megváltoztatása</string> <string name="list_menu_rename">Az aktuális lista átnevezése</string> <string name="list_title">Válassz listát</string> <string name="list_inbox">Mentett</string> @@ -302,8 +288,6 @@ <string name="init_signature_template_owner">Tulajdonos</string> <string name="init_ratingwanted">Értékelés betöltése a GCvote.com-ról</string> <string name="init_summary_ratingwanted">Értékelés betöltése a GCvote.com-ról</string> - <string name="init_friendlogswanted">További logbook oldal betöltése a barátok logjainak.</string> - <string name="init_summary_friendlogswanted">További logbook oldal betöltése a barátok logjainak.</string> <string name="init_openlastdetailspage">Az utoljára használt oldal részleteinek betöltése</string> <string name="init_summary_openlastdetailspage">Az utoljára használt oldal részleteinek betöltése</string> <string name="init_autoload">Hosszú leírás automatikus betöltése</string> @@ -431,7 +415,6 @@ <string name="cache_waypoints_add">Útpont hozzáadása</string> <string name="cache_hint">Segítség</string> <string name="cache_logs">Láda napló</string> - <string name="cache_logsfriends">Logbook (Barátok)</string> <string name="cache_dialog_loading_details">Láda adatainak betöltése…</string> <string name="cache_dialog_loading_details_status_loadpage">Oldal betöltése</string> <string name="cache_dialog_loading_details_status_details">Részletek feldolgozása</string> @@ -469,7 +452,6 @@ <string name="cache_menu_refresh">Frissítés</string> <string name="cache_menu_share">Láda megosztása</string> <string name="cache_menu_move_list">Mozgatás másik listára</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Geoláda jelzőbója</string> @@ -566,9 +548,7 @@ <string name="map_view_map">Térkép nézet</string> <string name="map_modes">Térkép módok</string> <string name="map_trail_show">Ösvény mutatása</string> - <string name="map_trail_hide">Ösvény elrejtése</string> <string name="map_circles_show">Körök mutatása</string> - <string name="map_circles_hide">Körök elrejtése</string> <string name="map_theme_builtin">Alapértelmezett</string> <string name="map_theme_select">Válassz térképtémát</string> <string name="map_live_enable">Élő mód engedélyezése</string> @@ -807,7 +787,6 @@ <string name="website">Weboldal: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Kézikönyv: <a href="">A c:geo dióhéjban</a></string> <string name="about_twitter">Akarod, hogy <b>c:geo</b> új bejegyzést írjon Twitterre mindig mikor egy ládát megtalálsz?</string> <string name="status_new_release" tools:ignore="UnusedResources">Új kiadás található.\nKattints a telepítéshez.</string> <string name="status_new_nightly" tools:ignore="UnusedResources">Új napi verzió található.\nKattints a telepítéshez.</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 43e6c88..ebcbb2d 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -79,21 +79,9 @@ <string name="log_saving_and_uploading">Invio log e immagine…</string> <string name="log_clear">Azzera</string> <string name="log_post">Invia log</string> - <string name="log_post_rate">Invia log + voto</string> - <string name="log_post_no_rate">Invia log senza voto</string> <string name="log_post_not_possible">Connessione…</string> <string name="log_add">Aggiungi</string> - <string name="log_rating">Voto</string> <string name="log_no_rating">Nessun voto</string> - <string name="log_stars_1">1 stella</string> - <string name="log_stars_15">1.5 stelle</string> - <string name="log_stars_2">2 stelle</string> - <string name="log_stars_25">2.5 stelle</string> - <string name="log_stars_3">3 stelle</string> - <string name="log_stars_35">3.5 stelle</string> - <string name="log_stars_4">4 stelle</string> - <string name="log_stars_45">4.5 stelle</string> - <string name="log_stars_5">5 stelle</string> <string name="log_stars_1_description">proprio brutto</string> <string name="log_stars_15_description">abbastanza brutto</string> <string name="log_stars_2_description">bruttino</string> @@ -112,7 +100,6 @@ <string name="log_smilies">Faccine</string> <string name="log_image">Immagine</string> <string name="log_image_attach">Aggiungi immagine</string> - <string name="log_image_edit">Modifica immagine</string> <string name="log_image_stored">Esistente</string> <string name="log_image_camera">Nuova</string> <string name="log_image_caption">Didascalia</string> @@ -121,6 +108,13 @@ <string name="log_password_title">Log Password:</string> <string name="log_hint_log_password">Inserisci la password per il log</string> <string name="log_oc_team_comment">Commenti del Team OC</string> + <string-array name="log_image_scales"> + <item>Dimensioni originali</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduci in %s</string> <string name="translate_to_english">Traduci in inglese</string> <string name="translate_length_warning">La traduzione può fallire quando c\'è molto testo.</string> @@ -241,6 +235,10 @@ <string name="caches_more_caches_currently">attualmente</string> <string name="caches_downloading">Download cache in corso…\nETA: </string> <string name="caches_eta_ltm">Meno di un minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minuti</item> + </plurals> <string name="caches_store_offline">Salva per Offline</string> <string name="caches_store_selected">Salva selezionati</string> <string name="caches_history">Cronologia</string> @@ -301,10 +299,8 @@ <string name="caches_removing_from_history">Rimozione dalla cronologia…</string> <string name="caches_clear_offlinelogs">Cancella i log offline</string> <string name="caches_clear_offlinelogs_progress">Cancellazione logs offline</string> - <string name="list_menu">Lista</string> <string name="list_menu_create">Crea nuova lista</string> <string name="list_menu_drop">Elimina la lista corrente</string> - <string name="list_menu_change">Cambia lista</string> <string name="list_menu_rename">Rinomina la lista corrente</string> <string name="list_title">Seleziona una lista</string> <string name="list_inbox">Salvate</string> @@ -399,8 +395,6 @@ <string name="init_signature_template_log">Testo di Log</string> <string name="init_ratingwanted">Rating da GCvote.com</string> <string name="init_summary_ratingwanted">Carica il rating del cache da GCvote.com</string> - <string name="init_friendlogswanted">Visualizza log dei miei amici</string> - <string name="init_summary_friendlogswanted">Carica logbook addizionale con i log dei miei amici</string> <string name="init_openlastdetailspage">Carica ultima pagina usata nei dettagli</string> <string name="init_summary_openlastdetailspage">Ricorda l\'ultima pagina usata nei dettagli</string> <string name="init_autoload">Descrizione estesa</string> @@ -536,6 +530,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo è ora autorizzato ad accedere a %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Un cache</item> + <item quantity="other">%1$d cache</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Aggiorna</string> <string name="cache_offline_drop">Elimina</string> @@ -562,8 +560,6 @@ <string name="cache_personal_note_uploading">Nota personale in caricamento</string> <string name="cache_personal_note_upload_done">Nota personale caricata</string> <string name="cache_personal_note_upload_cancelled">Caricamento nota personale annullato</string> - <string name="cache_personal_note_unstored">Cache non salvati</string> - <string name="cache_personal_note_store">Il cache verrà prima salvato per abilitare le note personali.</string> <string name="cache_description">Descrizione</string> <string name="cache_description_long">Descrizione estesa</string> <string name="cache_description_table_note">La descrizione contiene una tabella formattata in modo tale che potresti aver bisogno di andare su %s per vederla correttamente.</string> @@ -580,10 +576,13 @@ <string name="cache_list_unknown">Non in una lista</string> <string name="cache_images">Immagini</string> <string name="cache_waypoints">Waypoints</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoint</item> + </plurals> <string name="cache_waypoints_add">Aggiungi waypoint</string> <string name="cache_hint">Aiuto (spoiler)</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Log amici</string> <string name="cache_dialog_loading_details">Caricamento dettagli del cache…</string> <string name="cache_dialog_loading_details_status_loadpage">Caricamento pagina</string> <string name="cache_dialog_loading_details_status_details">Elaborazione dettagli</string> @@ -629,7 +628,6 @@ <string name="cache_menu_refresh">Aggiorna</string> <string name="cache_menu_share">Condividi cache</string> <string name="cache_menu_move_list">Muovi in un\'altra lista</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -749,10 +747,7 @@ <string name="map_view_map">Scegli mappa</string> <string name="map_modes">Modi mappa</string> <string name="map_trail_show">Mostra scia</string> - <string name="map_trail_hide">Nasconde scia</string> <string name="map_circles_show">Mostra area cache</string> - <string name="map_circles_hide">Nascondi area cache</string> - <string name="map_mycaches_show">Visualizza cache tuoi o che hai trovato</string> <string name="map_mycaches_hide">Nascondi i tuoi cache o che hai trovato</string> <string name="map_theme_builtin">Tema predefinito</string> <string name="map_theme_select">Scegli un tema mappa</string> @@ -1106,7 +1101,6 @@ <string name="website">Sito: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">Pagina c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manuale: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo su Google Play</a></string> <string name="about_twitter">Può <b>c:geo</b> pubblicare su Twitter ogni volta che logghi un cache?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1122,50 +1116,28 @@ <string name="tts_stop">Stop voce</string> <string name="err_tts_lang_not_supported">Il linguaggio attivo non è supportato dal modulo di sintesi vocale.</string> <string name="tts_one_kilometer">un chilometro</string> - <string name="tts_one_meter">un metro</string> - <string name="tts_one_mile">un miglio</string> - <string name="tts_one_foot">un piede</string> - <string name="tts_one_oclock">a ore una</string> - <string name="tts_oclock">a ore %s</string> - <string name="clipboard_copy_ok">Copiato nella clipboard</string> - <string name="percent_favorite_points">%\ preferiti</string> - <string name="cgeo_shortcut">collegamento a c:geo</string> - <string name="create_shortcut">Crea collegamento</string> - <string-array name="log_image_scales"> - <item>Dimensioni originali</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minuti</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Un cache</item> - <item quantity="other">%1$d cache</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoint</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">un chilometro</item> <item quantity="other">%s chilometri</item> </plurals> + <string name="tts_one_meter">un metro</string> <plurals name="tts_meters"> <item quantity="one">un metro</item> <item quantity="other">%s metri</item> </plurals> + <string name="tts_one_mile">un miglio</string> <plurals name="tts_miles"> <item quantity="one">un miglio</item> <item quantity="other">%s miglia</item> </plurals> + <string name="tts_one_foot">un piede</string> <plurals name="tts_feet"> <item quantity="one">un piede</item> <item quantity="other">%s piedi</item> </plurals> + <string name="tts_one_oclock">a ore una</string> + <string name="tts_oclock">a ore %s</string> + <string name="clipboard_copy_ok">Copiato nella clipboard</string> <plurals name="days_ago"> <item quantity="one">ieri</item> <item quantity="other">%d giorni fa</item> @@ -1174,4 +1146,7 @@ <item quantity="one">%s preferito</item> <item quantity="other">%s preferiti</item> </plurals> + <string name="percent_favorite_points">%\ preferiti</string> + <string name="cgeo_shortcut">collegamento a c:geo</string> + <string name="create_shortcut">Crea collegamento</string> </resources> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 9164a8c..29a2199 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -77,21 +77,9 @@ <string name="log_saving_and_uploading">ログと画像を送信中…</string> <string name="log_clear">消去</string> <string name="log_post">ログの投稿</string> - <string name="log_post_rate">ログの投稿と評価:</string> - <string name="log_post_no_rate">ログの投稿(未評価)</string> <string name="log_post_not_possible">ログのページをロード中…</string> <string name="log_add">挿入</string> - <string name="log_rating">評価</string> <string name="log_no_rating">未評価</string> - <string name="log_stars_1">星1つ</string> - <string name="log_stars_15">星1.5</string> - <string name="log_stars_2">星2つ</string> - <string name="log_stars_25">星2.5</string> - <string name="log_stars_3">星3つ</string> - <string name="log_stars_35">星3.5</string> - <string name="log_stars_4">星4つ</string> - <string name="log_stars_45">星4.5</string> - <string name="log_stars_5">星5つ</string> <string name="log_stars_1_description">お粗末</string> <string name="log_stars_15_description">見劣りする</string> <string name="log_stars_2_description">平均以下</string> @@ -110,7 +98,6 @@ <string name="log_smilies">スマイルマーク</string> <string name="log_image">画像</string> <string name="log_image_attach">画像を添付</string> - <string name="log_image_edit">添付画像を変更</string> <string name="log_image_stored">ファイル選択</string> <string name="log_image_camera">撮影</string> <string name="log_image_caption">タイトル</string> @@ -118,6 +105,13 @@ <string name="log_image_scale">拡大縮小</string> <string name="log_password_title">Log Password:</string> <string name="log_hint_log_password">Enter your log password</string> + <string-array name="log_image_scales"> + <item>実サイズ</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">%sに翻訳</string> <string name="translate_to_english">英語に翻訳</string> <string name="translate_length_warning">文章が長すぎるので翻訳できないかもしれません。</string> @@ -235,6 +229,9 @@ <string name="caches_more_caches_currently">現在</string> <string name="caches_downloading">キャッシュ情報をダウンロード中…\n残り時間: </string> <string name="caches_eta_ltm">1分以内</string> + <plurals name="caches_eta_mins"> + <item quantity="other">分</item> + </plurals> <string name="caches_store_offline">オフライン用に保存</string> <string name="caches_store_selected">選択したキャッシュを保存</string> <string name="caches_history">履歴</string> @@ -295,10 +292,8 @@ <string name="caches_removing_from_history">履歴から削除中…</string> <string name="caches_clear_offlinelogs">全てのオフラインログを削除</string> <string name="caches_clear_offlinelogs_progress">全てのオフラインログを削除中</string> - <string name="list_menu">リスト</string> <string name="list_menu_create">新しいリストを作成</string> <string name="list_menu_drop">このリストを消去</string> - <string name="list_menu_change">別のリストにする</string> <string name="list_menu_rename">このリスト名を変更</string> <string name="list_title">リストの選択</string> <string name="list_inbox">保存済み</string> @@ -381,8 +376,6 @@ <string name="init_signature_template_url">URL</string> <string name="init_ratingwanted">GCvote評価</string> <string name="init_summary_ratingwanted">キャッシュの評価をGCvote.comから取得</string> - <string name="init_friendlogswanted">友達のログページ</string> - <string name="init_summary_friendlogswanted">友達の書いたログを別ページに表示</string> <string name="init_openlastdetailspage">最後に表示したページ</string> <string name="init_summary_openlastdetailspage">キャッシュ情報の表示では最後に表示したページを開く</string> <string name="init_autoload">詳細表示</string> @@ -491,6 +484,9 @@ <string name="auth_dialog_completed_twitter">c:geoはTwitterにポストするための認証を受けました。</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geoは%sと連携するための認証を受けました。</string> + <plurals name="cache_counts"> + <item quantity="other">%1$d キャッシュ</item> + </plurals> <string name="cache_offline">オフライン</string> <string name="cache_offline_refresh">更新</string> <string name="cache_offline_drop">削除</string> @@ -517,8 +513,6 @@ <string name="cache_personal_note_uploading">パーソナルノートをアップロード中</string> <string name="cache_personal_note_upload_done">パーソナルノートをアップロードしました</string> <string name="cache_personal_note_upload_cancelled">パーソナルノートのアップロードをキャンセルしました</string> - <string name="cache_personal_note_unstored">キャッシュ情報が保存されていません</string> - <string name="cache_personal_note_store">パーソナルノートを有効にするためにキャッシュ情報を保存します。</string> <string name="cache_description">説明</string> <string name="cache_description_long">全て表示</string> <string name="cache_description_table_note">キャッシュ情報の説明にはhtmlを使ったテーブル表が含まれています。正しく表示するには%sで開く必要があるかもしれません。</string> @@ -535,10 +529,12 @@ <string name="cache_list_unknown">Not in a list</string> <string name="cache_images">画像</string> <string name="cache_waypoints">ウェイポイント</string> + <plurals name="waypoints"> + <item quantity="other">%d ウェイポイント</item> + </plurals> <string name="cache_waypoints_add">ウェイポイントを追加</string> <string name="cache_hint">ヒント</string> <string name="cache_logs">ログブック</string> - <string name="cache_logsfriends">ログブック(友達)</string> <string name="cache_dialog_loading_details">キャッシュの詳細をロード中…</string> <string name="cache_dialog_loading_details_status_loadpage">ページをロード中</string> <string name="cache_dialog_loading_details_status_details">詳細を処理中</string> @@ -584,7 +580,6 @@ <string name="cache_menu_refresh">更新</string> <string name="cache_menu_share">キャッシュを共有</string> <string name="cache_menu_move_list">他のリストに移動</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">キャッシュビーコン</string> @@ -701,10 +696,7 @@ <string name="map_view_map">地図の変更</string> <string name="map_modes">表示切替</string> <string name="map_trail_show">軌跡を表示</string> - <string name="map_trail_hide">軌跡を非表示</string> <string name="map_circles_show">0.1マイル円を表示</string> - <string name="map_circles_hide">円を非表示</string> - <string name="map_mycaches_show">所有/見つけたキャッシュを表示</string> <string name="map_mycaches_hide">所有/見つけたキャッシュを非表示</string> <string name="map_theme_builtin">デフォルト</string> <string name="map_theme_select">地図のテーマを選択</string> @@ -1023,7 +1015,6 @@ Google翻訳アプリで各言語の辞書をダウンロードしておけば <string name="website">Webサイト: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">マニュアル: <a href="">c:geo マニュアル(英語)</a></string> <string name="market">Android: <a href="">Google Playのc:geo</a></string> <string name="about_twitter">キャッシュのログを書いたら<b>c:geo</b>にTwitterでつぶやいてほしい?</string> <string name="status_new_release" tools:ignore="UnusedResources">新しいバージョンがあります。\nクリックしてインストールしてください。</string> @@ -1036,29 +1027,13 @@ Google翻訳アプリで各言語の辞書をダウンロードしておけば <string name="tts_start">音声案内開始</string> <string name="tts_stop">音声案内終了</string> <string name="tts_one_kilometer">1 km</string> + <plurals name="tts_kilometers"> + <item quantity="other">%s キロメートル</item> + </plurals> <string name="tts_one_meter">1 m</string> <string name="tts_one_mile">1 マイル</string> <string name="tts_one_foot">1 フィート</string> <string name="tts_one_oclock">1 時</string> <string name="tts_oclock">%s 時</string> <string name="clipboard_copy_ok">クリップボードにコピーしました</string> - <string-array name="log_image_scales"> - <item>実サイズ</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="other">分</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="other">%1$d キャッシュ</item> - </plurals> - <plurals name="waypoints"> - <item quantity="other">%d ウェイポイント</item> - </plurals> - <plurals name="tts_kilometers"> - <item quantity="other">%s キロメートル</item> - </plurals> </resources> diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml index 2494f90..70967b0 100644 --- a/main/res/values-lt/strings.xml +++ b/main/res/values-lt/strings.xml @@ -80,21 +80,9 @@ <string name="log_saving_and_uploading">Siunčiamas įrašas ir įkeliama nuotrauka…</string> <string name="log_clear">Išvalyti</string> <string name="log_post">Siųsti įrašą</string> - <string name="log_post_rate">Siųsti įrašą ir Reitinguoti</string> - <string name="log_post_no_rate">Siųsti įrašą ir Nereitinguoti</string> <string name="log_post_not_possible">Įkeliamas įrašo puslapis…</string> <string name="log_add">Pridėti</string> - <string name="log_rating">Reitingas</string> <string name="log_no_rating">Nėra reitingo</string> - <string name="log_stars_1">1 žvaigždė</string> - <string name="log_stars_15">1,5 žvaigždės</string> - <string name="log_stars_2">2 žvaigždės</string> - <string name="log_stars_25">2,5 žvaigždės</string> - <string name="log_stars_3">3 žvaigždės</string> - <string name="log_stars_35">3,5 žvaigždės</string> - <string name="log_stars_4">4 žvaigždės</string> - <string name="log_stars_45">4,5 žvaigždės</string> - <string name="log_stars_5">5 žvaigždės</string> <string name="log_stars_1_description">Prasta</string> <string name="log_stars_15_description">Pakankamai prasta</string> <string name="log_stars_2_description">Žemiau vidutinio</string> @@ -113,7 +101,6 @@ <string name="log_smilies">Šypsenėlės</string> <string name="log_image">Nuotrauka</string> <string name="log_image_attach">Pridėti nuotrauką</string> - <string name="log_image_edit">Taisyti nuotrauką</string> <string name="log_image_stored">Esamą</string> <string name="log_image_camera">Naują</string> <string name="log_image_caption">Antraštė</string> @@ -122,6 +109,13 @@ <string name="log_password_title">Įrašo slaptažodis:</string> <string name="log_hint_log_password">Įveskite savo įrašo slaptažodį</string> <string name="log_oc_team_comment">OC komandos komentaras</string> + <string-array name="log_image_scales"> + <item>Nekeisti dydžio</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Išversti į %s</string> <string name="translate_to_english">Išversti į anglų</string> <string name="translate_length_warning">Vertimas gali nepavykti jei tekstas labai ilgas.</string> @@ -221,6 +215,7 @@ <string name="loc_trying">Bandoma nustatyti</string> <string name="loc_no_addr">Nežinomas adresas</string> <string name="loc_gps_disabled">GPS išjungtas</string> + <string name="menu_centerposition">Centruoti mano poziciją</string> <string name="menu_about">Apie c:geo</string> <string name="menu_helpers">Naudingos programos</string> <string name="menu_settings">Nustatymai</string> @@ -240,12 +235,17 @@ <string name="caches_more_caches_no">Daugiau slėptuvių nėra</string> <string name="caches_more_caches_loading">Įkeliamos slėptuvės…</string> <string name="caches_more_caches_currently">dabar</string> - <string name="caches_downloading">Atsisiunčiamos slėptuvės…\nUžtruks</string> + <string name="caches_downloading">Atnaujinamos slėptuvės…\nUžtruks</string> <string name="caches_eta_ltm">mažiau nei minutę</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minutę</item> + <item quantity="few">minutes</item> + <item quantity="other">minučių</item> + </plurals> <string name="caches_store_offline">Išsaugoti slėptuves</string> <string name="caches_store_selected">Išsaugoti pasirinktas</string> <string name="caches_history">Istorija</string> - <string name="caches_on_map">Žemėlapyje</string> + <string name="caches_on_map">Rodyti žemėlapyje</string> <string name="caches_sort">Rūšiuoti</string> <string name="caches_sort_title">Rūšiuoti pagal</string> <string name="caches_sort_distance">Atstumą</string> @@ -303,10 +303,8 @@ <string name="caches_removing_from_history">Pašalinama iš Istorijos…</string> <string name="caches_clear_offlinelogs">Išvalyti išsaugotus įrašus</string> <string name="caches_clear_offlinelogs_progress">Išvalomi išsaugoti įrašai</string> - <string name="list_menu">Sąrašas</string> <string name="list_menu_create">Sukurti naują sąrašą</string> <string name="list_menu_drop">Išmesti dabartinį sąrašą</string> - <string name="list_menu_change">Pakeisti sąrašą</string> <string name="list_menu_rename">Pervadinti dabartinį sąrašą</string> <string name="list_title">Pasirinkti sąrašą</string> <string name="list_inbox">Išsaugota</string> @@ -400,8 +398,8 @@ <string name="init_signature_template_log">Įrašo tekstas</string> <string name="init_ratingwanted">GCvote reitingas</string> <string name="init_summary_ratingwanted">Įkelti slėptuvės reitingą iš GCvote.com</string> - <string name="init_friendlogswanted">Rodyti draugų įrašus</string> - <string name="init_summary_friendlogswanted">Rodyti papildomą draugų įrašų puslapį</string> + <string name="init_friends_and_own_logs_wanted">Rodyti draugų/savo</string> + <string name="init_summary_friends_and_own_logs_wanted">Rodyti papildomą draugų ir savų įrašų puslapį</string> <string name="init_openlastdetailspage">Paskutinis naudotas puslapis</string> <string name="init_summary_openlastdetailspage">Atidaryti kitą slėptuvę nuo paskutinio naudoto puslapio</string> <string name="init_autoload">Ilgas aprašymas</string> @@ -413,6 +411,8 @@ <string name="init_captcha">Rodyti CAPTCHA</string> <string name="init_summary_captcha">Jei reikia rodyti CAPTCHA (tik baziniams nariams)</string> <string name="init_useenglish">Anglu kalba</string> + <string name="init_showoverflowmenu">Visada rodyti papildomą meniu</string> + <string name="init_showoverflow_summary">Visada rodyti papildomą meniu (trys taškai ⋮) net jei prietaisas turi meniu mygtuką (reikia pakartotinai paleisti)</string> <string name="init_summary_useenglish">Naudoti anglų kalbą (reikia pakartotinai paleisti)</string> <string name="init_exclude">Atmesti savo ir rastas</string> <string name="init_summary_exclude">Atmesti nuosavas ir rastas slėptuves</string> @@ -490,6 +490,9 @@ <string name="init_maintenance">Priežiūra</string> <string name="init_maintenance_directories_note">c:geo saugo nuotraukas, įrašų nuotraukas ir kitus failus, susijusius su slėptuve, atskirame kataloge. Kai kuriais atvejais (pvz., importuojant/eksportuojant duomenų bazę) šiame kataloge gali likti pasenusių failų, kuriuos galima panaikinti čia.</string> <string name="init_maintenance_directories">Ištrinti nebereikalingus failus</string> + <string name="init_create_memory_dump">Sukurti atminties dump failą</string> + <string name="init_memory_dump">Atminties dump failas</string> + <string name="init_memory_dumped">Atminties dump failas išsaugotas %s</string> <string name="settings_open_website">Atidaryti interneto svetainę</string> <string name="settings_settings">Nustatymai</string> <string name="settings_information">Informacija</string> @@ -536,6 +539,11 @@ <string name="auth_dialog_completed_twitter">c:geo priregistruota ir jai leidžiama rašyti Twitter paskyroje.</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geo dabar registruota ir leidžiama naudotis %s.</string> + <plurals name="cache_counts"> + <item quantity="one">%1$d slėptuvė</item> + <item quantity="few">%1$d slėptuvės</item> + <item quantity="other">%1$d slėptuvių</item> + </plurals> <string name="cache_offline">Išsaugota</string> <string name="cache_offline_refresh">Naujinti</string> <string name="cache_offline_drop">Išmesti</string> @@ -562,8 +570,6 @@ <string name="cache_personal_note_uploading">Įkeliama asmeninė pastaba</string> <string name="cache_personal_note_upload_done">Asmeninė pastaba įkelta</string> <string name="cache_personal_note_upload_cancelled">Asmeninės pastabos įkėlimas atšauktas</string> - <string name="cache_personal_note_unstored">Slėptuvė neišsaugota</string> - <string name="cache_personal_note_store">Rašyti asmeninę pastabą galima tik išsaugotos slėptuvės aprašyme.</string> <string name="cache_description">Aprašymas</string> <string name="cache_description_long">Ilgas aprašymas</string> <string name="cache_description_table_note">Aprašymas turi lentelės formatavimą ir norint pamatyti jį atvaizduotą teisingai gali tekti apsilankyti %s.</string> @@ -580,10 +586,15 @@ <string name="cache_list_unknown">Nėra sąraše</string> <string name="cache_images">Nuotraukos</string> <string name="cache_waypoints">Papildomi taškai</string> + <plurals name="waypoints"> + <item quantity="one">1papildomas taškas</item> + <item quantity="few">%d papildomi taškai</item> + <item quantity="other">%d papildomų taškų</item> + </plurals> <string name="cache_waypoints_add">Pridėti papildomą tašką</string> <string name="cache_hint">Užuomina</string> <string name="cache_logs">Įrašai</string> - <string name="cache_logsfriends">Draugų įrašai</string> + <string name="cache_logs_friends_and_own">Draugų/savi įrašai</string> <string name="cache_dialog_loading_details">Įkeliama slėptuvės informacija…</string> <string name="cache_dialog_loading_details_status_loadpage">Įkeliamas puslapis</string> <string name="cache_dialog_loading_details_status_details">Apdorojama informacija</string> @@ -598,7 +609,7 @@ <string name="cache_dialog_offline_drop_title">Pašalinti</string> <string name="cache_dialog_offline_drop_message">Slėptuvė pašalinama iš prietaiso atminties…</string> <string name="cache_dialog_refresh_title">Atnaujinti</string> - <string name="cache_dialog_refresh_message">Slėptuvės informacija atsiunčiama iš naujo…</string> + <string name="cache_dialog_refresh_message">Atnaujinama slėptuvės informacija…</string> <string name="cache_dialog_watchlist_add_title">Įtraukti į stebimų slėptuvių sąrašą</string> <string name="cache_dialog_watchlist_add_message">Slėptuvė įtraukiama į stebimų slėptuvių sąrašą…</string> <string name="cache_dialog_watchlist_remove_title">Pašalinti iš stebimų slėptuvių sąrašo</string> @@ -629,15 +640,15 @@ <string name="cache_menu_refresh">Atnaujinti</string> <string name="cache_menu_share">Bendrinti slėptuvę</string> <string name="cache_menu_move_list">Perkelti į kitą sąrašą</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> <string name="cache_menu_pebble">Pebble</string> <string name="cache_menu_mapswithme">MapsWithMe</string> <string name="cache_status">Būsena</string> - <string name="cache_status_offline_log">Įrašas išsaugotas</string> + <string name="cache_status_offline_log">Išsaugotas įrašas</string> <string name="cache_status_found">Rasta</string> + <string name="cache_not_status_found">Nerasta</string> <string name="cache_status_archived">Suarchyvuota</string> <string name="cache_status_disabled">Išjungta</string> <string name="cache_status_premium">Tik Premium nariams</string> @@ -749,10 +760,7 @@ <string name="map_view_map">Žemėlapio šaltinis</string> <string name="map_modes">Žemėlapio nustatymai</string> <string name="map_trail_show">Rodyti pėdsaką</string> - <string name="map_trail_hide">Slėpti pėdsaką</string> <string name="map_circles_show">Rodyti apskritimus</string> - <string name="map_circles_hide">Slėpti apskritimus</string> - <string name="map_mycaches_show">Rodyti savo/rastas slėptuves</string> <string name="map_mycaches_hide">Slėpti savo/rastas slėptuves</string> <string name="map_theme_builtin">Numatyta</string> <string name="map_theme_select">Pasirinkti žemėlapio temą</string> @@ -1105,7 +1113,6 @@ <string name="website">Tinklapis: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Vadovas: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo on Google Play</a></string> <string name="about_twitter">Kaskart registruojant slėptuvę <b>c:geo</b> paskelbs nauja statusą Twitter paskyroje.</string> <string name="status_new_release" tools:ignore="UnusedResources">Galima nauja versija. \nPaspauskite čia ir įdiekite.</string> @@ -1120,57 +1127,32 @@ <string name="tts_stop">Nekalbėti</string> <string name="err_tts_lang_not_supported">Dabartinė kalba nepalaikoma teksto-į-kalbą.</string> <string name="tts_one_kilometer">vienas kilometras</string> - <string name="tts_one_meter">vienas metras</string> - <string name="tts_one_mile">viena mylia</string> - <string name="tts_one_foot">viena pėda</string> - <string name="tts_one_oclock">one o\'clock</string> - <string name="tts_oclock">%s o\'clock</string> - <string name="clipboard_copy_ok">Nukopijuota į mainų sritį</string> - <string name="percent_favorite_points">%\ mėgiamos</string> - <string name="cgeo_shortcut">c:geo nuoroda</string> - <string name="create_shortcut">Sukurti nuorodą</string> - <string-array name="log_image_scales"> - <item>Nekeisti dydžio</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minutę</item> - <item quantity="few">minutes</item> - <item quantity="other">minučių</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">%1$d slėptuvė</item> - <item quantity="few">%1$d slėptuvės</item> - <item quantity="other">%1$d slėptuvių</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1papildomas taškas</item> - <item quantity="few">%d papildomi taškai</item> - <item quantity="other">%d papildomų taškų</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometras</item> <item quantity="few">%s kilometrai</item> <item quantity="other">%s kilometrų</item> </plurals> + <string name="tts_one_meter">vienas metras</string> <plurals name="tts_meters"> <item quantity="one">%s metras</item> <item quantity="few">%s metrai</item> <item quantity="other">%s metrų</item> </plurals> + <string name="tts_one_mile">viena mylia</string> <plurals name="tts_miles"> <item quantity="one">%s mylia</item> <item quantity="few">%s mylios</item> <item quantity="other">%s mylių</item> </plurals> + <string name="tts_one_foot">viena pėda</string> <plurals name="tts_feet"> <item quantity="one">%s pėda</item> <item quantity="few">%s pėdos</item> <item quantity="other">%s pėdų</item> </plurals> + <string name="tts_one_oclock">one o\'clock</string> + <string name="tts_oclock">%s o\'clock</string> + <string name="clipboard_copy_ok">Nukopijuota į mainų sritį</string> <plurals name="days_ago"> <item quantity="one">vakar</item> <item quantity="few">%d dienas atgal</item> @@ -1181,4 +1163,8 @@ <item quantity="few">%s mėgiamos</item> <item quantity="other">%s mėgiamų</item> </plurals> + <string name="percent_favorite_points">%\ mėgiamos</string> + <string name="cgeo_shortcut">c:geo nuoroda</string> + <string name="create_shortcut">Sukurti nuorodą</string> + <string name="send">Siųsti</string> </resources> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 6fe79e1..d5ff462 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -79,21 +79,9 @@ <string name="log_saving_and_uploading">Sender logg og laster opp bilde…</string> <string name="log_clear">Tøm</string> <string name="log_post">Last opp loggen</string> - <string name="log_post_rate">Last opp loggen og rangér</string> - <string name="log_post_no_rate">Last opp loggen uten å rangere</string> <string name="log_post_not_possible">Laster loggsiden…</string> <string name="log_add">Legg til</string> - <string name="log_rating">Rangering</string> <string name="log_no_rating">Ingen rangering</string> - <string name="log_stars_1">1 stjerne</string> - <string name="log_stars_15">1,5 stjerner</string> - <string name="log_stars_2">2 stjerner</string> - <string name="log_stars_25">2,5 stjerner</string> - <string name="log_stars_3">3 stjerner</string> - <string name="log_stars_35">3,5 stjerner</string> - <string name="log_stars_4">4 stjerner</string> - <string name="log_stars_45">4,5 stjerner</string> - <string name="log_stars_5">5 stjerner</string> <string name="log_stars_1_description">Dårlig</string> <string name="log_stars_15_description">Ganske dårlig</string> <string name="log_stars_2_description">Under gjennomsnitt</string> @@ -112,7 +100,6 @@ <string name="log_smilies">Smilefjes</string> <string name="log_image">Bilde</string> <string name="log_image_attach">Legg ved bilde</string> - <string name="log_image_edit">Rediger bilde</string> <string name="log_image_stored">Eksisterende</string> <string name="log_image_camera">Nytt</string> <string name="log_image_caption">Bildetekst</string> @@ -121,6 +108,13 @@ <string name="log_password_title">Passord for logg:</string> <string name="log_hint_log_password">Angi passordet for logg</string> <string name="log_oc_team_comment">Kommentar fra OC-teamet</string> + <string-array name="log_image_scales"> + <item>Ingen skalering</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Oversett til %s</string> <string name="translate_to_english">Oversett til engelsk</string> <string name="translate_length_warning">Oversettelse kan mislykkes med store mengder tekst.</string> @@ -241,6 +235,10 @@ <string name="caches_more_caches_currently">for øyeblikket</string> <string name="caches_downloading">Laster ned cacher…\nETA: </string> <string name="caches_eta_ltm">Mindre enn ett minutt</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minutt</item> + <item quantity="other">minutter</item> + </plurals> <string name="caches_store_offline">Lagre for offline-bruk</string> <string name="caches_store_selected">Lagre valgte</string> <string name="caches_history">Historikk</string> @@ -301,10 +299,8 @@ <string name="caches_removing_from_history">Fjerner fra historikken…</string> <string name="caches_clear_offlinelogs">Fjern offline-logger</string> <string name="caches_clear_offlinelogs_progress">Fjerner offline-logger</string> - <string name="list_menu">Liste</string> <string name="list_menu_create">Opprett ny liste</string> <string name="list_menu_drop">Fjern liste</string> - <string name="list_menu_change">Endre liste</string> <string name="list_menu_rename">Endre navn på listen</string> <string name="list_title">Velg en liste</string> <string name="list_inbox">Lagret</string> @@ -395,8 +391,6 @@ <string name="init_signature_template_log">Loggtekst</string> <string name="init_ratingwanted">GCvote-rangering</string> <string name="init_summary_ratingwanted">Last rangering for cachen fra GCvote.com</string> - <string name="init_friendlogswanted">Vis venners logger</string> - <string name="init_summary_friendlogswanted">Vis flere logger fra venner</string> <string name="init_openlastdetailspage">Sist brukte fane</string> <string name="init_summary_openlastdetailspage">Åpne detaljsiden til cacher på den siste brukte fanen</string> <string name="init_autoload">Last full beskrivelse automatisk</string> @@ -531,6 +525,10 @@ <string name="auth_dialog_completed_twitter">c:geo har nå fått godkjenning til å kvitre på Twitter.</string> <string name="auth_ocde">opencaching.de</string> <string name="auth_dialog_completed_oc">c:geo har nå fått godkjenning til å kommunisere med %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Én cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Oppdater</string> <string name="cache_offline_drop">Fjern</string> @@ -557,8 +555,6 @@ <string name="cache_personal_note_uploading">Laster opp personlig cachenotat</string> <string name="cache_personal_note_upload_done">Personlig cachenotat er lastet opp</string> <string name="cache_personal_note_upload_cancelled">Personlig cachenotat ble avbrutt under opplasting</string> - <string name="cache_personal_note_unstored">Cachen er ikke lagret</string> - <string name="cache_personal_note_store">Cachen vil bli lagret for å skrive personlig cachenotat.</string> <string name="cache_description">Beskrivelse</string> <string name="cache_description_long">Full beskrivelse</string> <string name="cache_description_table_note">Beskrivelsen inneholder tabellformatering og må åpnes på %s for å vises riktig.</string> @@ -575,10 +571,13 @@ <string name="cache_list_unknown">Ikke i en liste</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Veipunkter</string> + <plurals name="waypoints"> + <item quantity="one">1 veipunkt</item> + <item quantity="other">%d veipunkter</item> + </plurals> <string name="cache_waypoints_add">Legg til veipunkter</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Loggbok</string> - <string name="cache_logsfriends">Loggbok (venner)</string> <string name="cache_dialog_loading_details">Laster cachens detaljer…</string> <string name="cache_dialog_loading_details_status_loadpage">Laster siden</string> <string name="cache_dialog_loading_details_status_details">Behandler detaljer</string> @@ -624,7 +623,6 @@ <string name="cache_menu_refresh">Oppdater</string> <string name="cache_menu_share">Del cachen</string> <string name="cache_menu_move_list">Flytt til annen liste</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -743,10 +741,7 @@ <string name="map_view_map">Kart</string> <string name="map_modes">Kartinnstillinger</string> <string name="map_trail_show">Vis spor</string> - <string name="map_trail_hide">Skjul spor</string> <string name="map_circles_show">Vis sirkler</string> - <string name="map_circles_hide">Skjul sirkler</string> - <string name="map_mycaches_show">Vis egne og funnede cacher</string> <string name="map_mycaches_hide">Skjul egne og funnede cacher</string> <string name="map_theme_builtin">Standard</string> <string name="map_theme_select">Velg karttema</string> @@ -1100,7 +1095,6 @@ <string name="website">web-side: <a href="http://cgeo.org/">cgeo.org</a></string> <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Bruksanvisning: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo i Google Play</a></string> <string name="about_twitter">Ønsker du at <b>c:geo</b> skal poste en status på Twitter hver gang du logger ett funn via <b>c:geo</b>?</string> <string name="status_new_release" tools:ignore="UnusedResources">Ny versjon tilgjengelig. \nKlikk for å installere.</string> @@ -1117,40 +1111,18 @@ <string name="tts_one_kilometer">en kilometer</string> <string name="tts_one_meter">en meter</string> <string name="tts_one_mile">En enkelsk mil</string> - <string name="tts_one_foot">En fot</string> - <string name="tts_one_oclock">klokken ett</string> - <string name="tts_oclock">klokken %s</string> - <string name="clipboard_copy_ok">Kopiert til utklippstavlen</string> - <string name="percent_favorite_points">%\ favoritter</string> - <string name="cgeo_shortcut">c:geo-snartvei</string> - <string name="create_shortcut">Opprett snarvei</string> - <string-array name="log_image_scales"> - <item>Ingen skalering</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minutt</item> - <item quantity="other">minutter</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Én cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 veipunkt</item> - <item quantity="other">%d veipunkter</item> - </plurals> <plurals name="tts_miles"> <item quantity="one">%s engelsk mil</item> <item quantity="other">%s engelske mil</item> </plurals> + <string name="tts_one_foot">En fot</string> <plurals name="tts_feet"> <item quantity="one">%s fot</item> <item quantity="other">%s fot</item> </plurals> + <string name="tts_one_oclock">klokken ett</string> + <string name="tts_oclock">klokken %s</string> + <string name="clipboard_copy_ok">Kopiert til utklippstavlen</string> <plurals name="days_ago"> <item quantity="one">i går</item> <item quantity="other">%d dager siden</item> @@ -1159,4 +1131,7 @@ <item quantity="one">%s favoritt</item> <item quantity="other">%s favoritt</item> </plurals> + <string name="percent_favorite_points">%\ favoritter</string> + <string name="cgeo_shortcut">c:geo-snartvei</string> + <string name="create_shortcut">Opprett snarvei</string> </resources> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 3568423..91491ea 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -18,6 +18,7 @@ <string name="letterbox">Letterbox hybrid</string> <string name="event">Event cache</string> <string name="mega">Mega-event cache</string> + <string name="giga">Giga-Event Cache</string> <string name="earth">Earthcache</string> <string name="cito">Cache in trash out event</string> <string name="webcam">Webcam cache</string> @@ -79,21 +80,9 @@ <string name="log_saving_and_uploading">Verzenden van log en uploaden foto…</string> <string name="log_clear">Wissen</string> <string name="log_post">Verzend log</string> - <string name="log_post_rate">Verzend log & beoordeel</string> - <string name="log_post_no_rate">Verzend log zonder beoordeling</string> <string name="log_post_not_possible">Laden Log Pagina…</string> <string name="log_add">Toevoegen</string> - <string name="log_rating">Beoordeling</string> <string name="log_no_rating">Geen beoordeling</string> - <string name="log_stars_1">1 ster</string> - <string name="log_stars_15">1.5 ster</string> - <string name="log_stars_2">2 sterren</string> - <string name="log_stars_25">2.5 sterren</string> - <string name="log_stars_3">3 sterren</string> - <string name="log_stars_35">3.5 sterren</string> - <string name="log_stars_4">4 sterren</string> - <string name="log_stars_45">4.5 sterren</string> - <string name="log_stars_5">5 sterren</string> <string name="log_stars_1_description">Slecht</string> <string name="log_stars_15_description">Redelijk slecht</string> <string name="log_stars_2_description">Beneden gemiddeld</string> @@ -112,7 +101,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Foto</string> <string name="log_image_attach">Foto koppelen</string> - <string name="log_image_edit">Foto bewerken</string> <string name="log_image_stored">Bestaande</string> <string name="log_image_camera">Nieuw</string> <string name="log_image_caption">Bijschrift</string> @@ -121,6 +109,13 @@ <string name="log_password_title">Log wachtwoord:</string> <string name="log_hint_log_password">Voer Login Wachtwoord</string> <string name="log_oc_team_comment">OC Team commentaar</string> + <string-array name="log_image_scales"> + <item>Niet schalen</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Vertaal naar %s</string> <string name="translate_to_english">Vertaal naar engels</string> <string name="translate_length_warning">Vertaling kan mislukken bij grote stukken tekst.</string> @@ -241,6 +236,10 @@ <string name="caches_more_caches_currently">op dit moment</string> <string name="caches_downloading">Caches aan het downloaden…\nGeschatte tijd: </string> <string name="caches_eta_ltm">Minder dan een minuut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuut</item> + <item quantity="other">minuten</item> + </plurals> <string name="caches_store_offline">Opslaan voor Offline gebruik</string> <string name="caches_store_selected">Geselecteerden opslaan</string> <string name="caches_history">Geschiedenis</string> @@ -282,6 +281,7 @@ <string name="caches_move_all">Verplaats alle</string> <string name="caches_map_locus">Locus</string> <string name="caches_map_locus_export">Exporteer naar Locus</string> + <string name="caches_map_mapswithme">MapsWithMe</string> <string name="caches_recaptcha_title">reCAPTCHA</string> <string name="caches_recaptcha_explanation">Vul de tekst uit de afbeelding in. Dit is nodig voor het downloaden van de coördinaten van de caches. Dit is optioneel en kan in de instellingen uitgeschakeld worden.</string> <string name="caches_recaptcha_hint">Tekst uit de afbeelding</string> @@ -301,10 +301,8 @@ <string name="caches_removing_from_history">Verwijderen uit geschiedenis…</string> <string name="caches_clear_offlinelogs">Verwijderen offline logs</string> <string name="caches_clear_offlinelogs_progress">Offline logs worden verwijderd</string> - <string name="list_menu">Lijst</string> <string name="list_menu_create">Maak nieuwe lijst</string> <string name="list_menu_drop">Verwijder huidige lijst</string> - <string name="list_menu_change">Pas lijst aan</string> <string name="list_menu_rename">Hernoem huidige lijst</string> <string name="list_title">Selecteer een lijst</string> <string name="list_inbox">Opgeslagen</string> @@ -402,8 +400,8 @@ <string name="init_signature_template_log">Log tekst</string> <string name="init_ratingwanted">GCvote.com waardering</string> <string name="init_summary_ratingwanted">Laad cachewaardering van GCvote.com</string> - <string name="init_friendlogswanted">Lange omschrijving</string> - <string name="init_summary_friendlogswanted">Laad extra logbook pagina voor logs van vrienden</string> + <string name="init_friends_and_own_logs_wanted">Toon eigen/van vrienden</string> + <string name="init_summary_friends_and_own_logs_wanted">Toon additionele logboek pagina voor eigen en vrienden logs</string> <string name="init_openlastdetailspage">Laad details met laatst gebruikte pagina</string> <string name="init_summary_openlastdetailspage">Laad details met laatst gebruikte pagina</string> <string name="init_autoload">Lange omschrijving</string> @@ -542,6 +540,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">c:geo is nu gekoppeld met %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Een cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Verversen</string> <string name="cache_offline_drop">Laten vervallen</string> @@ -568,8 +570,6 @@ <string name="cache_personal_note_uploading">Uploading persoonlijke notitie</string> <string name="cache_personal_note_upload_done">Persoonlijke notitie geupload</string> <string name="cache_personal_note_upload_cancelled">Persoonlijk notitie uploaden geannulleerd</string> - <string name="cache_personal_note_unstored">Cache niet opgeslagen</string> - <string name="cache_personal_note_store">De cache zal eerst opgeslagen worden om persoonlijke notities toe te kunnen voegen.</string> <string name="cache_description">Omschrijving</string> <string name="cache_description_long">Lange omschrijving</string> <string name="cache_description_table_note">Omschrijving bevat een tabel-layout welke misschien op %s bekeken moet worden.</string> @@ -586,10 +586,14 @@ <string name="cache_list_unknown">Niet in een lijst</string> <string name="cache_images">Afbeeldingen</string> <string name="cache_waypoints">Waypoints</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoints</item> + </plurals> <string name="cache_waypoints_add">Waypoint toevoegen</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Logboek</string> - <string name="cache_logsfriends">Logboek (vrienden)</string> + <string name="cache_logs_friends_and_own">Vrienden/Eigen Logs</string> <string name="cache_dialog_loading_details">Cache details laden…</string> <string name="cache_dialog_loading_details_status_loadpage">Pagina laden</string> <string name="cache_dialog_loading_details_status_details">Verwerken details</string> @@ -635,15 +639,16 @@ <string name="cache_menu_refresh">Verversen</string> <string name="cache_menu_share">Deel cache</string> <string name="cache_menu_move_list">Verplaats naar andere lijst</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache baken</string> <string name="cache_menu_navigon">Navigon</string> <string name="cache_menu_pebble">Pebble</string> + <string name="cache_menu_mapswithme">MapsWithMe</string> <string name="cache_status">Status</string> <string name="cache_status_offline_log">Log opgeslagen</string> <string name="cache_status_found">Gevonden</string> + <string name="cache_not_status_found">Niet gevonden</string> <string name="cache_status_archived">Gearchiveerd</string> <string name="cache_status_disabled">Uitgeschakeld</string> <string name="cache_status_premium">Alleen voor premium leden</string> @@ -755,10 +760,7 @@ <string name="map_view_map">Kaart weergave</string> <string name="map_modes">Kaartinstellingen</string> <string name="map_trail_show">Toon spoor</string> - <string name="map_trail_hide">Verberg spoor</string> <string name="map_circles_show">Laat cirkels zien</string> - <string name="map_circles_hide">Verberg cirkels</string> - <string name="map_mycaches_show">Tonen eigen/gevonden caches</string> <string name="map_mycaches_hide">Verbergen eigen/gevonden caches</string> <string name="map_theme_builtin">Standaard</string> <string name="map_theme_select">Selecteer mapthema</string> @@ -1112,7 +1114,6 @@ <string name="website">Website: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Handleiding: <a href="">c:geo in een notendop</a></string> <string name="market">Android: <a href="">c:geo op Google Play</a></string> <string name="about_twitter">Moet <b>c:geo</b> elke cache vondst publiceren naar Twitter?</string> <string name="faq">FAQ: <a href=""> faq.cgeo.org</a></string> @@ -1128,50 +1129,28 @@ <string name="tts_stop">Stop met praten</string> <string name="err_tts_lang_not_supported">De huidige taal wordt niet ondersteund door tekst naar spraak.</string> <string name="tts_one_kilometer">één kilometer</string> - <string name="tts_one_meter">één meter</string> - <string name="tts_one_mile">één mijl</string> - <string name="tts_one_foot">één voet</string> - <string name="tts_one_oclock">één uur</string> - <string name="tts_oclock">%s uur</string> - <string name="clipboard_copy_ok">Gekopieerd naar klembord</string> - <string name="percent_favorite_points">%\ favorieten</string> - <string name="cgeo_shortcut">c:geo snelkoppeling</string> - <string name="create_shortcut">Maak snelkoppeling</string> - <string-array name="log_image_scales"> - <item>Niet schalen</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuut</item> - <item quantity="other">minuten</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Een cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoints</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="other">%s kilometer</item> </plurals> + <string name="tts_one_meter">één meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="other">%s meter</item> </plurals> + <string name="tts_one_mile">één mijl</string> <plurals name="tts_miles"> <item quantity="one">%s mijl</item> <item quantity="other">%s mijl</item> </plurals> + <string name="tts_one_foot">één voet</string> <plurals name="tts_feet"> <item quantity="one">%s voet</item> <item quantity="other">%s voeten</item> </plurals> + <string name="tts_one_oclock">één uur</string> + <string name="tts_oclock">%s uur</string> + <string name="clipboard_copy_ok">Gekopieerd naar klembord</string> <plurals name="days_ago"> <item quantity="one">Gisteren</item> <item quantity="other">%d dagen geleden</item> @@ -1180,4 +1159,7 @@ <item quantity="one">%s favoriet</item> <item quantity="other">%s favorieten</item> </plurals> + <string name="percent_favorite_points">%\ favorieten</string> + <string name="cgeo_shortcut">c:geo snelkoppeling</string> + <string name="create_shortcut">Maak snelkoppeling</string> </resources> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 26b5e23..bfaa215 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -18,6 +18,7 @@ <string name="letterbox">Hybrydowa Letterbox</string> <string name="event">Wydarzenie</string> <string name="mega">Mega-Wydarzenie</string> + <string name="giga">Giga-Wydarzenie</string> <string name="earth">Earthcache</string> <string name="cito">CITO</string> <string name="webcam">Skrzynka Webcam</string> @@ -79,21 +80,9 @@ <string name="log_saving_and_uploading">Zapisuję w dzienniku i wysyłam zdjęcie…</string> <string name="log_clear">Wyczyść</string> <string name="log_post">Wpisz do dziennika</string> - <string name="log_post_rate">Wpisz do dziennika & oceń</string> - <string name="log_post_no_rate">Wpisz do dziennika & nie oceniaj</string> <string name="log_post_not_possible">Ładuję dziennik…</string> <string name="log_add">Dodaj</string> - <string name="log_rating">Ocena</string> <string name="log_no_rating">Bez oceny</string> - <string name="log_stars_1">1 gwiazdka</string> - <string name="log_stars_15">1,5 gwiazdki</string> - <string name="log_stars_2">2 gwiazdki</string> - <string name="log_stars_25">2,5 gwiazdki</string> - <string name="log_stars_3">3 gwiazdki</string> - <string name="log_stars_35">3,5 gwiazdki</string> - <string name="log_stars_4">4 gwiazdki</string> - <string name="log_stars_45">4,5 gwiazdki</string> - <string name="log_stars_5">5 gwiazdek</string> <string name="log_stars_1_description">Słaba</string> <string name="log_stars_15_description">Raczej słaba</string> <string name="log_stars_2_description">Poniżej średniej</string> @@ -112,7 +101,6 @@ <string name="log_smilies">Uśmiechy</string> <string name="log_image">Obraz</string> <string name="log_image_attach">Załącz obraz</string> - <string name="log_image_edit">Edytuj obraz</string> <string name="log_image_stored">Zapisany</string> <string name="log_image_camera">Nowy</string> <string name="log_image_caption">Podpis</string> @@ -121,6 +109,13 @@ <string name="log_password_title">Hasło do logu:</string> <string name="log_hint_log_password">Wpisz hasło do logu</string> <string name="log_oc_team_comment">Komentarz zespołu OC</string> + <string-array name="log_image_scales"> + <item>Brak skalowania</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Przetłumacz na %s</string> <string name="translate_to_english">Przetłumacz na angielski</string> <string name="translate_length_warning">Tłumaczenie może nie udać się przy dużej ilości tekstu.</string> @@ -213,7 +208,7 @@ <string name="info_select_logimage_cancelled">Wybór obrazu został anulowany.</string> <string name="info_stored_image">Nowy obraz zapisany w:</string> <string name="info_storing_static_maps">Próbuję zapisać mapy statyczne</string> - <string name="loc_last">Ostatnia znana pozycja</string> + <string name="loc_last">Ostatnia pozycja</string> <string name="loc_net">Sieć</string> <string name="loc_gps">GPS</string> <string name="loc_sat">Sat</string> @@ -241,6 +236,11 @@ <string name="caches_more_caches_currently">Obecnie</string> <string name="caches_downloading">Pobieram skrzynki…\nSzacowany czas: </string> <string name="caches_eta_ltm">Mniej niż minuta</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="few">minuty</item> + <item quantity="other">minut</item> + </plurals> <string name="caches_store_offline">Zapisz offline</string> <string name="caches_store_selected">Zapisz wybrane</string> <string name="caches_history">Historia</string> @@ -299,12 +299,10 @@ <string name="caches_filter_popularity">Ulubione</string> <string name="caches_filter_popularity_ratio">Ulubione [%]</string> <string name="caches_removing_from_history">Usuwam z Historii…</string> - <string name="caches_clear_offlinelogs">Usuń logi offline</string> - <string name="caches_clear_offlinelogs_progress">Usuwanie logów offline</string> - <string name="list_menu">Lista</string> + <string name="caches_clear_offlinelogs">Usuń wpisy offline</string> + <string name="caches_clear_offlinelogs_progress">Usuwanie wpisów offline</string> <string name="list_menu_create">Utwórz nową listę</string> <string name="list_menu_drop">Usuń aktualną listę</string> - <string name="list_menu_change">Zmień listę</string> <string name="list_menu_rename">Zmień nazwę aktualnej listy</string> <string name="list_title">Wybierz listę</string> <string name="list_inbox">Zapisane</string> @@ -399,8 +397,8 @@ <string name="init_signature_template_log">Wpis</string> <string name="init_ratingwanted">Załaduj ocenę skrzynki z GCvote.com</string> <string name="init_summary_ratingwanted">Załaduj ocenę skrzynki z GCvote.com</string> - <string name="init_friendlogswanted">Załaduj dodatkowy dziennik dla wpisów od przyjaciół</string> - <string name="init_summary_friendlogswanted">Załaduj dodatkowy dziennik dla wpisów od przyjaciół</string> + <string name="init_friends_and_own_logs_wanted">Pokaż przyjaciół/własne</string> + <string name="init_summary_friends_and_own_logs_wanted">Wyświetl dodatkowy dziennik dla wpisów własnych i przyjaciół</string> <string name="init_openlastdetailspage">Otwórz szczegóły ostatnio używanej strony</string> <string name="init_summary_openlastdetailspage">Otwórz szczegóły ostatnio używanej strony</string> <string name="init_autoload">Automatyczne ładowanie długich opisów</string> @@ -501,7 +499,7 @@ <string name="feature_description">Podane funkcje <b>online</b> na tej stronie są wspierane przez c:geo (w porównaniu do funkcji offline):</string> <string name="feature_personal_notes">Notatka osobista</string> <string name="feature_online_logging">Wpisy online</string> - <string name="feature_log_images">Załączanie zdjęć do logów</string> + <string name="feature_log_images">Załączanie zdjęć do wpisów</string> <string name="feature_watch_list">Listy obserwowanych skrzynek</string> <string name="feature_own_coordinates">Przechowywanie zmodyfikowanych współrzędnych</string> <string name="feature_search_keyword">Szukanie po słowie kluczowym</string> @@ -536,6 +534,11 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo został zautoryzowany by komunikować się z %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Jedna skrzynka</item> + <item quantity="few">%1$d skrzynki</item> + <item quantity="other">%1$d skrzynek</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Odśwież</string> <string name="cache_offline_drop">Usuń</string> @@ -562,8 +565,6 @@ <string name="cache_personal_note_uploading">Wysyłam osobistą notatkę</string> <string name="cache_personal_note_upload_done">Notatka osobista wysłana</string> <string name="cache_personal_note_upload_cancelled">Wysyłanie notatki osobistej anulowane</string> - <string name="cache_personal_note_unstored">Skrzynka nie jest zapisana</string> - <string name="cache_personal_note_store">Skrzynka będzie najpierw zapisana aby umożliwić dodawanie notatek osobistych.</string> <string name="cache_description">Opis</string> <string name="cache_description_long">Długi opis</string> <string name="cache_description_table_note">Opis zawiera formatowanie w formie tabeli, które w celu poprawnego wyświetlania może wymagać odwiedzenia %s.</string> @@ -580,10 +581,15 @@ <string name="cache_list_unknown">Nie znajduje się na liście</string> <string name="cache_images">Zdjęcia</string> <string name="cache_waypoints">Punkty nawigacji</string> + <plurals name="waypoints"> + <item quantity="one">1 punkt</item> + <item quantity="few">%d punkty</item> + <item quantity="other">%d punktów nawigacji</item> + </plurals> <string name="cache_waypoints_add">Dodaj punkt nawigacji</string> <string name="cache_hint">Wskazówka</string> <string name="cache_logs">Dziennik</string> - <string name="cache_logsfriends">Dziennik (Przyjaciele)</string> + <string name="cache_logs_friends_and_own">Wpisy przyjaciół/własne</string> <string name="cache_dialog_loading_details">Ładuję szczegóły skrzynki…</string> <string name="cache_dialog_loading_details_status_loadpage">Ładuję stronę</string> <string name="cache_dialog_loading_details_status_details">Przetwarzam szczegóły</string> @@ -629,7 +635,6 @@ <string name="cache_menu_refresh">Odśwież</string> <string name="cache_menu_share">Podziel się skrzynką</string> <string name="cache_menu_move_list">Przenieś do innej listy</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -638,6 +643,7 @@ <string name="cache_status">Status</string> <string name="cache_status_offline_log">Zapamiętany wpis</string> <string name="cache_status_found">Znaleziona</string> + <string name="cache_not_status_found">Nie znaleziono</string> <string name="cache_status_archived">Zarchiwizowana</string> <string name="cache_status_disabled">Niedostępna</string> <string name="cache_status_premium">Tylko dla użytkowników Premium</string> @@ -749,10 +755,7 @@ <string name="map_view_map">Widok mapy</string> <string name="map_modes">Tryb mapy</string> <string name="map_trail_show">Pokaż szlak</string> - <string name="map_trail_hide">Ukryj szlak</string> <string name="map_circles_show">Pokaż okręgi</string> - <string name="map_circles_hide">Ukryj okręgi</string> - <string name="map_mycaches_show">Pokazuj własne/znalezione skrzynki</string> <string name="map_mycaches_hide">Ukryj własne/znalezione skrzynki</string> <string name="map_theme_builtin">Domyślny</string> <string name="map_theme_select">Wybierz motyw mapy</string> @@ -1106,7 +1109,6 @@ <string name="website">Website: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo strona</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Podręcznik: <a href="">c:geo skrócona instrukcja obsługi</a></string> <string name="market">Android: <a href="">c:geo w Google Play</a></string> <string name="about_twitter">Czy chczesz aby <b>c:geo</b> publikował nowy status na Twitter za każdym razem kiedy znajdziesz skrzynkę?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1122,57 +1124,32 @@ <string name="tts_stop">Przestań mówić</string> <string name="err_tts_lang_not_supported">Aktualny język nie jest wspierany przez text-to-speech.</string> <string name="tts_one_kilometer">jeden kilometr</string> - <string name="tts_one_meter">jeden metr</string> - <string name="tts_one_mile">jedna mila</string> - <string name="tts_one_foot">jedna stopa</string> - <string name="tts_one_oclock">pierwsza</string> - <string name="tts_oclock">%s</string> - <string name="clipboard_copy_ok">Skopiowano do schowka</string> - <string name="percent_favorite_points">%\ ulubionych</string> - <string name="cgeo_shortcut">skrót do c:geo</string> - <string name="create_shortcut">Utwórz skrót</string> - <string-array name="log_image_scales"> - <item>Brak skalowania</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="few">minuty</item> - <item quantity="other">minut</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Jedna skrzynka</item> - <item quantity="few">%1$d skrzynki</item> - <item quantity="other">%1$d skrzynek</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 punkt</item> - <item quantity="few">%d punkty</item> - <item quantity="other">%d punktów nawigacji</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometr</item> <item quantity="few">%s kilometry</item> <item quantity="other">%s kilometrów</item> </plurals> + <string name="tts_one_meter">jeden metr</string> <plurals name="tts_meters"> <item quantity="one">%s metr</item> <item quantity="few">%s metry</item> <item quantity="other">%s metrów</item> </plurals> + <string name="tts_one_mile">jedna mila</string> <plurals name="tts_miles"> <item quantity="one">%s mila</item> <item quantity="few">%s mile</item> <item quantity="other">%s mil</item> </plurals> + <string name="tts_one_foot">jedna stopa</string> <plurals name="tts_feet"> <item quantity="one">%s stopa</item> <item quantity="few">%s stopy</item> <item quantity="other">%s stóp</item> </plurals> + <string name="tts_one_oclock">pierwsza</string> + <string name="tts_oclock">%s</string> + <string name="clipboard_copy_ok">Skopiowano do schowka</string> <plurals name="days_ago"> <item quantity="one">wczoraj</item> <item quantity="few">%d dni temu</item> @@ -1183,4 +1160,7 @@ <item quantity="few">%s ulubione</item> <item quantity="other">%s ulubionych</item> </plurals> + <string name="percent_favorite_points">%\ ulubionych</string> + <string name="cgeo_shortcut">skrót do c:geo</string> + <string name="create_shortcut">Utwórz skrót</string> </resources> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 8d781b5..cf95378 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -79,21 +79,9 @@ <string name="log_saving_and_uploading">A enviar o registo e a imagem…</string> <string name="log_clear">Limpar</string> <string name="log_post">Publicar o registo</string> - <string name="log_post_rate">Publicar registo & Votar</string> - <string name="log_post_no_rate">Publicar registo & Não votar</string> <string name="log_post_not_possible">A carregar página de registo…</string> <string name="log_add">Adicionar</string> - <string name="log_rating">Pontuação</string> <string name="log_no_rating">Não votar</string> - <string name="log_stars_1">1 estrela</string> - <string name="log_stars_15">1.5 estrelas</string> - <string name="log_stars_2">2 estrelas</string> - <string name="log_stars_25">2.5 estrelas</string> - <string name="log_stars_3">3 estrelas</string> - <string name="log_stars_35">3.5 estrelas</string> - <string name="log_stars_4">4 estrelas</string> - <string name="log_stars_45">4.5 estrelas</string> - <string name="log_stars_5">5 estrelas</string> <string name="log_stars_1_description">Terrível</string> <string name="log_stars_15_description">Muito má</string> <string name="log_stars_2_description">Má</string> @@ -112,7 +100,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Imagem</string> <string name="log_image_attach">Anexar Imagem</string> - <string name="log_image_edit">Editar Imagem</string> <string name="log_image_stored">Existente</string> <string name="log_image_camera">Nova</string> <string name="log_image_caption">Título</string> @@ -121,6 +108,13 @@ <string name="log_password_title">Password do registo:</string> <string name="log_hint_log_password">Inserira a password do registo</string> <string name="log_oc_team_comment">Comentário da OC Team</string> + <string-array name="log_image_scales"> + <item>Não dimensionar</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Traduzir para %s</string> <string name="translate_to_english">Traduzir para inglês</string> <string name="translate_length_warning">A tradução pode falhar se o texto fôr muito grande.</string> @@ -241,6 +235,10 @@ <string name="caches_more_caches_currently">actualmente</string> <string name="caches_downloading">Downloading caches…\nETE: </string> <string name="caches_eta_ltm">Menos de um minuto</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuto</item> + <item quantity="other">minutos</item> + </plurals> <string name="caches_store_offline">Arquivar para uso offline</string> <string name="caches_store_selected">Arquivar selecionadas</string> <string name="caches_history">Histórico</string> @@ -301,10 +299,8 @@ <string name="caches_removing_from_history">A remover do histórico…</string> <string name="caches_clear_offlinelogs">Limpar registos offline</string> <string name="caches_clear_offlinelogs_progress">A limpar registos offline</string> - <string name="list_menu">Listas</string> <string name="list_menu_create">Criar nova lista</string> <string name="list_menu_drop">Apagar lista actual</string> - <string name="list_menu_change">Mudar de lista</string> <string name="list_menu_rename">Mudar o nome da lista corrente.</string> <string name="list_title">Escolha uma lista</string> <string name="list_inbox">Arquivadas</string> @@ -402,8 +398,6 @@ <string name="init_signature_template_log">Texto de registo</string> <string name="init_ratingwanted">Carregar a pontuação da cache de GCvote.com</string> <string name="init_summary_ratingwanted">Carregar a pontuação da cache de GCvote.com</string> - <string name="init_friendlogswanted">Carregar página adicional de registos de amigos</string> - <string name="init_summary_friendlogswanted">Carregar página adicional de registos de amigos</string> <string name="init_openlastdetailspage">Abrir detalhes da última página vizualizada</string> <string name="init_summary_openlastdetailspage">Abrir detalhes da última página vizualizada</string> <string name="init_autoload">Carregar automaticamente a descrição longa</string> @@ -539,6 +533,10 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">Opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo está agora autorizado a interagir com %s.</string> + <plurals name="cache_counts"> + <item quantity="one">Uma cache</item> + <item quantity="other">%1$d Caches</item> + </plurals> <string name="cache_offline">Arquivo</string> <string name="cache_offline_refresh">Actualizar</string> <string name="cache_offline_drop">Apagar</string> @@ -565,8 +563,6 @@ <string name="cache_personal_note_uploading">A enviar nota pessoal</string> <string name="cache_personal_note_upload_done">Nota pessoal enviada</string> <string name="cache_personal_note_upload_cancelled">Envio de nota pessoal cancelado</string> - <string name="cache_personal_note_unstored">Cache não guaradada</string> - <string name="cache_personal_note_store">A cache vai ser guardada primeiro para permitir notas pessoais.</string> <string name="cache_description">Descrição</string> <string name="cache_description_long">Descrição longa</string> <string name="cache_description_table_note">A descrição contém a formatação da tabela que pode ser necessário para ser vista correctamente em %s.</string> @@ -583,10 +579,13 @@ <string name="cache_list_unknown">Não está numa lista</string> <string name="cache_images">Imagens</string> <string name="cache_waypoints">Pontos de referência</string> + <plurals name="waypoints"> + <item quantity="one">1 Waypoint</item> + <item quantity="other">%d Waypoints</item> + </plurals> <string name="cache_waypoints_add">Adicionar ponto de referência</string> <string name="cache_hint">Pista</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Logbook (Amigos)</string> <string name="cache_dialog_loading_details">A carregar os detalhes da cache…</string> <string name="cache_dialog_loading_details_status_loadpage">A carregar a página</string> <string name="cache_dialog_loading_details_status_details">A processar os detalhes</string> @@ -632,7 +631,6 @@ <string name="cache_menu_refresh">Actualizar</string> <string name="cache_menu_share">Partilhar cache</string> <string name="cache_menu_move_list">Mover para outra lista</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -752,10 +750,7 @@ <string name="map_view_map">Vista de mapa</string> <string name="map_modes">Modos de mapa</string> <string name="map_trail_show">Mostrar caminho</string> - <string name="map_trail_hide">Esconder caminho</string> <string name="map_circles_show">Mostrar círculos</string> - <string name="map_circles_hide">Esconder círculos</string> - <string name="map_mycaches_show">Mostrar caches encontradas e minhas</string> <string name="map_mycaches_hide">Esconder caches encontradas e minhas</string> <string name="map_theme_builtin">Padrão</string> <string name="map_theme_select">Selecione o tema de mapa</string> @@ -1109,7 +1104,6 @@ <string name="website">Site na internet: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">página do c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">o essencial do c:geo</a></string> <string name="market">Android: <a href="">c:geo no Google Play</a></string> <string name="about_twitter">O <b>c:geo</b> deve publicar no Twitter de cada vez que uma cache foi registrada?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1125,52 +1119,33 @@ <string name="tts_stop">Páre de falar</string> <string name="err_tts_lang_not_supported">A linguagem corrente não é suportada pelo texto em fala.</string> <string name="tts_one_kilometer">um quilômetro</string> - <string name="tts_one_meter">um metro</string> - <string name="tts_one_mile">uma milha</string> - <string name="tts_one_foot">um pé</string> - <string name="tts_one_oclock">uma hora</string> - <string name="tts_oclock">%s horas</string> - <string name="clipboard_copy_ok">Copiado para a área de transferência</string> - <string name="percent_favorite_points">%\ favoritos</string> - <string name="cgeo_shortcut">Atalho c:geo</string> - <string name="create_shortcut">Criar atalho</string> - <string-array name="log_image_scales"> - <item>Não dimensionar</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuto</item> - <item quantity="other">minutos</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">Uma cache</item> - <item quantity="other">%1$d Caches</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Waypoint</item> - <item quantity="other">%d Waypoints</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s quilômetros</item> <item quantity="other">%s quilômetros</item> </plurals> + <string name="tts_one_meter">um metro</string> <plurals name="tts_meters"> <item quantity="one">%s metro</item> <item quantity="other">%s metros</item> </plurals> + <string name="tts_one_mile">uma milha</string> <plurals name="tts_miles"> <item quantity="one">%s milha</item> <item quantity="other">%s milhas</item> </plurals> + <string name="tts_one_foot">um pé</string> <plurals name="tts_feet"> <item quantity="one">%s pé</item> <item quantity="other">%s pés</item> </plurals> + <string name="tts_one_oclock">uma hora</string> + <string name="tts_oclock">%s horas</string> + <string name="clipboard_copy_ok">Copiado para a área de transferência</string> <plurals name="days_ago"> <item quantity="one">ontem</item> <item quantity="other">%d dias atrás</item> </plurals> + <string name="percent_favorite_points">%\ favoritos</string> + <string name="cgeo_shortcut">Atalho c:geo</string> + <string name="create_shortcut">Criar atalho</string> </resources> diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml index ecb96ec..c082efd 100644 --- a/main/res/values-ro/strings.xml +++ b/main/res/values-ro/strings.xml @@ -80,21 +80,9 @@ <string name="log_saving_and_uploading">Trimitre jurnal şi încarcare poze…</string> <string name="log_clear">Şterge</string> <string name="log_post">Trimite Însemnare</string> - <string name="log_post_rate">Trimite Însemnare & Votează</string> - <string name="log_post_no_rate">Trimite Însemnare & Fără Vot</string> <string name="log_post_not_possible">Încărcare pagină însemnări…</string> <string name="log_add">Adaugă</string> - <string name="log_rating">Vot</string> <string name="log_no_rating">Fără voturi</string> - <string name="log_stars_1">1 stea</string> - <string name="log_stars_15">1,5 stele</string> - <string name="log_stars_2">2 stele</string> - <string name="log_stars_25">2,5 stele</string> - <string name="log_stars_3">3 stele</string> - <string name="log_stars_35">3,5 stele</string> - <string name="log_stars_4">4 stele</string> - <string name="log_stars_45">4,5 stele</string> - <string name="log_stars_5">5 stele</string> <string name="log_stars_1_description">Foarte slabă</string> <string name="log_stars_15_description">Slabă</string> <string name="log_stars_2_description">Slăbuţă</string> @@ -113,7 +101,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Imagine</string> <string name="log_image_attach">Ataşează imagine</string> - <string name="log_image_edit">Modifică imagine</string> <string name="log_image_stored">Existentă</string> <string name="log_image_camera">Nouă</string> <string name="log_image_caption">Titlu</string> @@ -122,6 +109,13 @@ <string name="log_password_title">Parolă:</string> <string name="log_hint_log_password">Introdu parola pentru jurnal</string> <string name="log_oc_team_comment">Comentariu din partea echipei OC</string> + <string-array name="log_image_scales"> + <item>Fără redimensionare</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Tradu în limba %s</string> <string name="translate_to_english">Tradu în limba engleză</string> <string name="translate_length_warning">Traducerea poate fi incompletă în cazul unui text mare.</string> @@ -221,6 +215,7 @@ <string name="loc_trying">Încerc să determin poziţia</string> <string name="loc_no_addr">Adresă necunoscută</string> <string name="loc_gps_disabled">GPS inactiv</string> + <string name="menu_centerposition">Centrează pe poziţia mea</string> <string name="menu_about">Despre c:geo</string> <string name="menu_helpers">Programe utilitare</string> <string name="menu_settings">Setări</string> @@ -303,10 +298,8 @@ <string name="caches_removing_from_history">Şterge din istoric…</string> <string name="caches_clear_offlinelogs">Şterge însemnări stocate local</string> <string name="caches_clear_offlinelogs_progress">Ştergere însemnări stocate local</string> - <string name="list_menu">Liste</string> <string name="list_menu_create">Crează listă nouă</string> <string name="list_menu_drop">Şterge lista curentă</string> - <string name="list_menu_change">Schimbă lista</string> <string name="list_menu_rename">Redenumeşte lista curentă</string> <string name="list_title">Alege o listă</string> <string name="list_inbox">Salvate</string> @@ -404,8 +397,8 @@ <string name="init_signature_template_log">Text însemnare</string> <string name="init_ratingwanted">Voturi GCvote</string> <string name="init_summary_ratingwanted">Încarcă voturi de la GCvote.com</string> - <string name="init_friendlogswanted">Arată însemnările prietenilor</string> - <string name="init_summary_friendlogswanted">Afişează o pagină suplimentară cu însemnări de la prieteni</string> + <string name="init_friends_and_own_logs_wanted">Arată ale mele/ale prietenilor</string> + <string name="init_summary_friends_and_own_logs_wanted">Afişează pagină de jurnal separată pentru însemnările proprii şi ale prietenilor</string> <string name="init_openlastdetailspage">Ultima pagină cu detalii</string> <string name="init_summary_openlastdetailspage">Arată detaliile de pe ultima pagină afişată</string> <string name="init_autoload">Descriere completă</string> @@ -417,6 +410,8 @@ <string name="init_captcha">Arată CAPTCHA</string> <string name="init_summary_captcha">Arată CAPTCHA dacă este necesar (doar Basic Member)</string> <string name="init_useenglish">Foloseşte limba engleză</string> + <string name="init_showoverflowmenu">Afişează întotdeauna meniul suprapus</string> + <string name="init_showoverflow_summary">Afişează întotdeauna meniul suprapus (trei puncte ⋮) chiar dacă dispozitivul are buton pentru meniu (necesită repornirea aplicaţiei)</string> <string name="init_summary_useenglish">Foloseşte limba engleză în c:geo (Aplicaţia trebuie repornită)</string> <string name="init_exclude">Exclude Găsite şi Ale mele</string> <string name="init_summary_exclude">Exclude cutiile găsite şi cele proprii</string> @@ -494,6 +489,9 @@ <string name="init_maintenance">Întreţinere</string> <string name="init_maintenance_directories_note">c:geo salvează imagini, imagini din însemnări şi alte fişiere legate de o geocutie într-un dosar separat. Este posibil ca în unele cazuri (precum import/export al bazei de date) acest dosar să conţină fişiere vechi ce pot fi şterse aici.</string> <string name="init_maintenance_directories">Şterge fişierele devenite inutile</string> + <string name="init_create_memory_dump">Creează un extras de memorie copie după memoria folosită de aplicaţie</string> + <string name="init_memory_dump">Extras de memorie</string> + <string name="init_memory_dumped">Extras de memorie salvat în %s</string> <string name="settings_open_website">Intră pe site</string> <string name="settings_settings">Opţiuni</string> <string name="settings_information">Informaţii</string> @@ -569,8 +567,6 @@ <string name="cache_personal_note_uploading">Încărcare notă personală</string> <string name="cache_personal_note_upload_done">Nota personală a fost încărcată</string> <string name="cache_personal_note_upload_cancelled">Încărcarea notei personale a fost anulată</string> - <string name="cache_personal_note_unstored">Cutia nu este salvată</string> - <string name="cache_personal_note_store">Cutia va fi mai întâi salvată pentru a permite adăugarea de note personale.</string> <string name="cache_description">Descriere</string> <string name="cache_description_long">Descriere completă</string> <string name="cache_description_table_note">Descrierea conţine tabele sau formatări care ar trebui vizualizate aici %s pentru a fi afişate corect.</string> @@ -590,7 +586,7 @@ <string name="cache_waypoints_add">Adaugă punct</string> <string name="cache_hint">Indiciu</string> <string name="cache_logs">Jurnal</string> - <string name="cache_logsfriends">Jurnal (Prieteni)</string> + <string name="cache_logs_friends_and_own">Însemnări proprii/de la prieteni</string> <string name="cache_dialog_loading_details">Încărcare detaliile cutiei…</string> <string name="cache_dialog_loading_details_status_loadpage">Încărcare pagină</string> <string name="cache_dialog_loading_details_status_details">Prelucrare detalii</string> @@ -636,7 +632,6 @@ <string name="cache_menu_refresh">Împrospătează</string> <string name="cache_menu_share">Distribuie geocutie</string> <string name="cache_menu_move_list">Mută în altă listă</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cutie Baliză</string> @@ -646,6 +641,7 @@ <string name="cache_status">Stare</string> <string name="cache_status_offline_log">Jurnal salvat</string> <string name="cache_status_found">Găsit</string> + <string name="cache_not_status_found">Nu a fost găsită</string> <string name="cache_status_archived">Arhivată</string> <string name="cache_status_disabled">Inactivă</string> <string name="cache_status_premium">Doar membrii Premium</string> @@ -757,10 +753,7 @@ <string name="map_view_map">Hărţi</string> <string name="map_modes">Opţiuni hărţi</string> <string name="map_trail_show">Arată traseu</string> - <string name="map_trail_hide">Ascunde traseu</string> <string name="map_circles_show">Arată cercurile</string> - <string name="map_circles_hide">Ascunde cercurile</string> - <string name="map_mycaches_show">Arată geocutiile mele/găsite</string> <string name="map_mycaches_hide">Ascunde geocutiile mele/găsite</string> <string name="map_theme_builtin">Implicit</string> <string name="map_theme_select">Alege un stil pentru hartă</string> @@ -1114,7 +1107,6 @@ <string name="website">Site: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">pagina c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo într-o coajă de nucă</a></string> <string name="market">Android: <a href="">c:geo pe Google Play</a></string> <string name="about_twitter">Ar trebui ca <b>c:geo</b> să publice un statut nou pe Twitter de fiecare dată când scrii o însemnare pentru o geocutie?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1139,11 +1131,5 @@ <string name="percent_favorite_points">%\ favorite</string> <string name="cgeo_shortcut">legătură la c:geo</string> <string name="create_shortcut">Crează scurtătură</string> - <string-array name="log_image_scales"> - <item>Fără redimensionare</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> + <string name="send">Trimite</string> </resources> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index b321f83..ecb86c3 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -79,21 +79,9 @@ <string name="log_saving_and_uploading">Odosielanie logu a nahrávanie obrázku…</string> <string name="log_clear">Vyčistiť</string> <string name="log_post">Odoslať log</string> - <string name="log_post_rate">Odoslať log a hlasovať</string> - <string name="log_post_no_rate">Odoslať log a nehlasovať</string> <string name="log_post_not_possible">Načítanie stránky s logmi…</string> <string name="log_add">Pridať</string> - <string name="log_rating">Hlasovať</string> <string name="log_no_rating">Nehlasovať</string> - <string name="log_stars_1">1 hviezdička</string> - <string name="log_stars_15">1,5 hviezdičky</string> - <string name="log_stars_2">2 hviezdičky</string> - <string name="log_stars_25">2,5 hviezdičky</string> - <string name="log_stars_3">3 hviezdičky</string> - <string name="log_stars_35">3,5 hviezdičky</string> - <string name="log_stars_4">4 hviezdičky</string> - <string name="log_stars_45">4,5 hviezdičky</string> - <string name="log_stars_5">5 hviezdičiek</string> <string name="log_stars_1_description">slabé</string> <string name="log_stars_15_description">dosť slabé</string> <string name="log_stars_2_description">podpriemerné</string> @@ -112,7 +100,6 @@ <string name="log_smilies">Smajlíci</string> <string name="log_image">Obrázok</string> <string name="log_image_attach">Pripojiť obrázok</string> - <string name="log_image_edit">Upraviť obrázok</string> <string name="log_image_stored">Existujúci</string> <string name="log_image_camera">Nový</string> <string name="log_image_caption">Titulok</string> @@ -121,6 +108,13 @@ <string name="log_password_title">Prihlásiť heslo:</string> <string name="log_hint_log_password">Zadajte svoje logovacie heslo</string> <string name="log_oc_team_comment">Komentár tímu OC</string> + <string-array name="log_image_scales"> + <item>Bez zmeny mierky</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Preložiť do jazyka %s</string> <string name="translate_to_english">Preložiť do angličtiny</string> <string name="translate_length_warning">Pre veľké texty môže preklad zlyhať.</string> @@ -301,10 +295,8 @@ <string name="caches_removing_from_history">Odstraňovanie z histórie…</string> <string name="caches_clear_offlinelogs">Vymazať offline záznamy</string> <string name="caches_clear_offlinelogs_progress">Vymazanie logov v režime offline</string> - <string name="list_menu">Zoznam</string> <string name="list_menu_create">Vytvoriť nový zoznam</string> <string name="list_menu_drop">Zahodiť aktuálny zoznam</string> - <string name="list_menu_change">Zmeniť zoznam</string> <string name="list_menu_rename">Premenovať tento zoznam</string> <string name="list_title">Výber zoznamu</string> <string name="list_inbox">Uložené</string> @@ -402,8 +394,6 @@ <string name="init_signature_template_log">Zápis do logu</string> <string name="init_ratingwanted">Načítať hodnotenie skrýše z GCvote.com</string> <string name="init_summary_ratingwanted">Načítať hodnotenie skrýše z GCvote.com</string> - <string name="init_friendlogswanted">Načítať dodatočnú stránku s logmi od priateľov</string> - <string name="init_summary_friendlogswanted">Načítať dodatočnú stránku s logmi od priateľov</string> <string name="init_openlastdetailspage">Otvoriť detaily na naposledy použitej stránke</string> <string name="init_summary_openlastdetailspage">Otvoriť detaily na naposledy použitej stránke</string> <string name="init_autoload">Automatické načítanie dlhého popisu</string> @@ -565,8 +555,6 @@ <string name="cache_personal_note_uploading">Nahrať osobnú poznámku</string> <string name="cache_personal_note_upload_done">Osobná poznámka nahraná</string> <string name="cache_personal_note_upload_cancelled">Nahrávanie osobnej poznámky zrušené</string> - <string name="cache_personal_note_unstored">Cache nie je uložená</string> - <string name="cache_personal_note_store">Cache sa najskôr uložia aby sa povolila osobná poznámka.</string> <string name="cache_description">Popis</string> <string name="cache_description_long">Dlhý popis</string> <string name="cache_description_table_note">Popis obsahuje formátovanie tabuľky, ktorý môže byť pre správne zobrazenie potrebné otvoriť v %s.</string> @@ -583,10 +571,14 @@ <string name="cache_list_unknown">Nie je v zozname</string> <string name="cache_images">Obrázky</string> <string name="cache_waypoints">Body trasy</string> + <plurals name="waypoints"> + <item quantity="one">1 bod trasy</item> + <item quantity="few">%d body trasy</item> + <item quantity="other">%d bodov trasy</item> + </plurals> <string name="cache_waypoints_add">Pridať bod</string> <string name="cache_hint">Nápoveda</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Logbook (priatelia)</string> <string name="cache_dialog_loading_details">Načítanie detailov skrýše…</string> <string name="cache_dialog_loading_details_status_loadpage">Načítanie stránky</string> <string name="cache_dialog_loading_details_status_details">Spracovanie detailov</string> @@ -632,7 +624,6 @@ <string name="cache_menu_refresh">Obnoviť</string> <string name="cache_menu_share">Zdielať skrýšu</string> <string name="cache_menu_move_list">Presunúť do iného zoznamu</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -752,10 +743,7 @@ <string name="map_view_map">Zobrazenie mapy</string> <string name="map_modes">Režimy mapy</string> <string name="map_trail_show">Zobraziť záznam trasy</string> - <string name="map_trail_hide">Skryť záznam trasy</string> <string name="map_circles_show">Zobraziť kruhy</string> - <string name="map_circles_hide">Skryť kruhy</string> - <string name="map_mycaches_show">Zobraziť vlastné/nájdené cache</string> <string name="map_mycaches_hide">Skryť vlastné/nájdené cache</string> <string name="map_theme_builtin">Predvolené</string> <string name="map_theme_select">Vybrať tému mapy</string> @@ -1109,7 +1097,6 @@ <string name="website">Web: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manuál: <a href="">c:geo v kocke</a></string> <string name="market">Android: <a href=""> c:geo na Google Play</a></string> <string name="about_twitter">Chcete, aby <b>c:geo</b> napísalo na váš Twitter vždy keď zapíšete nájdenie skrýše?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1125,47 +1112,32 @@ <string name="tts_stop">Prestať hovoriť</string> <string name="err_tts_lang_not_supported">Aktuálny jazyk nepodporuje prevod textu na reč.</string> <string name="tts_one_kilometer">jeden kilometer</string> - <string name="tts_one_meter">jeden meter</string> - <string name="tts_one_mile">jedna míľa</string> - <string name="tts_one_foot">jedna stopa</string> - <string name="tts_one_oclock">jedna hodina</string> - <string name="tts_oclock">%s hodín</string> - <string name="clipboard_copy_ok">Skopírované do schránky</string> - <string name="percent_favorite_points">% \ obľúbených</string> - <string name="cgeo_shortcut">c:Geo odkaz</string> - <string name="create_shortcut">Vytvoriť odkaz</string> - <string-array name="log_image_scales"> - <item>Bez zmeny mierky</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="waypoints"> - <item quantity="one">1 bod trasy</item> - <item quantity="few">%d body trasy</item> - <item quantity="other">%d bodov trasy</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="few">%s kilometre</item> <item quantity="other">%s kilometrov</item> </plurals> + <string name="tts_one_meter">jeden meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="few">%s metre</item> <item quantity="other">%s metrov</item> </plurals> + <string name="tts_one_mile">jedna míľa</string> <plurals name="tts_miles"> <item quantity="one">%s míľa</item> <item quantity="few">%s míľ</item> <item quantity="other">%s míľ</item> </plurals> + <string name="tts_one_foot">jedna stopa</string> <plurals name="tts_feet"> <item quantity="one">%s stopa</item> <item quantity="few">%s stopy</item> <item quantity="other">%s stôp</item> </plurals> + <string name="tts_one_oclock">jedna hodina</string> + <string name="tts_oclock">%s hodín</string> + <string name="clipboard_copy_ok">Skopírované do schránky</string> <plurals name="days_ago"> <item quantity="one">včera</item> <item quantity="few">pred %d dňami</item> @@ -1176,4 +1148,7 @@ <item quantity="few">%s obľúbené</item> <item quantity="other">%s obľúbených</item> </plurals> + <string name="percent_favorite_points">% \ obľúbených</string> + <string name="cgeo_shortcut">c:Geo odkaz</string> + <string name="create_shortcut">Vytvoriť odkaz</string> </resources> diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml index 1237699..00195b4 100644 --- a/main/res/values-sl/strings.xml +++ b/main/res/values-sl/strings.xml @@ -79,21 +79,9 @@ <string name="log_saving_and_uploading">Pošiljam zapis in nalagam sliko…</string> <string name="log_clear">Počisti</string> <string name="log_post">Pošlji</string> - <string name="log_post_rate">Pošlji in oceni</string> - <string name="log_post_no_rate">Pošlji in ne oceni</string> <string name="log_post_not_possible">Nalagam stran…</string> <string name="log_add">Dodaj</string> - <string name="log_rating">Ocena</string> <string name="log_no_rating">Brez ocene</string> - <string name="log_stars_1">1 zvezdica</string> - <string name="log_stars_15">1.5 zvezdice</string> - <string name="log_stars_2">2 zvezdici</string> - <string name="log_stars_25">2.5 zvezdici</string> - <string name="log_stars_3">3 zvezdice</string> - <string name="log_stars_35">3.5 zvezdice</string> - <string name="log_stars_4">4 zvezdice</string> - <string name="log_stars_45">4.5 zvezdice</string> - <string name="log_stars_5">5 zvezdic</string> <string name="log_stars_1_description">Zelo slabo</string> <string name="log_stars_15_description">Slabo</string> <string name="log_stars_2_description">Pod povprečjem</string> @@ -112,7 +100,6 @@ <string name="log_smilies">Smeškoti</string> <string name="log_image">Slika</string> <string name="log_image_attach">Dodaj sliko</string> - <string name="log_image_edit">Uredi sliko</string> <string name="log_image_stored">Obstoječa</string> <string name="log_image_camera">Nova</string> <string name="log_image_caption">Naslov</string> @@ -121,6 +108,13 @@ <string name="log_password_title">Geslo zapisa:</string> <string name="log_hint_log_password">Vnesite geslo zapisa</string> <string name="log_oc_team_comment">Komentar ekipe OC</string> + <string-array name="log_image_scales"> + <item>Brez skaliranja</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Prevedi v: %s</string> <string name="translate_to_english">Prevedi v: angleščino</string> <string name="translate_length_warning">Prevod lahko spodleti zaradi velike količine besedila.</string> @@ -241,6 +235,12 @@ <string name="caches_more_caches_currently">trenutno</string> <string name="caches_downloading">Nalagam zaklade…\nČas do konca: </string> <string name="caches_eta_ltm">manj kot minuta</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minuta</item> + <item quantity="two">minuti</item> + <item quantity="few">minute</item> + <item quantity="other">minut</item> + </plurals> <string name="caches_store_offline">Shrani</string> <string name="caches_store_selected">Shrani izbrane</string> <string name="caches_history">Zgodovina</string> @@ -301,10 +301,8 @@ <string name="caches_removing_from_history">Brišem iz zgodovine…</string> <string name="caches_clear_offlinelogs">Izbriši shranjene zapise</string> <string name="caches_clear_offlinelogs_progress">Izbris shranjenih zapisov</string> - <string name="list_menu">Seznam</string> <string name="list_menu_create">Ustvari nov seznam</string> <string name="list_menu_drop">Izbriši trenutni seznam</string> - <string name="list_menu_change">Spremeni seznam</string> <string name="list_menu_rename">Preimenuj trenutni seznam</string> <string name="list_title">Izberi seznam</string> <string name="list_inbox">Shranjeni</string> @@ -399,8 +397,6 @@ <string name="init_signature_template_log">Vsebina zapisa</string> <string name="init_ratingwanted">GCvote ocene</string> <string name="init_summary_ratingwanted">Naloži ocene iz GCvote.com</string> - <string name="init_friendlogswanted">Naloži zapise prijateljev</string> - <string name="init_summary_friendlogswanted">Naloži tudi posebno stran zapisov mojih prijateljev</string> <string name="init_openlastdetailspage">Odpri nazadnje odprto stran</string> <string name="init_summary_openlastdetailspage">Pri podrobnostih zaklada vedno odpri zadnjo uporabljeno stran</string> <string name="init_autoload">Prikaži celoten opis</string> @@ -536,6 +532,12 @@ <string name="auth_ocde">opencaching.de</string> <string name="auth_ocpl">opencaching.pl</string> <string name="auth_dialog_completed_oc">c:geo je sedaj povezan z %s.</string> + <plurals name="cache_counts"> + <item quantity="one">%1$d zaklad</item> + <item quantity="two">%1$d zaklada</item> + <item quantity="few">%1$d zakladi</item> + <item quantity="other">%1$d zakladov</item> + </plurals> <string name="cache_offline">Brez povezave</string> <string name="cache_offline_refresh">Osveži</string> <string name="cache_offline_drop">Izbriši</string> @@ -562,8 +564,6 @@ <string name="cache_personal_note_uploading">Nalagam lastno opombo na spletno stran</string> <string name="cache_personal_note_upload_done">Lastna opomba je bila uspešno naložena na spletno stran</string> <string name="cache_personal_note_upload_cancelled">Nalaganje lastne opombe je bilo preklicano</string> - <string name="cache_personal_note_unstored">Zaklad ni shranjen</string> - <string name="cache_personal_note_store">Za vklop opomb bo zaklad najprej shranjen na napravo.</string> <string name="cache_description">Opis</string> <string name="cache_description_long">Daljši opis</string> <string name="cache_description_table_note">Opis vsebuje oblikovanje s tabelami. Za pravilen prikaz opisa bo mogoče potrebno obiskati %s.</string> @@ -580,10 +580,15 @@ <string name="cache_list_unknown">Ni v seznamu</string> <string name="cache_images">Slike</string> <string name="cache_waypoints">Dodatne točke</string> + <plurals name="waypoints"> + <item quantity="one">%d dodatna točka</item> + <item quantity="two">%d dodatni točki</item> + <item quantity="few">%d dodatne točke</item> + <item quantity="other">%d dodatnih točk</item> + </plurals> <string name="cache_waypoints_add">Dodaj točko</string> <string name="cache_hint">Namig</string> <string name="cache_logs">Dnevnik zapisov</string> - <string name="cache_logsfriends">Zapisi prijateljev</string> <string name="cache_dialog_loading_details">Nalaganje podatkov zaklada…</string> <string name="cache_dialog_loading_details_status_loadpage">Nalaganje strani</string> <string name="cache_dialog_loading_details_status_details">Obdelujem podatke</string> @@ -629,7 +634,6 @@ <string name="cache_menu_refresh">Osveži</string> <string name="cache_menu_share">Deli povezavo</string> <string name="cache_menu_move_list">Premakni v drug seznam</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -749,10 +753,7 @@ <string name="map_view_map">Pogled zemljevida</string> <string name="map_modes">Možnosti</string> <string name="map_trail_show">Pokaži sled</string> - <string name="map_trail_hide">Skrij sled</string> <string name="map_circles_show">Pokaži kroge</string> - <string name="map_circles_hide">Skrij kroge</string> - <string name="map_mycaches_show">Pokaži lastne ali najdene zaklade</string> <string name="map_mycaches_hide">Skrij lastne ali najdene zaklade</string> <string name="map_theme_builtin">Privzeto</string> <string name="map_theme_select">Izberi temo zemljevida</string> @@ -1106,7 +1107,6 @@ <string name="website">Spletna stran: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo stran</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Priročnik: <a href="">c:geo na kratko</a></string> <string name="market">Android: <a href="">c:geo na Google Play</a></string> <string name="about_twitter">Naj <b>c:geo</b> objavi nov status na Twitter, ko objavite nov zapis pri zakladu?</string> <string name="faq">Pogosto zastavljena vprašanja: <a href="">faq.cgeo.org</a></string> @@ -1122,64 +1122,36 @@ <string name="tts_stop">Ustavi glasovno navigacijo</string> <string name="err_tts_lang_not_supported">Trenutno izbrani jezik ni podprt s storitvijo pretvorbe besedila v govor.</string> <string name="tts_one_kilometer">en kilometer</string> - <string name="tts_one_meter">en meter</string> - <string name="tts_one_mile">ena milja</string> - <string name="tts_one_foot">en čevelj</string> - <string name="tts_one_oclock">one o\'clock</string> - <string name="tts_oclock">%s o\'clock</string> - <string name="clipboard_copy_ok">Skopirano v odložišče</string> - <string name="percent_favorite_points">%\ favoritov</string> - <string name="cgeo_shortcut">Bližnjica c:geo</string> - <string name="create_shortcut">Ustvari bližnjico</string> - <string-array name="log_image_scales"> - <item>Brez skaliranja</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minuta</item> - <item quantity="two">minuti</item> - <item quantity="few">minute</item> - <item quantity="other">minut</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">%1$d zaklad</item> - <item quantity="two">%1$d zaklada</item> - <item quantity="few">%1$d zakladi</item> - <item quantity="other">%1$d zakladov</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">%d dodatna točka</item> - <item quantity="two">%d dodatni točki</item> - <item quantity="few">%d dodatne točke</item> - <item quantity="other">%d dodatnih točk</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="two">%s kilometra</item> <item quantity="few">%s kilometrov</item> <item quantity="other">%s kilometrov</item> </plurals> + <string name="tts_one_meter">en meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="two">%s metra</item> <item quantity="few">%s metri</item> <item quantity="other">%s metrov</item> </plurals> + <string name="tts_one_mile">ena milja</string> <plurals name="tts_miles"> <item quantity="one">%s milja</item> <item quantity="two">%s milji</item> <item quantity="few">%s milj</item> <item quantity="other">%s milj</item> </plurals> + <string name="tts_one_foot">en čevelj</string> <plurals name="tts_feet"> <item quantity="one">%s čevelj</item> <item quantity="two">%s čevlja</item> <item quantity="few">%s čevljev</item> <item quantity="other">%s čevljev</item> </plurals> + <string name="tts_one_oclock">one o\'clock</string> + <string name="tts_oclock">%s o\'clock</string> + <string name="clipboard_copy_ok">Skopirano v odložišče</string> <plurals name="days_ago"> <item quantity="one">Pred %d dnevom</item> <item quantity="two">Pred %d dnevoma</item> @@ -1192,4 +1164,7 @@ <item quantity="few">%s favoritov</item> <item quantity="other">%s favoritov</item> </plurals> + <string name="percent_favorite_points">%\ favoritov</string> + <string name="cgeo_shortcut">Bližnjica c:geo</string> + <string name="create_shortcut">Ustvari bližnjico</string> </resources> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 3c94ee2..ce42b71 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -18,6 +18,7 @@ <string name="letterbox">Letterbox hybrid</string> <string name="event">Event cache</string> <string name="mega">Mega-event cache</string> + <string name="giga">Giga-Event Cache</string> <string name="earth">Earthcache</string> <string name="cito">Cache in trash out event</string> <string name="webcam">Webcam cache</string> @@ -79,21 +80,9 @@ <string name="log_saving_and_uploading">Sparar logg och laddar upp bild…</string> <string name="log_clear">Rensa</string> <string name="log_post">Posta logg</string> - <string name="log_post_rate">Posta logg & ge betyget</string> - <string name="log_post_no_rate">Posta logg utan betyg</string> <string name="log_post_not_possible">Laddar loggningssida…</string> <string name="log_add">Lägg till</string> - <string name="log_rating">Betyg</string> <string name="log_no_rating">Inget betyg</string> - <string name="log_stars_1">1 stjärna</string> - <string name="log_stars_15">1.5 stjärnor</string> - <string name="log_stars_2">2 stjärnor</string> - <string name="log_stars_25">2.5 stjärnor</string> - <string name="log_stars_3">3 stjärnor</string> - <string name="log_stars_35">3.5 stjärnor</string> - <string name="log_stars_4">4 stjärnor</string> - <string name="log_stars_45">4.5 stjärnor</string> - <string name="log_stars_5">5 stjärnor</string> <string name="log_stars_1_description">Dålig</string> <string name="log_stars_15_description">Halvdålig</string> <string name="log_stars_2_description">Under medel</string> @@ -112,7 +101,6 @@ <string name="log_smilies">Smileys</string> <string name="log_image">Bild</string> <string name="log_image_attach">Lägg till bild</string> - <string name="log_image_edit">Redigera bild</string> <string name="log_image_stored">Från fil</string> <string name="log_image_camera">Ny</string> <string name="log_image_caption">Bildtext</string> @@ -121,6 +109,13 @@ <string name="log_password_title">Logglösenord:</string> <string name="log_hint_log_password">Ange ditt lösenord för loggning</string> <string name="log_oc_team_comment">Meddelande från OC Team</string> + <string-array name="log_image_scales"> + <item>Ingen skalning</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <string name="translate_to_sys_lang">Översätt till %s</string> <string name="translate_to_english">Översätt till engelska</string> <string name="translate_length_warning">Översättningen kan misslyckas med långa texter.</string> @@ -241,6 +236,10 @@ <string name="caches_more_caches_currently">nu</string> <string name="caches_downloading">Laddar ner cacher…\nTid kvar: </string> <string name="caches_eta_ltm">mindre än en minut</string> + <plurals name="caches_eta_mins"> + <item quantity="one">minut</item> + <item quantity="other">minuter</item> + </plurals> <string name="caches_store_offline">Spara för Offline</string> <string name="caches_store_selected">Spara valda</string> <string name="caches_history">Senast hittade cacher</string> @@ -282,6 +281,7 @@ <string name="caches_move_all">Flytta alla</string> <string name="caches_map_locus">Locus</string> <string name="caches_map_locus_export">Exportera till Locus</string> + <string name="caches_map_mapswithme">MapsWithMe</string> <string name="caches_recaptcha_title">reCAPTCHA</string> <string name="caches_recaptcha_explanation">Skriv texten som syns i bilden. Det krävs för att hämta koordinaterna för cacherna i listan. Det går att fortsätta ändå (men med sämre funktionalitet).</string> <string name="caches_recaptcha_hint">Text från bilden</string> @@ -301,10 +301,8 @@ <string name="caches_removing_from_history">Tar bort från historik…</string> <string name="caches_clear_offlinelogs">Rensa offline loggar</string> <string name="caches_clear_offlinelogs_progress">Rensar offline loggar</string> - <string name="list_menu">Listor</string> <string name="list_menu_create">Skapa en ny lista</string> <string name="list_menu_drop">Ta bort den här listan</string> - <string name="list_menu_change">Byt lista</string> <string name="list_menu_rename">Byt namn på den här listan</string> <string name="list_title">Välj en lista</string> <string name="list_inbox">Sparade</string> @@ -402,8 +400,8 @@ <string name="init_signature_template_log">Loggtext</string> <string name="init_ratingwanted">GCvote.com</string> <string name="init_summary_ratingwanted">Ladda cache betyg från GCvote.com</string> - <string name="init_friendlogswanted">Vänners loggar</string> - <string name="init_summary_friendlogswanted">Ladda extra sida med loggbok för dina vänner</string> + <string name="init_friends_and_own_logs_wanted">Visa vänners/egna</string> + <string name="init_summary_friends_and_own_logs_wanted">Visa en extra loggbok med dina vänners och egna loggar</string> <string name="init_openlastdetailspage">Visning av cachedetaljer</string> <string name="init_summary_openlastdetailspage">Visa senaste använda delsidan när detaljer öppnas</string> <string name="init_autoload">Cachebeskrivning</string> @@ -542,6 +540,10 @@ <string name="auth_ocus">opencaching.us</string> <string name="auth_ocro">opencaching.ro</string> <string name="auth_dialog_completed_oc">c:geo är nu godkänd för att kommunicera med %s.</string> + <plurals name="cache_counts"> + <item quantity="one">En cache</item> + <item quantity="other">%1$d cacher</item> + </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Uppdatera</string> <string name="cache_offline_drop">Radera</string> @@ -568,8 +570,6 @@ <string name="cache_personal_note_uploading">Laddar upp personlig anteckning</string> <string name="cache_personal_note_upload_done">Den personliga anteckning har laddats upp</string> <string name="cache_personal_note_upload_cancelled">Uppladdningen av personliga anteckning avbruten</string> - <string name="cache_personal_note_unstored">Cachen ej sparad</string> - <string name="cache_personal_note_store">Cachen kommer att sparas först för att kunna hantera personlig anteckning.</string> <string name="cache_description">Beskrivning</string> <string name="cache_description_long">Lång beskrivning</string> <string name="cache_description_table_note">Beskrivningen innehåller tabellformatering som eventuellt behöver läsas på %s för att se korrekt ut.</string> @@ -586,10 +586,14 @@ <string name="cache_list_unknown">Ej i någon lista</string> <string name="cache_images">Bilder</string> <string name="cache_waypoints">Punkter</string> + <plurals name="waypoints"> + <item quantity="one">1 Punkt</item> + <item quantity="other">%d Punkter</item> + </plurals> <string name="cache_waypoints_add">Lägg till punkt</string> <string name="cache_hint">Tips</string> <string name="cache_logs">Loggbok</string> - <string name="cache_logsfriends">Loggbok (Vänner)</string> + <string name="cache_logs_friends_and_own">Vänners/egna loggar</string> <string name="cache_dialog_loading_details">Laddar detaljer om cachen…</string> <string name="cache_dialog_loading_details_status_loadpage">Hämtar från gc.com</string> <string name="cache_dialog_loading_details_status_details">Analyserar cacheinformation</string> @@ -635,15 +639,16 @@ <string name="cache_menu_refresh">Uppdatera</string> <string name="cache_menu_share">Skicka länk</string> <string name="cache_menu_move_list">Flytta till annan lista</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> <string name="cache_menu_navigon">Navigon</string> <string name="cache_menu_pebble">Pebble</string> + <string name="cache_menu_mapswithme">MapsWithMe</string> <string name="cache_status">Status</string> <string name="cache_status_offline_log">Sparad logg</string> <string name="cache_status_found">Hittad</string> + <string name="cache_not_status_found">Ej hittad</string> <string name="cache_status_archived">Arkiverad</string> <string name="cache_status_disabled">Inaktiverad</string> <string name="cache_status_premium">Enbart för Premium medlemmar</string> @@ -755,10 +760,7 @@ <string name="map_view_map">Karttyp</string> <string name="map_modes">Kartlägen</string> <string name="map_trail_show">Visa spår</string> - <string name="map_trail_hide">Dölj spår</string> <string name="map_circles_show">Visa cirklar</string> - <string name="map_circles_hide">Dölj cirklar</string> - <string name="map_mycaches_show">Visa egna/funna cacher</string> <string name="map_mycaches_hide">Dölj egna/funna cacher</string> <string name="map_theme_builtin">Standard</string> <string name="map_theme_select">Välj karttema</string> @@ -1112,7 +1114,6 @@ <string name="website">Hemsida: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo på Google Play</a></string> <string name="about_twitter">Ska <b>c:geo</b> publicera ny status på Twitter varje gång en cache loggas?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1128,52 +1129,33 @@ <string name="tts_stop">Stoppa tal</string> <string name="err_tts_lang_not_supported">Detta språk hanteras inte av text-to-speech.</string> <string name="tts_one_kilometer">en kilometer</string> - <string name="tts_one_meter">en meter</string> - <string name="tts_one_mile">en engelsk mil</string> - <string name="tts_one_foot">en fot</string> - <string name="tts_one_oclock">Klockan ett</string> - <string name="tts_oclock">Klockan %s</string> - <string name="clipboard_copy_ok">Kopierat till urklipp</string> - <string name="percent_favorite_points">%\ favoriter</string> - <string name="cgeo_shortcut">c:geo genväg</string> - <string name="create_shortcut">Skapa genväg</string> - <string-array name="log_image_scales"> - <item>Ingen skalning</item> - <item>512 px</item> - <item>640 px</item> - <item>800 px</item> - <item>1024 px</item> - </string-array> - <plurals name="caches_eta_mins"> - <item quantity="one">minut</item> - <item quantity="other">minuter</item> - </plurals> - <plurals name="cache_counts"> - <item quantity="one">En cache</item> - <item quantity="other">%1$d cacher</item> - </plurals> - <plurals name="waypoints"> - <item quantity="one">1 Punkt</item> - <item quantity="other">%d Punkter</item> - </plurals> <plurals name="tts_kilometers"> <item quantity="one">%s kilometer</item> <item quantity="other">%s kilometer</item> </plurals> + <string name="tts_one_meter">en meter</string> <plurals name="tts_meters"> <item quantity="one">%s meter</item> <item quantity="other">%s meter</item> </plurals> + <string name="tts_one_mile">en engelsk mil</string> <plurals name="tts_miles"> <item quantity="one">%s engelsk mil</item> <item quantity="other">%s engelsk mil</item> </plurals> + <string name="tts_one_foot">en fot</string> <plurals name="tts_feet"> <item quantity="one">%s fot</item> <item quantity="other">%s fot</item> </plurals> + <string name="tts_one_oclock">Klockan ett</string> + <string name="tts_oclock">Klockan %s</string> + <string name="clipboard_copy_ok">Kopierat till urklipp</string> <plurals name="days_ago"> <item quantity="one">igår</item> <item quantity="other">%d dagar sedan</item> </plurals> + <string name="percent_favorite_points">%\ favoriter</string> + <string name="cgeo_shortcut">c:geo genväg</string> + <string name="create_shortcut">Skapa genväg</string> </resources> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index ab1db9f..be33f09 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -42,7 +42,6 @@ <!-- attributes for custom made preferences --> - <attr name="title" format="string" /> <attr name="text" format="string" /> <attr name="url" format="string" /> <attr name="urlButton" format="string" /> diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml index 1e3c3d4..c62ec3a 100644 --- a/main/res/values/changelog_master.xml +++ b/main/res/values/changelog_master.xml @@ -2,5 +2,24 @@ <resources> <!-- changelog for the master branch --> <string name="changelog_master" translatable="false"> + <b>Next feature release:</b>\n + · New: Implemented actionbar menus\n + · New: Show also own logs on friend log page\n + · New: Navigate - WhereYouGo will invoke automatic cartridge download in WhereYouGo\n + · New: Filter for caches which are not found\n + · New: Show "Import from web" also if not yet registered\n + · New: Popup list of changes on first start after upgrade\n + · New: Android Beam (NFC Sharing)\n + · New: Debugging option to save memory dumps on user demand\n + · Fix: Hiding own caches on opencaching\n + · Fix: Webcam caches not marked as found after posting log\n + · Fix: Archived caches now also hidden if hiding disabled caches is active\n + · Fix: Filter invalid characters in GPX files\n + · Fix: All caches shown as owned if no username stored\n + · Fix: GPX import from mail failing on some devices\n + · Fix: Updating cache history should not ask for list to save caches\n + · Fix: Speed now always shown in km or miles per hour\n + \n + \n </string> </resources> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 0e85c36..30d00df 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources> + <color name="background_main_transparent">#D0000000</color> <color name="just_white">#FFFFFFFF</color> <color name="just_black">#FF000000</color> <color name="background_dark">#FF000000</color> diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index 6036be3..e77cd79 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -19,6 +19,7 @@ <string name="preference_screen_ox">preference_screen_ox</string> <string name="preference_screen_twitter">preference_screen_twitter</string> <string name="preference_screen_navigation_menu">fakekey_navigation_menu_screen</string> + <string name="preference_screen_sendtocgeo">preference_screen_sendtocgeo</string> <string name="pref_fakekey_ocde_authorization">fakekey_ocde_authorization</string> <string name="pref_fakekey_ocpl_authorization">fakekey_ocpl_authorization</string> <string name="pref_fakekey_ocnl_authorization">fakekey_ocnl_authorization</string> @@ -45,6 +46,7 @@ <string name="pref_showaddress">showaddress</string> <string name="pref_useenglish">useenglish</string> <string name="pref_units">units</string> + <string name="pref_alwaysshowoverflowmenu">alwaysshowoverflowmenu</string> <string name="pref_autoloaddesc">autoloaddesc</string> <string name="pref_ratingwanted">ratingwanted</string> <string name="pref_friendlogswanted">friendlogswanted</string> @@ -134,7 +136,6 @@ <string name="pref_navigation_menu_google_bike">navigationGoogleBike</string> <string name="pref_navigation_menu_google_maps_directions">navigationMapsDirections</string> <string name="pref_navigation_menu_cache_beacon">navigationCacheBeacon</string> - <string name="pref_navigation_menu_gcc">navigationGcc</string> <string name="pref_navigation_menu_where_you_go">navigationWhereYouGo</string> <string name="pref_navigation_menu_pebble">navigationPebble</string> <string name="pref_navigation_menu_mapswithme">navigationMapsWithMe</string> @@ -167,5 +168,8 @@ <string name="pref_twitter_cache_message">twitter_cache_message</string> <string name="pref_twitter_trackable_message">twitter_trackable_message</string> <string name="pref_ec_icons">ec_icons</string> - -</resources>
\ No newline at end of file + <string name="pref_memory_dump">memory_dump</string> + <string name="pref_appearance">pref_appearance</string> + <string name="pref_changelog_last_version">changelog_last_version</string> + <string name="pref_caches_history">caches_history</string> +</resources> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 2aa3d00..b1c7544 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -92,21 +92,9 @@ <string name="log_saving_and_uploading">Sending log and uploading image…</string> <string name="log_clear">Clear</string> <string name="log_post">Submit Log</string> - <string name="log_post_rate">Submit Log & Rate</string> - <string name="log_post_no_rate">Submit Log & Do not Rate</string> <string name="log_post_not_possible">Loading Log Page…</string> <string name="log_add">Add</string> - <string name="log_rating">Rating</string> <string name="log_no_rating">No rating</string> - <string name="log_stars_1">1 Star</string> - <string name="log_stars_15">1.5 Stars</string> - <string name="log_stars_2">2 Stars</string> - <string name="log_stars_25">2.5 Stars</string> - <string name="log_stars_3">3 Stars</string> - <string name="log_stars_35">3.5 Stars</string> - <string name="log_stars_4">4 Stars</string> - <string name="log_stars_45">4.5 Stars</string> - <string name="log_stars_5">5 Stars</string> <string name="log_stars_1_description">Poor</string> <string name="log_stars_15_description">Fairly poor</string> <string name="log_stars_2_description">Below average</string> @@ -125,7 +113,6 @@ <string name="log_smilies">Smilies</string> <string name="log_image">Image</string> <string name="log_image_attach">Attach Image</string> - <string name="log_image_edit">Edit Image</string> <string name="log_image_stored">Existing</string> <string name="log_image_camera">New</string> <string name="log_image_caption">Caption</string> @@ -238,6 +225,7 @@ <string name="info_select_logimage_cancelled">Image selection or capture was cancelled.</string> <string name="info_stored_image">New image saved to:</string> <string name="info_storing_static_maps">Trying to store static maps</string> + <string name="info_cache_saved">The cache has been stored locally</string> <!-- location service --> <string name="loc_last">Last known</string> @@ -247,6 +235,8 @@ <string name="loc_trying">Trying to Locate</string> <string name="loc_no_addr">Unknown address</string> <string name="loc_gps_disabled">GPS disabled</string> + <string name="menu_centerposition">Center on my position</string> + <!-- standard menu --> <string name="menu_about">About c:geo</string> @@ -343,10 +333,8 @@ <string name="caches_clear_offlinelogs_progress">Clearing offline logs</string> <!-- caches lists --> - <string name="list_menu">List</string> <string name="list_menu_create">Create new list</string> <string name="list_menu_drop">Drop current list</string> - <string name="list_menu_change">Change list</string> <string name="list_menu_rename">Rename current list</string> <string name="list_title">Pick a list</string> <string name="list_inbox">Stored</string> @@ -451,8 +439,8 @@ <string name="init_signature_template_log">Log text</string> <string name="init_ratingwanted">GCvote Rating</string> <string name="init_summary_ratingwanted">Load cache rating from GCvote.com</string> - <string name="init_friendlogswanted">Show Friends\' Logs</string> - <string name="init_summary_friendlogswanted">Display additional logbook page for logs from friends</string> + <string name="init_friends_and_own_logs_wanted">Show Friends\'/Own</string> + <string name="init_summary_friends_and_own_logs_wanted">Display additional logbook page for friends\' and own logs</string> <string name="init_openlastdetailspage">Last Details Page</string> <string name="init_summary_openlastdetailspage">Open details with last used page</string> <string name="init_autoload">Long Description</string> @@ -464,6 +452,8 @@ <string name="init_captcha">Show CAPTCHA</string> <string name="init_summary_captcha">Show CAPTCHA if necessary (only Basic Member)</string> <string name="init_useenglish">Use English</string> + <string name="init_showoverflowmenu">Always show overflow menu</string> + <string name="init_showoverflow_summary">Always show the overflow menu (three dots ⋮) even if the device has a menu button (Restart needed)</string> <string name="init_summary_useenglish">Use English language for c:geo (Restart needed)</string> <string name="init_exclude">Exclude Own and Found</string> <string name="init_summary_exclude">Exclude caches you own or have found</string> @@ -541,6 +531,9 @@ <string name="init_maintenance">Maintenance</string> <string name="init_maintenance_directories_note">c:geo stores images, log images and other files related to a cache in a separate directory. In some cases (like importing/exporting the database) this directory may contain outdated files, which can be deleted here.</string> <string name="init_maintenance_directories">Delete orphaned files</string> + <string name="init_create_memory_dump">Create memory dump</string> + <string name="init_memory_dump">Memory dump</string> + <string name="init_memory_dumped">Memory dumped to %s</string> <string name="settings_open_website">Open website</string> <string name="settings_settings">Settings</string> <string name="settings_information">Information</string> @@ -632,8 +625,6 @@ <string name="cache_personal_note_uploading">Uploading personal note</string> <string name="cache_personal_note_upload_done">Personal note uploaded</string> <string name="cache_personal_note_upload_cancelled">Personal note upload cancelled</string> - <string name="cache_personal_note_unstored">Cache not stored</string> - <string name="cache_personal_note_store">The cache will be stored first to allow a personal note.</string> <string name="cache_description">Description</string> <string name="cache_description_long">Long Description</string> <string name="cache_description_table_note">Description contains table formatting which may need to be viewed at %s to be seen correctly.</string> @@ -659,7 +650,7 @@ <string name="cache_waypoints_add">Add Waypoint</string> <string name="cache_hint">Hint</string> <string name="cache_logs">Logbook</string> - <string name="cache_logsfriends">Logbook (Friends)</string> + <string name="cache_logs_friends_and_own">Friends/Own Logs</string> <string name="cache_dialog_loading_details">Loading cache details…</string> <string name="cache_dialog_loading_details_status_loadpage">Loading page</string> <string name="cache_dialog_loading_details_status_details">Processing details</string> @@ -705,7 +696,6 @@ <string name="cache_menu_refresh">Refresh</string> <string name="cache_menu_share">Share cache</string> <string name="cache_menu_move_list">Move to different list</string> - <string name="cache_menu_gcc">GCC</string> <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> @@ -715,6 +705,7 @@ <string name="cache_status">Status</string> <string name="cache_status_offline_log">Saved Log</string> <string name="cache_status_found">Found</string> + <string name="cache_not_status_found">Not Found</string> <string name="cache_status_archived">Archived</string> <string name="cache_status_disabled">Disabled</string> <string name="cache_status_premium">Premium Members only</string> @@ -847,10 +838,7 @@ <string name="map_view_map">Map view</string> <string name="map_modes">Map settings</string> <string name="map_trail_show">Show trail</string> - <string name="map_trail_hide">Hide trail</string> <string name="map_circles_show">Show circles</string> - <string name="map_circles_hide">Hide circles</string> - <string name="map_mycaches_show">Show own/found caches</string> <string name="map_mycaches_hide">Hide own/found caches</string> <string name="map_theme_builtin">Default</string> <string name="map_theme_select">Select map theme</string> @@ -1226,7 +1214,6 @@ <string name="website">Website: <a href="">cgeo.org</a></string> <string name="facebook">Facebook: <a href="">c:geo page</a></string> <string name="twitter">Twitter: <a href="">@android_GC</a></string> - <string name="nutshellmanual">Manual: <a href="">c:geo in a Nutshell</a></string> <string name="market">Android: <a href="">c:geo on Google Play</a></string> <string name="about_twitter">Should <b>c:geo</b> publish a new status on Twitter every time you log a cache?</string> <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string> @@ -1285,4 +1272,6 @@ <!-- shortcuts --> <string name="cgeo_shortcut">c:geo shortcut</string> <string name="create_shortcut">Create shortcut</string> + <string name="send">Send</string> + </resources> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index c566122..ffcb6aa 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -70,7 +70,7 @@ <item name="android:padding">2dip</item> <item name="android:scaleType">center</item> <item name="android:focusable">true</item> - <item name="android:src">@drawable/actionbar_home</item> + <item name="android:src">@drawable/actionbar_cgeo</item> <item name="android:background">@drawable/actionbar_button</item> </style> @@ -102,6 +102,10 @@ <item name="android:text">c:geo</item> </style> + <style name="actionbar_myposition"> + <item name="android:button">@drawable/ic_menu_myposition</item> + </style> + <!-- button: full width --> <style name="button_full" parent="button"> <item name="android:layout_width">fill_parent</item> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index ed64ef5..82a4422 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="cgeo_main" parent="android:style/Theme.Wallpaper.NoTitleBar"> + + <style name="cgeo_main" parent="@style/Theme.AppCompat"> + + <!-- copy the style elements of the Wallpaper theme since AppCombat has no Wallpaper theme --> + <item name="android:windowBackground">@color/background_main_transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowShowWallpaper">true</item> + <!-- system elements --> <item name="android:windowContentOverlay">@null</item> + + </style> + + <style name="cgeo" parent="@style/Theme.AppCompat"> + + + <item name="android:buttonStyle">@style/button</item> + <item name="android:editTextStyle">@style/edittext</item> + <item name="android:windowContentOverlay">@null</item> + + <!-- own values: colors --> + <item name="just_color">@color/just_black</item> + <item name="text_color_link">@color/link</item> + <item name="button_color_enabled">@color/button_enabled</item> + <item name="button_color_disabled">@color/button_disabled</item> </style> - <style name="cgeo" parent="android:style/Theme.NoTitleBar"> - <!-- system elements --> + <!-- Identical to cgeo aside from different parent style --> + <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar"> + + <!-- For some reason we get the non inversed texts here (bug in abc?), explicitly set text styles --> + <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Title.Inverse</item> + <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse</item> + + <item name="android:buttonStyle">@style/button</item> <item name="android:editTextStyle">@style/edittext</item> <item name="android:windowContentOverlay">@null</item> @@ -21,6 +49,8 @@ <item name="button_color_disabled">@color/button_disabled</item> </style> + + <style name="dark" parent="cgeo"> <!-- own values: colors --> @@ -50,10 +80,10 @@ <item name="compass">0</item> </style> - <style name="light" parent="cgeo"> + <style name="light" parent="cgeo_light"> <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> + <item name="android:windowBackground">@color/just_white</item> <item name="text_color">@color/text_light</item> <item name="text_color_headline">@color/text_headline_light</item> <item name="text_color_grey">@color/text_grey_light</item> @@ -80,80 +110,33 @@ <item name="compass">1</item> </style> - <style name="cgeo_popup" parent="android:style/Theme.Dialog"> - - <!-- system elements --> - <item name="android:buttonStyle">@style/button</item> - <item name="android:editTextStyle">@style/edittext</item> - <item name="android:windowNoTitle">true</item> + + <style name="cgeo.Translucent.Light" parent="light"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> - <style name="popup_dark" parent="cgeo_popup"> - <!-- own values: colors --> - <item name="just_color">@color/just_black</item> - <item name="text_color">@color/text_dark</item> - <item name="text_color_headline">@color/text_headline_dark</item> - <item name="text_color_grey">@color/text_grey_dark</item> - <item name="text_color_hint">@color/text_hint_dark</item> - <item name="text_color_link">@color/link</item> - <item name="button_color_enabled">@color/button_enabled</item> - <item name="button_color_disabled">@color/button_disabled</item> - <item name="background_color">@color/background_dark</item> - <item name="background_color_notice">@color/background_dark_notice</item> - <item name="background_color_transparent">@color/background_dark_transparent</item> - <item name="separator_color">@color/separator_dark</item> + <style name="cgeo.Translucent" parent="dark"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> + </style> - <!-- own values: drawables --> - <item name="button">@drawable/action_button_dark</item> - <item name="input">@drawable/input_bcg_dark</item> - <item name="inventory">@drawable/inventory_background_dark</item> - <item name="favorite">@drawable/favorite_background_dark</item> - <item name="favorite_r">@drawable/favorite_background_red_dark</item> - <item name="favorite_o">@drawable/favorite_background_orange_dark</item> - <item name="favorite_g">@drawable/favorite_background_green_dark</item> - <item name="close">@drawable/map_close_dark</item> - <item name="log_img_icon">@drawable/log_img_dark</item> - <item name="actionbar_compass">@drawable/actionbar_compass_dark</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item> + <style name="cgeo_popup" parent="cgeo.Translucent.Light"> + <item name="android:windowNoTitle">true</item> + </style> - <!-- own values: other --> - <item name="compass">0</item> + <style name="popup_dark" parent="cgeo.Translucent"> </style> - <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> <style name="popup_light" parent="cgeo_popup"> - - <!-- own values: colors --> - <item name="android:windowBackground">@color/just_white</item> - <item name="text_color">@color/text_light</item> - <item name="text_color_headline">@color/text_headline_light</item> - <item name="text_color_grey">@color/text_grey_light</item> - <item name="text_color_hint">@color/text_hint_light</item> - <item name="background_color">@color/background_light</item> - <item name="background_color_notice">@color/background_light_notice</item> - <item name="background_color_transparent">@color/background_light_transparent</item> - <item name="separator_color">@color/separator_light</item> - - <!-- own values: drawables --> - <item name="button">@drawable/action_button_light</item> - <item name="input">@drawable/input_bcg_light</item> - <item name="inventory">@drawable/inventory_background_light</item> - <item name="favorite">@drawable/favorite_background_light</item> - <item name="favorite_r">@drawable/favorite_background_red_light</item> - <item name="favorite_o">@drawable/favorite_background_orange_light</item> - <item name="favorite_g">@drawable/favorite_background_green_light</item> - <item name="close">@drawable/map_close_light</item> - <item name="log_img_icon">@drawable/log_img_light</item> - <item name="actionbar_compass">@drawable/actionbar_compass_light</item> - <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large.Inverse</item> - - <!-- own values: other --> - <item name="compass">1</item> </style> - <style name="settings" parent="android:Theme"> + <style name="settings" parent="@style/Theme.AppCompat"> <item name="settings_cloud">@drawable/settings_cloud_white</item> <item name="settings_details">@drawable/settings_details_white</item> <item name="settings_eye">@drawable/settings_eye_white</item> @@ -165,7 +148,7 @@ <item name="settings_info_icon">@drawable/settings_info_icon_white</item> </style> - <style name="settings.light" parent="android:Theme.Light"> + <style name="settings.light" parent="@style/Theme.AppCompat.Light"> <item name="settings_cloud">@drawable/settings_cloud_black</item> <item name="settings_details">@drawable/settings_details_black</item> <item name="settings_eye">@drawable/settings_eye_black</item> diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index d550dc8..148c4aa 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -216,7 +216,9 @@ android:title="@string/settings_open_website" /> </PreferenceCategory> </PreferenceScreen> - <PreferenceScreen android:title="@string/settings_title_ec" android:key="@string/preference_screen_ec"> + <PreferenceScreen + android:key="@string/preference_screen_ec" + android:title="@string/settings_title_ec" > <PreferenceCategory android:title="@string/settings_settings" > <CheckBoxPreference android:defaultValue="false" @@ -266,7 +268,9 @@ android:title="@string/settings_open_website" /> </PreferenceCategory> </PreferenceScreen> - <PreferenceScreen android:title="@string/settings_title_ox" android:key="@string/preference_screen_ox"> + <PreferenceScreen + android:key="@string/preference_screen_ox" + android:title="@string/settings_title_ox" > <PreferenceCategory android:title="@string/settings_settings" > <CheckBoxPreference android:defaultValue="false" @@ -285,11 +289,12 @@ </PreferenceScreen> <PreferenceScreen android:title="@string/init_gcvote" > <PreferenceCategory android:title="@string/settings_settings" > - <CheckBoxPreference - android:defaultValue="true" - android:key="@string/pref_ratingwanted" - android:summary="@string/init_summary_ratingwanted" - android:title="@string/init_ratingwanted" /> + <CheckBoxPreference + android:defaultValue="true" + android:key="@string/pref_ratingwanted" + android:summary="@string/init_summary_ratingwanted" + android:title="@string/init_ratingwanted" /> + <cgeo.geocaching.settings.EditPasswordPreference android:dialogTitle="@string/init_password" android:hint="@string/init_password" @@ -305,7 +310,9 @@ android:title="@string/settings_open_website" /> </PreferenceCategory> </PreferenceScreen> - <PreferenceScreen android:title="@string/init_sendToCgeo" > + <PreferenceScreen + android:key="@string/preference_screen_sendtocgeo" + android:title="@string/init_sendToCgeo" > <PreferenceCategory android:title="@string/settings_settings" > <EditTextPreference android:dialogTitle="@string/init_sendToCgeo_name" @@ -368,6 +375,7 @@ </PreferenceCategory> </PreferenceScreen> <PreferenceScreen + android:key="@string/pref_appearance" android:icon="?attr/settings_eye" android:title="@string/settings_title_appearance" > <CheckBoxPreference @@ -395,6 +403,12 @@ android:key="@string/pref_units" android:summary="@string/init_summary_units" android:title="@string/init_units" /> + <!-- this preference is only shown on < 4.4 devices, 4.4 unconditionally enables it --> + <CheckBoxPreference + android:title="@string/init_showoverflowmenu" + android:summary="@string/init_showoverflow_summary" + android:key="@string/pref_alwaysshowoverflowmenu" + android:defaultValue="false" /> </PreferenceScreen> <PreferenceScreen android:icon="?attr/settings_details" @@ -407,8 +421,8 @@ <CheckBoxPreference android:defaultValue="true" android:key="@string/pref_friendlogswanted" - android:summary="@string/init_summary_friendlogswanted" - android:title="@string/init_friendlogswanted" /> + android:summary="@string/init_summary_friends_and_own_logs_wanted" + android:title="@string/init_friends_and_own_logs_wanted" /> <CheckBoxPreference android:defaultValue="false" android:key="@string/pref_opendetailslastpage" @@ -654,11 +668,6 @@ <CheckBoxPreference android:defaultValue="true" android:enabled="false" - android:key="@string/pref_navigation_menu_gcc" - android:title="@string/cache_menu_gcc" /> - <CheckBoxPreference - android:defaultValue="true" - android:enabled="false" android:key="@string/pref_navigation_menu_where_you_go" android:title="@string/cache_menu_whereyougo" /> <CheckBoxPreference @@ -726,7 +735,10 @@ android:defaultValue="false" android:key="@string/pref_debug" android:title="@string/init_debug" /> + <Preference + android:key="@string/pref_memory_dump" + android:title="@string/init_create_memory_dump" /> </PreferenceCategory> </PreferenceScreen> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> |
