diff options
Diffstat (limited to 'main/res')
69 files changed, 440 insertions, 714 deletions
diff --git a/main/res/drawable-hdpi/actionbar_manual.png b/main/res/drawable-hdpi/actionbar_manual.png Binary files differdeleted file mode 100644 index 0b0c93c..0000000 --- a/main/res/drawable-hdpi/actionbar_manual.png +++ /dev/null diff --git a/main/res/drawable-ldpi/actionbar_manual.png b/main/res/drawable-ldpi/actionbar_manual.png Binary files differdeleted file mode 100644 index 14af11d..0000000 --- a/main/res/drawable-ldpi/actionbar_manual.png +++ /dev/null diff --git a/main/res/drawable-mdpi/actionbar_manual.png b/main/res/drawable-mdpi/actionbar_manual.png Binary files differdeleted file mode 100644 index a71acb3..0000000 --- a/main/res/drawable-mdpi/actionbar_manual.png +++ /dev/null diff --git a/main/res/drawable-mdpi/attribute_easy_climbing.png b/main/res/drawable-mdpi/attribute_easy_climbing.png Binary files differnew file mode 100644 index 0000000..ecf10b8 --- /dev/null +++ b/main/res/drawable-mdpi/attribute_easy_climbing.png diff --git a/main/res/drawable-mdpi/helper_manual.png b/main/res/drawable-mdpi/helper_manual.png Binary files differdeleted file mode 100644 index c3c43db..0000000 --- a/main/res/drawable-mdpi/helper_manual.png +++ /dev/null diff --git a/main/res/drawable/favourite_background_dark.xml b/main/res/drawable/favorite_background_dark.xml index b8aa8d3..b8aa8d3 100644 --- a/main/res/drawable/favourite_background_dark.xml +++ b/main/res/drawable/favorite_background_dark.xml diff --git a/main/res/drawable/favourite_background_green_dark.xml b/main/res/drawable/favorite_background_green_dark.xml index 3e1b545..3e1b545 100644 --- a/main/res/drawable/favourite_background_green_dark.xml +++ b/main/res/drawable/favorite_background_green_dark.xml diff --git a/main/res/drawable/favourite_background_green_light.xml b/main/res/drawable/favorite_background_green_light.xml index a2070e7..a2070e7 100644 --- a/main/res/drawable/favourite_background_green_light.xml +++ b/main/res/drawable/favorite_background_green_light.xml diff --git a/main/res/drawable/favourite_background_light.xml b/main/res/drawable/favorite_background_light.xml index 60c0b2c..60c0b2c 100644 --- a/main/res/drawable/favourite_background_light.xml +++ b/main/res/drawable/favorite_background_light.xml diff --git a/main/res/drawable/favourite_background_orange_dark.xml b/main/res/drawable/favorite_background_orange_dark.xml index 8730487..8730487 100644 --- a/main/res/drawable/favourite_background_orange_dark.xml +++ b/main/res/drawable/favorite_background_orange_dark.xml diff --git a/main/res/drawable/favourite_background_orange_light.xml b/main/res/drawable/favorite_background_orange_light.xml index 89ef726..89ef726 100644 --- a/main/res/drawable/favourite_background_orange_light.xml +++ b/main/res/drawable/favorite_background_orange_light.xml diff --git a/main/res/drawable/favourite_background_red_dark.xml b/main/res/drawable/favorite_background_red_dark.xml index 2fb580e..2fb580e 100644 --- a/main/res/drawable/favourite_background_red_dark.xml +++ b/main/res/drawable/favorite_background_red_dark.xml diff --git a/main/res/drawable/favourite_background_red_light.xml b/main/res/drawable/favorite_background_red_light.xml index b16cb92..b16cb92 100644 --- a/main/res/drawable/favourite_background_red_light.xml +++ b/main/res/drawable/favorite_background_red_light.xml diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml index 1388187..88e5e76 100644 --- a/main/res/layout-land/coords.xml +++ b/main/res/layout-land/coords.xml @@ -10,13 +10,6 @@ <TextView style="@style/action_bar_title" android:text="@string/cache_coordinates" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - android:id="@+id/actionBarManualbutton" - style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" /> </LinearLayout> <ScrollView diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml index aa8b2b4..5965128 100644 --- a/main/res/layout-land/navigate.xml +++ b/main/res/layout-land/navigate.xml @@ -5,23 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <LinearLayout android:layout_width="fill_parent" diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml index 9325ea0..b0de7ea 100644 --- a/main/res/layout/about_activity.xml +++ b/main/res/layout/about_activity.xml @@ -5,16 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml new file mode 100644 index 0000000..9a3efa0 --- /dev/null +++ b/main/res/layout/actionbar.xml @@ -0,0 +1,6 @@ +<?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 new file mode 100644 index 0000000..932444b --- /dev/null +++ b/main/res/layout/actionbar_button_compass.xml @@ -0,0 +1,15 @@ +<?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 new file mode 100644 index 0000000..9b2138a --- /dev/null +++ b/main/res/layout/actionbar_button_map.xml @@ -0,0 +1,13 @@ +<?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 new file mode 100644 index 0000000..3604345 --- /dev/null +++ b/main/res/layout/actionbar_button_myposition.xml @@ -0,0 +1,12 @@ +<?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 new file mode 100644 index 0000000..2aa1a50 --- /dev/null +++ b/main/res/layout/actionbar_button_search.xml @@ -0,0 +1,13 @@ +<?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_progress.xml b/main/res/layout/actionbar_progress.xml new file mode 100644 index 0000000..a39d103 --- /dev/null +++ b/main/res/layout/actionbar_progress.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/action_bar_progress" + android:visibility="gone" android:id="@+id/actionbar_progress"/>
\ No newline at end of file diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml new file mode 100644 index 0000000..4fa5348 --- /dev/null +++ b/main/res/layout/actionbar_title.xml @@ -0,0 +1,16 @@ +<?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/addresses.xml b/main/res/layout/addresses.xml index 2be131d..08f5bc1 100644 --- a/main/res/layout/addresses.xml +++ b/main/res/layout/addresses.xml @@ -4,16 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ListView android:id="@android:id/list" diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml index 7ed4782..3e025e1 100644 --- a/main/res/layout/cache_image_item.xml +++ b/main/res/layout/cache_image_item.xml @@ -27,4 +27,10 @@ android:textSize="14dip" android:visibility="gone" /> + <ProgressBar + android:id="@+id/progress_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@android:style/Widget.ProgressBar.Small"/> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml index 147a596..5c3abbc 100644 --- a/main/res/layout/caches.xml +++ b/main/res/layout/caches.xml @@ -6,34 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <TextView - style="@style/action_bar_title" - android:clickable="true" - android:onClick="selectList" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goMap" - android:src="@drawable/actionbar_map" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_map" /> </LinearLayout> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml index e3b861c..d4e7b27 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/caches_item.xml @@ -159,14 +159,14 @@ android:src="@drawable/trackable_all" /> <TextView - android:id="@+id/favourite" + android:id="@+id/favorite" android:layout_width="35dip" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_gravity="center" android:layout_marginTop="22dip" - android:background="?favourite" + android:background="?favorite" android:ellipsize="marquee" android:gravity="center" android:lines="1" diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml index 89d7152..44765dc 100644 --- a/main/res/layout/cacheview.xml +++ b/main/res/layout/cacheview.xml @@ -8,29 +8,9 @@ <LinearLayout style="@style/action_bar" >
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goHome" />
+ <include layout="@layout/actionbar_title" />
- <View style="@style/action_bar_separator" />
-
- <TextView style="@style/action_bar_title" />
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- android:id="@+id/defaultNavigation"
- style="@style/action_bar_action"
- android:longClickable="true"
- android:onClick="startDefaultNavigation"
- android:src="@drawable/actionbar_compass_dark" />
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goManual"
- android:src="@drawable/actionbar_manual" />
+ <include layout="@layout/actionbar_button_compass" />
</LinearLayout>
<android.support.v4.view.ViewPager
diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml index ddb2f4e..6da453e 100644 --- a/main/res/layout/coords.xml +++ b/main/res/layout/coords.xml @@ -5,19 +5,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <TextView - style="@style/action_bar_title" - android:text="@string/cache_coordinates" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - android:id="@+id/actionBarManualbutton" - style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <ScrollView android:id="@+id/scroller" diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml index 3fbd19e..657e9f4 100644 --- a/main/res/layout/edit_waypoint_activity.xml +++ b/main/res/layout/edit_waypoint_activity.xml @@ -5,23 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/editor.xml b/main/res/layout/editor.xml deleted file mode 100644 index d556836..0000000 --- a/main/res/layout/editor.xml +++ /dev/null @@ -1,25 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <EditText - android:id="@+id/editorEditText" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:inputType="textMultiLine" - android:scrollbars="vertical" > - - <requestFocus /> - </EditText> - - <Button - android:id="@+id/editorSave" - style="@style/button_full" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/editor_save" /> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml new file mode 100644 index 0000000..68e2b2c --- /dev/null +++ b/main/res/layout/fragment_edit_note.xml @@ -0,0 +1,15 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/edit_note" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical"> + + <EditText + android:id="@+id/note" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="text" + android:imeOptions="actionDone"/> +</LinearLayout> diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 2be131d..08f5bc1 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -4,16 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ListView android:id="@android:id/list" diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index 26137fc..ab38fb6 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -5,23 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml index 0f9aff0..e90cd37 100644 --- a/main/res/layout/main.xml +++ b/main/res/layout/main.xml @@ -13,19 +13,7 @@ <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goSearch" - android:src="@drawable/actionbar_search" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_search" /> </LinearLayout> <fragment @@ -178,41 +166,6 @@ </LinearLayout> <!-- ** --> - <RelativeLayout - android:id="@+id/helper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginBottom="64dip" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:background="@drawable/helper_bcg" - android:visibility="gone" > - - <ImageView - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_alignParentLeft="true" - android:layout_gravity="center" - android:layout_margin="4dip" - android:gravity="center" - android:scaleType="center" - android:src="@drawable/actionbar_manual" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_gravity="center" - android:layout_marginLeft="34dip" - android:gravity="center" - android:padding="4dip" - android:text="@string/helper" - android:textColor="@color/text_icon" - android:textSize="14dip" /> - </RelativeLayout> - <!-- ** --> - <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml index 723b7157..3e460ef 100644 --- a/main/res/layout/map_google.xml +++ b/main/res/layout/map_google.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <TextView style="@style/action_bar_title" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <View style="@style/action_bar_separator" /> - - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml index f3b183e..1833da3 100644 --- a/main/res/layout/map_mapsforge.xml +++ b/main/res/layout/map_mapsforge.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <TextView style="@style/action_bar_title" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <View style="@style/action_bar_separator" /> - - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml index 44b3387..6ca98e1 100644 --- a/main/res/layout/map_mapsforge_old.xml +++ b/main/res/layout/map_mapsforge_old.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <TextView style="@style/action_bar_title" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <View style="@style/action_bar_separator" /> - - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml index ff0435c..edf6c6e 100644 --- a/main/res/layout/map_static.xml +++ b/main/res/layout/map_static.xml @@ -4,16 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml index 0c95958..ae51735 100644 --- a/main/res/layout/navigate.xml +++ b/main/res/layout/navigate.xml @@ -5,24 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> - <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" > diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml index 3c133d8..baa568c 100644 --- a/main/res/layout/point.xml +++ b/main/res/layout/point.xml @@ -5,23 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <ListView android:id="@+id/historyList" diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index ff64c91..15e4248 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -7,25 +7,11 @@ <LinearLayout style="@style/action_bar" > - <TextView style="@style/action_bar_title" /> + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> - <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" /> - - <View - android:id="@+id/separator" - style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_compass" /> </LinearLayout> <ScrollView diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml index 6d0bf91..a0a699d 100644 --- a/main/res/layout/search.xml +++ b/main/res/layout/search.xml @@ -6,23 +6,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> - </LinearLayout> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml index 233972a..2027b7a 100644 --- a/main/res/layout/spoilers.xml +++ b/main/res/layout/spoilers.xml @@ -5,16 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <include layout="@layout/caches_images" /> diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml index 09a8033..61778ce 100644 --- a/main/res/layout/touch.xml +++ b/main/res/layout/touch.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml index fe61409..bcfb42d 100644 --- a/main/res/layout/trackable_activity.xml +++ b/main/res/layout/trackable_activity.xml @@ -6,23 +6,7 @@ android:background="?background_color"
android:orientation="vertical" >
- <LinearLayout style="@style/action_bar" >
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goHome" />
-
- <View style="@style/action_bar_separator" />
-
- <TextView style="@style/action_bar_title" />
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goManual"
- android:src="@drawable/actionbar_manual" />
- </LinearLayout>
+ <include layout="@layout/actionbar" />
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
diff --git a/main/res/layout/twitter_authorization_activity.xml b/main/res/layout/twitter_authorization_activity.xml index 97c2236..ec9aa8a 100644 --- a/main/res/layout/twitter_authorization_activity.xml +++ b/main/res/layout/twitter_authorization_activity.xml @@ -5,16 +5,7 @@ android:orientation="vertical" android:visibility="visible" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml index 2a3d14e..8fd73bf 100644 --- a/main/res/layout/useful_apps.xml +++ b/main/res/layout/useful_apps.xml @@ -5,16 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - </LinearLayout> + <include layout="@layout/actionbar"/> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml index 43a3308..7ffd630 100644 --- a/main/res/layout/visit.xml +++ b/main/res/layout/visit.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView diff --git a/main/res/layout/visit_image.xml b/main/res/layout/visit_image.xml index 7997406..fd8eaea 100644 --- a/main/res/layout/visit_image.xml +++ b/main/res/layout/visit_image.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> - - <TextView style="@style/action_bar_title" /> - - <View style="@style/action_bar_separator" /> - - <ProgressBar - style="@style/action_bar_progress" - android:visibility="gone" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView @@ -98,6 +83,13 @@ 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" diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml index 869ffa0..b3806aa 100644 --- a/main/res/layout/waypoint_popup.xml +++ b/main/res/layout/waypoint_popup.xml @@ -7,25 +7,11 @@ <LinearLayout style="@style/action_bar" > - <TextView style="@style/action_bar_title" /> + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> - <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" /> - - <View - android:id="@+id/separator" - style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_compass" /> </LinearLayout> <ScrollView diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 8bff251..b5df662 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -90,7 +90,7 @@ <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 Logy…</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> @@ -175,7 +175,7 @@ <string name="err_missing_device_name">Před registrací prosím zadej název zařízení.</string> <string name="err_favorite_failed">Označení oblíbenosti keše selhalo.</string> <string name="err_select_logimage_failed">Výběr obrázku pro zápis selhal.</string> - <string name="err_aquire_image_failed">Získání obrázku selhalo.</string> + <string name="err_acquire_image_failed">Získání obrázku selhalo.</string> <string name="err_tb_display">c:geo nemůže zobrazit sledovatelný předmět. Je to opravdu sledovatelný předmět?</string> <string name="err_tb_details_open">c:geo nemůže otevřít podrobnosti ke sledovatelnému předmětu.</string> @@ -323,7 +323,7 @@ <string name="caches_filter_track">Se sledovatelnými předměty</string> <string name="caches_filter_clear">Vymazat filtry</string> <string name="caches_filter_modified">S upravenými souřadnicemi</string> - <string name="caches_filter_origin">Originální</string> + <string name="caches_filter_origin">Původ keše</string> <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> @@ -409,7 +409,6 @@ <string name="init_offline_wp">Ukládat statické mapy k bodům trasy pro offline použití</string> <string name="init_save_log_img">Ukládat obrázky z logů</string> <string name="init_units">Používat imperiální jednotky vzdálenosti</string> - <string name="init_nav">Používat Google Navigaci</string> <string name="init_log_offline">Povolit Offline logování\n(Při logování nezobrazovat online logovací obrazovku a neodesílat Log na server)</string> <string name="init_choose_list">Ptát se na seznam pro uložení keše</string> <string name="init_livelist">Zobrazovat směr v seznamu keší</string> @@ -515,7 +514,6 @@ <string name="cache_attributes">Atributy</string> <string name="cache_inventory">Inventář</string> <string name="cache_log_offline">Offline Log</string> - <string name="cache_log_images_loading">Načítání obrázků z logů…</string> <string name="cache_log_images_title">Obrázky z Logů</string> <string name="cache_log_image_default_title">Fotografie</string> <string name="cache_personal_note">Osobní poznámka</string> @@ -554,7 +552,7 @@ <string name="cache_dialog_loading_details_status_gcvote">Načítání GCVote</string> <string name="cache_dialog_loading_details_status_elevation">Načítání údajů o nadmořské výšce</string> <string name="cache_dialog_loading_details_status_cache">Ukládání do mezipaměti</string> - <string name="cache_dialog_loading_details_status_render">Renderování zobrazení</string> + <string name="cache_dialog_loading_details_status_render">Vykreslování pohledu</string> <string name="cache_dialog_offline_save_title">Offline</string> <string name="cache_dialog_offline_save_message">Ukládání keše pro offline použití…</string> <string name="cache_dialog_offline_drop_title">Offline</string> @@ -565,10 +563,10 @@ <string name="cache_dialog_watchlist_add_message">Přidávání keše do tvého Watchlistu…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Odstraňování keše z tvého Watchlistu…</string> - <string name="cache_dialog_favourite_add_title">Oblíbené</string> - <string name="cache_dialog_favourite_add_message">Přidávání keše do Oblíbených…</string> - <string name="cache_dialog_favourite_remove_title">Oblíbené</string> - <string name="cache_dialog_favourite_remove_message">Odstraňování keše z Oblíbených…</string> + <string name="cache_dialog_favorite_add_title">Oblíbené</string> + <string name="cache_dialog_favorite_add_message">Přidávání keše do Oblíbených…</string> + <string name="cache_dialog_favorite_remove_title">Oblíbené</string> + <string name="cache_dialog_favorite_remove_message">Odstraňování keše z Oblíbených…</string> <string name="cache_menu_navigate">Navigovat</string> <string name="cache_menu_navigation_drive">Navigace (Řízení)</string> <string name="cache_menu_navigation_walk">Navigace (Chůze)</string> @@ -610,7 +608,7 @@ <string name="cache_rating">Hodnocení</string> <string name="cache_own_rating">Vlastní hodnocení</string> <string name="cache_rating_of">z</string> - <string name="cache_favourite">Oblíbená</string> + <string name="cache_favorite">Oblíbená</string> <string name="cache_owner">Zakladatel</string> <string name="cache_hidden">Skryta</string> <string name="cache_event">Datum</string> @@ -618,9 +616,7 @@ <string name="cache_coordinates">Souřadnice</string> <string name="cache_coordinates_original">Původní souřadnice</string> <string name="cache_spoiler_images_title">Obrázky s nápovědou</string> - <string name="cache_spoiler_images_loading">Načítání obrázků s nápovědou…</string> <string name="cache_images_title">Obrázky</string> - <string name="cache_images_loading">Načítání obrázků…</string> <string name="cache_log_types">Typy zápisů</string> <string name="cache_coordinates_no">Tato keš nemá souřadnice.</string> <string name="cache_clear_history">Vymazat historii</string> @@ -823,8 +819,6 @@ <string name="license_dismiss">Zamítnout</string> <!-- helpers --> - <string name="helper_manual_title">Manuál</string> - <string name="helper_manual_description">Komplexní příručka aplikace c:geo obsahující popis všech možností této aplikace (včetně těch skrytých).</string> <string name="helper_calendar_title">c:geo modul kalendáře</string> <string name="helper_calendar_missing">c:geo modul kalendáře není nainstalován.</string> <string name="helper_calendar_description">Umožňuje exportovat události keší do tvého kalendáře.</string> @@ -1055,7 +1049,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">Stránka c:geo</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Návod: <a href="http://manual.cgeo.org/">c:geo v Nutshell</a></string> - <string name="about_go4cache">Služba <b>Go 4 Cache</b> zobrazuje ostatní geokačery na mapě (v <b>c:geo</b> nebo v prohlížeči) v reálném čase. Může zobrazovat - na příklad - jakou keš zrovna hledají. Připojením se k <b>Go 4 Cache</b> získá aplikace <b>c:geo</b> povolení zveřejňovat tvou polohu při geocachingu (pouze když je <b>c:geo</b> spuštěno).</string> <string name="about_twitter">Má <b>c:geo</b> publikovat nový status na Twitteru vždy, když zaloguješ keš?</string> <string name="about_auth_1">Následující proces dovoluje aplikaci <b>c:geo</b> přístup na Twitter - pokud budeš souhlasit.</string> <string name="about_auth_2">Klepnutím na tlačítko \"Zahájit autorizaci\" bude proces zahájen. Tento proces otevře webový prohlížeč s Twitterem. Přihlaš se na této stránce a povol <b>c:geu</b> přístup k tvému účtu. Pokud je to povoleno, Twitter ti ukáže číselný PIN kód. Tento PIN kód musíš zadat do <b>c:geo</b> a potvrdit. To je vše.</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index dd40100..5d19848 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -125,7 +125,15 @@ <string name="log_image_camera">Neu</string> <string name="log_image_caption">Überschrift</string> <string name="log_image_description">Beschreibung</string> - + <string name="log_image_scale">Skalierung</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> + <!-- translation --> <string name="translate_to_sys_lang">Übersetze in %s</string> <string name="translate_to_english">Übersetze in Englisch</string> @@ -502,7 +510,6 @@ <string name="cache_attributes">Attribute</string> <string name="cache_inventory">Inventar</string> <string name="cache_log_offline">Offline-Log</string> - <string name="cache_log_images_loading">Lade Logbild…</string> <string name="cache_log_images_title">Logbild</string> <string name="cache_log_image_default_title">Bild</string> <string name="cache_personal_note">Persönliche Notiz</string> @@ -551,10 +558,10 @@ <string name="cache_dialog_watchlist_add_message">Füge den Cache deiner Watchlist hinzu…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Entferne den Cache von deiner Watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favorit</string> - <string name="cache_dialog_favourite_add_message">Füge den Cache als dein Favorit hinzu…</string> - <string name="cache_dialog_favourite_remove_title">Favorit</string> - <string name="cache_dialog_favourite_remove_message">Entferne den Cache von deinen Favoriten…</string> + <string name="cache_dialog_favorite_add_title">Favorit</string> + <string name="cache_dialog_favorite_add_message">Füge den Cache zu Favoriten hinzu…</string> + <string name="cache_dialog_favorite_remove_title">Favorit</string> + <string name="cache_dialog_favorite_remove_message">Entferne den Cache von deinen Favoriten…</string> <string name="cache_menu_navigate">Navigieren</string> <string name="cache_menu_navigation_drive">Navigation (Fahren)</string> <string name="cache_menu_navigation_walk">Navigation (Gehen)</string> @@ -585,6 +592,8 @@ <string name="cache_status_disabled">Deaktiviert</string> <string name="cache_status_premium">Nur für Premium-Mitglieder</string> <string name="cache_status_not_premium">Für alle Mitglieder</string> + <string name="cache_status_stored">Gespeichert</string> + <string name="cache_status_not_stored">Nicht gespeichert</string> <string name="cache_geocode">Geocode</string> <string name="cache_name">Name</string> <string name="cache_type">Typ</string> @@ -595,7 +604,7 @@ <string name="cache_rating">Bewertung</string> <string name="cache_own_rating">Eigene Bewertung</string> <string name="cache_rating_of">von</string> - <string name="cache_favourite">Favorit</string> + <string name="cache_favorite">Favorit</string> <string name="cache_owner">Besitzer</string> <string name="cache_hidden">Versteckt</string> <string name="cache_event">Zeitangabe</string> @@ -603,8 +612,6 @@ <string name="cache_coordinates">Koordinaten</string> <string name="cache_coordinates_original">Ursprüngliche Koordinaten</string> <string name="cache_spoiler_images_title">Hinweisbilder</string> - <string name="cache_spoiler_images_loading">Lade Hinweisbilder…</string> - <string name="cache_images_loading">Lade Bilder…</string> <string name="cache_log_types">Logs</string> <string name="cache_coordinates_no">Dieser Cache hat keine Koordinaten.</string> <string name="cache_clear_history">Verlauf leeren</string> @@ -806,8 +813,6 @@ <string name="license_dismiss">Ablehnen</string> <!-- helpers --> - <string name="helper_manual_title">Anleitung</string> - <string name="helper_manual_description">Umfangreiche Anleitung für c:geo mit Beschreibung aller Möglichkeiten dieser App (auch versteckte).</string> <string name="helper_calendar_title">c:geo Kalender Add-on</string> <string name="helper_calendar_missing">c:geo Kalender Add-on nicht installiert</string> <string name="helper_calendar_description">Ermöglicht die Übernahme von Event-Caches in den Kalender.</string> @@ -984,6 +989,8 @@ <string name="attribute_swamp_no">Nicht sumpfig / kein matschiges Gelände</string> <string name="attribute_hills_yes">Hügeliges Gelände</string> <string name="attribute_hills_no">Kein hügeliges Gelände</string> + <string name="attribute_easy_climbing_yes">Einfaches Klettern</string> + <string name="attribute_easy_climbing_no">Kein einfaches Klettern</string> <string name="attribute_poi_yes">Interessanter Ort</string> <string name="attribute_poi_no">Uninteressanter Ort</string> <string name="attribute_moving_target_yes">Bewegliches Ziel</string> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 7215d72..b618fb9 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -11,6 +11,8 @@ <string name="helpers">¿Qué instalar?</string> <string name="about">Sobre c:geo</string> <string name="helper">Si quieres aprender cosas sobre <b>c:geo</b>?\nEcha un ojo a nuestro manual.</string> + <string name="latitude">Latitud</string> + <string name="longitude">Longitud</string> <!-- actionbar --> <string name="action_bar_share_title">Compartir enlace a escondite</string> @@ -19,19 +21,20 @@ <string name="all_types">Todos los escondites</string> <string name="traditional">Tradicionales</string> <string name="multi">Multis</string> - <string name="mystery">Desconocidos</string> + <string name="mystery">Desconocidos/Mistery</string> <string name="letterbox">Buzón híbrido</string> - <string name="event">Por pistas</string> - <string name="mega">Mega-eventos</string> + <string name="event">Eventos</string> + <string name="mega">Mega-Eventos</string> <string name="earth">Educativos (Earth)</string> - <string name="cito">Limpieza de escondites</string> + <string name="cito">Eventos Limpieza(CITO)</string> <string name="webcam">Webcams</string> <string name="virtual">Virtuales</string> <string name="wherigo">Wherigo</string> - <string name="lostfound">Perdidos y encontrados</string> + <string name="lostfound">Eventos Perdidos y Encontrados</string> <string name="ape">Proyecto APE</string> <string name="gchq">Groundspeak HQ</string> - <string name="gps">Exhibición de escondites GPS </string> + <string name="gps">Exhibición de escondites GPS</string> + <string name="unknown">De tipo desconocido</string> <!-- cache sizes --> <string name="cache_size_micro">micro</string> @@ -46,36 +49,43 @@ <!-- waypoints --> <string name="wp_final">Ubicación final</string> <string name="wp_stage">Etapa de multi escondite</string> - <string name="wp_puzzle">Preguntar sin contestar</string> + <string name="wp_puzzle">Preguntar a contestar</string> <string name="wp_pkg">Zona de aparcamiento</string> <string name="wp_trailhead">Sendero</string> <string name="wp_waypoint">Punto de referencia</string> + <string name="wp_original">Coordenadas originales</string> <!-- logs --> <string name="log_found">Encontrado</string> <string name="log_dnf">No encontrado</string> <string name="log_note">Nota</string> <string name="log_published">Publicado</string> - <string name="log_enabled">Activo</string> - <string name="log_disabled">Inactivo</string> - <string name="log_attend">Iré</string> + <string name="log_enabled">Activado</string> + <string name="log_disabled">Desactivado</string> + <string name="log_attend">Asistiré</string> <string name="log_attended">Asistí</string> - <string name="log_retrieved">Obtenido</string> - <string name="log_placed">Colocado</string> - <string name="log_grabbed">Guardado en alguna parte</string> + <string name="log_retrieved">Recogido</string> + <string name="log_placed">Depositado</string> + <string name="log_grabbed">Recogido de alguna parte</string> + <string name="log_movecollection">Mover a la colección</string> + <string name="log_moveinventory">Mover al inventario</string> <string name="log_maintained">Mantenimiento efectuado</string> <string name="log_maintenance_needed">Necesita mantenimiento</string> <string name="log_update">Coordenadas actualizadas</string> <string name="log_archived">Archivado</string> + <string name="log_unarchived">Desarchivado</string> <string name="log_needs_archived">Necesita ser archivado</string> <string name="log_discovered">Descubierto</string> <string name="log_reviewer">Nota del revisor</string> + <string name="log_retractlisting">Retirar ficha del escondite</string> + <string name="log_marked_missing">Marcado como perdido</string> <string name="log_tb_nothing">No hacer nada</string> - <string name="log_tb_visit">Visita</string> - <string name="log_tb_drop">Colocar aquí</string> + <string name="log_tb_visit">Visitado</string> + <string name="log_tb_drop">Dejar aquí</string> <string name="log_tb_changeall">Cambiar todo</string> <string name="log_save">Guardar</string> - <string name="log_saving">Guardando registo…</string> + <string name="log_saving">Enviando registo…</string> + <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> @@ -84,27 +94,45 @@ <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_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_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_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_45">4,5 estrellas</string> <string name="log_stars_5">5 estrellas</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> - <string name="log_stars_25_description">not so bad</string> - <string name="log_stars_3_description">average </string> - <string name="log_stars_35_description">not bad at all</string> - <string name="log_stars_4_description">better than average</string> - <string name="log_stars_45_description">very good</string> - <string name="log_stars_5_description">awesome</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> + <string name="log_stars_25_description">un poco malo</string> + <string name="log_stars_3_description">aceptable</string> + <string name="log_stars_35_description">algo bueno</string> + <string name="log_stars_4_description">bueno</string> + <string name="log_stars_45_description">muy bueno</string> + <string name="log_stars_5_description">buenísimo</string> <string name="log_webcam">Foto de webcam tomada</string> <string name="log_new_log">Registro</string> <string name="log_new_log_text">Texto del registro</string> <string name="log_announcement">Aviso</string> + <string name="log_today">Hoy</string> + <string name="log_yesterday">Ayer</string> + <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> + <string name="log_image_description">Descripción</string> + <string name="log_image_scale">Redimensionamiento</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> <!-- errors, warnings, info toasts --> <string name="err_none">Aceptar</string> @@ -251,6 +279,7 @@ <string name="caches_drop_all_ask">¿Quieres borrar todos los escondites guardados en el dispositivo?</string> <string name="caches_drop_stored">Descartar guardados</string> <string name="caches_drop_progress">Borrando escondites</string> + <string name="caches_drop_all_and_list">Descartar todos y borrar lista</string> <string name="caches_refresh_selected">Actualizar seleccionados</string> <string name="caches_refresh_all">Actualizar todos</string> <string name="caches_move_selected">Mover seleccionados</string> @@ -263,7 +292,7 @@ <string name="caches_recaptcha_continue">Continuar</string> <string name="caches_filter">Filtrar</string> <string name="caches_filter_title">Filtrar por</string> - <string name="caches_filter_size">tamaó</string> + <string name="caches_filter_size">tamaño</string> <string name="caches_filter_type">tipo</string> <string name="caches_filter_track">con rastreables</string> <string name="caches_filter_clear">limpiar filtros</string> @@ -401,8 +430,7 @@ <string name="cache_attributes">Atributos</string> <string name="cache_inventory">Inventario</string> <string name="cache_log_offline">Registro desconectado</string> - <string name="cache_log_images_loading">Cargando imagen de registro…</string> - <string name="cache_log_images_title">Imagen de resgistro</string> + <string name="cache_log_images_title">Imagen de registro</string> <string name="cache_log_image_default_title">Foto</string> <string name="cache_personal_note">Nota personal</string> <string name="cache_description">Descripción</string> @@ -457,14 +485,13 @@ <string name="cache_terrain">Terreno</string> <string name="cache_rating">Puntuación</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favorito</string> + <string name="cache_favorite">Favorito</string> <string name="cache_owner">Propietario</string> <string name="cache_hidden">Oculto</string> <string name="cache_event">Fecha</string> <string name="cache_location">Ubicación</string> <string name="cache_coordinates">Coordenadas</string> <string name="cache_spoiler_images_title">Imágenes reveladoras</string> - <string name="cache_spoiler_images_loading">Cargando imágenes reveladoras…</string> <string name="cache_log_types">Tipos de registro</string> <string name="cache_coordinates_no">Este escondite no tiene coordenadas.</string> <string name="cache_clear_history">Borrar historial</string> @@ -600,8 +627,6 @@ <string name="license_dismiss">Descartar</string> <!-- helpers --> - <string name="helper_manual_title">Manual</string> - <string name="helper_manual_description">Sencillo manual de c:geo que contiene todas las capacidades de este programa (incluidas las ocultas).</string> <string name="helper_locus_title">Locus</string> <string name="helper_locus_description">Sencilla aplicación que muestra mapas en línea y permite descargarlos para ser usados sin conexión (sólo mapas no vectoriales). También permite registrar el recorrido, gestionar puntos de interés y más funciones interesantes.</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 122c33b..2f5fccb 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -175,7 +175,7 @@ <string name="err_missing_device_name">Veuillez saisir un nom pour votre appareil avant l\'enregistrement.</string> <string name="err_favorite_failed">c:geo ne peut pas changer le status de favori.</string> <string name="err_select_logimage_failed">La sélection d\'une image pour la note a échoué.</string> - <string name="err_aquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string> + <string name="err_acquire_image_failed">L\'acquisition d\'une nouvelle image pour la note a échoué.</string> <string name="err_tb_display">"c:geo ne peut pas afficher l\'objet voyageur demandé. Est-ce vraiment un objet voyageur?</string> <string name="err_tb_details_open">c:geo ne peut pas ouvrir le détail de l\'objet voyageur.</string> @@ -512,7 +512,6 @@ <string name="cache_attributes">Attributs</string> <string name="cache_inventory">Inventaire</string> <string name="cache_log_offline">Visite hors-ligne</string> - <string name="cache_log_images_loading">Chargement de l\'image de la visite…</string> <string name="cache_log_images_title">Image de la visite</string> <string name="cache_log_image_default_title">Photo</string> <string name="cache_personal_note">Note personnelle</string> @@ -562,10 +561,10 @@ <string name="cache_dialog_watchlist_add_message">Ajout de la cache à votre liste de suivi…</string> <string name="cache_dialog_watchlist_remove_title">Liste de suivi</string> <string name="cache_dialog_watchlist_remove_message">Retrait de la cache de votre liste de suivi…</string> - <string name="cache_dialog_favourite_add_title">Favori</string> - <string name="cache_dialog_favourite_add_message">Ajout de la cache à vos favoris…</string> - <string name="cache_dialog_favourite_remove_title">Favori</string> - <string name="cache_dialog_favourite_remove_message">Suppression de la cache de vos favoris…</string> + <string name="cache_dialog_favorite_add_title">Favori</string> + <string name="cache_dialog_favorite_add_message">Ajout de la cache à vos favoris…</string> + <string name="cache_dialog_favorite_remove_title">Favori</string> + <string name="cache_dialog_favorite_remove_message">Suppression de la cache de vos favoris…</string> <string name="cache_menu_navigate">Navigation</string> <string name="cache_menu_navigation_drive">Navigation (voiture)</string> <string name="cache_menu_navigation_walk">Navigation (piéton)</string> @@ -607,7 +606,7 @@ <string name="cache_rating">Note</string> <string name="cache_own_rating">Note personnelle</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favori</string> + <string name="cache_favorite">Favori</string> <string name="cache_owner">Propriétaire</string> <string name="cache_hidden">Cachée</string> <string name="cache_event">Date</string> @@ -615,9 +614,7 @@ <string name="cache_coordinates">Coordonnées</string> <string name="cache_coordinates_original">Coordonnées d\'origine</string> <string name="cache_spoiler_images_title">Images indices</string> - <string name="cache_spoiler_images_loading">Chargement des images indices…</string> <string name="cache_images_title">Images</string> - <string name="cache_images_loading">Chargement des images…</string> <string name="cache_log_types">Types de visites</string> <string name="cache_coordinates_no">Cette cache n\'a pas de coordonnées.</string> <string name="cache_clear_history">Effacer l\'historique</string> @@ -820,8 +817,6 @@ <string name="license_dismiss">Rejeter</string> <!-- helpers --> - <string name="helper_manual_title">Manuel</string> - <string name="helper_manual_description">Manuel complet pour c:geo contenant la description de toutes les fonctionnalités de cette application (y compris celle secrètes).</string> <string name="helper_calendar_title">Module supplémentaire c:geo agenda</string> <string name="helper_calendar_missing">Module supplémentaire c:geo agenda non installé</string> <string name="helper_calendar_description">Permet d\'exporter les événements liés aux caches dans le calendrier Android.</string> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index ac2a088..689912c 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -483,7 +483,6 @@ <string name="cache_attributes">Tulajdonságok</string> <string name="cache_inventory">Tárgyak</string> <string name="cache_log_offline">Offline bejegyzés</string> - <string name="cache_log_images_loading">Bejegyzés kép betöltése…</string> <string name="cache_log_images_title">Bejegyzés kép</string> <string name="cache_log_image_default_title">Fotó</string> <string name="cache_personal_note">Személyes megjegyzés</string> @@ -569,7 +568,7 @@ <string name="cache_rating">Osztályzat</string> <string name="cache_own_rating">Saját értékelés</string> <string name="cache_rating_of">/</string> - <string name="cache_favourite">Kedvenc</string> + <string name="cache_favorite">Kedvenc</string> <string name="cache_owner">Tulajdonos</string> <string name="cache_hidden">Elrejtve</string> <string name="cache_event">Dátum</string> @@ -577,9 +576,7 @@ <string name="cache_coordinates">Koordináták</string> <string name="cache_coordinates_original">Eredeti koordináták</string> <string name="cache_spoiler_images_title">Spoiler képek</string> - <string name="cache_spoiler_images_loading">Spoiler képek betöltése…</string> <string name="cache_images_title">Képek</string> - <string name="cache_images_loading">Képek betéltése…</string> <string name="cache_log_types">Bejegyzés típusok</string> <string name="cache_coordinates_no">Ennek a ládának nincsenek koordinátái.</string> <string name="cache_clear_history">Előzmények törlése</string> @@ -762,8 +759,6 @@ <string name="license_dismiss">Elutasítás</string> <!-- helpers --> - <string name="helper_manual_title">Kézikönyv</string> - <string name="helper_manual_description">Részletes kézikönyv a c:geo-hoz amiben az összes lehetőség leírása szerepel. (még a rejtettek is).</string> <string name="helper_calendar_title">c:geo naptár add-on</string> <string name="helper_calendar_missing">c:geo naptár add-on nincs telepítve.</string> <string name="helper_calendar_description">Lehetővé teszi a geoládák exportálását az eszközöd naptárába.</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index af45b6f3..b3af349 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -85,6 +85,7 @@ <string name="log_tb_changeall">Cambia tutto</string> <string name="log_save">Salva</string> <string name="log_saving">Invio log…</string> + <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> @@ -118,6 +119,21 @@ <string name="log_today">Oggi</string> <string name="log_yesterday">Ieri</string> <string name="log_smilies">Smile</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> + <string name="log_image_description">Descrizione</string> + <string name="log_image_scale">Ridimensiona</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> <!-- translation --> <string name="translate_to_sys_lang">Traduci in %s</string> @@ -167,6 +183,8 @@ <string name="err_missing_device_name">Per cortesia inserire il nome del dispositivo prima di registrarsi.</string> <string name="err_favorite_failed">Errore nella modifica dello stato preferiti.</string> + <string name="err_select_logimage_failed">La selezione dell\'immagine per il log è fallita.</string> + <string name="err_acquire_image_failed">Acquisizione immagine fallita.</string> <string name="err_tb_display">c:geo non riesce a visualizzare il trackable che vuoi. È veramente un trackable?</string> <string name="err_tb_details_open">c:geo non riesce ad aprire i dettagli del trackable.</string> @@ -189,6 +207,7 @@ <string name="err_log_load_data_still">c:geo sta ancora caricando i dati necessari per salvare il log. Per cortesia attendere ancora un pochino.</string> <string name="err_log_failed_server">c:geo non è riuscito ad inviare il log perché il server non risponde.</string> <string name="err_log_post_failed">Sembra che il log non sia stato inviato. Prego verificare su Geocaching.com.</string> + <string name="err_logimage_post_failed">Sembra la l\'immagine non sia stata caricata. Si prega di controllare su Geocaching.com.</string> <string name="err_search_address_forgot">c:geo ha dimenticato l\'indirizzo che vuoi trovare.</string> <string name="err_parse_lat">c:geo non riesce ad interpretare la latitudine.</string> @@ -218,6 +237,8 @@ <string name="info_log_saved">c:geo ha salvato il log.</string> <string name="info_log_cleared">Il log è stato azzerato.</string> <string name="info_log_type_changed">Il tipo di log è cambiato!</string> + <string name="info_select_logimage_cancelled">Selezione o cattura immagine annnulata.</string> + <string name="info_stored_image">Nuova immagine salvata su:</string> <string name="info_storing_static_maps">Tento di salvare la static map</string> @@ -293,7 +314,7 @@ <string name="caches_refresh_selected">Aggiorna i cache selezionati</string> <string name="caches_refresh_all">Aggiorna tutti</string> <string name="caches_move_selected">Muovi i cache selezionati</string> - <string name="caches_move_all">Muovi tutte</string> + <string name="caches_move_all">Muovi tutti</string> <string name="caches_map_locus">Locus</string> <string name="caches_map_locus_export">Esporta in Locus</string> <string name="caches_recaptcha_title">reCAPTCHA</string> @@ -307,7 +328,10 @@ <string name="caches_filter_track">Con oggetti trackables</string> <string name="caches_filter_clear">Rimuovi filtri</string> <string name="caches_filter_modified">Con coordinate modificate</string> + <string name="caches_filter_origin">Origine</string> <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> <!-- caches lists --> <string name="list_menu">Lista</string> @@ -340,6 +364,7 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> + <string name="init_gc_activate">Attiva Geocaching.com su mappa live e nelle ricerche</string> <string name="init_oc">opencaching.de</string> <string name="init_oc_activate">Attiva opencaching.de su mappa live e nelle ricerche</string> <string name="init_oc_username_description">Inserisci il tuo utente opencaching.de per marcare i tuoi ritrovamenti.</string> @@ -386,7 +411,8 @@ <string name="init_offline_wp">Salva i waypoints delle mappe per uso offline</string> <string name="init_save_log_img">Salva immagini contenute nei log</string> <string name="init_units">Usa miglia/piedi</string> - <string name="init_log_offline">Quando salvi log, fallo sempre offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string> + <string name="init_log_offline">Attiva log offline (non visualizzerà lo schermo di log online, non invierà subito il log)</string> + <string name="init_choose_list">Chiedi la lista quando salvi un cache</string> <string name="init_livelist">Visualizza in che direzione sono i cache, nelle liste</string> <string name="init_altitude">Correzione di altitudine</string> <string name="init_altitude_description">Se il GPS restituisce un\'errata altitudine, puoi correggerla inserendo un valore positivo o negativo, in metri.</string> @@ -437,6 +463,12 @@ <string name="init_plain_logs">Visualizza i LOG senza colori</string> <string name="init_use_native_ua">Identifica come browser Android. Risolve alcuni problemi di login con alcuni provider di rete.</string> <string name="init_rendertheme_folder">Cartella per i temi mappa personali off-line</string> + <!-- map sources --> + <string name="map_source_google_map">Google: Map</string> + <string name="map_source_google_satellite">Google: Satellite</string> + <string name="map_source_osm_mapnik">OSM: Mapnik</string> + <string name="map_source_osm_cyclemap">OSM: Cyclemap</string> + <string name="map_source_osm_offline">OSM: Offline</string> <string name="init_sendToCgeo">Send to c:geo</string> <string name="init_sendToCgeo_name">Nome dispositivo:</string> @@ -484,7 +516,6 @@ <string name="cache_attributes">Attributi</string> <string name="cache_inventory">Oggetti</string> <string name="cache_log_offline">Log Offline</string> - <string name="cache_log_images_loading">Caricamento immagini log…</string> <string name="cache_log_images_title">Immagini Log</string> <string name="cache_log_image_default_title">Foto</string> <string name="cache_personal_note">Note personali</string> @@ -499,6 +530,9 @@ <string name="cache_favpoint_not_on">Questo cache non è uno dei tuoi favoriti.</string> <string name="cache_favpoint_add">Aggiungi</string> <string name="cache_favpoint_remove">Rimuovi</string> + <string name="cache_list_text">Lista:</string> + <string name="cache_list_change">Sposta</string> + <string name="cache_list_unknown">Non in una lista</string> <string name="cache_images">Immagini</string> <string name="cache_waypoints">Waypoints</string> @@ -530,10 +564,10 @@ <string name="cache_dialog_watchlist_add_message">Aggiunto il cache alla watchlist in corso…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Rimozione dei cache dalla tua watchlist…</string> - <string name="cache_dialog_favourite_add_title">Preferiti</string> - <string name="cache_dialog_favourite_add_message">Aggiungi il cache ai tuoi preferiti…</string> - <string name="cache_dialog_favourite_remove_title">Preferiti</string> - <string name="cache_dialog_favourite_remove_message">Rimozione cache dai tuoi preferiti…</string> + <string name="cache_dialog_favorite_add_title">Preferiti</string> + <string name="cache_dialog_favorite_add_message">Aggiungi il cache ai tuoi preferiti…</string> + <string name="cache_dialog_favorite_remove_title">Preferiti</string> + <string name="cache_dialog_favorite_remove_message">Rimozione cache dai tuoi preferiti…</string> <string name="cache_menu_navigate">Naviga</string> <string name="cache_menu_navigation_drive">Naviga (in auto)</string> <string name="cache_menu_navigation_walk">Naviga (a piedi)</string> @@ -575,7 +609,7 @@ <string name="cache_rating">Voto</string> <string name="cache_own_rating">Il tuo voto</string> <string name="cache_rating_of">di</string> - <string name="cache_favourite">Popolarità</string> + <string name="cache_favorite">Popolarità</string> <string name="cache_owner">Proprietario</string> <string name="cache_hidden">Nascosto il</string> <string name="cache_event">Data</string> @@ -583,9 +617,7 @@ <string name="cache_coordinates">Coordinate</string> <string name="cache_coordinates_original">Coordinate originali</string> <string name="cache_spoiler_images_title">Immagini spoiler</string> - <string name="cache_spoiler_images_loading">Caricamento immagini spoiler…</string> <string name="cache_images_title">Immaginis</string> - <string name="cache_images_loading">Caricamento immagini…</string> <string name="cache_log_types">Tipi di Log</string> <string name="cache_coordinates_no">Questo cache non ha coordinate.</string> <string name="cache_clear_history">Cancella cronologia</string> @@ -656,6 +688,7 @@ <string name="waypoint_edit_title">Modifica waypoint</string> <string name="waypoint_add_title">Aggiungi waypoint</string> <string name="waypoint_note">Note</string> + <string name="waypoint_visited">Visitato</string> <string name="waypoint_save">Salva</string> <string name="waypoint_loading">Caricamento waypoint…</string> <string name="waypoint_do_not_touch_cache_coordinates">Nessuna modifica alle coordinate cache</string> @@ -783,8 +816,6 @@ <string name="license_dismiss">Chiudi</string> <!-- helpers --> - <string name="helper_manual_title">Manual</string> - <string name="helper_manual_description">Manuale dettagliato di c:geo che contiene la descrizione di tutte le possibilità offerte da questa applicazione, comprese quelle nascoste (in inglese).</string> <string name="helper_calendar_title">c:geo calendario add-on</string> <string name="helper_calendar_missing">c:geo calendario add-on non installato</string> <string name="helper_calendar_description">Permette di esportare gli eventi cache nel calendario del tuo dispositivo.</string> @@ -816,10 +847,7 @@ <string name="export_gpx_info">Il file GPX sarà esportato in %1$s con data ed ora correnti come nome file.</string> <string name="export_gpx_to">Invia il GPX esportato a</string> -<!-- attribute unknown --> - <string name="attribute_unknown_yes">(attributo sconosciuto) permesso</string> - <string name="attribute_unknown_no">(attributo sconosciuto) non permesso</string> - <!-- attributes (permissions -> allowed, not allowed) --> + <!-- GC attributes --> <string name="attribute_dogs_yes">Cani permessi</string> <string name="attribute_dogs_no">Cani NON permessi</string> <string name="attribute_bicycles_yes">Biciclette permesse</string> @@ -838,8 +866,6 @@ <string name="attribute_campfires_no">Fuochi da campo NON permessi</string> <string name="attribute_rv_yes">Camper/roulotte permessi</string> <string name="attribute_rv_no">Camper/roulotte NON permessi</string> - - <!-- attributes (conditions -> yes, no) --> <string name="attribute_kids_yes">Raccomandato per bambini</string> <string name="attribute_kids_no">Non raccomandato per bambini</string> <string name="attribute_onehour_yes">Richiede meno di un\'ora</string> @@ -892,8 +918,6 @@ <string name="attribute_landf_no">Non è un tour \"Lost and found\"</string> <string name="attribute_partnership_yes">Cache di gruppo</string> <string name="attribute_partnership_no">Cache non di gruppo</string> - - <!-- attributes (equipment -> required, not required) --> <string name="attribute_fee_yes">Accesso o parcheggio a pagamento</string> <string name="attribute_fee_no">Accesso o parcheggio non a pagamento</string> <string name="attribute_rappelling_yes">Richiesta attrezzatura da arrampicata</string> @@ -916,8 +940,6 @@ <string name="attribute_wirelessbeacon_no">Segnalatore radio non necessario</string> <string name="attribute_treeclimbing_yes">Richiede di salire su un albero</string> <string name="attribute_treeclimbing_no">Non richiede di salire su un albero</string> - - <!-- attributes (hazards -> present, not present) --> <string name="attribute_poisonoak_yes">Piante velenose</string> <string name="attribute_poisonoak_no">Piante non velenose</string> <string name="attribute_dangerousanimals_yes">Animali pericolosi</string> @@ -934,8 +956,6 @@ <string name="attribute_danger_no">Area non pericolosa</string> <string name="attribute_thorn_yes">Rovi</string> <string name="attribute_thorn_no">Senza rovi</string> - - <!-- attributes (facilities -> yes, no) --> <string name="attribute_wheelchair_yes">Accessibile con sedia a rotelle</string> <string name="attribute_wheelchair_no">Non accessibile con sedia a rotelle</string> <string name="attribute_parking_yes">Parcheggio</string> @@ -958,6 +978,67 @@ <string name="attribute_fuel_no">Lontano da pompa carburante</string> <string name="attribute_food_yes">Vicino a punto ristoro</string> <string name="attribute_food_no">Lontano da punti ristoro</string> + + <string name="attribute_oc_only_yes">Loggabile solo su Opencaching</string> + <string name="attribute_oc_only_no">Loggabile non solo su Opencaching</string> + <string name="attribute_link_only_yes">Hyperlink solo verso un altro portale di cache</string> + <string name="attribute_link_only_no">Non solo hyperlink ad un altro portale di cache</string> + <string name="attribute_letterbox_yes">Lettera (richiede francobollo)</string> + <string name="attribute_letterbox_no">No lettera (non richiede francobollo)</string> + <string name="attribute_railway_yes">Ferrovia attiva nelle vicinanze</string> + <string name="attribute_railway_no">Nessuna ferrovia nelle vicinanze</string> + <string name="attribute_syringe_yes">Pronto soccorso disponibile</string> + <string name="attribute_syringe_no">Pronto soccorso non disponibile</string> + <string name="attribute_swamp_yes">Paludoso</string> + <string name="attribute_swamp_no">Non paludoso</string> + <string name="attribute_hills_yes">Area collinare</string> + <string name="attribute_hills_no">Area non collinare</string> + <string name="attribute_easy_climbing_yes">Facile scalata</string> + <string name="attribute_easy_climbing_no">Nessuna facile scalata</string> + <string name="attribute_poi_yes">Punto di interesse</string> + <string name="attribute_poi_no">Nessun punto di interesse</string> + <string name="attribute_moving_target_yes">Obiettivo in movimento</string> + <string name="attribute_moving_target_no">Obiettivo non in movimento</string> + <string name="attribute_webcam_yes">Webcam</string> + <string name="attribute_webcam_no">No webcam</string> + <string name="attribute_inside_yes">Con aree interne (cave, edifici etc.)</string> + <string name="attribute_inside_no">Senza aree interne</string> + <string name="attribute_in_water_yes">In acqua</string> + <string name="attribute_in_water_no">Non in acqua</string> + <string name="attribute_no_gps_yes">Senza GPS (lettere, cistes, carta e bussola…)</string> + <string name="attribute_no_gps_no">Con GPS</string> + <string name="attribute_overnight_yes">Necessario permanere di notte</string> + <string name="attribute_overnight_no">Permanenza notturna non necessaria</string> + <string name="attribute_specific_times_yes">Disponibile solo in certi orari</string> + <string name="attribute_specific_times_no">Disponibile a tutte le ore</string> + <string name="attribute_day_yes">Solo di giorno</string> + <string name="attribute_day_no">Non solo di giorno</string> + <string name="attribute_tide_yes">Marea</string> + <string name="attribute_tide_no">Senza marea</string> + <string name="attribute_all_seasons_yes">Tutte le stagioni</string> + <string name="attribute_all_seasons_no">Non in tutte le stagioni</string> + <string name="attribute_breeding_yes">Stagione di riproduzione / natura protetta</string> + <string name="attribute_breeding_no">Disponibile anche in stagione di riproduzione / natura protetta</string> + <string name="attribute_snow_proof_yes">Nascondiglio a prova di neve</string> + <string name="attribute_snow_proof_no">Nascondiglio non a prova di neve</string> + <string name="attribute_compass_yes">Bussola</string> + <string name="attribute_compass_no">Senza bussola</string> + <string name="attribute_cave_yes">Equipaggiamento da caverna</string> + <string name="attribute_cave_no">Senza equipaggiamento da caverna</string> + <string name="attribute_aircraft_yes">Aircraft</string> + <string name="attribute_aircraft_no">Senza aircraft</string> + <string name="attribute_investigation_yes">Investigazione</string> + <string name="attribute_investigation_no">Senza investigazione</string> + <string name="attribute_puzzle_yes">Puzzle / Mystery</string> + <string name="attribute_puzzle_no">No puzzle / mystery</string> + <string name="attribute_arithmetic_yes">Problema aritmetico</string> + <string name="attribute_arithmetic_no">Problema non aritmetico</string> + <string name="attribute_other_cache_yes">Cache di altro tipo</string> + <string name="attribute_other_cache_no">Cache non di altro tipo</string> + <string name="attribute_ask_owner_yes">Chiedere al proprietario per le condizioni di partenza</string> + <string name="attribute_ask_owner_no">Non chiedere al proprietario per le condizioni di partenza</string> + <string name="attribute_unknown_yes">Attributo sconosciuto</string> + <string name="attribute_unknown_no">Senza attributo sconosciuto</string> <!-- next things --> <string name="legal_note">Per usare i servizi di Geocaching.com, si applicano i termini e le condizioni del <a href="http://www.geocaching.com/about/termsofuse.aspx">Contratto Groundspeak</a> che deve essere approvato dall\'utente.</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 9c5636c..42f16be 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -494,7 +494,6 @@ <string name="cache_attributes">属性</string> <string name="cache_inventory">目録</string> <string name="cache_log_offline">オフラインログ</string> - <string name="cache_log_images_loading">添付画像をロード中…</string> <string name="cache_log_images_title">ログの添付画像</string> <string name="cache_log_image_default_title">写真</string> <string name="cache_personal_note">パーソナルノート</string> @@ -541,10 +540,10 @@ <string name="cache_dialog_watchlist_add_message">ウォッチリストに追加中…</string> <string name="cache_dialog_watchlist_remove_title">ウォッチリスト</string> <string name="cache_dialog_watchlist_remove_message">ウォッチリストから削除中…</string> - <string name="cache_dialog_favourite_add_title">お気に入り</string> - <string name="cache_dialog_favourite_add_message">お気に入りに追加中…</string> - <string name="cache_dialog_favourite_remove_title">お気に入り</string> - <string name="cache_dialog_favourite_remove_message">お気に入りから削除中…</string> + <string name="cache_dialog_favorite_add_title">お気に入り</string> + <string name="cache_dialog_favorite_add_message">お気に入りに追加中…</string> + <string name="cache_dialog_favorite_remove_title">お気に入り</string> + <string name="cache_dialog_favorite_remove_message">お気に入りから削除中…</string> <string name="cache_menu_navigate">ナビゲーション</string> <string name="cache_menu_navigation_drive">ナビゲーション(自動車)</string> <string name="cache_menu_navigation_walk">ナビゲーション(徒歩)</string> @@ -587,7 +586,7 @@ <string name="cache_rating">評価</string> <string name="cache_own_rating">Own Rating</string> <string name="cache_rating_of">/</string> - <string name="cache_favourite">お気に入り</string> + <string name="cache_favorite">お気に入り</string> <string name="cache_owner">所有者</string> <string name="cache_hidden">隠した日</string> <string name="cache_event">イベント日付</string> @@ -595,9 +594,7 @@ <string name="cache_coordinates">座標</string> <string name="cache_coordinates_original">オリジナル座標</string> <!-- 「初公開時の座標」の方がいいかも --> <string name="cache_spoiler_images_title">スポイラー画像</string> - <string name="cache_spoiler_images_loading">スポイラー画像をロード中…</string> <string name="cache_images_title">画像</string> - <string name="cache_images_loading">画像をロード中…</string> <string name="cache_log_types">ログタイプ</string> <string name="cache_coordinates_no">このキャッシュに座標値はありません。</string> <string name="cache_clear_history">全履歴を削除</string> @@ -796,8 +793,6 @@ <string name="license_dismiss">閉じる</string> <!-- helpers --> - <string name="helper_manual_title">マニュアル</string> - <string name="helper_manual_description">c:geoのマニュアル(英語)はこのアプリでできる事(隠れ機能も)の全てについて書いてあります。</string> <string name="helper_calendar_title">c:geo - カレンダープラグイン</string> <string name="helper_calendar_missing">c:geo - カレンダープラグインはインストールされていません。</string> <string name="helper_calendar_description">イベントキャッシュをカレンダーアプリに登録することができます。</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 9453601..f4dbd10 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -497,7 +497,6 @@ <string name="cache_attributes">Attributen</string> <string name="cache_inventory">Inventaris</string> <string name="cache_log_offline">Offline log</string> - <string name="cache_log_images_loading">Laden van logafbeeldingen…</string> <string name="cache_log_images_title">Logafbeelding</string> <string name="cache_log_image_default_title">Foto</string> <string name="cache_personal_note">Persoonlijke aantekening</string> @@ -547,10 +546,10 @@ <string name="cache_dialog_watchlist_add_message">Voeg cache toe aan watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Verwijder cache van watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favoriet</string> - <string name="cache_dialog_favourite_add_message">Voeg cache toe aan favorieten…</string> - <string name="cache_dialog_favourite_remove_title">Favoriet</string> - <string name="cache_dialog_favourite_remove_message">Verwijder cache van je favorieten…</string> + <string name="cache_dialog_favorite_add_title">Favoriet</string> + <string name="cache_dialog_favorite_add_message">Voeg cache toe aan favorieten…</string> + <string name="cache_dialog_favorite_remove_title">Favoriet</string> + <string name="cache_dialog_favorite_remove_message">Verwijder cache van je favorieten…</string> <string name="cache_menu_navigate">Navigeer</string> <string name="cache_menu_navigation_drive">Navigeer (rijden)</string> <string name="cache_menu_navigation_walk">Navigeer (lopen)</string> @@ -592,7 +591,7 @@ <string name="cache_rating">Waardering</string> <string name="cache_own_rating">Eigen waardering</string> <string name="cache_rating_of">van</string> - <string name="cache_favourite">Favoriet</string> + <string name="cache_favorite">Favoriet</string> <string name="cache_owner">Eigenaar</string> <string name="cache_hidden">Verstopt</string> <string name="cache_event">Datum</string> @@ -600,9 +599,7 @@ <string name="cache_coordinates">Coördinaten</string> <string name="cache_coordinates_original">Originele coordinaten</string> <string name="cache_spoiler_images_title">Spoiler afbeeldingen</string> - <string name="cache_spoiler_images_loading">Spoiler afbeeldingen laden…</string> <string name="cache_images_title">Afbeeldingen</string> - <string name="cache_images_loading">Afbeeldingen laden…</string> <string name="cache_log_types">Log types</string> <string name="cache_coordinates_no">Deze cache heeft geen coördinaten.</string> <string name="cache_clear_history">Maak geschiedenis leeg</string> @@ -804,8 +801,6 @@ <string name="license_dismiss">Afwijzen</string> <!-- helpers --> - <string name="helper_manual_title">Handleiding</string> - <string name="helper_manual_description">Uitgebreide handleiding voor c:geo welke alle mogelijkheden van deze applicatie uitlegt (ook de verborgen mogelijkheden).</string> <string name="helper_calendar_title">c:geo kalender add-on</string> <string name="helper_calendar_missing">c:geo kalender add-on niet geinstalleerd.</string> <string name="helper_calendar_description">Maakt het mogelijk om Geocaching events in je kalender op te slaan.</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 49e8c6b..1c460a1 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -511,7 +511,6 @@ <string name="cache_attributes">Atrybuty</string> <string name="cache_inventory">Inwentarz</string> <string name="cache_log_offline">Wpis offline</string> - <string name="cache_log_images_loading">Trwa ładowanie zdjęć z wpisu…</string> <string name="cache_log_images_title">Zdjęcie z wpisu</string> <string name="cache_log_image_default_title">Zdjęcie</string> <string name="cache_personal_note">Notatka osobista</string> @@ -562,10 +561,10 @@ <string name="cache_dialog_watchlist_add_message">Dodaję skrzynkę do listy obserwowanych…</string> <string name="cache_dialog_watchlist_remove_title">Lista obserwowanych</string> <string name="cache_dialog_watchlist_remove_message">Usuwam skrzynkę z listy obserwowanych…</string> - <string name="cache_dialog_favourite_add_title">Ulubione</string> - <string name="cache_dialog_favourite_add_message">Dodaję skrzynkę do listy ulubionych…</string> - <string name="cache_dialog_favourite_remove_title">Ulubione</string> - <string name="cache_dialog_favourite_remove_message">Usuwam skrzynkę z listy ulubionych…</string> + <string name="cache_dialog_favorite_add_title">Ulubione</string> + <string name="cache_dialog_favorite_add_message">Dodaję skrzynkę do listy ulubionych…</string> + <string name="cache_dialog_favorite_remove_title">Ulubione</string> + <string name="cache_dialog_favorite_remove_message">Usuwam skrzynkę z listy ulubionych…</string> <string name="cache_menu_navigate">Nawiguj</string> <string name="cache_menu_navigation_drive">Nawigacja (jazda)</string> <string name="cache_menu_navigation_walk">Nawigacja (pieszo)</string> @@ -607,7 +606,7 @@ <string name="cache_rating">Ocena</string> <string name="cache_own_rating">Własna ocena</string> <string name="cache_rating_of">od</string> - <string name="cache_favourite">Ulubiona</string> + <string name="cache_favorite">Ulubiona</string> <string name="cache_owner">Właściciel</string> <string name="cache_hidden">Ukryta</string> <string name="cache_event">Data</string> @@ -615,9 +614,7 @@ <string name="cache_coordinates">Współrzędne</string> <string name="cache_coordinates_original">Oryginalne współrzędne</string> <string name="cache_spoiler_images_title">Zdjęcia spoiler</string> - <string name="cache_spoiler_images_loading">Ładuję zdjęcia spoiler…</string> <string name="cache_images_title">Zdjęcia</string> - <string name="cache_images_loading">Ładuję zdjęcia…</string> <string name="cache_log_types">Rodzaj wpisu</string> <string name="cache_coordinates_no">Ta skrzynka nie ma współrzędnych GPS.</string> <string name="cache_clear_history">Usuń historię</string> @@ -818,8 +815,6 @@ <string name="license_dismiss">Odmów</string> <!-- helpers --> - <string name="helper_manual_title">Instrukcja obsługi</string> - <string name="helper_manual_description">Obszerny przewodnik do c:geo wraz z opisem wszystkich możliwości tego programu (także ukrytych).</string> <string name="helper_calendar_title">Dodatek Kalendarz c:geo</string> <string name="helper_calendar_missing">Dodatek Kalendarz c:geo nie jest zainstalowany.</string> <string name="helper_calendar_description">Umożliwia Tobie eksport skrzynek Wydarzenie do kalendarza w Twoim urządzeniu.</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 5f67281..5916133 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -484,7 +484,6 @@ <string name="cache_attributes">Atributos</string> <string name="cache_inventory">Inventário</string> <string name="cache_log_offline">Registo Offline</string> - <string name="cache_log_images_loading">A carregar imagem do registo…</string> <string name="cache_log_images_title">Imagem do registo</string> <string name="cache_log_image_default_title">Foto</string> <string name="cache_personal_note">Nota pessoal</string> @@ -572,7 +571,7 @@ <string name="cache_rating">Pontuação</string> <string name="cache_own_rating">A minha pontuação</string> <string name="cache_rating_of">de</string> - <string name="cache_favourite">Favorita</string> + <string name="cache_favorite">Favorita</string> <string name="cache_owner">Dono</string> <string name="cache_hidden">Escondida</string> <string name="cache_event">Data</string> @@ -580,9 +579,7 @@ <string name="cache_coordinates">Coordenadas</string> <string name="cache_coordinates_original">Coordenadas originais</string> <string name="cache_spoiler_images_title">Imagens spoiler</string> - <string name="cache_spoiler_images_loading">A carregar imagens spoiler…</string> <string name="cache_images_title">Imagens</string> - <string name="cache_images_loading">A carregar as imagens…</string> <string name="cache_log_types">Tipos de log</string> <string name="cache_coordinates_no">Esta cache não tem coordenadas.</string> <string name="cache_clear_history">Apagar histórico</string> @@ -766,8 +763,6 @@ <string name="license_dismiss">Dispensar</string> <!-- helpers --> - <string name="helper_manual_title">Manual</string> - <string name="helper_manual_description">Manual prático do c:geo, que contém a descrição de todas as funcionalidades desta aplicação (mesmo as que estão escondidas).</string> <string name="helper_calendar_title">Add on calendário para c:geo </string> <string name="helper_calendar_missing">Add on calendário para o c:geo não está instalado.</string> <string name="helper_calendar_description">Permite exportar caches evento para o calendário do seu dispositivo.</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index d8e2414..af796ba 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -484,7 +484,6 @@ <string name="cache_attributes">Atribúty</string> <string name="cache_inventory">Obsah</string> <string name="cache_log_offline">Offline log</string> - <string name="cache_log_images_loading">Načítanie obrázku z logu…</string> <string name="cache_log_images_title">Obrázok z logu</string> <string name="cache_log_image_default_title">Fotografia</string> <string name="cache_personal_note">Osobná poznámka</string> @@ -571,7 +570,7 @@ <string name="cache_rating">Hodnotenie</string> <string name="cache_own_rating">Vlastné hodnotenie</string> <string name="cache_rating_of">z</string> - <string name="cache_favourite">Obľúbené</string> + <string name="cache_favorite">Obľúbené</string> <string name="cache_owner">Vlastník</string> <string name="cache_hidden">Skrytá</string> <string name="cache_event">Dátum</string> @@ -579,9 +578,7 @@ <string name="cache_coordinates">Súradnice</string> <string name="cache_coordinates_original">Pôvodné súradnice</string> <string name="cache_spoiler_images_title">Spoilerové obrázky</string> - <string name="cache_spoiler_images_loading">Načítanie spoilerových obrázkov…</string> <string name="cache_images_title">Obrázky</string> - <string name="cache_images_loading">Prebieha načítanie obrázkov…</string> <string name="cache_log_types">Typy záznamov</string> <string name="cache_coordinates_no">Táto skrýša nemá žiadne súradnice.</string> <string name="cache_clear_history">Vymazať históriu</string> @@ -767,8 +764,6 @@ <string name="license_dismiss">Zamietnutie</string> <!-- helpers --> - <string name="helper_manual_title">Manuál</string> - <string name="helper_manual_description">Obsiahly manuál pre c:geo, ktorý obsahuje popisy všetkých možností tejto aplikácie (dokonca i skrytých).</string> <string name="helper_calendar_title">Doplnok c:geo calendar</string> <string name="helper_calendar_missing">Doplnok c:geo calendar nie je nainštalovaný</string> <string name="helper_calendar_description">Umožní vám exportovať skrýše udalostí do kalendára na vašom zariadení.</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index d3be9ff..0171288 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -176,7 +176,7 @@ <string name="err_favorite_failed">Misslyckades att ändra favoritstatus.</string> <string name="err_select_logimage_failed">Misslyckades att välja bild till loggen.</string> - <string name="err_aquire_image_failed">Hämtning av bilden misslyckades.</string> + <string name="err_acquire_image_failed">Hämtning av bilden misslyckades.</string> <string name="err_tb_display">Tyvärr kan c:geo inte visa den trackable du önskar. Är den verkligen trackable?</string> <string name="err_tb_details_open">Tyvärr kan c:geo inte öppna detaljer för trackable.</string> <string name="err_tb_forgot_saw">Tyvärr glömde c:geo vilken trackable du såg.</string> @@ -512,7 +512,6 @@ <string name="cache_attributes">Attribut</string> <string name="cache_inventory">Innehåll</string> <string name="cache_log_offline">Offline logg</string> - <string name="cache_log_images_loading">Laddar loggbilder…</string> <string name="cache_log_images_title">Loggbild</string> <string name="cache_log_image_default_title">Foto</string> <string name="cache_personal_note">Personlig anteckning</string> @@ -562,10 +561,10 @@ <string name="cache_dialog_watchlist_add_message">Lägger till cachen till din watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Tar bort cachen från din watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favorit</string> - <string name="cache_dialog_favourite_add_message">Lägger till cachen till dina favoriter…</string> - <string name="cache_dialog_favourite_remove_title">Favorit</string> - <string name="cache_dialog_favourite_remove_message">Tar bort cachen från dina favoriter…</string> + <string name="cache_dialog_favorite_add_title">Favorit</string> + <string name="cache_dialog_favorite_add_message">Lägger till cachen till dina favoriter…</string> + <string name="cache_dialog_favorite_remove_title">Favorit</string> + <string name="cache_dialog_favorite_remove_message">Tar bort cachen från dina favoriter…</string> <string name="cache_menu_navigate">Navigera</string> <string name="cache_menu_navigation_drive">Navigering (med bil)</string> <string name="cache_menu_navigation_walk">Navigering (till fots)</string> @@ -607,7 +606,7 @@ <string name="cache_rating">Betyg</string> <string name="cache_own_rating">Eget betyg</string> <string name="cache_rating_of">av</string> - <string name="cache_favourite">Favorit</string> + <string name="cache_favorite">Favorit</string> <string name="cache_owner">Ägare</string> <string name="cache_hidden">Gömd</string> <string name="cache_event">Datum</string> @@ -615,9 +614,7 @@ <string name="cache_coordinates">Koordinater</string> <string name="cache_coordinates_original">Ursprungliga koordinater</string> <string name="cache_spoiler_images_title">Spoiler bilder</string> - <string name="cache_spoiler_images_loading">Laddar spoiler bilder…</string> <string name="cache_images_title">Bilder</string> - <string name="cache_images_loading">Laddar bilder…</string> <string name="cache_log_types">Loggtyper</string> <string name="cache_coordinates_no">Cachen saknar koordinater.</string> <string name="cache_clear_history">Rensa historik</string> @@ -819,8 +816,6 @@ <string name="license_dismiss">Avbryt</string> <!-- helpers --> - <string name="helper_manual_title">Manual</string> - <string name="helper_manual_description">En utförlig manual för c:geo som beskriver alla möjligheter och ger en hel del tips. Manualen finns enbart på engelska.</string> <string name="helper_calendar_title">c:geo kalendertillägg</string> <string name="helper_calendar_missing">c:geo kalendertillägg är inte installerat</string> <string name="helper_calendar_description">Gör det möjligt att exportera event till din kalender.</string> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 558c353..092d307 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -22,10 +22,10 @@ <attr name="button" format="integer" /> <attr name="input" format="integer" /> <attr name="inventory" format="integer" /> - <attr name="favourite" format="integer" /> - <attr name="favourite_r" format="integer" /> - <attr name="favourite_o" format="integer" /> - <attr name="favourite_g" format="integer" /> + <attr name="favorite" format="integer" /> + <attr name="favorite_r" format="integer" /> + <attr name="favorite_o" format="integer" /> + <attr name="favorite_g" format="integer" /> <attr name="close" format="integer" /> <attr name="log_img_icon" format="integer" /> <attr name="actionbar_compass" format="integer" /> diff --git a/main/res/values/ids.xml b/main/res/values/ids.xml deleted file mode 100644 index cfb09cd..0000000 --- a/main/res/values/ids.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources> - <item type="id" name="actionbar_title" /> - <item type="id" name="actionbar_progress" /> -</resources> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 5f56ebb..b537b74 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -126,6 +126,14 @@ <string name="log_image_camera">New</string> <string name="log_image_caption">Caption</string> <string name="log_image_description">Description</string> + <string name="log_image_scale">Scaling</string> + <string-array name="log_image_scales"> + <item>No scaling</item> + <item>512 px</item> + <item>640 px</item> + <item>800 px</item> + <item>1024 px</item> + </string-array> <!-- translation --> <string name="translate_to_sys_lang">Translate to %s</string> @@ -175,7 +183,7 @@ <string name="err_missing_device_name">Please enter a device name before registering.</string> <string name="err_favorite_failed">Changing favorite status failed.</string> <string name="err_select_logimage_failed">Selecting an image for the log failed.</string> - <string name="err_aquire_image_failed">Acquiring an image failed.</string> + <string name="err_acquire_image_failed">Acquiring an image failed.</string> <string name="err_tb_display">c:geo can\'t display trackable you want. Is it really a trackable?</string> <string name="err_tb_details_open">c:geo can\'t open trackable details.</string> @@ -512,7 +520,6 @@ <string name="cache_attributes">Attributes</string> <string name="cache_inventory">Inventory</string> <string name="cache_log_offline">Offline Log</string> - <string name="cache_log_images_loading">Loading Log images…</string> <string name="cache_log_images_title">Log images</string> <string name="cache_log_image_default_title">Photo</string> <string name="cache_personal_note">Personal note</string> @@ -562,10 +569,10 @@ <string name="cache_dialog_watchlist_add_message">Adding cache to your watchlist…</string> <string name="cache_dialog_watchlist_remove_title">Watchlist</string> <string name="cache_dialog_watchlist_remove_message">Removing cache from your watchlist…</string> - <string name="cache_dialog_favourite_add_title">Favourite</string> - <string name="cache_dialog_favourite_add_message">Adding cache to your favourites…</string> - <string name="cache_dialog_favourite_remove_title">Favourite</string> - <string name="cache_dialog_favourite_remove_message">Removing cache from your favourites…</string> + <string name="cache_dialog_favorite_add_title">Favorite</string> + <string name="cache_dialog_favorite_add_message">Adding cache to your favorites…</string> + <string name="cache_dialog_favorite_remove_title">Favorite</string> + <string name="cache_dialog_favorite_remove_message">Removing cache from your favorites…</string> <string name="cache_menu_navigate">Navigate</string> <string name="cache_menu_navigation_drive">Navigation (Driving)</string> <string name="cache_menu_navigation_walk">Navigation (Walking)</string> @@ -597,6 +604,8 @@ <string name="cache_status_disabled">Disabled</string> <string name="cache_status_premium">Premium Members only</string> <string name="cache_status_not_premium">All Members Access</string> + <string name="cache_status_stored">Stored</string> + <string name="cache_status_not_stored">Not stored</string> <string name="cache_geocode">Geo code</string> <string name="cache_name">Name</string> <string name="cache_type">Type</string> @@ -607,7 +616,7 @@ <string name="cache_rating">Rating</string> <string name="cache_own_rating">Own Rating</string> <string name="cache_rating_of">of</string> - <string name="cache_favourite">Favorite</string> + <string name="cache_favorite">Favorite</string> <string name="cache_owner">Owner</string> <string name="cache_hidden">Hidden</string> <string name="cache_event">Date</string> @@ -615,9 +624,7 @@ <string name="cache_coordinates">Coordinates</string> <string name="cache_coordinates_original">Original Coordinates</string> <string name="cache_spoiler_images_title">Spoiler images</string> - <string name="cache_spoiler_images_loading">Loading spoiler images…</string> <string name="cache_images_title">Images</string> - <string name="cache_images_loading">Loading images…</string> <string name="cache_log_types">Log types</string> <string name="cache_coordinates_no">This cache has no coordinates.</string> <string name="cache_clear_history">Clear history</string> @@ -820,8 +827,6 @@ <string name="license_dismiss">Dismiss</string> <!-- helpers --> - <string name="helper_manual_title">Manual</string> - <string name="helper_manual_description">Comprehensive manual for c:geo that contains description of all possibilities of this application (even hidden ones).</string> <string name="helper_calendar_title">c:geo calendar add-on</string> <string name="helper_calendar_missing">c:geo calendar add-on not installed.</string> <string name="helper_calendar_description">Enables you to export event caches into the calendar on your device.</string> @@ -998,6 +1003,8 @@ <string name="attribute_swamp_no">No swamp or marsh</string> <string name="attribute_hills_yes">Hilly area</string> <string name="attribute_hills_no">No hilly area</string> + <string name="attribute_easy_climbing_yes">Lightweight climbing</string> + <string name="attribute_easy_climbing_no">No lightweight climbing</string> <string name="attribute_poi_yes">Point of interest</string> <string name="attribute_poi_no">No point of interest</string> <string name="attribute_moving_target_yes">Moving target</string> diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index 755385f..7fde7a0 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="waypoint_coordinate_formats" translatable="false">
<item>@string/waypoint_coordinate_formats_plain</item>
@@ -28,6 +28,15 @@ <string name="init_select_gpx_exportdir" translatable="false">…</string>
<string name="init_select_gpx_importdir" translatable="false">…</string>
+ <!-- upload image scaling -->
+ <integer-array name="log_image_scale_values">
+ <item>-1</item>
+ <item>512</item>
+ <item>640</item>
+ <item>800</item>
+ <item>1024</item>
+ </integer-array>
+
<!-- contributors -->
<string name="contributors" translatable="false">\n
· <a href="http://carnero.cc/">carnero</a> as the father of c:geo\n
@@ -87,40 +96,26 @@ <!-- changelog -->
<string name="changelog" translatable="false">\n
- <b>2013.04.03</b>\n\n
+ <b>Next release</b>\n\n
<b>New Features/Functions:</b>\n
- · Support of attaching pictures to logs\n
- · Support of opencaching.de online API in live map and nearby search\n
- · Support for searching opencaching.nl caches\n
- · Alphabetical sorting of OSM:Offline maps in map selection\n
- · Color markers also in trackable logbook\n
- · Edit cache type filter by clicking on filter bar\n
- · Inverse sorting of cache lists (hit the same menu again)\n
- · View pager for trackable activity\n
- · Menu item to delete past events\n
- · Settings: Option to ask for list to store caches\n
- · Change list in cache details\n
- · Ability to select \"All\" list from main screen\n
- · Default log type for event caches will be \"Attended\" if \"Will attend\" was logged before\n
- · Improved and extended cache type detection on live map\n
- · Waypoints can be marked as visited\n
- · Possibility to delete offline logs in lists\n
- · Support of language specific characters in log text equally to the website\n
+ · Log images can be scaled before upload to save traffic
+ · Improved online detection when refreshing caches\n
\n
<b>Bugfixing:</b>\n
- · Final flag icon lost when updating cache with self defined final\n
- · Bad selection in directory chooser\n
- · Log type \"Retract Listing\" now parsed correctly\n
- · Active cache detail page now remembered when rotating device\n
- · Replaced the term \"GC-Code\" by \"Geocode\"\n
- · Improvements for light theme\n
- · Share function uses short URL again\n
- · Offline log marker now shown after autosave of log\n
- · GPX export no longer exports waypoints without coordinates\n
- · Corrections for light scheme on Adnroid 2.x devices\n
- · Avoid crash if logging page is opened while not connected correctly\n
- \n
- <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=9&state=closed">Detailed list of all changes</a>\n
+ · Do not apply encryption/decryption when clicking on a link in a log\n
+ · Also show a picture attached to a log locally after sending the log\n
+ · Improved display of log text for OC-caches\n
+ · Improved performance of GPX exports\n
+ · GPX import option now also shown on all caches list\n
+ · OC.de attributes correction\n
+ · Reduce memory usage for images to avoid crashes\n
+ · Do not show short description if it is contained in long description for OC.de caches\n
+ · Do not allow setting the GPX dir to a not accessible directory\n
+ · Failure in waypoint projection for some languages corrected\n
+ · Avoid crashes when selecting images for logs\n
+ · Ignore hide setting when searching for owned caches\n
+ \n
+ <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=17&state=closed">Detailed list of all changes</a>\n
\n
<b>Known Limitations/Bugs:</b>\n
· Live map:\n
@@ -130,7 +125,6 @@ On low zoom owned/found caches may not be hidden anymore\n
· Other:\n
Log images with huge size cause a long loading time\n
- After uploading log images they are only shown in the logview after refreshing the cache\n
The personal note added to a cache is not synced to geocaching.com but will be overruled by personal notes on geocaching.com\n
On devices with HD display resolution OSM maps might not work. Please use Google maps in this case.\n
A huge amount of pictures on the image tab of a cache might cause a crash\n
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index caa884a..0116577 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -81,7 +81,6 @@ </style> <style name="action_bar_progress" parent="@android:style/Widget.ProgressBar.Small"> - <item name="android:id">@id/actionbar_progress</item> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginLeft">15dip</item> @@ -90,7 +89,6 @@ </style> <style name="action_bar_title"> - <item name="android:id">@id/actionbar_title</item> <item name="android:layout_width">0dip</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_weight">1</item> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index fdc2eeb..655d9e1 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -36,10 +36,10 @@ <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="favourite">@drawable/favourite_background_dark</item> - <item name="favourite_r">@drawable/favourite_background_red_dark</item> - <item name="favourite_o">@drawable/favourite_background_orange_dark</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -67,10 +67,10 @@ <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="favourite">@drawable/favourite_background_light</item> - <item name="favourite_r">@drawable/favourite_background_red_light</item> - <item name="favourite_o">@drawable/favourite_background_orange_light</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -109,10 +109,10 @@ <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="favourite">@drawable/favourite_background_dark</item> - <item name="favourite_r">@drawable/favourite_background_red_dark</item> - <item name="favourite_o">@drawable/favourite_background_orange_dark</item> - <item name="favourite_g">@drawable/favourite_background_green_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> @@ -141,10 +141,10 @@ <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="favourite">@drawable/favourite_background_light</item> - <item name="favourite_r">@drawable/favourite_background_red_light</item> - <item name="favourite_o">@drawable/favourite_background_orange_light</item> - <item name="favourite_g">@drawable/favourite_background_green_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> |
