diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php
index b0e378a9f..882d22c44 100644
--- a/airtime_mvc/application/services/ShowFormService.php
+++ b/airtime_mvc/application/services/ShowFormService.php
@@ -393,7 +393,7 @@ class Application_Service_ShowFormService
 
         //if the show is repeating, set the start date to the next
         //repeating instance in the future
-        if ($currentShowDay->isRepeating()) {
+        if ($this->ccShow->isRepeating()) {
              list($originalShowStartDateTime,) = $this->getNextFutureRepeatShowTime();
         } else {
             $originalShowStartDateTime = $dt;
diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
index acece2b3e..5086a3ada 100644
Binary files a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
index ff7018044..59b047a0a 100644
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-04-11 13:09+0000\n"
-"Last-Translator: picizse <picizse@gmail.com>\n"
+"PO-Revision-Date: 2014-04-25 15:57+0000\n"
+"Last-Translator: danielhjames <daniel@64studio.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/airtime/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,12 +62,30 @@ msgstr "Felkeverés"
 msgid "Set Cue In"
 msgstr "Felkeverés Beállítása"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/layouts/scripts/layout.phtml:54
 #: airtime_mvc/application/models/Block.php:1348
 #: airtime_mvc/application/controllers/LocaleController.php:273
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:56
 msgid "Cue Out"
 msgstr "Lekeverés"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/configs/navigation.php:33
+msgid "Calendar"
+msgstr "Naptár"
+=======
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
+#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:7
+#: airtime_mvc/application/models/Block.php:1349
+#: airtime_mvc/application/controllers/LocaleController.php:67
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:57
+msgid "Creator"
+msgstr "Előadó/Szerző"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:56
 msgid "Set Cue Out"
@@ -332,10 +350,201 @@ msgstr "Az adás újbóli közvetítésére 1 órát kell várni."
 msgid "Preferences"
 msgstr "Beállítások"
 
+<<<<<<< HEAD
+=======
+#: airtime_mvc/application/services/HistoryService.php:1109
+#: airtime_mvc/application/services/HistoryService.php:1149
+#: airtime_mvc/application/services/HistoryService.php:1166
+#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:7
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:57
+#: airtime_mvc/application/controllers/LocaleController.php:67
+#: airtime_mvc/application/models/Block.php:1349
+msgid "Creator"
+msgstr "Szerző"
+
+#: airtime_mvc/application/services/HistoryService.php:1110
+#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:8
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:49
+#: airtime_mvc/application/controllers/LocaleController.php:68
+#: airtime_mvc/application/models/Block.php:1341
+msgid "Album"
+msgstr "Album"
+
+#: airtime_mvc/application/services/HistoryService.php:1111
+#: airtime_mvc/application/services/HistoryService.php:1168
+#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:9
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:65
+#: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/models/Block.php:1357
+msgid "Length"
+msgstr "Hossz"
+
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:10
+#: airtime_mvc/application/forms/StreamSettingSubForm.php:132
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:59
+#: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/models/Block.php:1351
+msgid "Genre"
+msgstr "Műfaj"
+
+#: airtime_mvc/application/services/HistoryService.php:1113
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:67
+#: airtime_mvc/application/controllers/LocaleController.php:83
+#: airtime_mvc/application/models/Block.php:1359
+msgid "Mood"
+msgstr "Hangulat"
+
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:61
+#: airtime_mvc/application/controllers/LocaleController.php:77
+#: airtime_mvc/application/models/Block.php:1353
+msgid "Label"
+msgstr "Címke"
+
+#: airtime_mvc/application/services/HistoryService.php:1115
+#: airtime_mvc/application/services/HistoryService.php:1169
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:52
+#: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/models/Block.php:1344
+msgid "Composer"
+msgstr "Hangszerkesztő"
+
+#: airtime_mvc/application/services/HistoryService.php:1116
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:60
+#: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/models/Block.php:1352
+msgid "ISRC"
+msgstr "ISRC"
+
+#: airtime_mvc/application/services/HistoryService.php:1117
+#: airtime_mvc/application/services/HistoryService.php:1170
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:54
+#: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/models/Block.php:1346
+msgid "Copyright"
+msgstr "Szerzői jog"
+
+#: airtime_mvc/application/services/HistoryService.php:1118
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:75
+#: airtime_mvc/application/controllers/LocaleController.php:90
+#: airtime_mvc/application/models/Block.php:1367
+msgid "Year"
+msgstr "Év"
+
+#: airtime_mvc/application/services/HistoryService.php:1119
+msgid "Track"
+msgstr "Szám"
+
+#: airtime_mvc/application/services/HistoryService.php:1120
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:53
+#: airtime_mvc/application/controllers/LocaleController.php:72
+#: airtime_mvc/application/models/Block.php:1345
+msgid "Conductor"
+msgstr "Karmester"
+
+#: airtime_mvc/application/services/HistoryService.php:1121
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:62
+#: airtime_mvc/application/controllers/LocaleController.php:78
+#: airtime_mvc/application/models/Block.php:1354
+msgid "Language"
+msgstr "Nyelv"
+
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/forms/EditHistoryItem.php:32
+msgid "Start Time"
+msgstr "Kezdési Idő"
+
+#: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/forms/EditHistoryItem.php:44
+msgid "End Time"
+msgstr "Fejezési Idő"
+
+#: airtime_mvc/application/services/HistoryService.php:1167
+msgid "Played"
+msgstr "Lejátszva"
+
+#: airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml:3
+#: airtime_mvc/application/views/scripts/library/library.phtml:3
+msgid "File import in progress..."
+msgstr "Fájl importálása folyamatban..."
+
+#: airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml:5
+#: airtime_mvc/application/views/scripts/library/library.phtml:10
+msgid "Advanced Search Options"
+msgstr "Speciális Keresési Beállítások"
+
+#: airtime_mvc/application/views/scripts/listenerstat/index.phtml:2
+msgid "Listener Count Over Time"
+msgstr "Hallgatói Statisztika"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:11
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:11
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:5
+msgid "New"
+msgstr "Új"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:14
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:14
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:8
+msgid "New Playlist"
+msgstr "Új Lejátszási Lista"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:15
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:15
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:9
+msgid "New Smart Block"
+msgstr "Új Smart Block"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:16
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:16
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:10
+msgid "New Webstream"
+msgstr "Új Adásfolyam"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21
+msgid "Empty playlist content"
+msgstr "Üres lejátszási lista tartalom"
+
+<<<<<<< HEAD
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21
+msgid "Clear"
+msgstr "Törlés"
+=======
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This"
+" information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr "Segítse az Airtime fejlesztését azáltal, hogy a Sourcefabric tudja, hogy Ön, hogyan használja azt. Információk összegyűjtése céljából, rendszerezve azokat, hogy fokozza a felhasználás élményét.%sKlikkeljen a 'Támogatási Visszajelzés Küldése' mezőbe és győződjön meg arról, hogy a funkciók használatának minősége folyamatosan javul."
+>>>>>>> 2.5.x
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24
+msgid "Shuffle playlist"
+msgstr "Véletlenszerű lejátszási lista"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24
+#: airtime_mvc/application/forms/SmartBlockCriteria.php:334
+msgid "Shuffle"
+msgstr "Véletlenszerű"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:27
+msgid "Save playlist"
+msgstr "Lejátszási lista mentése"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:27
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:24
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:16
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+>>>>>>> cc-5709-airtime-analyzer
 #: airtime_mvc/application/views/scripts/preference/index.phtml:6
 #: airtime_mvc/application/views/scripts/preference/index.phtml:14
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:6
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:16
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:27
@@ -348,6 +557,374 @@ msgstr "Beállítások"
 #: airtime_mvc/application/forms/EditAudioMD.php:135
 msgid "Save"
 msgstr "Mentés"
+=======
+#: airtime_mvc/application/views/scripts/playouthistorytemplate/template-contents.phtml:85
+#: airtime_mvc/application/forms/EditHistory.php:131
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/EditAudioMD.php:135
+#: airtime_mvc/application/forms/SupportSettings.php:158
+#: airtime_mvc/application/controllers/LocaleController.php:285
+msgid "Save"
+msgstr "Mentés"
+
+<<<<<<< HEAD
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:34
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:31
+msgid "Playlist crossfade"
+msgstr "Lejátszási lista átúsztatása"
+=======
+#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:109
+msgid "Master Source Connection URL:"
+msgstr "Mester Forrási URL Kapcsolat:"
+>>>>>>> 2.5.x
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:53
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:55
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:39
+msgid "View / edit description"
+msgstr "A leíás megtekíntése / szerkesztése"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:55
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:57
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:41
+#: airtime_mvc/application/forms/StreamSettingSubForm.php:162
+msgid "Description"
+msgstr "Leírás"
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:67
+#: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:19
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:72
+msgid "Fade in: "
+msgstr "Felúsztatás:"
+
+<<<<<<< HEAD
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:70
+#: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:6
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:75
+msgid "Fade out: "
+msgstr "Leúsztatás:"
+=======
+#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:153
+msgid "Show Source Connection URL:"
+msgstr "Műsor Forrási URL Kapcsolat:"
+>>>>>>> 2.5.x
+
+#: airtime_mvc/application/views/scripts/playlist/playlist.phtml:85
+msgid "No open playlist"
+msgstr "Nincs megnyitott lejátszási lista"
+
+#: airtime_mvc/application/views/scripts/playlist/update.phtml:54
+msgid "Expand Static Block"
+msgstr "Statikus Block Kibővítése"
+
+#: airtime_mvc/application/views/scripts/playlist/update.phtml:59
+msgid "Expand Dynamic Block"
+msgstr "Dinamikus Block Kibővítése"
+
+#: airtime_mvc/application/views/scripts/playlist/update.phtml:135
+msgid "Empty smart block"
+msgstr "Üres smart block"
+
+#: airtime_mvc/application/views/scripts/playlist/update.phtml:137
+msgid "Empty playlist"
+msgstr "Üres lejátszási lista"
+
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:3
+#: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:3
+msgid "Show Waveform"
+msgstr "Mutasd a Hullámalakot"
+
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:5
+msgid "Cue In: "
+msgstr "Felkeverés:"
+
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:5
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:12
+msgid "(hh:mm:ss.t)"
+msgstr "(óó:pp:mm.t)"
+
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:12
+msgid "Cue Out: "
+msgstr "Lekeverés:"
+
+#: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:19
+msgid "Original Length:"
+msgstr "Eredeti Hossz:"
+
+#: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:6
+#: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:19
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:72
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:75
+msgid "(ss.t)"
+msgstr "(mm.t)"
+
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21
+msgid "Empty smart block content"
+msgstr "Üres smart block tartalom"
+
+#: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:90
+msgid "No open smart block"
+msgstr "Nincs megnyitott smart block"
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid "%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"
+msgstr "%sAirtime%s %s, a nyitott rádiós szoftver, az ütemezett és távoli állomás menedzsment. %s"
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. az Airtime forgalmazója %sGNU GPL v.3%s alatt"
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Üdvözöljük az Airtime-nál!"
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid "Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr "Itt van pár tipp, hogy hogyan is automatizálhatja adásait az Airtime segítségével:"
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:7
+<<<<<<< HEAD
+msgid "Begin by adding your files to the library using the 'Add Media' menu button. You can drag and drop your files to this window too."
+msgstr "Kezdje médiafájlok hozzáadásával a 'Média Hozzáadása' menü gombon. A hozd és vidd fájlokat ugyanebben az ablakban szerkesztheti."
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:8
+msgid "Create a show by going to 'Calendar' in the menu bar, and then clicking the '+ Show' icon. This can be either a one-time or repeating show. Only admins and program managers can add shows."
+msgstr "Hozzon létre egy műsort a 'Naptár' menüsorban, majd kattintson a '+ Műsor' ikonra. Ez lehet egyszeri vagy ismétlődő műsor. Csak az adminisztrátorok és a programok vezetői adhatnak hozzá műsort."
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:9
+msgid "Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting 'Add / Remove Content'"
+msgstr "Adjon hozzá médiát, hogy a műsora futni tudjon, az Ütemezett naptárban, bal egérgombbal kattintva, és itt válassza ki a 'Tartalom Hozzáadása/Eltávolítása' opciót"
+=======
+msgid ""
+"Begin by adding your files to the library using the 'Add Media' menu button."
+" You can drag and drop your files to this window too."
+msgstr "Kezdje médiafájlok hozzáadásával a 'Média Hozzáadása' menü gombon. A \"hozd és vidd\" fájlokat ugyanebben az ablakban szerkesztheti."
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:8
+msgid ""
+"Create a show by going to 'Calendar' in the menu bar, and then clicking the "
+"'+ Show' icon. This can be either a one-time or repeating show. Only admins "
+"and program managers can add shows."
+msgstr "Hozzon létre egy műsort a 'Naptár' menüpontban, majd kattintson a '+ Műsor' ikonra. Ez lehet alkalmi vagy megismétlő műsor. Csak az adminisztrátorok és a programkezelők adhatnak hozzá műsort."
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:9
+msgid ""
+"Add media to the show by going to your show in the Schedule calendar, left-"
+"clicking on it and selecting 'Add / Remove Content'"
+msgstr "Adjon hozzá médiatartalmakat, hogy műsorokat tudjon ütemezni, a 'Naptár' menüpontban, bal egérgombbal kattintva, és itt válassza ki a 'Tartalom Hozzáadása/Eltávolítása' opciót"
+>>>>>>> 2.5.x
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:10
+msgid "Select your media from the left pane and drag them to your show in the right pane."
+msgstr "Válassza ki a média tartalmat a bal oldali panelen, és húzza azt a műsorba, a jobb oldali panelre."
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:12
+msgid "Then you're good to go!"
+msgstr "És már készen is van!"
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
+#, php-format
+msgid "For more detailed help, read the %suser manual%s."
+msgstr "További segítségért, olvassa el a %shasználati útmutatót%s."
+
+#: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/livestream.phtml:9
+msgid "Live stream"
+msgstr "Élő adásfolyam"
+
+#: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:3
+msgid "Share"
+msgstr "Megosztás"
+
+#: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:64
+msgid "Select stream:"
+msgstr "Adásfolyam:"
+
+#: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:90
+#: airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml:60
+msgid "mute"
+msgstr "elnémítás"
+
+#: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:91
+#: airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml:63
+msgid "unmute"
+msgstr "elnémítás megszüntetése"
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
+#: airtime_mvc/application/controllers/LocaleController.php:92
+#: airtime_mvc/application/controllers/LocaleController.php:392
+msgid "All"
+msgstr "Összes"
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
+msgid "Failed"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+msgid "Pending"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
+msgid "Recent Uploads"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:52
+msgid "Stream URL:"
+msgstr "Adásfolyam URL:"
+
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:57
+msgid "Default Length:"
+msgstr "Alapértelmezett Hossz:"
+
+#: airtime_mvc/application/views/scripts/webstream/webstream.phtml:64
+msgid "No webstream"
+msgstr "Nincs adásfolyam"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:9
+#: airtime_mvc/application/forms/EditAudioMD.php:19
+msgid "Title:"
+msgstr "Cím:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:10
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:34
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:148
+#: airtime_mvc/application/forms/EditAudioMD.php:26
+msgid "Creator:"
+msgstr "Szerző:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:11
+#: airtime_mvc/application/forms/EditAudioMD.php:33
+msgid "Album:"
+msgstr "Album:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:12
+#: airtime_mvc/application/forms/EditAudioMD.php:40
+msgid "Track:"
+msgstr "Sorszám:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:13
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:36
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:38
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:147
+msgid "Length:"
+msgstr "Hossz:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:14
+msgid "Sample Rate:"
+msgstr "Mintavételi Ráta:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:15
+#: airtime_mvc/application/forms/StreamSettingSubForm.php:67
+msgid "Bit Rate:"
+msgstr "Bitráta:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:16
+#: airtime_mvc/application/forms/EditAudioMD.php:88
+msgid "Mood:"
+msgstr "Hangulat:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:17
+#: airtime_mvc/application/forms/AddShowWhat.php:45
+#: airtime_mvc/application/forms/EditAudioMD.php:47
+msgid "Genre:"
+msgstr "Műfaj:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:18
+#: airtime_mvc/application/forms/EditAudioMD.php:55
+msgid "Year:"
+msgstr "Év:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:19
+#: airtime_mvc/application/forms/EditAudioMD.php:67
+msgid "Label:"
+msgstr "Kiadó:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:20
+#: airtime_mvc/application/forms/EditAudioMD.php:96
+msgid "BPM:"
+msgstr "BPM:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:21
+#: airtime_mvc/application/forms/EditAudioMD.php:74
+msgid "Composer:"
+msgstr "Zeneszerző:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:22
+#: airtime_mvc/application/forms/EditAudioMD.php:81
+msgid "Conductor:"
+msgstr "Vezénylő:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:23
+#: airtime_mvc/application/forms/EditAudioMD.php:105
+msgid "Copyright:"
+msgstr "Szerzői jog:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:24
+msgid "Isrc Number:"
+msgstr "Isrc Szám:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:25
+#: airtime_mvc/application/forms/EditAudioMD.php:119
+msgid "Website:"
+msgstr "Honlap:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
+#: airtime_mvc/application/forms/EditAudioMD.php:126
+msgid "Language:"
+msgstr "Nyelv:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:27
+msgid "File Path:"
+msgstr "Fájl Elérési Útvonal:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:33
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:146
+#: airtime_mvc/application/forms/AddShowWhat.php:26
+msgid "Name:"
+msgstr "Név:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:40
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:149
+#: airtime_mvc/application/forms/AddShowWhat.php:54
+msgid "Description:"
+msgstr "Leírás:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:45
+msgid "Web Stream"
+msgstr "Adásfolyam"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:46
+msgid "Dynamic Smart Block"
+msgstr "Dinamikus Smart Block"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:47
+msgid "Static Smart Block"
+msgstr "Statikus Smart Block"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:48
+msgid "Audio Track"
+msgstr "Audió Sáv"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:63
+msgid "Playlist Contents: "
+msgstr "Lejátszási Lista Tartalmak:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:65
+msgid "Static Smart Block Contents: "
+msgstr "Statikus Smart Block Tartalmak:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:104
+msgid "Dynamic Smart Block Criteria: "
+msgstr "Dinamikus Smart Block Kritériumok:"
+
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:137
+msgid "Limit to "
+msgstr "Korlátozva"
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/views/scripts/preference/directory-config.phtml:2
 #: airtime_mvc/application/controllers/LocaleController.php:156
@@ -842,9 +1419,21 @@ msgstr "Szolgáltatás"
 msgid "Status"
 msgstr "Állapot"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:6
 msgid "Uptime"
 msgstr "Üzemidő"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
+msgid "dB"
+msgstr "dB"
+=======
+#: airtime_mvc/application/views/scripts/playouthistorytemplate/template-contents.phtml:4
+msgid "Creating Log Sheet Template"
+msgstr "Naplózási Sablon Létrehozása"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:7
 msgid "CPU"
@@ -867,6 +1456,7 @@ msgstr "Lemezterület"
 msgid "File import in progress..."
 msgstr "Fájl importálása folyamatban..."
 
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml:5
 #: airtime_mvc/application/views/scripts/library/library.phtml:10
 msgid "Advanced Search Options"
@@ -875,6 +1465,15 @@ msgstr "Speciális Keresési Beállítások"
 #: airtime_mvc/application/views/scripts/listenerstat/index.phtml:2
 msgid "Listener Count Over Time"
 msgstr "Hallgatói Statisztika"
+=======
+#: airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml:4
+msgid "Log Sheet Templates"
+msgstr "Naplózási Sablonok"
+
+#: airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml:7
+msgid "No Log Sheet Templates"
+msgstr "Nincsenek Naplózási Sablonok"
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:5
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:11
@@ -882,11 +1481,17 @@ msgstr "Hallgatói Statisztika"
 msgid "New"
 msgstr "Új"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:8
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:14
 #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:14
 msgid "New Playlist"
 msgstr "Új Lejátszási Lista"
+=======
+#: airtime_mvc/application/views/scripts/playouthistorytemplate/index.phtml:31
+msgid "New Log Sheet Template"
+msgstr "Új Naplózási Sablon"
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:9
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:15
@@ -934,9 +1539,24 @@ msgstr "Üres lejátszási lista tartalom"
 msgid "Clear"
 msgstr "Törlés"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24
 msgid "Shuffle playlist"
 msgstr "Véletlenszerű lejátszási lista"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/views/scripts/login/password-change.phtml:3
+msgid "New password"
+msgstr "Új jelszó"
+=======
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:10
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:34
+#: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:148
+#: airtime_mvc/application/forms/EditAudioMD.php:26
+msgid "Creator:"
+msgstr "Előadó/Szerző:"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:334
@@ -1146,6 +1766,7 @@ msgstr "id"
 msgid "Username"
 msgstr "Felhasználónév"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/views/scripts/user/add-user.phtml:19
 msgid "First Name"
 msgstr "Vezetéknév"
@@ -1157,6 +1778,19 @@ msgstr "Keresztnév"
 #: airtime_mvc/application/views/scripts/user/add-user.phtml:21
 msgid "User Type"
 msgstr "Felhasználói Típus"
+=======
+#: airtime_mvc/application/views/scripts/playouthistory/index.phtml:7
+msgid "Log Sheet"
+msgstr "Napló"
+
+#: airtime_mvc/application/views/scripts/playouthistory/index.phtml:8
+msgid "File Summary"
+msgstr "Fájl Összegző"
+
+#: airtime_mvc/application/views/scripts/playouthistory/index.phtml:10
+msgid "Show Summary"
+msgstr "Műsor Összegző"
+>>>>>>> 2.5.x
 
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:9
 #: airtime_mvc/application/forms/EditAudioMD.php:19
@@ -2849,9 +3483,25 @@ msgstr "%d várakozó fájl"
 msgid "File: %f, size: %s, max file size: %m"
 msgstr "Fájl: %f,méret: %s, max fájl méret: %m"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/controllers/LocaleController.php:384
 msgid "Upload URL might be wrong or doesn't exist"
 msgstr "URL feltöltése esetén, felléphet hiba, esetleg nem létezik"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/controllers/LocaleController.php:155
+msgid ""
+"Are you sure you want to change the storage folder?\n"
+"This will remove the files from your Airtime library!"
+msgstr ""
+"Biztos benne, hogy meg akarja változtatni a tároló mappát?\n"
+"Ezzel eltávolítja a fájlokat az Airtime médiatárából!"
+=======
+#: airtime_mvc/application/controllers/LocaleController.php:389
+msgid "Create Entry"
+msgstr "Napló Létrehozása"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/controllers/LocaleController.php:385
 msgid "Error: File too large: "
@@ -3112,17 +3762,41 @@ msgstr "Mester Felhasználónév"
 msgid "Master Password"
 msgstr "Mester Jelszó"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:70
 msgid "Master Source Connection URL"
 msgstr "Mester Csatlakozás Forrása URL"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/controllers/LocaleController.php:236
+msgid "today"
+msgstr "ma"
+=======
+#: airtime_mvc/application/forms/LiveStreamingPreferences.php:87
+msgid "Master Source Port"
+msgstr "Mester Forrás Port"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:78
 msgid "Show Source Connection URL"
 msgstr "Műsor Csatlakozás Forrása URL"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:87
 msgid "Master Source Port"
 msgstr "Mester Forrás Portja"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/controllers/LocaleController.php:238
+msgid "week"
+msgstr "hét"
+=======
+#: airtime_mvc/application/forms/LiveStreamingPreferences.php:96
+msgid "Master Source Mount Point"
+msgstr "Mester Forrási Csatolási Pont"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:90
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:109
@@ -3130,6 +3804,7 @@ msgstr "Mester Forrás Portja"
 msgid "Only numbers are allowed."
 msgstr "Csak számok adhatók meg."
 
+<<<<<<< HEAD
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:96
 msgid "Master Source Mount Point"
 msgstr "Mester Csatolási Pont Forrása"
@@ -3151,6 +3826,25 @@ msgstr "Mester Csatolási Pont Forrása"
 #: airtime_mvc/application/forms/ShowBuilder.php:65
 msgid "Invalid character entered"
 msgstr "Érvénytelen bevitt karakterek"
+=======
+<<<<<<< HEAD
+#: airtime_mvc/application/controllers/LocaleController.php:254
+msgid "Shows longer than their scheduled time will be cut off by a following show."
+msgstr "Ha egy műsor hosszabb az ütemezett időnél, meg lesz vágva és követi azt a következő műsor."
+
+#: airtime_mvc/application/controllers/LocaleController.php:255
+msgid "Cancel Current Show?"
+msgstr "A Jelenlegi Műsor Megszakítása?"
+=======
+#: airtime_mvc/application/forms/LiveStreamingPreferences.php:106
+msgid "Show Source Port"
+msgstr "Műsor Forrás Port"
+
+#: airtime_mvc/application/forms/LiveStreamingPreferences.php:115
+msgid "Show Source Mount Point"
+msgstr "Műsor Forrási Csatolási Pont"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/forms/LiveStreamingPreferences.php:106
 msgid "Show Source Port"
@@ -3895,9 +4589,20 @@ msgstr "Előzmények"
 msgid "Playout History"
 msgstr "Lejátszási Előzmények"
 
+<<<<<<< HEAD
 #: airtime_mvc/application/configs/navigation.php:104
 msgid "History Templates"
 msgstr "Előzményi Sablonok"
+=======
+<<<<<<< HEAD
+#~ msgid "Should not overlap shows"
+#~ msgstr "Nem kellene, hogy a műsorok fedjék egymást"
+=======
+#: airtime_mvc/application/configs/navigation.php:104
+msgid "History Templates"
+msgstr "Naplózási Sablonok"
+>>>>>>> 2.5.x
+>>>>>>> cc-5709-airtime-analyzer
 
 #: airtime_mvc/application/configs/navigation.php:118
 msgid "Getting Started"
diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo
index a7f163309..db6588c07 100644
Binary files a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
index fff86a845..cd6dbe23a 100644
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-02-04 11:29+0000\n"
+"PO-Revision-Date: 2014-04-24 15:34+0000\n"
 "Last-Translator: terwey <terwey@gmail.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/airtime/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"