diff options
Diffstat (limited to 'main/res')
30 files changed, 325 insertions, 587 deletions
diff --git a/main/res/drawable-hdpi/marker_disabled_oc.png b/main/res/drawable-hdpi/marker_disabled_oc.png Binary files differnew file mode 100644 index 0000000..b759bbf --- /dev/null +++ b/main/res/drawable-hdpi/marker_disabled_oc.png diff --git a/main/res/drawable-hdpi/marker_disabled_other.png b/main/res/drawable-hdpi/marker_disabled_other.png Binary files differnew file mode 100644 index 0000000..748c3c6 --- /dev/null +++ b/main/res/drawable-hdpi/marker_disabled_other.png diff --git a/main/res/drawable-hdpi/marker_oc.png b/main/res/drawable-hdpi/marker_oc.png Binary files differnew file mode 100644 index 0000000..96f2987 --- /dev/null +++ b/main/res/drawable-hdpi/marker_oc.png diff --git a/main/res/drawable-hdpi/marker_other.png b/main/res/drawable-hdpi/marker_other.png Binary files differnew file mode 100644 index 0000000..94e170b --- /dev/null +++ b/main/res/drawable-hdpi/marker_other.png diff --git a/main/res/drawable-mdpi/marker_disabled_oc.png b/main/res/drawable-mdpi/marker_disabled_oc.png Binary files differnew file mode 100644 index 0000000..36f2d5b --- /dev/null +++ b/main/res/drawable-mdpi/marker_disabled_oc.png diff --git a/main/res/drawable-mdpi/marker_disabled_other.png b/main/res/drawable-mdpi/marker_disabled_other.png Binary files differnew file mode 100644 index 0000000..52ae651 --- /dev/null +++ b/main/res/drawable-mdpi/marker_disabled_other.png diff --git a/main/res/drawable-mdpi/marker_oc.png b/main/res/drawable-mdpi/marker_oc.png Binary files differnew file mode 100644 index 0000000..03e1fe7 --- /dev/null +++ b/main/res/drawable-mdpi/marker_oc.png diff --git a/main/res/drawable-mdpi/marker_other.png b/main/res/drawable-mdpi/marker_other.png Binary files differnew file mode 100644 index 0000000..2456d82 --- /dev/null +++ b/main/res/drawable-mdpi/marker_other.png diff --git a/main/res/drawable-xhdpi/cgeo.png b/main/res/drawable-xhdpi/cgeo.png Binary files differnew file mode 100644 index 0000000..cea22bc --- /dev/null +++ b/main/res/drawable-xhdpi/cgeo.png diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/edit_waypoint_activity.xml index 03847e3..46134a0 100644 --- a/main/res/layout/edit_waypoint_activity.xml +++ b/main/res/layout/edit_waypoint_activity.xml @@ -90,17 +90,29 @@ android:minLines="5" android:singleLine="false" /> - <CheckBox - android:id="@+id/setAsCacheCoordsCheckBox" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_set_as_cache_coords" /> - - <CheckBox - android:id="@+id/uploadCoordsToWebsiteCheckBox" - android:layout_width="fill_parent" + <RadioGroup + android:id="@+id/modify_cache_coordinates_group" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/waypoint_modify_on_website" /> + android:visibility="gone" > + + <RadioButton + android:id="@+id/modify_cache_coordinates_nothing" + style="@style/radiobutton_wrap" + android:checked="true" + android:text="@string/waypoint_do_not_touch_cache_coordinates" /> + + <RadioButton + android:id="@+id/modify_cache_coordinates_local" + style="@style/radiobutton_wrap" + android:text="@string/waypoint_set_as_cache_coords" /> + + <RadioButton + android:id="@+id/modify_cache_coordinates_local_and_remote" + style="@style/radiobutton_wrap" + android:text="@string/waypoint_save_and_modify_on_website" + android:visibility="gone" /> + </RadioGroup> <Button android:id="@+id/add_waypoint" diff --git a/main/res/layout/fieldnote_export_dialog.xml b/main/res/layout/fieldnote_export_dialog.xml index a83fc67..ca0b01d 100644 --- a/main/res/layout/fieldnote_export_dialog.xml +++ b/main/res/layout/fieldnote_export_dialog.xml @@ -2,32 +2,30 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?background_color"
android:orientation="vertical"
android:padding="3dip" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="?text_color"
android:text="@string/export_fieldnotes_info" />
<CheckBox
android:id="@+id/upload"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ style="@style/checkbox_full"
android:text="@string/export_fieldnotes_upload" />
<CheckBox
android:id="@+id/onlynew"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ style="@style/checkbox_full"
android:enabled="false"
android:text="@string/export_fieldnotes_onlynew" />
<Button
android:id="@+id/export"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_margin="3dip"
+ style="@style/button_full"
android:text="@string/export" />
</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gpx_export_dialog.xml b/main/res/layout/gpx_export_dialog.xml index 7c9345f..a997d6b 100644 --- a/main/res/layout/gpx_export_dialog.xml +++ b/main/res/layout/gpx_export_dialog.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?background_color"
android:orientation="vertical"
android:padding="3dip" >
@@ -9,19 +10,17 @@ android:id="@id/info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="?text_color"
android:text="@string/export_gpx_info" />
<CheckBox
android:id="@+id/share"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ style="@style/checkbox_full"
android:text="@string/init_share_after_export" />
<Button
android:id="@+id/export"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_margin="3dip"
+ style="@style/button_full"
android:text="@string/export" />
</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index fc425ec..28e0a3c 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -60,6 +60,28 @@ <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> <TextView style="@style/separator_horizontal_headline" + android:text="@string/init_oc" /> + </RelativeLayout> + <CheckBox android:id="@+id/oc_option" + style="@style/checkbox_full" + android:text="@string/init_oc_activate" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:layout_marginBottom="5dip" + android:padding="3dip" + android:textSize="14sp" + android:textColor="?text_color" + android:text="@string/init_oc_username_description" /> + <EditText style="@style/edittext_full" + android:id="@+id/oc_username" + android:hint="@string/init_oc_username" /> +<!-- ** --> + <RelativeLayout style="@style/separator_horizontal_layout" > + <View style="@style/separator_horizontal" /> + <TextView style="@style/separator_horizontal_headline" android:text="@string/init_gcvote" /> </RelativeLayout> <EditText style="@style/edittext_full" @@ -88,29 +110,10 @@ <Button style="@style/button_full" android:id="@+id/authorize_twitter" android:text="@string/init_twitter_authorize" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="3dip" - android:orientation="horizontal" - android:padding="3dip" > <CheckBox android:id="@+id/twitter_option" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" + style="@style/checkbox_full" android:text="@string/init_twitter_publish" /> - </LinearLayout> -<!-- ** --> + <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> <TextView style="@style/separator_horizontal_headline" @@ -139,28 +142,9 @@ android:textSize="14dip" android:text="@string/init_signature_help_button" /> </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="3dip" - android:orientation="horizontal" - android:padding="3dip" > - <CheckBox android:id="@+id/sigautoinsert" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_sigautoinsert" /> - </LinearLayout> + <CheckBox android:id="@+id/sigautoinsert" + style="@style/checkbox_full" + android:text="@string/init_sigautoinsert" /> <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> <TextView style="@style/separator_horizontal_headline" @@ -168,167 +152,30 @@ </RelativeLayout> <LinearLayout android:layout_margin="3dip" android:padding="3dip" android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="fill_parent"> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > <CheckBox android:id="@+id/autoload" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_autoload" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_autoload" /> <CheckBox android:id="@+id/ratingwanted" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_ratingwanted" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_ratingwanted" /> <CheckBox android:id="@+id/elevationwanted" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_elevationwanted" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <CheckBox - android:id="@+id/friendlogswanted" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:gravity="center" - android:padding="1px" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:text="@string/init_friendlogswanted" - android:textColor="?text_color" - android:textSize="14dip" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_elevationwanted" /> + <CheckBox android:id="@+id/friendlogswanted" + style="@style/checkbox_full" + android:text="@string/init_friendlogswanted" /> <CheckBox android:id="@+id/openlastdetailspage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_openlastdetailspage" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_openlastdetailspage" /> <CheckBox android:id="@+id/offline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_offline" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_offline" /> <CheckBox android:id="@+id/offline_wp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_offline_wp" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_offline_wp" /> <CheckBox android:id="@+id/save_log_img" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_save_log_img" /> - </LinearLayout> + style="@style/checkbox_full" + android:text="@string/init_save_log_img" /> </LinearLayout> <!-- ** --> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -342,286 +189,48 @@ android:layout_margin="3dip" android:orientation="vertical" android:padding="3dip" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > <CheckBox android:id="@+id/skin" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_skin" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_skin" /> <CheckBox android:id="@+id/address" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_address" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_address" /> <CheckBox android:id="@+id/captcha" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_captcha" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_captcha" /> <CheckBox android:id="@+id/loaddirectionimg" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_loaddirectionimg" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_loaddirectionimg" /> <CheckBox android:id="@+id/useenglish" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_useenglish" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_useenglish" /> <CheckBox android:id="@+id/exclude" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_exclude" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_exclude" /> <CheckBox android:id="@+id/disabled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_disabled" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_disabled" /> <CheckBox android:id="@+id/trackautovisit" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_trackautovisit" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_trackautovisit" /> <CheckBox android:id="@+id/units" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_units" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_units" /> <CheckBox android:id="@+id/livelist" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_livelist" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_livelist" /> <CheckBox android:id="@+id/log_offline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_log_offline" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_log_offline" /> <CheckBox android:id="@+id/trail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_maptrail" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_maptrail" /> <CheckBox android:id="@+id/plain_logs" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_plain_logs" /> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + style="@style/checkbox_full" + android:text="@string/init_plain_logs" /> <CheckBox android:id="@+id/use_native_ua" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_use_native_ua" /> - </LinearLayout> + style="@style/checkbox_full" + android:text="@string/init_use_native_ua" /> </LinearLayout> <!-- ** --> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -980,26 +589,9 @@ android:textColorLink="?text_color_link" android:linksClickable="true" android:text="@string/init_dbonsdcard_note" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > <CheckBox android:id="@+id/dbonsdcard" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_dbonsdcard" /> - </LinearLayout> + style="@style/checkbox_full" + android:text="@string/init_dbonsdcard" /> <!-- ** --> <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> @@ -1020,26 +612,9 @@ android:textColorLink="?text_color_link" android:linksClickable="true" android:text="@string/init_debug_note" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > <CheckBox android:id="@+id/debug" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" + style="@style/checkbox_full" android:text="@string/init_debug" /> - </LinearLayout> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml index 1341821..575fe1f 100644 --- a/main/res/layout/main.xml +++ b/main/res/layout/main.xml @@ -17,31 +17,15 @@ android:src="@drawable/actionbar_manual" android:onClick="goManual" /> </LinearLayout> - <RelativeLayout android:id="@+id/status" - android:visibility="gone" + <fragment android:id="@+id/status" + android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginLeft="16dip" android:layout_marginRight="16dip" android:layout_marginTop="60dip" - android:background="@drawable/helper_bcg" > - <ImageView android:id="@+id/status_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_margin="4dip" /> - <TextView android:id="@+id/status_message" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/status_icon" - android:layout_centerVertical="true" - android:gravity="center" - android:padding="4dip" - android:textSize="14dip" - android:textColor="@color/text_icon" /> - </RelativeLayout> + android:name="cgeo.geocaching.StatusFragment" /> <!-- ** --> <LinearLayout android:layout_width="fill_parent" diff --git a/main/res/layout/reset_cache_coords_dialog.xml b/main/res/layout/reset_cache_coords_dialog.xml index 2773041..67ffda3 100644 --- a/main/res/layout/reset_cache_coords_dialog.xml +++ b/main/res/layout/reset_cache_coords_dialog.xml @@ -2,28 +2,33 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?background_color"
android:orientation="vertical"
android:padding="3dip" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="?text_color"
android:text="@string/waypoint_reset_cache_coords_info" />
- <CheckBox
- android:id="@+id/local"
+ <RadioGroup
+ android:id="@+id/modify_cache_coordinates_group"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:checked="true"
- android:text="@string/waypoint_localy_reset_cache_coords" />
+ android:layout_height="wrap_content" >
- <CheckBox
- android:id="@+id/upload"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:checked="false"
- android:visibility="gone"
- android:text="@string/waypoint_reset_cache_coords_on_website" />
+ <RadioButton
+ android:id="@+id/reset_cache_coordinates_local"
+ style="@style/radiobutton_wrap"
+ android:checked="true"
+ android:text="@string/waypoint_localy_reset_cache_coords" />
+
+ <RadioButton
+ android:id="@+id/reset_cache_coordinates_local_and_remote"
+ style="@style/radiobutton_wrap"
+ android:text="@string/waypoint_reset_local_and_remote_cache_coords"
+ android:visibility="gone" />
+ </RadioGroup>
<Button
android:id="@+id/reset"
diff --git a/main/res/layout/status.xml b/main/res/layout/status.xml new file mode 100644 index 0000000..6d9aba3 --- /dev/null +++ b/main/res/layout/status.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/status" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/helper_bcg" > + <ImageView android:id="@+id/status_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_margin="4dip" /> + <TextView android:id="@+id/status_message" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/status_icon" + android:layout_centerVertical="true" + android:gravity="center" + android:padding="4dip" + android:textSize="14dip" + android:textColor="@color/text_icon" /> +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/menu/main_options.xml b/main/res/menu/main_options.xml new file mode 100644 index 0000000..e06e948 --- /dev/null +++ b/main/res/menu/main_options.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@drawable/ic_menu_preferences"
+ android:title="@string/menu_settings">
+ </item>
+ <item
+ android:id="@+id/menu_history"
+ android:icon="@drawable/ic_menu_recent_history"
+ android:title="@string/menu_history">
+ </item>
+ <item
+ android:id="@+id/menu_helpers"
+ android:icon="@drawable/ic_menu_shopping"
+ android:title="@string/menu_helpers">
+ </item>
+ <item
+ android:id="@+id/menu_scan"
+ android:icon="@drawable/ic_menu_barcode"
+ android:title="@string/menu_scan_geo">
+ </item>
+ <item
+ android:id="@+id/menu_about"
+ android:icon="@drawable/ic_menu_info_details"
+ android:title="@string/menu_about">
+ </item>
+
+</menu>
\ No newline at end of file diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index c89cf82..e103b69 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -411,7 +411,6 @@ <string name="cache_offline_time_days">dny</string> <string name="cache_premium">placený účet</string> <string name="cache_attributes">atributy</string> - <string name="cache_attributes_no_icons">(obnov cache ke zobrazení atributů)</string> <string name="cache_inventory">Inventář</string> <string name="cache_log_offline">offline log</string> <string name="cache_log_images_loading">Načítám obrázky z logů…</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index d8b6222..8585851 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -341,6 +341,10 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> + <string name="init_oc">opencaching.de</string> + <string name="init_oc_activate">Opencaching.de auf Live-Karte und für die Suche aktivieren</string> + <string name="init_oc_username_description">Benutzername für opencaching.de eingeben damit gefundene Caches markiert werden können.</string> + <string name="init_oc_username">Benutzername</string> <string name="init_gcvote">GCvote.com</string> <string name="init_twitter">Twitter</string> <string name="init_username">Benutzername</string> @@ -483,7 +487,6 @@ <string name="cache_offline_time_days">Tagen</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attribute</string> - <string name="cache_attributes_no_icons">(aktualisiere den Cache um die Attribut-Icons anzuzeigen)</string> <string name="cache_inventory">Inventar</string> <string name="cache_log_offline">Offline-Log</string> <string name="cache_log_images_loading">Lade Logbild…</string> @@ -536,6 +539,7 @@ <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> + <string name="cache_menu_maps_directions">Google Maps Route</string> <string name="cache_menu_radar">Radar</string> <string name="cache_menu_map">Karte</string> <string name="cache_menu_map_static">Statische Karten</string> @@ -653,7 +657,6 @@ <string name="waypoint_note">Notiz</string> <string name="waypoint_save">Speichern</string> <string name="waypoint_loading">Lade Wegpunkt…</string> - <string name="waypoint_unknown_coordinates">Koordinaten unbekannt</string> <string name="waypoint_set_as_cache_coords">Als Cache-Koordinaten lokal setzen</string> <string name="waypoint_reset_cache_coords">Zurücksetzen</string> <string name="waypoint_reset_cache_coords_on_website">Cache-Koordinaten auf Webseite zurücksetzen</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 41a4600..d75d8b4 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -468,7 +468,6 @@ <string name="cache_offline_time_days">jours</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attributs</string> - <string name="cache_attributes_no_icons">(recharger la cache pour voir les icônes des 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> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index b4f59c7..94da99f 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -483,7 +483,6 @@ <string name="cache_offline_time_days">nappal ezelőtt</string> <string name="cache_premium">Prémium</string> <string name="cache_attributes">Tulajdonságok</string> - <string name="cache_attributes_no_icons">(frissítsd a ládát, hogy lásd a tulajdonság ikonokat)</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> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index a60cde2..ba72faf 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -53,6 +53,7 @@ <string name="wp_pkg">Area parcheggio</string> <string name="wp_trailhead">Partenza percorso</string> <string name="wp_waypoint">Punto di riferimento</string> + <string name="wp_original">Coordinate originali</string> <!-- logs --> <string name="log_found">Trovato</string> @@ -72,9 +73,12 @@ <string name="log_maintenance_needed">Richiede manutenzione</string> <string name="log_update">Coordinate aggiornate</string> <string name="log_archived">Archiviato</string> + <string name="log_unarchived">Reinserito</string> <string name="log_needs_archived">Necessita archiviazione</string> <string name="log_discovered">Scoperto</string> <string name="log_reviewer">Nota del reviewer</string> + <string name="log_retractlisting">Ritirato</string> + <string name="log_marked_missing">Segnalato come mancante</string> <string name="log_tb_nothing">Non fare nulla</string> <string name="log_tb_visit">Visitato</string> <string name="log_tb_drop">Lasciato</string> @@ -161,6 +165,8 @@ <string name="err_load_descr_failed">c:geo non può caricare la descrizione.</string> <string name="err_location_unknown">c:geo non conosce la posizione dei cache.</string> <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_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> @@ -206,6 +212,7 @@ <string name="warn_invalid_mapfile">La mappa selezionata non è mapsforge versione 0.3.0.\nMappa offline non disponibile.</string> <string name="warn_deprecated_mapfile">Stai usando una vecchia mappa 0.2.4.\nAggiornala alla 0.3.0 appena puoi.\nIl supporto alla 0.2.4 sarà rimosso nella prossima versione.</string> <string name="warn_nonexistant_mapfile">La mappa selezionata non esiste.\nMappa offline non disponibile.</string> + <string name="warn_rendertheme_missing">Tema mappa non trovato.</string> <string name="info_log_posted">c:geo ha inviato il log con successo.</string> <string name="info_log_saved">c:geo ha salvato il log.</string> @@ -283,6 +290,7 @@ <string name="caches_drop_stored">Elimina i cache salvati</string> <string name="caches_drop_progress">Eliminando caches</string> <string name="caches_drop_all_and_list">Elimina tutti ed elimina la lista</string> + <string name="caches_delete_events">Cancella eventi passati</string> <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> @@ -333,6 +341,10 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</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> + <string name="init_oc_username">Inserisci nome utente</string> <string name="init_gcvote">GCvote.com</string> <string name="init_twitter">Twitter</string> <string name="init_username">Utente</string> @@ -396,8 +408,11 @@ <string name="init_backup_last">Disponibile Backup delle</string> <string name="init_backup_last_no">Non esiste il file con il backup.</string> <string name="init_mapsources">Tipi di mappe</string> - <string name="init_mapsources_description">Qui puoi scegliere dove c:geo preleverà le mappe. Come alternativa a Google maps esistono vari stili di OpenStreetMap disponibili anche per uso offline (vedi <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> per dettagli).</string> + <string name="init_mapsources_description">Qui puoi scegliere dove c:geo preleverà le mappe. Come alternativa a Google maps esistono vari stili di OpenStreetMap disponibili anche per uso offline (vedi <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> per dettagli).\nIn aggiunta, temi personalizzati sono disponibili per le mappe offline</string> <string name="init_mapsource_select">Seleziona il tipo di mappa</string> + <string name="init_select_themefolder">…</string> + <string name="init_map_directory_description">Cartella con le mappe offline</string> + <string name="init_select_map_directory">…</string> <string name="init_gpx_exportdir">Cartella di export GPX</string> <string name="init_gpx_importdir">Cartella di import GPX</string> <string name="init_gpx_exportdir_description">Qui puoi selezionare la cartella di esportazione GPX.</string> @@ -423,6 +438,8 @@ <string name="init_dbmove_success">Database spostato con successo.</string> <string name="init_dbmove_failed">Spostamento fallito</string> <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> <string name="init_sendToCgeo">Send to c:geo</string> <string name="init_sendToCgeo_name">Nome dispositivo:</string> @@ -468,7 +485,6 @@ <string name="cache_offline_time_days">giorni fa</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attributi</string> - <string name="cache_attributes_no_icons">(aggiorna il cache per visualizzare le icone degli 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> @@ -486,6 +502,8 @@ <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_images">Immagini</string> + <string name="cache_waypoints">Waypoints</string> <plurals name="waypoints"> <item quantity="one">1 Waypoint</item> @@ -515,7 +533,14 @@ <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_menu_navigate">Naviga</string> + <string name="cache_menu_navigation_drive">Naviga (in auto)</string> + <string name="cache_menu_navigation_walk">Naviga (a piedi)</string> + <string name="cache_menu_maps_directions">Direzioni su Google Maps</string> <string name="cache_menu_radar">Radar</string> <string name="cache_menu_map">Mappa</string> <string name="cache_menu_map_static">Mappe statiche</string> @@ -528,6 +553,8 @@ <string name="cache_menu_visit_offline">Scrivi Log offline</string> <string name="cache_menu_spoilers">Immagini spoiler</string> <string name="cache_menu_around">Cache qui intorno</string> + <string name="cache_menu_set_as_cache_coords">Setta come coordinate cache</string> + <string name="cache_menu_upload_wpt_to_gc_com">Setta come coordinate cache e carica il waypoint su Geocaching.com</string> <string name="cache_menu_event">Aggiungi al calendario</string> <string name="cache_menu_details">Dettagli</string> <string name="cache_menu_share">Condividi cache</string> @@ -536,12 +563,14 @@ <string name="cache_menu_whereyougo">WhereYouGo</string> <string name="cache_menu_oruxmaps">OruxMaps</string> <string name="cache_menu_cachebeacon">Cache Beacon</string> + <string name="cache_menu_sygic" translatable="false">Sygic</string> <string name="cache_status">Stato</string> <string name="cache_status_offline_log">Log salvato</string> <string name="cache_status_found">Trovato</string> <string name="cache_status_archived">Archiviato</string> <string name="cache_status_disabled">Non attivo</string> <string name="cache_status_premium">Solo per utenti Premium</string> + <string name="cache_status_not_premium">Per tutti gli utenti</string> <string name="cache_geocode">GC-code</string> <string name="cache_name">Nome</string> <string name="cache_type">Tipo</string> @@ -561,6 +590,8 @@ <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> @@ -572,6 +603,9 @@ <string name="cache_share_field">Condividi</string> <string name="cache_time_full_hours">Precise</string> + <!-- editor dialog --> + <string name="editor_save">Salva</string> + <!-- file list base --> <string name="file_searching_in">Ricerca file\nin</string> <string name="file_searching_sdcard_in">Nessun file trovato nella cartella di default:\n%1$s\n\nRicerca in tutta la SD i files:\n</string> @@ -605,6 +639,9 @@ <!-- map file select --> <string name="map_file_select_title">Seleziona il file mappa</string> + <!-- theme file select --> + <string name="theme_file_select_title">Seleziona il tema personale</string> + <!-- import --> <string name="web_import_title">Importa dal web</string> <string name="web_import_waiting">In attesa di nuovi cache dal web…</string> @@ -629,6 +666,22 @@ <string name="waypoint_note">Note</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> + <string name="waypoint_set_as_cache_coords">Setta come coordinate cache</string> + <string name="waypoint_coordinates_has_been_reset_on_website">Le coordinates sono state resettate su web</string> + <string name="waypoint_save_and_modify_on_website">Setta come coordinate cache in c:geo e su web</string> + <string name="waypoint_reset_cache_coords">Resetta le coordinate cache</string> + <string name="waypoint_coordinates_being_reset_on_website">Le coordinate sono in fase di reset su web</string> + <string name="waypoint_reset_cache_coords_info">Opzioni di reset</string> + <string name="waypoint_reset">Reset</string> + <string name="waypoint_localy_reset_cache_coords">Resetta in c:geo</string> + <string name="waypoint_reset_local_and_remote_cache_coords">Resetta in c:geo e su web.</string> + <string name="waypoint_coordinates_couldnt_be_modified_on_website">Il sito web non supporta la modifica delle coordinate</string> + <string name="waypoint_coordinates_upload_error">Errore durante il caricamento delle coordinate su web</string> + <string name="waypoint_coordinates_uploading_to_website">Caricamento delle coordinate %s su web</string> + <string name="waypoint_coordinates_reseting_on_website">Reset alle coordinate originali su web</string> + <string name="waypoint_coordinates_has_been_modified_on_website">Le coordinate cache su web sono state modificate in: %s.</string> + <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Le coordinate cache sono state modificate in c:geo in: %s.</string> <string name="waypoint_done">Fatto</string> <string name="waypoint_duplicate">Duplicato</string> <string name="waypoint_copy_of">Copia di</string> @@ -654,10 +707,13 @@ <string name="map_map">Mappa</string> <string name="map_live">Mappa Live</string> <string name="map_view_map">Scegli mappa</string> + <string name="map_modes">Modi mappa</string> <string name="map_trail_show">Mostra scia</string> <string name="map_trail_hide">Nasconde scia</string> <string name="map_circles_show">Mostra area cache</string> <string name="map_circles_hide">Nascondi area cache</string> + <string name="map_theme_builtin">Tema predefinito</string> + <string name="map_theme_select">Scegli un tema mappa</string> <string name="map_live_enable">Attiva online</string> <string name="map_live_disable">Disattiva online</string> <string name="map_static_title">Mappe statiche</string> @@ -703,7 +759,7 @@ <!-- trackable --> <string name="trackable">Oggetto trackable</string> - <string name="trackable_details_loading">Caricamente dettagli trackable…</string> + <string name="trackable_details_loading">Caricamento dettagli trackable…</string> <string name="trackable_log_touch">Documenta il contatto</string> <string name="trackable_browser_open">Apri nel Browser</string> <string name="trackable_goal">Obbiettivo</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 83aae5e..00b7c61 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -476,7 +476,6 @@ <string name="cache_offline_time_days">日前</string> <string name="cache_premium">プレミアム会員</string> <string name="cache_attributes">属性</string> - <string name="cache_attributes_no_icons">(属性アイコンを表示するためにはキャッシュ情報を更新してください)</string> <string name="cache_inventory">目録</string> <string name="cache_log_offline">オフラインログ</string> <string name="cache_log_images_loading">添付画像をロード中…</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 9502d3e..48de4aa 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -448,7 +448,6 @@ <string name="cache_offline_time_days">dagen geleden</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attributen</string> - <string name="cache_attributes_no_icons">(herlaad cache om attribuut-iconen weer te geven)</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> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 9516927..d8acac3 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -484,7 +484,6 @@ <string name="cache_offline_time_days">dias atrás</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Atributos</string> - <string name="cache_attributes_no_icons">(actualize a cache para mostrar os ícones dos 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> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index fe2ca66..0593da5 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -483,7 +483,6 @@ <string name="cache_offline_time_days">pred dňami</string> <string name="cache_premium">platený účet</string> <string name="cache_attributes">Atribúty</string> - <string name="cache_attributes_no_icons">(obnoví skrýšu pre zobrazenie ikon atribútov)</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> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 72b613d..285a224 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -53,6 +53,7 @@ <string name="wp_pkg">Parkeringsplats</string> <string name="wp_trailhead">Stigstart</string> <string name="wp_waypoint">Referensplats</string> + <string name="wp_original">Ursprungliga koordinater</string> <!-- logs --> <string name="log_found">Hittad</string> @@ -72,9 +73,12 @@ <string name="log_maintenance_needed">Behöver underhåll</string> <string name="log_update">Uppdaterade koordinaterna</string> <string name="log_archived">Arkiverad</string> + <string name="log_unarchived">Återöppnad</string> <string name="log_needs_archived">Behöver arkiveras</string> <string name="log_discovered">Såg den</string> <string name="log_reviewer">Meddelande från reviewern</string> + <string name="log_retractlisting">Återkallad</string> + <string name="log_marked_missing">Markerad saknad</string> <string name="log_tb_nothing">Gör inget</string> <string name="log_tb_visit">Besök</string> <string name="log_tb_drop">Lämna här</string> @@ -161,6 +165,7 @@ <string name="err_load_descr_failed">Tyvärr kan c:geo inte ladda beskrivningen.</string> <string name="err_location_unknown">c:geo har inte koordinaterna för cachen.</string> <string name="err_missing_device_name">Vänligen ange ett namn för din enhet innan registering.</string> + <string name="err_favorite_failed">Misslyckades att ändra favoritstatus.</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> @@ -285,6 +290,7 @@ <string name="caches_drop_stored">Ta bort sparade</string> <string name="caches_drop_progress">Tar bort cacher</string> <string name="caches_drop_all_and_list">Ta bort listan och dess cacher</string> + <string name="caches_delete_events">Ta bort gamla event</string> <string name="caches_refresh_selected">Uppdatera valda</string> <string name="caches_refresh_all">Uppdatera alla</string> <string name="caches_move_selected">Flytta valda</string> @@ -337,6 +343,10 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> + <string name="init_oc">opencaching.de</string> + <string name="init_oc_activate">Aktivera opencaching.de i live-kartor och sökningar</string> + <string name="init_oc_username_description">Ange användarnamn till opencaching.de för att kunna markera dina hittade cacher.</string> + <string name="init_oc_username">Ange ditt användarnamn</string> <string name="init_gcvote">GCvote.com</string> <string name="init_twitter">Twitter</string> <string name="init_username">Användare</string> @@ -401,7 +411,7 @@ <string name="init_backup_last">Tillgänglig kopia från</string> <string name="init_backup_last_no">Det finns ingen säkerhetskopia.</string> <string name="init_mapsources">Kartkällor</string> - <string name="init_mapsources_description">Här kan du vilken typ av kartor du vill använda. Som alternativ till Google Maps finns olika varianter av OpenStreetMap och till och med offline kartor (se <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> för detaljer).</string> + <string name="init_mapsources_description">Här kan du vilken typ av kartor du vill använda. Som alternativ till Google Maps finns olika varianter av OpenStreetMap och till och med offline kartor (se <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> för detaljer). Ytterligare valbara teman stödjs också.</string> <string name="init_mapsource_select">Välj kartkälla</string> <string name="init_map_directory_description">Katalog med offline kartor</string> <string name="init_gpx_exportdir">GPX-exportkatalog</string> @@ -429,7 +439,7 @@ <string name="init_dbmove_failed">Misslyckades att flytta databasen</string> <string name="init_plain_logs">Visa loggar utan färger</string> <string name="init_use_native_ua">Identifiera som en Android webbläsare. Löser problem med inloggning vid uppkoppling via vissa operatörer.</string> - <string name="init_rendertheme_folder">Välj katalog för egna offline kartteman</string> + <string name="init_rendertheme_folder">Katalog för offline kartteman (valfritt)</string> <!-- map sources --> <string name="map_source_google_map">Google: Map</string> @@ -482,7 +492,6 @@ <string name="cache_offline_time_days">dagar sedan</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attribut</string> - <string name="cache_attributes_no_icons">(uppdatera cachen för att visa bilder för 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> @@ -532,7 +541,14 @@ <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_menu_navigate">Navigera</string> + <string name="cache_menu_navigation_drive">Navigering (med bil)</string> + <string name="cache_menu_navigation_walk">Navigering (till fots)</string> + <string name="cache_menu_maps_directions">Google Maps Navigering</string> <string name="cache_menu_radar">Radar</string> <string name="cache_menu_map">Visa på karta</string> <string name="cache_menu_map_static">Sparade kartor</string> @@ -545,6 +561,8 @@ <string name="cache_menu_visit_offline">Logga besök offline</string> <string name="cache_menu_spoilers">Spoiler bilder</string> <string name="cache_menu_around">Cacher i närheten</string> + <string name="cache_menu_set_as_cache_coords">Sätt som cachens koordinater</string> + <string name="cache_menu_upload_wpt_to_gc_com">Sätt som cachens koordinater och ladda upp waypoint till Geocaching.com</string> <string name="cache_menu_event">Lägg till i kalender</string> <string name="cache_menu_details">Detaljer</string> <string name="cache_menu_share">Skicka länk</string> @@ -559,6 +577,7 @@ <string name="cache_status_archived">Arkiverad</string> <string name="cache_status_disabled">Inaktiverad</string> <string name="cache_status_premium">Enbart för Premium medlemmar</string> + <string name="cache_status_not_premium">Tillgänglig för alla medlemmar</string> <string name="cache_geocode">GC-kod</string> <string name="cache_name">Namn</string> <string name="cache_type">Typ</string> @@ -617,7 +636,7 @@ <string name="gpx_import_title_caches_imported">Resultat</string> <string name="gpx_import_title_caches_import_failed">Importeringen misslyckades</string> <string name="gpx_import_error_io">Kan inte läsa filen</string> - <string name="gpx_import_error_parser">Filens format är felaktigt</string> + <string name="gpx_import_error_parser">Felaktigt filformat</string> <string name="gpx_import_error_unexpected">Oväntat fel</string> <string name="gpx_import_confirm">Vill du importera GPX filen till c:geo?</string> <string name="gpx_import_canceled">Importeringen av GPX filen avbröts</string> @@ -652,6 +671,21 @@ <string name="waypoint_note">Kommentar</string> <string name="waypoint_save">Spara</string> <string name="waypoint_loading">Laddar punkt…</string> + <string name="waypoint_set_as_cache_coords">Ange som cachens koordinater i c:geo</string> + <string name="waypoint_reset_cache_coords">Återställ cachens koordinater</string> + <string name="waypoint_reset_cache_coords_on_website">Återställ koordinaterna på hemsidan</string> + <string name="waypoint_coordinates_has_been_reset_on_website">Cachens koordinater har återställts på hemsidan.</string> + <string name="waypoint_coordinates_being_reset_on_website">Återställer cachens koordinater på hemsidan…</string> + <string name="waypoint_reset_cache_coords_info">Återställningsalternativ</string> + <string name="waypoint_reset">Återställ</string> + <string name="waypoint_localy_reset_cache_coords">Återställ koordinaterna i c:geo</string> + <string name="waypoint_modify_on_website">Ange som cachens koordinater på hemsidan</string> + <string name="waypoint_coordinates_couldnt_be_modified_on_website">Hemsidan kan inte hantera att ändra cachens koordinater.</string> + <string name="waypoint_coordinates_upload_error">Ett fel inträffade när koordinaterna skulle ändras på hemsidan.</string> + <string name="waypoint_coordinates_uploading_to_website">Laddar upp koordinaterna %s till hemsidan.</string> + <string name="waypoint_coordinates_reseting_on_website">Återställer till ursprungliga koordinaterna på hemsidan.</string> + <string name="waypoint_coordinates_has_been_modified_on_website">Cachens koordinater på hemsidan har ändrats till: %s.</string> + <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Cachens koordinater har ändrats i c:geo till: %s.</string> <string name="waypoint_done">Klar</string> <string name="waypoint_duplicate">Duplicera</string> <string name="waypoint_copy_of">Kopia av</string> @@ -675,7 +709,7 @@ <string name="map_trail_hide">Dölj spår</string> <string name="map_circles_show">Visa cirklar</string> <string name="map_circles_hide">Dölj cirklar</string> - <string name="map_theme_builtin">Inbyggt karttema</string> + <string name="map_theme_builtin">Standard</string> <string name="map_theme_select">Välj karttema</string> <string name="map_live_enable">Aktivera live</string> <string name="map_live_disable">Inaktivera live</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 3d2cb13..9831059 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -165,7 +165,8 @@ <string name="err_load_descr_failed">c:geo can\'t load description.</string> <string name="err_location_unknown">c:geo doesn\'t know location of cache.</string> <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_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> <string name="err_tb_forgot_saw">c:geo forgot which trackable you saw.</string> @@ -343,6 +344,10 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> + <string name="init_oc">opencaching.de</string> + <string name="init_oc_activate">Activate opencaching.de on live-map and in searches</string> + <string name="init_oc_username_description">Enter your opencaching.de user name in order to allow marking your finds.</string> + <string name="init_oc_username">Enter your user name</string> <string name="init_gcvote">GCvote.com</string> <string name="init_twitter">Twitter</string> <string name="init_username">Username</string> @@ -488,7 +493,6 @@ <string name="cache_offline_time_days">days ago</string> <string name="cache_premium">Premium</string> <string name="cache_attributes">Attributes</string> - <string name="cache_attributes_no_icons">(refresh cache to show attribute icons)</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> @@ -538,6 +542,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_menu_navigate">Navigate</string> <string name="cache_menu_navigation_drive">Navigation (Driving)</string> <string name="cache_menu_navigation_walk">Navigation (Walking)</string> @@ -665,22 +673,22 @@ <string name="waypoint_note">Note</string> <string name="waypoint_save">Save</string> <string name="waypoint_loading">Loading waypoint…</string> - <string name="waypoint_unknown_coordinates">Coordinates unknown</string> - <string name="waypoint_set_as_cache_coords">Set as cache coordinates</string> - <string name="waypoint_reset_cache_coords">Reset cache coordinates</string> - <string name="waypoint_reset_cache_coords_on_website">Reset cache coordinates on website</string> - <string name="waypoint_coordinates_has_been_reset_on_website">Cache coordinates has been reset on website.</string> - <string name="waypoint_coordinates_being_reset_on_website">Cache coordinates being reset on website.</string> - <string name="waypoint_reset_cache_coords_info">Reset possibilities</string> + <string name="waypoint_do_not_touch_cache_coordinates">No change to cache coordinates</string> + <string name="waypoint_set_as_cache_coords">Set as cache coordinates in c:geo</string> + <string name="waypoint_save_and_modify_on_website">Set as cache coordinates in c:geo and on website</string> + <string name="waypoint_reset_cache_coords">Reset cache coordinates</string> + <string name="waypoint_coordinates_has_been_reset_on_website">Cache coordinates have been reset on website.</string> + <string name="waypoint_coordinates_being_reset_on_website">Resetting cache coordinates on website…</string> + <string name="waypoint_reset_cache_coords_info">Coordinate reset options</string> <string name="waypoint_reset">Reset</string> - <string name="waypoint_localy_reset_cache_coords">Reset coordinates locally</string> - <string name="waypoint_modify_on_website">Modify coordinates on website</string> - <string name="waypoint_coordinates_couldnt_be_modified_on_website">Cache coordinates couldn\'t be set on website.</string> - <string name="waypoint_coordinates_upload_error">Error occurred during uploading coordinates to website.</string> - <string name="waypoint_coordinates_uploading_to_website">Uploading %s to website.</string> - <string name="waypoint_coordinates_reseting_on_website">Reseting to original coordinates on website.</string> - <string name="waypoint_coordinates_has_been_modified_on_website">Cache coordinates has been modified on website to: %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Cache coordinates has been localy modified to: %s.</string> + <string name="waypoint_localy_reset_cache_coords">Reset in c:geo</string> + <string name="waypoint_reset_local_and_remote_cache_coords">Reset in c:geo and on website</string> + <string name="waypoint_coordinates_couldnt_be_modified_on_website">Website doesn\'t support modifying cache coordinates.</string> + <string name="waypoint_coordinates_upload_error">Error occurred while modifying coordinates on website.</string> + <string name="waypoint_coordinates_uploading_to_website">Uploading coordinates %s to website.</string> + <string name="waypoint_coordinates_reseting_on_website">Resetting to original coordinates on website.</string> + <string name="waypoint_coordinates_has_been_modified_on_website">Cache coordinates on website have been modified to: %s.</string> + <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Cache coordinates have been changed in c:geo to: %s.</string> <string name="waypoint_done">Done</string> <string name="waypoint_duplicate">Duplicate</string> <string name="waypoint_copy_of">Copy of</string> diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml index d907563..3678357 100644 --- a/main/res/values/strings_not_translatable.xml +++ b/main/res/values/strings_not_translatable.xml @@ -86,6 +86,7 @@ · Inverse sorting of cache lists (hit the same menu again)\n
· view pager in trackable activity\n
· menu item to delete past events\n
+ · ability to select "all" list from main screen\n
\n
<b>Bugfixing:</b>\n
· Final flag icon lost when updating cache with self defined final\n
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index 394e3d0..caa884a 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -26,6 +26,24 @@ <item name="android:capitalize">none</item> </style> + <style name="checkbox" parent="@android:style/Widget.CompoundButton.CheckBox"> + <item name="android:textColor">?text_color</item> + </style> + + <style name="checkbox_full" parent="checkbox"> + <item name="android:layout_width">fill_parent</item> + <item name="android:layout_height">wrap_content</item> + </style> + + <style name="radiobutton" parent="@android:style/Widget.CompoundButton.RadioButton"> + <item name="android:textColor">?text_color</item> + </style> + + <style name="radiobutton_wrap" parent="radiobutton"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + </style> + <!-- own definitions --> <!-- actionbar --> <style name="action_bar"> |
