From 9a8ba3e10859a274ffeaf604debddf02538dff85 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Wed, 23 Dec 2015 20:45:44 +0100 Subject: [PATCH 1/7] Translated using Weblate (French) Currently translated at 100.0% (1861 of 1861 strings) --- OsmAnd/res/values-fr/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 62e1b02e1b..7a344fda11 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2090,4 +2090,5 @@ Mise à jour : %s Heure de mise à jour Mises à jour : %s +Dernier carte modifiée : %s From 7c6e633b8b111c1a1ed352acfadb6cacb70cf67b Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Thu, 24 Dec 2015 04:32:02 +0100 Subject: [PATCH 2/7] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1861 of 1861 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index ade3a54e72..cf1af3b310 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2050,4 +2050,5 @@ 更新時間 大小：%s 更新：%s +上次地圖的更改：%s From cd5a4025403a7ccc6f3544c14ff1f734cbd50d8f Mon Sep 17 00:00:00 2001 From: jf-simon Date: Wed, 23 Dec 2015 19:09:06 +0100 Subject: [PATCH 3/7] Translated using Weblate (German) Currently translated at 100.0% (1861 of 1861 strings) --- OsmAnd/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 0be218fe3e..24b5c2d8c9 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2090,4 +2090,5 @@ Aktualisierung: %s Aktualisierungszeitpunkt Aktualisierungen: %s +Letzte Kartenänderung: %s From 031528b1721416a58044c225297605c09d43c514 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 24 Dec 2015 17:56:15 +0300 Subject: [PATCH 4/7] Try fix photo --- .../osmand/plus/audionotes/AudioVideoNotesPlugin.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index baa927eb57..8f3477dfb6 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -887,7 +887,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { } int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK); - //cam.setDisplayOrientation(cameraOrientation); + cam.setDisplayOrientation(cameraOrientation); parameters.set("rotation", cameraOrientation); if (mPreviewSize != null) { parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height); @@ -1143,7 +1143,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { parameters.setPictureSize(selectedCamPicSize.width, selectedCamPicSize.height); log.debug("takePhotoWithCamera() set Picture size: width=" + selectedCamPicSize.width + " height=" + selectedCamPicSize.height); -/* + // camera focus type autofocus = true; parameters.setGpsLatitude(lat); @@ -1177,7 +1177,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { log.info("Osmand:AudioNotes set camera FOCUS_MODE_AUTO"); break; } - + /* if (parameters.getSupportedWhiteBalance() != null && parameters.getSupportedWhiteBalance().contains(Parameters.WHITE_BALANCE_AUTO)) { parameters.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO); @@ -1186,10 +1186,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { && parameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_AUTO)) { parameters.setFlashMode(Parameters.FLASH_MODE_AUTO); } -*/ - autofocus = false; + */ int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK); - //cam.setDisplayOrientation(cameraOrientation); + cam.setDisplayOrientation(cameraOrientation); parameters.set("rotation", cameraOrientation); if (mPreviewSize != null) { parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height); From e78f352b535d938f59bd79d1cf9c0d96f9e34376 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 23 Dec 2015 18:01:55 +0100 Subject: [PATCH 5/7] Translated using Weblate (Danish) Currently translated at 100.0% (1861 of 1861 strings) --- OsmAnd/res/values-da/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index bd33a2499d..7b66bffff4 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2204,4 +2204,5 @@ Opdateringstid Størrelse: %s Opdateringer: %s +Sidste kortændring: %s From 4bbde2ed7d630ca7f6a459937db56793aaa58836 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 24 Dec 2015 18:38:27 +0300 Subject: [PATCH 6/7] Try fix photo --- .../plus/audionotes/AudioVideoNotesPlugin.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 8f3477dfb6..6c517f2627 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -142,6 +142,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { public final CommonPreference AV_DEFAULT_ACTION; public final OsmandPreference SHOW_RECORDINGS; + public static final int CLIP_LENGTH_DEFAULT = 5; + public static final int STORAGE_SIZE_DEFAULT = 5; + public final CommonPreference AV_RECORDER_SPLIT; + public final CommonPreference AV_RS_CLIP_LENGTH; + public final CommonPreference AV_RS_STORAGE_SIZE; + private DataTileManager recordings = new DataTileManager(14); private Map recordingByFileName = new LinkedHashMap<>(); private AudioNotesLayer audioNotesLayer; @@ -498,6 +504,10 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { AV_PHOTO_PLAY_SOUND = settings.registerBooleanPreference("av_photo_play_sound", true).makeGlobal(); SHOW_RECORDINGS = settings.registerBooleanPreference("show_recordings", true).makeGlobal(); + + AV_RECORDER_SPLIT = settings.registerBooleanPreference("av_recorder_split", false).makeGlobal(); + AV_RS_CLIP_LENGTH = settings.registerIntPreference("av_rs_clip_length", CLIP_LENGTH_DEFAULT).makeGlobal(); + AV_RS_STORAGE_SIZE = settings.registerIntPreference("av_rs_storage_size", STORAGE_SIZE_DEFAULT).makeGlobal(); } @Override @@ -1146,8 +1156,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { // camera focus type autofocus = true; - parameters.setGpsLatitude(lat); - parameters.setGpsLongitude(lon); + //parameters.setGpsLatitude(lat); + //parameters.setGpsLongitude(lon); switch (AV_CAMERA_FOCUS_TYPE.get()) { case AV_CAMERA_FOCUS_HIPERFOCAL: parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED); @@ -1177,7 +1187,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { log.info("Osmand:AudioNotes set camera FOCUS_MODE_AUTO"); break; } - /* + if (parameters.getSupportedWhiteBalance() != null && parameters.getSupportedWhiteBalance().contains(Parameters.WHITE_BALANCE_AUTO)) { parameters.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO); @@ -1186,7 +1196,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { && parameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_AUTO)) { parameters.setFlashMode(Parameters.FLASH_MODE_AUTO); } - */ + int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK); cam.setDisplayOrientation(cameraOrientation); parameters.set("rotation", cameraOrientation); From 12f9050f3c5e4be6063b59ae9c226839cb91bc36 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 24 Dec 2015 16:29:28 +0100 Subject: [PATCH 7/7] Translated using Weblate (Danish) Currently translated at 100.0% (1861 of 1861 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 7b66bffff4..deeb24bedd 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2204,5 +2204,5 @@ Opdateringstid Størrelse: %s Opdateringer: %s -Sidste kortændring: %s +Sidste ændring af kort: %s