Manuel fr 001

.tx/config

@@ -1,7 +1,11 @@
 [main]
 host = https://www.transifex.com
 
+<<<<<<< HEAD
+[o:mixxx-dj-software:p:mixxx-dj-manual-24:r:404]
+=======
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:404]
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 file_filter            = source/locale/<lang>/LC_MESSAGES/404.po
 source_file            = source/locale/pot/404.pot
 source_lang            = en
@@ -247,6 +251,8 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:chapters--preferences--sound_hardware]
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/preferences/sound_hardware.po
 source_file            = source/locale/pot/chapters/preferences/sound_hardware.pot
+<<<<<<< HEAD
+=======
 source_lang            = en
 type                   = PO
 minimum_perc           = 0
@@ -257,6 +263,7 @@ keep_translations      = false
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/quickstart.po
 source_file            = source/locale/pot/chapters/quickstart.pot
 source_lang            = en
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -274,6 +281,8 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:chapters--vinyl_control]
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/vinyl_control.po
 source_file            = source/locale/pot/chapters/vinyl_control.pot
+<<<<<<< HEAD
+=======
 source_lang            = en
 type                   = PO
 minimum_perc           = 0
@@ -410,6 +419,7 @@ keep_translations      = false
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/quickstart.po
 source_file            = source/locale/pot/chapters/quickstart.pot
 source_lang            = en
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -424,6 +434,9 @@ minimum_perc           = 0
 replace_edited_strings = false
 keep_translations      = false
 
+<<<<<<< HEAD
+[o:mixxx-dj-software:p:mixxx-dj-manual-24:r:hardware--controllers--akai_lpd8]
+=======
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:glossarypot]
 file_filter            = source/locale/<lang>/LC_MESSAGES/glossary.po
 source_file            = source/locale/pot/glossary.pot
@@ -433,6 +446,7 @@ replace_edited_strings = false
 keep_translations      = false
 
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--akai_lpd8]
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/akai_lpd8.po
 source_file            = source/locale/pot/hardware/controllers/akai_lpd8.pot
 source_lang            = en
@@ -1064,6 +1078,7 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--native_instruments_traktor_kontrol_s4_mk3]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.po
 source_file            = source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.pot
+source_lang            = en
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -1081,6 +1096,7 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--native_instruments_traktor_kontrol_z1]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/native_instruments_traktor_kontrol_z1.po
 source_file            = source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_z1.pot
+source_lang            = en
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -1323,6 +1339,7 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--pioneer_ddj_flx4]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/pioneer_ddj_flx4.po
 source_file            = source/locale/pot/hardware/controllers/pioneer_ddj_flx4.pot
+source_lang            = en
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -1583,6 +1600,7 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--yaeltex_minimixxx]
 file_filter            = source/locale/<lang>/LC_MESSAGES/hardware/controllers/yaeltex_minimixxx.po
 source_file            = source/locale/pot/hardware/controllers/yaeltex_minimixxx.pot
+source_lang            = en
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -1600,6 +1618,8 @@ keep_translations      = false
 [o:mixxx-dj-software:p:mixxx-dj-manual-25:r:index]
 file_filter            = source/locale/<lang>/LC_MESSAGES/index.po
 source_file            = source/locale/pot/index.pot
+<<<<<<< HEAD
+=======
 source_lang            = en
 type                   = PO
 minimum_perc           = 0
@@ -1627,6 +1647,7 @@ keep_translations      = false
 file_filter            = source/locale/<lang>/LC_MESSAGES/manual_guidelines.po
 source_file            = source/locale/pot/manual_guidelines.pot
 source_lang            = en
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false
@@ -1671,6 +1692,9 @@ keep_translations      = false
 file_filter            = source/locale/<lang>/LC_MESSAGES/chapters/vinyl_control.po
 source_file            = source/locale/pot/chapters/vinyl_control.pot
 source_lang            = en
+>>>>>>> b18c15129 (Remove 2.3 entries from .tx/config)
+=======
+>>>>>>> 9b646d009 (Remove obsolete entries from .tx/config)
 type                   = PO
 minimum_perc           = 0
 replace_edited_strings = false

source/chapters/appendix/mixxx_controls.rst

@@ -4347,7 +4347,7 @@ In the meantime, skins and controller mappings that still use them will keep wor
                    [PreviewDeckN],scratch
                    [SamplerN],scratch
 
-    Affects playback speed and direction ([differently whether currently playing or not](https://github.com/mixxxdj/mixxx/issues/5350)) (multiplicative).
+    Affects playback speed and direction (`differently whether currently playing or not <https://github.com/mixxxdj/mixxx/issues/5350>`__) (multiplicative).
 
     :range: -3.0..3.0
     :feedback: Waveform

source/locale/ca/LC_MESSAGES/glossary.po

@@ -11,10 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx 2.5\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2024-03-24 15:20+0100\n"
+"PO-Revision-Date: 2022-09-05 05:38+0000\n"
+"Last-Translator: Daniel Schürmann <[email protected]>, 2022\n"
+"Language-Team: Catalan (https://app.transifex.com/mixxx-dj-software/teams/7664/ca/)\n"
+=======
 "POT-Creation-Date: 2024-02-23 07:56+0100\n"
 "PO-Revision-Date: 2022-09-05 05:58+0000\n"
 "Last-Translator: Daniel Schürmann <[email protected]>, 2022\n"
 "Language-Team: Catalan (https://app.transifex.com/mixxx-dj-software/teams/7734/ca/)\n"
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

source/locale/de/LC_MESSAGES/chapters/introduction.po

@@ -4,17 +4,24 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Daniel Schürmann <[email protected]>, 2022
+# Daniel Schürmann <[email protected]>, 2024
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx 2.5\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2024-03-24 15:20+0100\n"
+"PO-Revision-Date: 2022-09-05 05:38+0000\n"
+"Last-Translator: Daniel Schürmann <[email protected]>, 2024\n"
+"Language-Team: German (https://app.transifex.com/mixxx-dj-software/teams/7664/de/)\n"
+=======
 "POT-Creation-Date: 2024-02-23 07:56+0100\n"
 "PO-Revision-Date: 2022-09-05 05:58+0000\n"
 "Last-Translator: Daniel Schürmann <[email protected]>, 2022\n"
 "Language-Team: German (https://app.transifex.com/mixxx-dj-software/teams/7734/de/)\n"
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -267,6 +274,14 @@ msgid ""
 "known as a “sound card”, although most of them are not shaped like cards "
 "anymore)."
 msgstr ""
+"Sie können Mixxx verwenden, um den nächsten Track mit Kopfhörern vorzuhören,"
+" bevor das Publikum ihn hört, auch bekannt als Kopfhörer-Cueing. Dies hilft "
+"Ihnen, einen Track auszuwählen, der für den Moment geeignet ist und gut in "
+"den gerade abgespielten Track gemischt werden kann. Um das Kopfhörer-Cueing "
+"zu verwenden, benötigen Sie mindestens 2 separate Audioausgänge, die in der "
+"Regel von einem USB-Audio-Adapter bereitgestellt werden (auch bekannt als "
+"\"Soundkarte\", obwohl die meisten von ihnen nicht mehr wie Karten geformt "
+"sind)."
 
 #: ../../chapters/introduction.rst:31
 msgid ""

source/locale/de/LC_MESSAGES/index.po

@@ -4,17 +4,24 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Daniel Schürmann <[email protected]>, 2022
+# Daniel Schürmann <[email protected]>, 2024
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx 2.5\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2024-03-24 15:20+0100\n"
+"PO-Revision-Date: 2022-09-05 05:38+0000\n"
+"Last-Translator: Daniel Schürmann <[email protected]>, 2024\n"
+"Language-Team: German (https://app.transifex.com/mixxx-dj-software/teams/7664/de/)\n"
+=======
 "POT-Creation-Date: 2024-02-23 07:56+0100\n"
 "PO-Revision-Date: 2022-09-05 05:58+0000\n"
 "Last-Translator: Daniel Schürmann <[email protected]>, 2022\n"
 "Language-Team: German (https://app.transifex.com/mixxx-dj-software/teams/7734/de/)\n"
+>>>>>>> 46b5492fa759ce056cf9026afdcff001d2fa4339
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -228,22 +235,27 @@ msgid ""
 "Mixxx offers a variety of features to help beginners get started and help "
 "experienced DJs get creative:"
 msgstr ""
+"Mixxx ist eine `freie <https://www.gnu.org/philosophy/free-sw.html>`_ DJ-"
+"Software für Windows, macOS und Linux. Sie ist einfach zu bedienen, auch "
+"wenn Sie noch nie als DJ gearbeitet haben. Mixxx bietet eine Vielzahl von "
+"Funktionen, um Anfängern den Einstieg zu erleichtern und um erfahrenen DJs "
+"zu helfen kreativ zu werden."
 
 #: ../../index.rst:18
 msgid "beat, tempo, and musical key detection"
-msgstr ""
+msgstr "Tempo- und Tonart-Erkennung"
 
 #: ../../index.rst:19
 msgid "sync lock"
-msgstr ""
+msgstr "Sync-Lock"
 
 #: ../../index.rst:20
 msgid "hotcues"
-msgstr ""
+msgstr "Hotcues"
 
 #: ../../index.rst:21
 msgid "looping"
-msgstr ""
+msgstr "Looping"
 
 #: ../../index.rst:22
 msgid "4 decks"
@@ -259,6 +271,8 @@ msgid ""
 "CD players, vinyl turntables or even just your computer's keyboard and "
 "mouse."
 msgstr ""
+"Sie können Mixxx mit MIDI- und HID-Controllern, CD-Playern, Plattenspielern "
+"oder sogar nur mit der Tastatur und Maus Ihres Computers verwenden."
 
 #: ../../index.rst:29
 msgid "Table of Contents"