Merge branch 'master' of https://lagunak.gisa-elkartea.org/git/negromate

bideoak/ni_yo_ni_nadie.srt

@@ -80,7 +80,7 @@ ya la has liado demasiado
 
 21
 00:01:25,200 --> 00:01:28,600
-no has hecho ningún test
+eso no lo has testeao   
 
 22
 00:01:28,600 --> 00:01:32,400
@@ -96,7 +96,7 @@ arrepentirse después
 
 25
 00:01:38,900 --> 00:01:42,300
-pero petó el frontend
+pero sin ningun test 
 
 26
 00:01:42,300 --> 00:01:46,300

bideoak/txoria_txori.ass

@@ -0,0 +1,44 @@
+[Script Info]
+; Script generated by Aegisub 3.2.2
+; http://www.aegisub.org/
+Title: Default Aegisub file
+ScriptType: v4.00+
+WrapStyle: 0
+ScaledBorderAndShadow: yes
+YCbCr Matrix: TV.601
+PlayResX: 384
+PlayResY: 288
+
+[Aegisub Project Garbage]
+Audio File: txoria_txori.mp4
+Video File: txoria_txori.mp4
+Video AR Mode: 4
+Video AR Value: 1.333333
+Scroll Position: 9
+Active Line: 17
+Video Position: 2042
+
+[V4+ Styles]
+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+Style: Default,Arial,20,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,10,10,10,1
+
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+Dialogue: 0,0:00:20.00,0:00:24.00,Default,,0,0,0,,{\k60}kodea {\k70}itxita {\k73}utziko {\k197}banu
+Dialogue: 0,0:00:24.00,0:00:27.40,Default,,0,0,0,,{\k127}neria {\k98}izango {\k75}zen
+Dialogue: 0,0:00:27.50,0:00:30.00,Default,,0,0,0,,{\k50}ez {\k69}zuten {\k131}kopiatuko
+Dialogue: 0,0:00:33.00,0:00:37.00,Default,,0,0,0,,{\k100}kodea {\k95}itxita {\k94}utziko {\k111}banu
+Dialogue: 0,0:00:37.50,0:00:40.00,Default,,0,0,0,,{\k101}neria {\k80}izango {\k69}zen
+Dialogue: 0,0:00:40.20,0:00:42.70,Default,,0,0,0,,{\k30}ez {\k56}zuten {\k194}kopiatuko
+Dialogue: 0,0:00:42.70,0:00:45.00,Default,,0,0,0,,{\k71}baina {\k159}honela
+Dialogue: 0,0:00:45.00,0:00:48.00,Default,,0,0,0,,{\k16}ez {\k61}zen {\k59}gehiago {\k46}askea {\k118}izango
+Dialogue: 0,0:00:48.40,0:00:50.50,Default,,0,0,0,,{\k100}baina {\k60}honela
+Dialogue: 0,0:00:50.50,0:00:53.40,Default,,0,0,0,,{\k28}ez {\k57}zen {\k54}gehiago {\k55}askea {\k56}izango
+Dialogue: 0,0:00:53.50,0:00:55.00,Default,,0,0,0,,{\k70}eta {\k80}nik,
+Dialogue: 0,0:00:55.00,0:00:58.00,Default,,0,0,0,,{\k106}kodea {\k56}nuen {\k138}maite!
+Dialogue: 0,0:00:58.00,0:00:59.50,Default,,0,0,0,,{\k35}eta {\k115}nik,
+Dialogue: 0,0:00:59.50,0:01:01.50,Default,,0,0,0,,{\k87}kodea {\k34}nuen {\k79}maite!
+Dialogue: 0,0:01:02.60,0:01:05.00,Default,,0,0,0,,{\k28}la {\k28}ra {\k28}la {\k28}ra {\k27}la {\k28}la {\k27}ra {\k28}la {\k18}ra
+Dialogue: 0,0:01:06.70,0:01:10.00,Default,,0,0,0,,{\k28}la {\k28}ra {\k28}la {\k28}ra {\k27}ra {\k28}la {\k27}ra {\k28}la {\k18}ra
+Dialogue: 0,0:01:10.40,0:01:12.40,Default,,0,0,0,,{\k28}la {\k28}ra {\k28}la {\k28}ra {\k27}la {\k28}la {\k27}ra {\k28}la {\k18}ra
+Dialogue: 0,0:00:12.50,0:00:15.50,Default,,0,0,0,,{\k28}la {\k28}ra {\k28}la {\k28}ra {\k27}ra {\k28}la {\k27}ra

cajonDesastre/el-tractor-amarillo.txt

@@ -1,7 +0,0 @@
-he probado todos los linux
-y me quedo con la debian
-hay que usar la debian
-ya lo decia mi madre
-....
-
-y es la distro mas estable

cajonDesastre/elTractorAmarillo.txt

@@ -1,9 +0,0 @@
-He probado todos los Linux
-y me quedo con la Debian
-he probado todos los linux
-y la debian es la pera
-
-Hay que usar la debian
-que es la más libre de todas
-tiene paquete anarka
-y se organiza en asamblea

cajonDesastre/laztana.txt

@@ -1,9 +0,0 @@
-Sudurra galtzen ari naiz
-Farlopa gehiegi xurgatzen dudalako, benetan
-
-Sudurra galtzen hasi naiz
-Farlopa gehiegi xurgatzen dudalako
-
-Ai ama, titaniazko sudurra
-Erregeeeak beeezalaaaa
-Xurgaaatzeen