Merge branch 'transform-to-plugin'

Conflicts: src/android/customCamera/res/layout/activity_camera_view.xml src/android/customCamera/src/org/geneanet/customcamera/CameraView.java src/android/customCamera/src/org/geneanet/customcamera/MainActivity.java
2026-06-08 00:00:19 +08:00 · 2014-11-14 16:26:38 +01:00
parent 27e8f13960 f6c5a77186
commit 2ec58daee2
62 changed files with 278 additions and 26 deletions
@@ -0,0 +1,11 @@
+{
+    "fr": {
+        "Miniature": "Miniature",
+        "PHOTO": "Photo",
+
+    },
+    "en": {
+        "Miniature": "Miniature",
+        "PHOTO": "Photo",
+    }
+}