search

ubports / camera-app

Moved to GitLab
https://gitlab.com/ubports/apps/camera-app
GNU General Public License v3.0
10 stars 9 forks source link

Differente translation between Xenial and Master #95

Open ernesst opened 6 years ago

ernesst commented 6 years ago

Gent, the po of the Xenial doesn't seem up to date, see below.

From Xenial fr.po

: DeleteDialog.qml:40 ViewFinderView.qml:494 ViewFinderOverlay.qml:1106

: ViewFinderOverlay.qml:1120 ViewFinderOverlay.qml:1159

msgid "Cancel" msgstr "" "La couleur du texte est déterminée en fonction de l'arrière-plan, donc " "définie à partir du HTML"

The master fr.po

: ../DeleteDialog.qml:40 ../ViewFinderOverlay.qml:1122

: ../ViewFinderOverlay.qml:1136 ../ViewFinderOverlay.qml:1175

: ../ViewFinderView.qml:494

msgid "Cancel" msgstr "Annuler"

The master one is the correct.

Flohack74 commented 6 years ago

Well sorry for that but our branching concept is a bit wonky: Originally we wanted to have release branches but also it is valid to ask for master being up2date. So on some core Apps master was connected to Weblate, on others its xenial.

We shall fix this after OTA-4 completly, for now I can fix it here if you like.

ernesst commented 6 years ago

Not urgent, keep it open to remember to merge/update correctly Xenial translation after ota-4. Thanks

dark-eye commented 6 years ago

I`ll try and keep the translation on xenial branch updated.