Merge origin/master

This commit is contained in:
Jindra Petřík
2015-05-18 21:28:41 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -351,5 +351,5 @@ config.description.loopMedia = Automatically restarts the playing of the sounds
config.name.gui.timeLineSplitPane.dividerLocationPercent = (Internal) Timeline Splitter location
config.description.gui.timeLineSplitPane.dividerLocationPercent =
config.name.cacheOnDisk = Cache images
config.description.cacheOnDisk = Cache the decoded image objects
config.name.cacheImages = Cache images
config.description.cacheImages = Cache the decoded image objects

View File

@@ -351,5 +351,5 @@ config.description.loopMedia = Aut\u00f3matikusan \u00fajraind\u00edtja a zen\u0
config.name.gui.timeLineSplitPane.dividerLocationPercent = (Internal) Timeline oszt\u00f3 helyzete
config.description.gui.timeLineSplitPane.dividerLocationPercent =
config.name.cacheOnDisk = K\u00e9pek gyors\u00edt\u00f3t\u00e1rba helyez\u00e9se
config.description.cacheOnDisk = A dek\u00f3dolt k\u00e9peket gyors\u00edt\u00f3t\u00e1rba helyezi
config.name.cacheImages = K\u00e9pek gyors\u00edt\u00f3t\u00e1rba helyez\u00e9se
config.description.cacheImages = A dek\u00f3dolt k\u00e9peket gyors\u00edt\u00f3t\u00e1rba helyezi