merge in jb-release history after reset to master
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d636d88..198ebc5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -145,9 +145,9 @@
<string name="edit" msgid="8659197150838109875">"Modifier"</string>
<string name="remove" msgid="7886072447916861923">"Supprimer"</string>
<string name="untitled" msgid="579236531346245199">"Sans nom"</string>
- <string name="hours_and_minutes" msgid="3321381734132704902">"<xliff:g id="HOURS">%d</xliff:g> h <xliff:g id="MINUTES">%d</xliff:g> mn"</string>
- <string name="hour_and_minutes" msgid="1067026366169392034">"1 h <xliff:g id="MINUTES">%d</xliff:g> mn"</string>
- <string name="minutes" msgid="6924555888655437479">"<xliff:g id="MINUTES">%d</xliff:g> mn"</string>
- <string name="minute_and_seconds" msgid="421389061027404642">"1 mn <xliff:g id="SECONDS">%d</xliff:g> s"</string>
+ <string name="hours_and_minutes" msgid="3321381734132704902">"<xliff:g id="HOURS">%d</xliff:g> h <xliff:g id="MINUTES">%d</xliff:g> min"</string>
+ <string name="hour_and_minutes" msgid="1067026366169392034">"1 h <xliff:g id="MINUTES">%d</xliff:g> min"</string>
+ <string name="minutes" msgid="6924555888655437479">"<xliff:g id="MINUTES">%d</xliff:g> min"</string>
+ <string name="minute_and_seconds" msgid="421389061027404642">"1 min <xliff:g id="SECONDS">%d</xliff:g> s"</string>
<string name="seconds" msgid="6169618193647386033">"<xliff:g id="SECONDS">%d</xliff:g> s"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0e9482a..ce576c7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -87,7 +87,7 @@
<string name="editor_remove_audio_track_error" msgid="3964817135562383898">"Tidak dapat menghapus trek audio."</string>
<string name="editor_set_audio_track_boundaries_error" msgid="1679475535915673070">"Tidak dapat memangkas trek audio."</string>
<string name="editor_transition_too_short" msgid="6861692504557642278">"Tidak dapat menambahkan transisi. Transisi akan menjadi terlalu singkat."</string>
- <string name="editor_media_load_error" msgid="458634098279249971">"Tidak dapat mengunduh berkas."</string>
+ <string name="editor_media_load_error" msgid="458634098279249971">"Tidak dapat mengunduh file."</string>
<string name="editor_preview_error" msgid="6896625021643290945">"Tidak dapat menampilkan pratinjau proyek karena galat."</string>
<string name="export_dialog_export" msgid="3425471919331193846">"Ekspor"</string>
<string name="export_dialog_movie_size" msgid="7285302703460176418">"Ukuran film"</string>
