Skip to content

Commit f5fd11f

Browse files
stuartastuarta
committed
Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into fixes/0.24
2 parents 9f9dcf5 + 07b1cc1 commit f5fd11f

File tree

36 files changed

+2723
-2125
lines changed

36 files changed

+2723
-2125
lines changed

‎mythplugins/mytharchive/i18n/mytharchive_da.qm‎

-64 Bytes
Binary file not shown.

‎mythplugins/mytharchive/i18n/mytharchive_da.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@
164164
<message>
165165
<location filename="../mytharchive/mythburn.cpp" line="400"/>
166166
<source>Retrieving File Information. Please Wait...</source>
167-
<translation>Modtager information.for fil Vent venligst...</translation>
167+
<translation>Modtager information for fil. Vent venligst...</translation>
168168
</message>
169169
<message>
170170
<location filename="../mytharchive/mythburn.cpp" line="466"/>
171171
<source>Encoder: </source>
172-
<translation>Encoder:</translation>
172+
<translation>Encoder: </translation>
173173
</message>
174174
<message>
175175
<location filename="../mytharchive/mythburn.cpp" line="792"/>
@@ -237,7 +237,7 @@
237237
<message>
238238
<location filename="../mytharchive/main.cpp" line="304"/>
239239
<source>View Archive Log</source>
240-
<translation>Vis arkiv log</translation>
240+
<translation>Vis arkivlog</translation>
241241
</message>
242242
<message>
243243
<location filename="../mytharchive/main.cpp" line="306"/>
@@ -656,6 +656,13 @@ Indsæt en blank DVD i drevet og vælg en af mulighederne nedenfor.</translation
656656
</context>
657657
<context>
658658
<name>RecordingSelector</name>
659+
<message>
660+
<location filename="../mytharchive/recordingselector.cpp" line="119"/>
661+
<source>Retrieving Recording List.
662+
Please Wait...</source>
663+
<translation>Modtager optagelseslisten.
664+
Vent venligst...</translation>
665+
</message>
659666
<message>
660667
<location filename="../mytharchive/recordingselector.cpp" line="199"/>
661668
<source>Clear All</source>
@@ -678,11 +685,6 @@ Indsæt en blank DVD i drevet og vælg en af mulighederne nedenfor.</translation
678685
<source>All Recordings</source>
679686
<translation>Alle optagelser</translation>
680687
</message>
681-
<message>
682-
<location filename="../mytharchive/recordingselector.cpp" line="119"/>
683-
<source>Retrieving Recording List. Please Wait...</source>
684-
<translation>Modtager optagelseslisten. Vent venligst...</translation>
685-
</message>
686688
<message>
687689
<location filename="../mytharchive/recordingselector.cpp" line="143"/>
688690
<source>Either you don&apos;t have any recordings or no recordings are available locally!</source>
@@ -873,7 +875,7 @@ Indsæt en blank DVD i drevet og vælg en af mulighederne nedenfor.</translation
873875
<message>
874876
<location filename="themestrings.h" line="53"/>
875877
<source>Select Archive Items</source>
876-
<translation>Vælg arkiv emner</translation>
878+
<translation>Vælg arkivemner</translation>
877879
</message>
878880
<message>
879881
<location filename="themestrings.h" line="55"/>

‎mythplugins/mythgallery/i18n/mythgallery_da.qm‎

575 Bytes
Binary file not shown.

‎mythplugins/mythgallery/i18n/mythgallery_da.ts‎

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -216,112 +216,112 @@
216216
<context>
217217
<name>MythControls</name>
218218
<message>
219-
<location filename="../mythgallery/main.cpp" line="69"/>
219+
<location filename="../mythgallery/main.cpp" line="71"/>
220220
<source>Image viewer / slideshow</source>
221221
<translation>Billedviser / slideshow</translation>
222222
</message>
223223
<message>
224-
<location filename="../mythgallery/main.cpp" line="72"/>
224+
<location filename="../mythgallery/main.cpp" line="74"/>
225225
<source>Start/Stop Slideshow</source>
226226
<translation>Start/stop slideshow</translation>
227227
</message>
228228
<message>
229-
<location filename="../mythgallery/main.cpp" line="74"/>
229+
<location filename="../mythgallery/main.cpp" line="76"/>
230230
<source>Go to the first image in thumbnail view</source>
231231
<translation>Gå til det første billede i oversigtsvisning</translation>
232232
</message>
233233
<message>
234-
<location filename="../mythgallery/main.cpp" line="76"/>
234+
<location filename="../mythgallery/main.cpp" line="78"/>
235235
<source>Go to the last image in thumbnail view</source>
236236
<translation>Gå til det sidste billede i oversigtsvisning</translation>
237237
</message>
238238
<message>
239-
<location filename="../mythgallery/main.cpp" line="78"/>
239+
<location filename="../mythgallery/main.cpp" line="80"/>
240240
<source>Start Slideshow in thumbnail view</source>
241241
<translation>Start slideshow i oversigtsvisning</translation>
242242
</message>
243243
<message>
244-
<location filename="../mythgallery/main.cpp" line="80"/>
244+
<location filename="../mythgallery/main.cpp" line="82"/>
245245
<source>Start Random Slideshow in thumbnail view</source>
246246
<translation>Start tilfældigt slideshow i oversigtsvisning</translation>
247247
</message>
248248
<message>
249-
<location filename="../mythgallery/main.cpp" line="83"/>
249+
<location filename="../mythgallery/main.cpp" line="85"/>
250250
<source>Rotate image right 90 degrees</source>
251251
<translation>Roter billede 90 grader mod højre</translation>
252252
</message>
253253
<message>
254-
<location filename="../mythgallery/main.cpp" line="85"/>
254+
<location filename="../mythgallery/main.cpp" line="87"/>
255255
<source>Rotate image left 90 degrees</source>
256256
<translation>Roter billede 90 grader mod venstre</translation>
257257
</message>
258258
<message>
259-
<location filename="../mythgallery/main.cpp" line="87"/>
259+
<location filename="../mythgallery/main.cpp" line="89"/>
260260
<source>Zoom image out</source>
261261
<translation>Zoom ud</translation>
262262
</message>
263263
<message>
264-
<location filename="../mythgallery/main.cpp" line="89"/>
264+
<location filename="../mythgallery/main.cpp" line="91"/>
265265
<source>Zoom image in</source>
266266
<translation>Zoom ind</translation>
267267
</message>
268268
<message>
269-
<location filename="../mythgallery/main.cpp" line="91"/>
269+
<location filename="../mythgallery/main.cpp" line="93"/>
270270
<source>Scroll image up</source>
271271
<translation>Flyt billede op</translation>
272272
</message>
273273
<message>
274-
<location filename="../mythgallery/main.cpp" line="93"/>
274+
<location filename="../mythgallery/main.cpp" line="95"/>
275275
<source>Scroll image left</source>
276276
<translation>Flyt billede til venstre</translation>
277277
</message>
278278
<message>
279-
<location filename="../mythgallery/main.cpp" line="95"/>
279+
<location filename="../mythgallery/main.cpp" line="97"/>
280280
<source>Scroll image right</source>
281281
<translation>Flyt billede til venstre</translation>
282282
</message>
283283
<message>
284-
<location filename="../mythgallery/main.cpp" line="97"/>
284+
<location filename="../mythgallery/main.cpp" line="99"/>
285285
<source>Scroll image down</source>
286286
<translation>Flyt billede ned</translation>
287287
</message>
288288
<message>
289-
<location filename="../mythgallery/main.cpp" line="99"/>
289+
<location filename="../mythgallery/main.cpp" line="101"/>
290290
<source>Recenter image</source>
291291
<translation>Centrer billedet</translation>
292292
</message>
293293
<message>
294-
<location filename="../mythgallery/main.cpp" line="101"/>
294+
<location filename="../mythgallery/main.cpp" line="103"/>
295295
<source>Full-size (un-zoom) image</source>
296296
<translation>Vis billede i fuld størrelse</translation>
297297
</message>
298298
<message>
299-
<location filename="../mythgallery/main.cpp" line="103"/>
299+
<location filename="../mythgallery/main.cpp" line="105"/>
300300
<source>Go to the upper-left corner of the image</source>
301301
<translation>Gå til øverste venstre hjørne af billedet</translation>
302302
</message>
303303
<message>
304-
<location filename="../mythgallery/main.cpp" line="105"/>
304+
<location filename="../mythgallery/main.cpp" line="107"/>
305305
<source>Go to the lower-right corner of the image</source>
306306
<translation>Gå til nederste højre hjørne af billedet</translation>
307307
</message>
308308
<message>
309-
<location filename="../mythgallery/main.cpp" line="107"/>
309+
<location filename="../mythgallery/main.cpp" line="109"/>
310310
<source>Mark image</source>
311311
<translation>Marker billede</translation>
312312
</message>
313313
<message>
314-
<location filename="../mythgallery/main.cpp" line="109"/>
314+
<location filename="../mythgallery/main.cpp" line="111"/>
315315
<source>Toggle scale to fullscreen/scale to fit</source>
316316
<translation>Skift mellem skaler-til-fuldskærm og skaler-for-tilpasning</translation>
317317
</message>
318318
<message>
319-
<location filename="../mythgallery/main.cpp" line="111"/>
319+
<location filename="../mythgallery/main.cpp" line="113"/>
320320
<source>MythGallery Media Handler 1/2</source>
321321
<translation>MythGallery mediehåndtering 1/2</translation>
322322
</message>
323323
<message>
324-
<location filename="../mythgallery/main.cpp" line="114"/>
324+
<location filename="../mythgallery/main.cpp" line="116"/>
325325
<source>MythGallery Media Handler 2/2</source>
326326
<translation>MythGallery mediehåndtering 2/2</translation>
327327
</message>
@@ -344,17 +344,27 @@
344344
<translation>Stier hvor der skal importeres billeder fra</translation>
345345
</message>
346346
<message>
347-
<location filename="../mythgallery/gallerysettings.cpp" line="127"/>
347+
<location filename="../mythgallery/gallerysettings.cpp" line="84"/>
348+
<source>Automatically load MythGallery to display pictures</source>
349+
<translation>Start automatisk MythGallery for at vise billeder</translation>
350+
</message>
351+
<message>
352+
<location filename="../mythgallery/gallerysettings.cpp" line="86"/>
353+
<source>When a new CD-Rom or removable storage device containing pictures is detected then load MythGallery to display the content.</source>
354+
<translation>Når der detekteres en ny CD-ROM eller flytbar disk indeholdende billeder, startes MythGallery for at vise indholdet.</translation>
355+
</message>
356+
<message>
357+
<location filename="../mythgallery/gallerysettings.cpp" line="136"/>
348358
<source>Type of transition</source>
349359
<translation>Overgangstype</translation>
350360
</message>
351361
<message>
352-
<location filename="../mythgallery/gallerysettings.cpp" line="150"/>
362+
<location filename="../mythgallery/gallerysettings.cpp" line="159"/>
353363
<source>Type of background</source>
354364
<translation>Baggrundstype</translation>
355365
</message>
356366
<message>
357-
<location filename="../mythgallery/gallerysettings.cpp" line="165"/>
367+
<location filename="../mythgallery/gallerysettings.cpp" line="174"/>
358368
<source>This is the number of seconds to display each picture.</source>
359369
<translation>Antal sekunder som hvert billede skal vises.</translation>
360370
</message>
@@ -364,37 +374,37 @@
364374
<translation>Dette er en kolon separeret liste af stier. Hvis stien i listen er en mappe, bliver indeholdet kopieret. Hvis det er en kommando, bliver den kørt.</translation>
365375
</message>
366376
<message>
367-
<location filename="../mythgallery/gallerysettings.cpp" line="142"/>
377+
<location filename="../mythgallery/gallerysettings.cpp" line="151"/>
368378
<source>This is the type of transition used between pictures in slideshow mode.</source>
369379
<translation>Dette er den overgangstype der benyttes mellem billederne under slideshow.</translation>
370380
</message>
371381
<message>
372-
<location filename="../mythgallery/gallerysettings.cpp" line="155"/>
382+
<location filename="../mythgallery/gallerysettings.cpp" line="164"/>
373383
<source>This is the type of background for each picture in single view mode.</source>
374384
<translation>Dette er den baggrundstype der benyttes til hvert billede under enkeltbilledvisning.</translation>
375385
</message>
376386
<message>
377-
<location filename="../mythgallery/gallerysettings.cpp" line="163"/>
387+
<location filename="../mythgallery/gallerysettings.cpp" line="172"/>
378388
<source>Slideshow Delay</source>
379389
<translation>Slideshow pause</translation>
380390
</message>
381391
<message>
382-
<location filename="../mythgallery/gallerysettings.cpp" line="86"/>
392+
<location filename="../mythgallery/gallerysettings.cpp" line="95"/>
383393
<source>Use OpenGL transitions</source>
384394
<translation>Brug OpenGL overgange</translation>
385395
</message>
386396
<message>
387-
<location filename="../mythgallery/gallerysettings.cpp" line="88"/>
397+
<location filename="../mythgallery/gallerysettings.cpp" line="97"/>
388398
<source>Check this to enable OpenGL based slideshow transitions</source>
389399
<translation>Sæt denne for at aktivere OpenGL overgange</translation>
390400
</message>
391401
<message>
392-
<location filename="../mythgallery/gallerysettings.cpp" line="96"/>
402+
<location filename="../mythgallery/gallerysettings.cpp" line="105"/>
393403
<source>Type of OpenGL transition</source>
394404
<translation>OpenGL overgangstype</translation>
395405
</message>
396406
<message>
397-
<location filename="../mythgallery/gallerysettings.cpp" line="108"/>
407+
<location filename="../mythgallery/gallerysettings.cpp" line="117"/>
398408
<source>This is the type of OpenGL transition used between pictures in slideshow mode.</source>
399409
<translation>Dette er den OpenGL overgangetype som benyttes mellem billeder i slideshow mode.</translation>
400410
</message>
@@ -419,12 +429,12 @@
419429
<translation>Hvis aktiv, bliver mini-billederne gemt i&apos;.thumbcache&apos; mapper i ovenstående mappe. Ellers bliver de gemt i brugerens hjemmemappe.</translation>
420430
</message>
421431
<message>
422-
<location filename="../mythgallery/gallerysettings.cpp" line="173"/>
432+
<location filename="../mythgallery/gallerysettings.cpp" line="182"/>
423433
<source>Recurse into directories</source>
424434
<translation>Inkluder undermapper</translation>
425435
</message>
426436
<message>
427-
<location filename="../mythgallery/gallerysettings.cpp" line="174"/>
437+
<location filename="../mythgallery/gallerysettings.cpp" line="183"/>
428438
<source>Check this to let the slideshow recurse into sub-directories.</source>
429439
<translation>Sættes hvis slideshowet skal indeholde billeder fra undermapper.</translation>
430440
</message>
@@ -449,22 +459,22 @@
449459
<translation>Sorteringsorden af mini-billeder under navigering.</translation>
450460
</message>
451461
<message>
452-
<location filename="../mythgallery/gallerysettings.cpp" line="117"/>
462+
<location filename="../mythgallery/gallerysettings.cpp" line="126"/>
453463
<source>Duration of OpenGL Transition (milliseconds)</source>
454464
<translation>Varighed af OpenGL overgang (millisekunder)</translation>
455465
</message>
456466
<message>
457-
<location filename="../mythgallery/gallerysettings.cpp" line="185"/>
467+
<location filename="../mythgallery/gallerysettings.cpp" line="194"/>
458468
<source>MythGallery Settings (Slideshow)</source>
459469
<translation>MythGallery indstillinger (Slideshow)</translation>
460470
</message>
461471
<message>
462-
<location filename="../mythgallery/gallerysettings.cpp" line="215"/>
472+
<location filename="../mythgallery/gallerysettings.cpp" line="224"/>
463473
<source>MythGallery Settings (General)</source>
464474
<translation>MythGallery indstillinger (Generelt)</translation>
465475
</message>
466476
<message>
467-
<location filename="../mythgallery/main.cpp" line="45"/>
477+
<location filename="../mythgallery/main.cpp" line="44"/>
468478
<source>MythGallery cannot find its start directory.
469479
%1
470480
Check the directory exists, is readable and the setting is correct on MythGallery&apos;s settings page.</source>

‎mythtv/bindings/python/MythTV/system.py‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,18 @@ def _fillNone(self):
147147

148148
def _process(self, xml):
149149
for element in xml.getchildren():
150-
if element.tag in self:
151-
if (element.text == '') or (element.text is None):
152-
self[element.tag] = None
153-
else:
154-
self[element.tag] = \
155-
self._trans[self._global_type[element.tag]]\
156-
(element.text)
157-
if element.tag in self._groups:
158-
self.__dict__[element.tag] = \
159-
eval('self.%s(element)' % element.tag.capitalize())
150+
try:
151+
if element.tag in self:
152+
if (element.text == '') or (element.text is None):
153+
self[element.tag] = None
154+
else:
155+
self[element.tag] = \
156+
self._trans[self._global_type[element.tag]]\
157+
(element.text)
158+
if element.tag in self._groups:
159+
self.__dict__[element.tag] = \
160+
eval('self.%s(element)' % element.tag.capitalize())
161+
except: pass
160162

161163
class VideoMetadata( Metadata ):
162164
_field_order = ['title','subtitle','tagline','description','season',

0 commit comments

Comments
 (0)