Skip to content

Commit

Permalink
Fix language-related merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kommunarr committed Jan 15, 2025
2 parents b1f0e5f + 829233b commit f20d1b2
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
8 changes: 5 additions & 3 deletions static/locales/de-DE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,11 @@ Settings:
Hide FreeTube Header Logo: FreeTube-Titellogo ausblenden
Player Settings:
Player Settings: Videoabspieler
Play Next Video: Nächstes Video abspielen
Play Next Video: Empfohlene Videos automatisch abspielen
Turn on Subtitles by Default: Untertitel standardmäßig aktivieren
Autoplay Videos: Videos automatisch abspielen
Autoplay Videos: Videos automatisch starten
Proxy Videos Through Invidious: Proxy-Videos durch Invidious
Autoplay Playlists: Wiedergabelisten automatisch abspielen
Autoplay Playlists: Wiedergabelisten-Videos automatisch abspielen
Default Volume: Standard-Lautstärke
Default Playback Rate: Standard-Wiedergabegeschwindigkeit
Default Video Format:
Expand Down Expand Up @@ -894,6 +894,8 @@ Video:
TranslatedCaptionTemplate: '{language} (übersetzt von {originalLanguage})'
Exit Full Window: Vollständiges Fenster beenden
Hide Stats: Statistiken ausblenden
Autoplay is off: Automatische Wiedergabe ist ausgeschaltet
Autoplay is on: Automatische Wiedergabe ist eingeschaltet
IP block: YouTube hat Ihre IP-Adresse für die Videowiedergabe gesperrt. Bitte versuchen
Sie, zu einem anderen VPN oder Proxy zu wechseln.
Unlisted: Nicht gelistet
Expand Down
8 changes: 5 additions & 3 deletions static/locales/fr-FR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,11 @@ Settings:
Hide FreeTube Header Logo: Masquer le logo d'en-tête de FreeTube
Player Settings:
Player Settings: 'Lecteur'
Play Next Video: 'Lire la vidéo suivante'
Play Next Video: 'Lecture automatique des vidéos recommandées'
Turn on Subtitles by Default: 'Activer les sous-titres par défaut'
Autoplay Videos: 'Lecture automatique des vidéos'
Autoplay Videos: 'Démarrer les vidéos automatiquement'
Proxy Videos Through Invidious: 'Proxy vidéo via Invidious'
Autoplay Playlists: 'Lecture automatique des listes de lecture'
Autoplay Playlists: 'Lire automatiquement les vidéos des listes de lecture'
Default Volume: 'Volume par défaut'
Default Playback Rate: 'Vitesse de lecture par défaut'
Default Video Format:
Expand Down Expand Up @@ -906,6 +906,8 @@ Video:
You appear to be offline: Vous semblez être hors ligne.
Playback will resume automatically when your connection comes back: La lecture
reprendra automatiquement quand votre connexion reviendra.
Autoplay is on: La lecture automatique est activée
Autoplay is off: La lecture automatique est désactivée
IP block: YouTube a bloqué votre adresse IP pour le visionnage de vidéos. Veuillez
essayer de changer de VPN ou de proxy.
Unlisted: Non répertorié
Expand Down
8 changes: 5 additions & 3 deletions static/locales/hu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@ Settings:
Hide FreeTube Header Logo: FreeTube logo elrejtése a fejlécből
Player Settings:
Player Settings: 'Lejátszó'
Play Next Video: 'Következő videó lejátszása'
Play Next Video: 'Ajánlott videók automatikus lejátszása'
Turn on Subtitles by Default: 'Feliratok bekapcsolása alapértelemezetten'
Autoplay Videos: 'Videók automatikus lejátszása'
Autoplay Videos: 'Videók automatikus elindítása'
Proxy Videos Through Invidious: 'Videók proxyzása az Invidiouson keresztül'
Autoplay Playlists: 'Lejátszási listák automatikus lejátszása'
Autoplay Playlists: 'Lejátszási lista az automatikus videó-lejátszáshoz'
Default Volume: 'Alapértelmezett hangerő'
Default Playback Rate: 'Alapértelmezett lejátszási sebesség'
Default Video Format:
Expand Down Expand Up @@ -942,6 +942,8 @@ Video:
Show Stats: Statisztika megjelenítése
Playback will resume automatically when your connection comes back: A lejátszás
automatikusan folytatódik, amikor a kapcsolat helyreáll.
Autoplay is off: Az automatikus lejátszás ki van kapcsolva
Autoplay is on: Az automatikus lejátszás be van kapcsolva
IP block: A YouTube letiltotta az IP-címét a videók megtekintéséhez. Próbáljon meg
másik VPN-re vagy proxyra váltani.
Unlisted: Listázatlan
Expand Down
8 changes: 5 additions & 3 deletions static/locales/is.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,11 @@ Settings:
Hide FreeTube Header Logo: Fela táknmynd FreeTube í haus
Player Settings:
Player Settings: 'Spilari'
Play Next Video: 'Spila næsta myndskeið'
Play Next Video: 'Spila sjálfkrafa myndskeið sem mælt er með'
Turn on Subtitles by Default: 'Sjálfgefið kveikja á skjátextum'
Autoplay Videos: 'Spila myndskeið sjálfkrafa'
Autoplay Videos: 'Ræsa myndskeið sjálfkrafa'
Proxy Videos Through Invidious: 'Beina myndskeiðum í gegnum Invidious-milliþjón'
Autoplay Playlists: 'Spila spilunarlista sjálfkrafa'
Autoplay Playlists: 'Spila sjálfkrafa myndskeið í spilunarlista'
Default Volume: 'Sjálfgefinn hljóðstyrkur'
Default Playback Rate: 'Sjálfgefinn afspilunarhraði'
Default Video Format:
Expand Down Expand Up @@ -933,6 +933,8 @@ Video:
sjálfkrafa áfram þegar tenging næst aftur.
Exit Theatre Mode: Fara út úr bíóham
Theatre Mode: Bíóhamur
Autoplay is off: Slökkt er á sjálfvirkri afspilun
Autoplay is on: Kveikt er á sjálfvirkri afspilun
Unlisted: Óskráð
MembersOnly: Ekki er hægt að horfa á myndskeið einungis fyrir meðlimi með FreeTube
þar sem þau krefjast innskráningar á Google og greiddu þátttökugjaldi á rás innsendandans.
Expand Down
8 changes: 5 additions & 3 deletions static/locales/it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,11 @@ Settings:
Hide FreeTube Header Logo: Nascondi il logo dell'intestazione di FreeTube
Player Settings:
Player Settings: 'Lettore'
Play Next Video: 'Riproduci il prossimo video'
Play Next Video: 'Riproduzione automatica dei video consigliati'
Turn on Subtitles by Default: 'Abilita i sottotitoli per impostazione predefinita'
Autoplay Videos: 'Riproduci i video automaticamente'
Autoplay Videos: 'Avvia video automaticamente'
Proxy Videos Through Invidious: 'Proxy dei video tramite Invidious'
Autoplay Playlists: 'Riproduci le playlist automaticamente'
Autoplay Playlists: 'Riproduzione automatica dei video della playlist'
Default Volume: 'Volume predefinito'
Default Playback Rate: 'Velocità di riproduzione predefinita'
Default Video Format:
Expand Down Expand Up @@ -890,6 +890,8 @@ Video:
Playback will resume automatically when your connection comes back: La riproduzione
riprenderà automaticamente quando verrà ripristinata la connessione.
Skipped segment: Segmento {segmentCategory} saltato
Autoplay is off: La riproduzione automatica è disattivata
Autoplay is on: La riproduzione automatica è attiva
IP block: YouTube ha bloccato il tuo indirizzo IP impedendogli di guardare i video.
Prova a passare a una VPN o a un proxy diverso.
Unlisted: Non elencato
Expand Down

0 comments on commit f20d1b2

Please sign in to comment.