Commit 620bcd28 authored by Ciarán Ainsworth's avatar Ciarán Ainsworth
Browse files

Merge branch 'develop' into '844-czech-language'

# Conflicts:
#   front/locales/en_GB/LC_MESSAGES/app.po
parents 70263758 6e80b830
Pipeline #4223 passed with stages
in 3 minutes and 52 seconds
Translating Funkwhale
=====================
A step-by-step, beginner friendly guide is available at https://contribute.funkwhale.audio/guides/translate/
Thank you for reading this! If you want to help translate Funkwhale,
you found the proper place :)
......@@ -21,8 +23,41 @@ Respecting those guidelines is mandatory if you want your translation to be incl
- Use gender-neutral language and wording
Submitting a new language
-------------------------
1. Pull the latest version of ``develop``
2. Create a new branch, e.g ``git checkout -b translations-new-fr-ca``
3. Add your new language code and name in ``front/src/locales.js``. Use the native language name, as it is what appears in the UI selector.
4. Create the ``po`` file from template:
.. code-block:: shell
export LOCALE=fr_CA # replace with your actual locale code
mkdir -p front/locales/$LOCALE/LC_MESSAGES
msginit --no-wrap --no-translator --locale=$LOCALE --input=front/locales/app.pot --output-file=front/locales/$LOCALE/LC_MESSAGES/app.po
5. Then commit your changes, push, and submit a pull request on the ``develop`` branch
Requesting a new language
-------------------------
If you'd like to see a new language in Funkwhale, please open an issue here:
If you cannot submit a new language yourself, you can request it by opening an issue here:
https://dev.funkwhale.audio/funkwhale/funkwhale/issues
Extracting messages from source
-------------------------------
We offer a script to update existing ``po`` and ``pot`` files with new translations
from the source code. This action should be run regularly, and in particular before
lots of translation work is expected (e.g a few weeks before a new release), or when
the UI code changes a lot. Otherwise, translators end up translating some obsolete messages,
or not translationg new messages.
1. `Lock the translations on weblate <https://translate.funkwhale.audio/projects/funkwhale/front/#repository>`_ (``Lock`` button in the sidebar). This will prevent translators from working, and help prevent potential conflicts in the source code
2. `Commit and push changes from weblate <https://translate.funkwhale.audio/projects/funkwhale/front/#repository>`_ (``Commit`` and ``Push`` buttons in the sidebar)
3. Pull ``develop`` in your local git repository to ensure you have the latest version of the translations
4. Create a dedicated branch with ``git checkout -b translations-integration``
5. Extract the translations with ``cd front && ./scripts/i18n-extract.sh``. This will update all ``po`` files as necessary
6. Review, commit and push the changes, then open a merge request on the ``develop`` branch
7. When the MR is merged, `Unlock the translations on weblate <https://translate.funkwhale.audio/projects/funkwhale/front/#repository>`_ (``Unlock`` button in the sidebar).
......@@ -4,14 +4,16 @@ msgstr ""
"Project-Id-Version: Arabic (FunkWhale)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-16 10:35+0200\n"
"PO-Revision-Date: 2019-05-13 13:31+0000\n"
"PO-Revision-Date: 2019-05-23 08:37+0000\n"
"Last-Translator: ButterflyOfFire <butterflyoffire+funkwhale@protonmail.com>\n"
"Language-Team: Arabic <https://translate.funkwhale.audio/projects/funkwhale/funkwhale/front/ar/>\n"
"Language-Team: Arabic <https://translate.funkwhale.audio/projects/funkwhale/"
"funkwhale/front/ar/>\n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Weblate 3.2.2\n"
#: front/src/components/playlists/PlaylistModal.vue:9
......@@ -94,7 +96,7 @@ msgstr[5] "%{ count } مَقاطِع"
#: front/src/views/content/libraries/Quota.vue:11
msgctxt "Content/Library/Paragraph"
msgid "%{ current } used on %{ max } allowed"
msgstr ""
msgstr "%{ current } مُستعمَلة مِن أصل %{ max } المسموح بها"
#: front/src/components/common/Duration.vue:2
msgctxt "Content/*/Paragraph"
......@@ -611,7 +613,7 @@ msgstr "قبول"
#: front/src/components/manage/library/EditsCardList.vue:21
msgctxt "Content/*/*/Short"
msgid "Approved"
msgstr "قبول"
msgstr "التي تم قبولها"
#: front/src/components/library/EditCard.vue:21
msgctxt "Content/Library/Card/Short"
......@@ -705,7 +707,7 @@ msgstr "أطلب إعادة تعيين كلمة المرور"
#: front/src/views/admin/moderation/DomainsDetail.vue:202
msgctxt "Content/Moderation/Title"
msgid "Audio content"
msgstr "محتوى مسموع"
msgstr "المحتوى الصوتي"
#: front/src/components/ShortcutsModal.vue:55
msgctxt "Popup/Keyboard shortcuts/Title"
......@@ -951,7 +953,7 @@ msgstr "إضغط مرة واحدة و استمع لساعات مِن الموس
msgctxt "Content/Library/Link.Title"
msgid ""
"Click to display more information about the import process for this upload"
msgstr ""
msgstr "اضغط لعرض المزيد من المعلومات حول عملية استيراد هذا التحميل"
#: front/src/components/library/FileUpload.vue:82
msgctxt "Content/Library/Paragraph/Call to action"
......@@ -2789,7 +2791,7 @@ msgstr "ليس هناك أي إشعار للعرض."
#: front/src/components/common/EmptyState.vue:7
msgctxt "Content/*/Paragraph"
msgid "No results were found."
msgstr ""
msgstr "لم يتم العثور على أية نتيجة."
#: front/src/components/mixins/Translations.vue:10
#: front/src/components/mixins/Translations.vue:11
......@@ -3465,7 +3467,7 @@ msgstr "آخِر زيارة"
#: front/src/components/library/FileUpload.vue:63
msgctxt "Content/Library/Paragraph"
msgid "Remaining storage space"
msgstr ""
msgstr "مساحة التخزين المتبقية"
#: front/src/views/content/remote/Home.vue:6
msgctxt "Content/Library/Title/Noun"
......@@ -4103,7 +4105,7 @@ msgstr "المنتدى"
#: front/src/components/library/FileUpload.vue:85
msgctxt "Content/Library/Paragraph"
msgid "Supported extensions: %{ extensions }"
msgstr ""
msgstr "امتدادات الملفات المدعومة: %{ extensions }"
#: front/src/components/playlists/Editor.vue:9
msgctxt "Content/Playlist/Paragraph"
......@@ -4723,7 +4725,7 @@ msgid ""
"directly from your browser to enjoy them here."
msgstr ""
"ارسل ملفات موسيقية (MP3, OGG, FLAC, etc.) مِن مكتبتك الشخصية مباشرة مِن "
"متصفحك للإستمتاع بها هنا."
"متصفحك للاستمتاع بها هنا."
#: front/src/components/library/FileUpload.vue:30
msgctxt "Content/Library/Title/Verb"
......@@ -4750,7 +4752,7 @@ msgstr ""
#: front/src/components/library/ImportStatusModal.vue:11
msgctxt "Popup/Import/Message"
msgid "Upload was successfully processed by the server."
msgstr ""
msgstr "تم تحميله بنجاح على الخادم."
#: front/src/components/library/FileUpload.vue:109
msgctxt "Content/Library/Table"
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: front 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-16 10:35+0200\n"
"PO-Revision-Date: 2019-05-03 10:33+0000\n"
"PO-Revision-Date: 2019-05-23 08:37+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@tuta.io>\n"
"Language-Team: none\n"
"Language: it\n"
......@@ -828,10 +828,9 @@ msgid "Cancel"
msgstr "Annulla"
#: front/src/views/content/remote/Card.vue:97
#, fuzzy
msgctxt "Content/Library/Card.Paragraph"
msgid "Cancel follow request"
msgstr "Richiesta di seguire in sospeso"
msgstr "Annulla richiesta di seguire"
#: front/src/components/library/radios/Builder.vue:64
msgctxt "Content/Radio/Table.Label/Noun (Value is a number of Tracks)"
......
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment