diff --git a/lang/_manifest_exclude b/lang/_manifest_exclude
deleted file mode 100644
index e69de29..0000000
diff --git a/lang/ar.yml b/lang/ar.yml
new file mode 100644
index 0000000..cd73681
--- /dev/null
+++ b/lang/ar.yml
@@ -0,0 +1,79 @@
+ar:
+  ArchiveWidget:
+    DispBY: "استعراض بواسطة"
+    MONTH: "شهر"
+    PLURALNAME: "مربعات الأرشيف"
+    SINGULARNAME: "مربع الأرشيف"
+    YEAR: "سنة"
+  BlogEntry:
+    AU: "الكاتب"
+    BBH: "مساعدة BBCode"
+    CN: "المحتوى"
+    DT: "تاريخ"
+    PLURALNAME: "تدوينات المدونة"
+    SINGULARNAME: "تدوينة المدونة"
+    TS: "وسوم (فاصلة,بين,الوسوم)"
+  BlogEntry.ss:
+    COMMENTS: "التعليقات"
+    EDITTHIS: "تحرير التدوينة"
+    POSTEDBY: "نشرت بواسطة"
+    POSTEDON: "في"
+    TAGS: "الوسوم:"
+    UNPUBLISHTHIS: "عدم نشر التدوينة"
+    VIEWALLPOSTTAGGED: "عرض جميع التدوينات"
+  BlogHolder:
+    PLURALNAME: "حاويات المدونة"
+    POST: "Post blog entry"
+    RSSFEED: "RSS لهذه المدونة"
+    SINGULARNAME: "حاوية المدونة"
+    SJ: "الموضوع"
+    SPUC: "فضلاً افصل بين الوسوم بفاصلة"
+    SUCCONTENT: "مبروك, تم تركيب Silverstripe blog بنجاح. هذه المدونة يمكن حذفها بأمان.يمكن تعديل المدونة عبر عبر رابط [url=admin]إدارة المحتوى[/url]"
+    SUCTAGS: "َsilverstripe , blog"
+    SUCTITLE: "تم تركيب SilverStripe Blog بنجاح"
+    TE: "مثال:رياضة,شخصية,علمية"
+  BlogHolder.ss:
+    NOENTRIES: "لا يوجد مدخلات"
+    VIEWINGTAGGED: "عرض المخلات الموسومة بـ"
+  BlogManagementWidget:
+    COMADM: "إدارة التعليقات"
+    PLURALNAME: "مربعات إدارة المدونة"
+    SINGULARNAME: "مربع إدارة المدونة"
+    UNM1: "يوجد تعليق واحد لا يحتاج إلى موافقة"
+    UNMM: "يوجد %i تعليقات لا تحتاج إلى موافقة"
+  BlogManagementWidget.ss:
+    LOGOUT: "خروج"
+    POSTNEW: "نشر تدوينة جديدة"
+  BlogSummary.ss:
+    COMMENTS: "التعليقات"
+    POSTEDBY: "بواسطة"
+    POSTEDON: "في"
+    VIEWFULL: "عرض كامل التدوينة"
+  BlogTree:
+    # 50
+    PLURALNAME: "Blog Tres"
+    # 50
+    SINGULARNAME: "Blog Tree"
+  RSSWidget:
+    CT: "العنوان المخصص للخلاصة"
+    NTS: "عدد العناصر لعرضها"
+    PLURALNAME: "مربعات الخلاصات RSS"
+    SINGULARNAME: "مربع الخلاصات RSS"
+    URL: "رابط الخلاصة"
+  SubscribeRSSWidget:
+    PLURALNAME: "مربعات الاشتراك في الخلاصات RSS"
+    SINGULARNAME: "مربع الاشتراك في الخلاصات RSS"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "اشتراك"
+    SUBSCRIBETITLE: "الاشتراك في المدونة عن طريق الخلاصات RSS"
+  TagCloudWidget:
+    LIMIT: "العدد المحدد للوسوم"
+    PLURALNAME: "مربعات الوسوم السحابية"
+    SBAL: "هجائي"
+    SBFREQ: "تكرار"
+    SINGULARNAME: "مربع الوسوم السحابيةَ"
+    SORTBY: "ترتيب"
+    TILE: "العنوان"
+  TrackBackPing:
+    PLURALNAME: "تنبيهات التعقيبات"
+    SINGULARNAME: "تنبيه التعقيبات"
diff --git a/lang/ar_SA.php b/lang/ar_SA.php
deleted file mode 100644
index 0f5d23c..0000000
--- a/lang/ar_SA.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Arabic (Saudi Arabia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('ar_SA', $lang) && is_array($lang['ar_SA'])) {
-	$lang['ar_SA'] = array_merge($lang['en_US'], $lang['ar_SA']);
-} else {
-	$lang['ar_SA'] = $lang['en_US'];
-}
-
-$lang['ar_SA']['ArchiveWidget']['DispBY'] = 'استعراض بواسطة';
-$lang['ar_SA']['ArchiveWidget']['MONTH'] = 'شهر';
-$lang['ar_SA']['ArchiveWidget']['PLURALNAME'] = 'مربعات الأرشيف';
-$lang['ar_SA']['ArchiveWidget']['SINGULARNAME'] = 'مربع الأرشيف';
-$lang['ar_SA']['ArchiveWidget']['YEAR'] = 'سنة';
-$lang['ar_SA']['BlogEntry']['AU'] = 'الكاتب';
-$lang['ar_SA']['BlogEntry']['BBH'] = 'مساعدة BBCode';
-$lang['ar_SA']['BlogEntry']['CN'] = 'المحتوى';
-$lang['ar_SA']['BlogEntry']['DT'] = 'تاريخ';
-$lang['ar_SA']['BlogEntry']['PLURALNAME'] = 'تدوينات المدونة';
-$lang['ar_SA']['BlogEntry']['SINGULARNAME'] = 'تدوينة المدونة';
-$lang['ar_SA']['BlogEntry.ss']['COMMENTS'] = 'التعليقات';
-$lang['ar_SA']['BlogEntry.ss']['EDITTHIS'] = 'تحرير التدوينة';
-$lang['ar_SA']['BlogEntry.ss']['POSTEDBY'] = 'نشرت بواسطة';
-$lang['ar_SA']['BlogEntry.ss']['POSTEDON'] = 'في';
-$lang['ar_SA']['BlogEntry.ss']['TAGS'] = 'الوسوم:';
-$lang['ar_SA']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'عدم نشر التدوينة';
-$lang['ar_SA']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'عرض جميع التدوينات';
-$lang['ar_SA']['BlogEntry']['TS'] = 'وسوم (فاصلة,بين,الوسوم)';
-$lang['ar_SA']['BlogHolder']['HAVENTPERM'] = 'تدوين المدونات يعتبر مهمة إدارية. فضلاً قم بتسجيل الدخول';
-$lang['ar_SA']['BlogHolder']['PLURALNAME'] = 'حاويات المدونة';
-$lang['ar_SA']['BlogHolder']['POST'] = 'Post blog entry';
-$lang['ar_SA']['BlogHolder']['RSSFEED'] = 'RSS لهذه المدونة';
-$lang['ar_SA']['BlogHolder']['SINGULARNAME'] = 'حاوية المدونة';
-$lang['ar_SA']['BlogHolder']['SJ'] = 'الموضوع';
-$lang['ar_SA']['BlogHolder']['SPUC'] = 'فضلاً افصل بين الوسوم بفاصلة';
-$lang['ar_SA']['BlogHolder.ss']['NOENTRIES'] = 'لا يوجد مدخلات';
-$lang['ar_SA']['BlogHolder.ss']['VIEWINGTAGGED'] = 'عرض المخلات الموسومة بـ';
-$lang['ar_SA']['BlogHolder']['SUCCONTENT'] = 'مبروك, تم تركيب Silverstripe blog بنجاح. هذه المدونة يمكن حذفها بأمان.يمكن تعديل المدونة عبر عبر رابط [url=admin]إدارة المحتوى[/url]';
-$lang['ar_SA']['BlogHolder']['SUCTAGS'] = 'َsilverstripe , blog';
-$lang['ar_SA']['BlogHolder']['SUCTITLE'] = 'تم تركيب SilverStripe Blog بنجاح';
-$lang['ar_SA']['BlogHolder']['TE'] = 'مثال:رياضة,شخصية,علمية';
-$lang['ar_SA']['BlogManagementWidget']['COMADM'] = 'إدارة التعليقات';
-$lang['ar_SA']['BlogManagementWidget']['PLURALNAME'] = 'مربعات إدارة المدونة';
-$lang['ar_SA']['BlogManagementWidget']['SINGULARNAME'] = 'مربع إدارة المدونة';
-$lang['ar_SA']['BlogManagementWidget.ss']['LOGOUT'] = 'خروج';
-$lang['ar_SA']['BlogManagementWidget.ss']['POSTNEW'] = 'نشر تدوينة جديدة';
-$lang['ar_SA']['BlogManagementWidget']['UNM1'] = 'يوجد تعليق واحد لا يحتاج إلى موافقة';
-$lang['ar_SA']['BlogManagementWidget']['UNMM'] = 'يوجد %i تعليقات لا تحتاج إلى موافقة';
-$lang['ar_SA']['BlogSummary.ss']['COMMENTS'] = 'التعليقات';
-$lang['ar_SA']['BlogSummary.ss']['POSTEDBY'] = 'بواسطة';
-$lang['ar_SA']['BlogSummary.ss']['POSTEDON'] = 'في';
-$lang['ar_SA']['BlogSummary.ss']['VIEWFULL'] = 'عرض كامل التدوينة';
-$lang['ar_SA']['RSSWidget']['CT'] = 'العنوان المخصص للخلاصة';
-$lang['ar_SA']['RSSWidget']['NTS'] = 'عدد العناصر لعرضها';
-$lang['ar_SA']['RSSWidget']['PLURALNAME'] = 'مربعات الخلاصات RSS';
-$lang['ar_SA']['RSSWidget']['SINGULARNAME'] = 'مربع الخلاصات RSS';
-$lang['ar_SA']['RSSWidget']['URL'] = 'رابط الخلاصة';
-$lang['ar_SA']['SubscribeRSSWidget']['PLURALNAME'] = 'مربعات الاشتراك في الخلاصات RSS';
-$lang['ar_SA']['SubscribeRSSWidget']['SINGULARNAME'] = 'مربع الاشتراك في الخلاصات RSS';
-$lang['ar_SA']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'اشتراك';
-$lang['ar_SA']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'الاشتراك في المدونة عن طريق الخلاصات RSS';
-$lang['ar_SA']['TagCloudWidget']['LIMIT'] = 'العدد المحدد للوسوم';
-$lang['ar_SA']['TagCloudWidget']['PLURALNAME'] = 'مربعات الوسوم السحابية';
-$lang['ar_SA']['TagCloudWidget']['SBAL'] = 'هجائي';
-$lang['ar_SA']['TagCloudWidget']['SBFREQ'] = 'تكرار';
-$lang['ar_SA']['TagCloudWidget']['SINGULARNAME'] = 'مربع الوسوم السحابيةَ';
-$lang['ar_SA']['TagCloudWidget']['SORTBY'] = 'ترتيب';
-$lang['ar_SA']['TagCloudWidget']['TILE'] = 'العنوان';
-$lang['ar_SA']['TrackBackPing']['PLURALNAME'] = 'تنبيهات التعقيبات';
-$lang['ar_SA']['TrackBackPing']['SINGULARNAME'] = 'تنبيه التعقيبات';
-
-?>
\ No newline at end of file
diff --git a/lang/bg.yml b/lang/bg.yml
new file mode 100644
index 0000000..2a97de1
--- /dev/null
+++ b/lang/bg.yml
@@ -0,0 +1,53 @@
+bg:
+  ArchiveWidget:
+    DispBY: "Покажи по"
+    MONTH: "месец"
+    YEAR: "година"
+  BlogEntry:
+    AU: "Автор"
+    BBH: "BBCode помощ"
+    CN: "Съдържание"
+    DT: "Дата"
+    TS: "Марки (разделени със запетайка)"
+  BlogEntry.ss:
+    COMMENTS: "Коментари"
+    EDITTHIS: "Промени тази статия"
+    POSTEDBY: "Публикувано от"
+    POSTEDON: "на"
+    TAGS: "Марки:"
+    UNPUBLISHTHIS: "Премахни от публикация тази статия"
+    VIEWALLPOSTTAGGED: "Прегледай всички маркирани статий"
+  BlogHolder:
+    POST: "Публикувай блог статия"
+    RSSFEED: "RSS емисия за този блог"
+    SJ: "Предмет"
+    SPUC: "Моля разделете марките използвайки запетайки."
+    SUCCONTENT: "Поздравления, SilverStripe blog модула беше инсталиран успешно. Тази блог статия може да бъде изтрита. Сега можете да конфигурирате аспектите на вашият блог (например кои widgets ще се показват) в [url=admin]CMS системата[/url]."
+    SUCTAGS: "silverstripe, блог"
+    SUCTITLE: "SilverStripe блог модул успешно инсталиран"
+    TE: "Например: спорт, наука, здраве"
+  BlogHolder.ss:
+    NOENTRIES: "Няма никакви блог статий"
+    VIEWINGTAGGED: "Разглеждане на статий маркирани с"
+  BlogManagementWidget:
+    COMADM: "Администрация за коментари"
+    UNM1: "Вие имате 1 непрегледан коментар"
+    UNMM: "Вие имате %i непрегледани коментара"
+  BlogManagementWidget.ss:
+    LOGOUT: "Излез"
+    POSTNEW: "Публикувайте нова блог статия"
+  BlogSummary.ss:
+    COMMENTS: "Коментари"
+    POSTEDBY: "Публикувано от"
+    POSTEDON: "на"
+    VIEWFULL: "Разгледай цялата статия"
+  RSSWidget:
+    CT: "Собствено заглавие за емисията"
+    NTS: "Брой на предмети за показване"
+    URL: "Адрес на RSS емисия"
+  TagCloudWidget:
+    LIMIT: "Ограничете броя на тагове"
+    SBAL: "азбука"
+    SBFREQ: "честота"
+    SORTBY: "Сортирай по"
+    TILE: "Заглавие"
diff --git a/lang/bg_BG.php b/lang/bg_BG.php
deleted file mode 100644
index 0b903e6..0000000
--- a/lang/bg_BG.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Bulgarian (Bulgaria) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('bg_BG', $lang) && is_array($lang['bg_BG'])) {
-	$lang['bg_BG'] = array_merge($lang['en_US'], $lang['bg_BG']);
-} else {
-	$lang['bg_BG'] = $lang['en_US'];
-}
-
-$lang['bg_BG']['ArchiveWidget']['DispBY'] = 'Покажи по';
-$lang['bg_BG']['ArchiveWidget']['MONTH'] = 'месец';
-$lang['bg_BG']['ArchiveWidget']['YEAR'] = 'година';
-$lang['bg_BG']['BlogEntry']['AU'] = 'Автор';
-$lang['bg_BG']['BlogEntry']['BBH'] = 'BBCode помощ';
-$lang['bg_BG']['BlogEntry']['CN'] = 'Съдържание';
-$lang['bg_BG']['BlogEntry']['DT'] = 'Дата';
-$lang['bg_BG']['BlogEntry.ss']['COMMENTS'] = 'Коментари';
-$lang['bg_BG']['BlogEntry.ss']['EDITTHIS'] = 'Промени тази статия';
-$lang['bg_BG']['BlogEntry.ss']['POSTEDBY'] = 'Публикувано от';
-$lang['bg_BG']['BlogEntry.ss']['POSTEDON'] = 'на';
-$lang['bg_BG']['BlogEntry.ss']['TAGS'] = 'Марки:';
-$lang['bg_BG']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Премахни от публикация тази статия';
-$lang['bg_BG']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Прегледай всички маркирани статий';
-$lang['bg_BG']['BlogEntry']['TS'] = 'Марки (разделени със запетайка)';
-$lang['bg_BG']['BlogHolder']['HAVENTPERM'] = 'Публикуване на блогове е администраторска задача. Моля влезте в системата.';
-$lang['bg_BG']['BlogHolder']['POST'] = 'Публикувай блог статия';
-$lang['bg_BG']['BlogHolder']['RSSFEED'] = 'RSS емисия за този блог';
-$lang['bg_BG']['BlogHolder']['SJ'] = 'Предмет';
-$lang['bg_BG']['BlogHolder']['SPUC'] = 'Моля разделете марките използвайки запетайки.';
-$lang['bg_BG']['BlogHolder.ss']['NOENTRIES'] = 'Няма никакви блог статий';
-$lang['bg_BG']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Разглеждане на статий маркирани с';
-$lang['bg_BG']['BlogHolder']['SUCCONTENT'] = 'Поздравления, SilverStripe blog модула беше инсталиран успешно. Тази блог статия може да бъде изтрита. Сега можете да конфигурирате аспектите на вашият блог (например кои widgets ще се показват) в [url=admin]CMS системата[/url].';
-$lang['bg_BG']['BlogHolder']['SUCTAGS'] = 'silverstripe, блог';
-$lang['bg_BG']['BlogHolder']['SUCTITLE'] = 'SilverStripe блог модул успешно инсталиран';
-$lang['bg_BG']['BlogHolder']['TE'] = 'Например: спорт, наука, здраве';
-$lang['bg_BG']['BlogManagementWidget']['COMADM'] = 'Администрация за коментари';
-$lang['bg_BG']['BlogManagementWidget.ss']['LOGOUT'] = 'Излез';
-$lang['bg_BG']['BlogManagementWidget.ss']['POSTNEW'] = 'Публикувайте нова блог статия';
-$lang['bg_BG']['BlogManagementWidget']['UNM1'] = 'Вие имате 1 непрегледан коментар';
-$lang['bg_BG']['BlogManagementWidget']['UNMM'] = 'Вие имате %i непрегледани коментара';
-$lang['bg_BG']['BlogSummary.ss']['COMMENTS'] = 'Коментари';
-$lang['bg_BG']['BlogSummary.ss']['POSTEDBY'] = 'Публикувано от';
-$lang['bg_BG']['BlogSummary.ss']['POSTEDON'] = 'на';
-$lang['bg_BG']['BlogSummary.ss']['VIEWFULL'] = 'Разгледай цялата статия';
-$lang['bg_BG']['RSSWidget']['CT'] = 'Собствено заглавие за емисията';
-$lang['bg_BG']['RSSWidget']['NTS'] = 'Брой на предмети за показване';
-$lang['bg_BG']['RSSWidget']['URL'] = 'Адрес на RSS емисия';
-$lang['bg_BG']['TagCloudWidget']['LIMIT'] = 'Ограничете броя на тагове';
-$lang['bg_BG']['TagCloudWidget']['SBAL'] = 'азбука';
-$lang['bg_BG']['TagCloudWidget']['SBFREQ'] = 'честота';
-$lang['bg_BG']['TagCloudWidget']['SORTBY'] = 'Сортирай по';
-$lang['bg_BG']['TagCloudWidget']['TILE'] = 'Заглавие';
-
-?>
\ No newline at end of file
diff --git a/lang/da.yml b/lang/da.yml
new file mode 100644
index 0000000..b08b3a7
--- /dev/null
+++ b/lang/da.yml
@@ -0,0 +1,51 @@
+da:
+  ArchiveWidget:
+    DispBY: "Vis efter"
+    MONTH: "måned"
+    YEAR: "år"
+  BlogEntry:
+    AU: "Forfatter"
+    BBH: "BBCode hjælp"
+    CN: "Indhold"
+    DT: "Dato"
+    TS: "Tags (kommasep.)"
+  BlogEntry.ss:
+    COMMENTS: "Kommentarer"
+    EDITTHIS: "Rediger dette indlæg"
+    POSTEDBY: "Indsendt af"
+    POSTEDON: "d. "
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "Upubliceret dette indlæg"
+    VIEWALLPOSTTAGGED: "Vis alle indlæg tagged "
+  BlogHolder:
+    POST: "Send blog indlæg"
+    RSSFEED: "RSS feed af denne blog"
+    SJ: "Emne"
+    SPUC: "Husk at seperere tags med komma"
+    SUCCONTENT: "Tillykke, SilverStripe blog modul er installeret succesfuldt. Dette blog indlæg kan du trygt slette. Du kan konfigurere bloggen som du har lyst (f.eks. widgets placeret i sidepanelet)"
+    SUCTAGS: "Silverstripe, blog"
+    SUCTITLE: "SilverStripe Blog modul installeret succesfuldt"
+    TE: "F.eks. sport, personligt, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "Der er ingen blog indlæg"
+    VIEWINGTAGGED: "Se indlæg tagged med"
+  BlogManagementWidget:
+    COMADM: "Kommentaradministration"
+    UNM1: "Du har 1 uvurderet kommentar"
+    UNMM: "Du har %i uvurderet kommentarer"
+  BlogManagementWidget.ss:
+    LOGOUT: "Log ud"
+    POSTNEW: "Send et nyt blog indlæg"
+  BlogSummary.ss:
+    COMMENTS: "Kommentarer"
+    POSTEDON: "d. "
+  RSSWidget:
+    CT: "Brugerdefineret title for dette feed"
+    NTS: "Antal af viste indlæg "
+    URL: "URL eller RSS Feed"
+  TagCloudWidget:
+    LIMIT: "Begrænsning af antalle af tags"
+    SBAL: "alfabet"
+    SBFREQ: "frekvens"
+    SORTBY: "Sorter efter"
+    TILE: "Titel"
diff --git a/lang/da_DK.php b/lang/da_DK.php
deleted file mode 100644
index 99a4318..0000000
--- a/lang/da_DK.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Danish (Denmark) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('da_DK', $lang) && is_array($lang['da_DK'])) {
-	$lang['da_DK'] = array_merge($lang['en_US'], $lang['da_DK']);
-} else {
-	$lang['da_DK'] = $lang['en_US'];
-}
-
-$lang['da_DK']['ArchiveWidget']['DispBY'] = 'Vis efter';
-$lang['da_DK']['ArchiveWidget']['MONTH'] = 'måned';
-$lang['da_DK']['ArchiveWidget']['YEAR'] = 'år';
-$lang['da_DK']['BlogEntry']['AU'] = 'Forfatter';
-$lang['da_DK']['BlogEntry']['BBH'] = 'BBCode hjælp';
-$lang['da_DK']['BlogEntry']['CN'] = 'Indhold';
-$lang['da_DK']['BlogEntry']['DT'] = 'Dato';
-$lang['da_DK']['BlogEntry.ss']['COMMENTS'] = 'Kommentarer';
-$lang['da_DK']['BlogEntry.ss']['EDITTHIS'] = 'Rediger dette indlæg';
-$lang['da_DK']['BlogEntry.ss']['POSTEDBY'] = 'Indsendt af';
-$lang['da_DK']['BlogEntry.ss']['POSTEDON'] = 'd. ';
-$lang['da_DK']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['da_DK']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Upubliceret dette indlæg';
-$lang['da_DK']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Vis alle indlæg tagged ';
-$lang['da_DK']['BlogEntry']['TS'] = 'Tags (kommasep.)';
-$lang['da_DK']['BlogHolder']['HAVENTPERM'] = 'At sende indlæg kræver er en administrativ opgave. Log venligst ind.';
-$lang['da_DK']['BlogHolder']['POST'] = 'Send blog indlæg';
-$lang['da_DK']['BlogHolder']['RSSFEED'] = 'RSS feed af denne blog';
-$lang['da_DK']['BlogHolder']['SJ'] = 'Emne';
-$lang['da_DK']['BlogHolder']['SPUC'] = 'Husk at seperere tags med komma';
-$lang['da_DK']['BlogHolder.ss']['NOENTRIES'] = 'Der er ingen blog indlæg';
-$lang['da_DK']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Se indlæg tagged med';
-$lang['da_DK']['BlogHolder']['SUCCONTENT'] = 'Tillykke, SilverStripe blog modul er installeret succesfuldt. Dette blog indlæg kan du trygt slette. Du kan konfigurere bloggen som du har lyst (f.eks. widgets placeret i sidepanelet)';
-$lang['da_DK']['BlogHolder']['SUCTAGS'] = 'Silverstripe, blog';
-$lang['da_DK']['BlogHolder']['SUCTITLE'] = 'SilverStripe Blog modul installeret succesfuldt';
-$lang['da_DK']['BlogHolder']['TE'] = 'F.eks. sport, personligt, science fiction';
-$lang['da_DK']['BlogManagementWidget']['COMADM'] = 'Kommentaradministration';
-$lang['da_DK']['BlogManagementWidget.ss']['LOGOUT'] = 'Log ud';
-$lang['da_DK']['BlogManagementWidget.ss']['POSTNEW'] = 'Send et nyt blog indlæg';
-$lang['da_DK']['BlogManagementWidget']['UNM1'] = 'Du har 1 uvurderet kommentar';
-$lang['da_DK']['BlogManagementWidget']['UNMM'] = 'Du har %i uvurderet kommentarer';
-$lang['da_DK']['BlogSummary.ss']['COMMENTS'] = 'Kommentarer';
-$lang['da_DK']['BlogSummary.ss']['POSTEDON'] = 'd. ';
-$lang['da_DK']['RSSWidget']['CT'] = 'Brugerdefineret title for dette feed';
-$lang['da_DK']['RSSWidget']['NTS'] = 'Antal af viste indlæg ';
-$lang['da_DK']['RSSWidget']['URL'] = 'URL eller RSS Feed';
-$lang['da_DK']['TagCloudWidget']['LIMIT'] = 'Begrænsning af antalle af tags';
-$lang['da_DK']['TagCloudWidget']['SBAL'] = 'alfabet';
-$lang['da_DK']['TagCloudWidget']['SBFREQ'] = 'frekvens';
-$lang['da_DK']['TagCloudWidget']['SORTBY'] = 'Sorter efter';
-$lang['da_DK']['TagCloudWidget']['TILE'] = 'Titel';
-
-?>
\ No newline at end of file
diff --git a/lang/de.yml b/lang/de.yml
new file mode 100644
index 0000000..25fa754
--- /dev/null
+++ b/lang/de.yml
@@ -0,0 +1,74 @@
+de:
+  ArchiveWidget:
+    DispBY: "Anzeige nach"
+    MONTH: "Monat"
+    PLURALNAME: "Archiv-Widgets"
+    SINGULARNAME: "Archiv-Widget"
+    YEAR: "Jahr"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "BBCode Hilfe"
+    CN: "Inhalt"
+    DT: "Datum"
+    PLURALNAME: "Blog-Einträge"
+    SINGULARNAME: "Blog-Eintrag"
+    TS: "Tags (Komma getrennt)"
+  BlogEntry.ss:
+    COMMENTS: "Kommentare"
+    EDITTHIS: "Eintrag bearbeiten"
+    POSTEDBY: "Eintrag von"
+    POSTEDON: "am"
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "Eintrag zurückziehen"
+    VIEWALLPOSTTAGGED: "Alle Beiträge mit Tag"
+  BlogHolder:
+    PLURALNAME: "Blog-Besitzer"
+    POST: "Eintrag senden"
+    RSSFEED: "RSS Feed dieser Blogs"
+    SINGULARNAME: "Blog-Besitzer"
+    SJ: "Betreff"
+    SPUC: "Bitte Tags mit Kommata trennen."
+    SUCCONTENT: "Herzlichen Glückwunsch, das SilverStripe Blog Modul wurde erfolgreich installiert. Dieser Blog-Eintrag kann sicher gelöscht werden. Sie können die Blog-Einstellungen (z.B. die angezeigten Widgets in der Sidebar) im admin-Bereich verändern."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe Blog Module erfolgreich installiert"
+    TE: "Zum Beispiel: sport, musik, video"
+  BlogHolder.ss:
+    NOENTRIES: "Es gibt keine Blog Einträge"
+    VIEWINGTAGGED: "Anzeige der Einträge mit Tag"
+  BlogManagementWidget:
+    COMADM: "Kommentare bearbeiten"
+    PLURALNAME: "Blog-Verwaltungs-Widgets"
+    SINGULARNAME: "Blog-Verwaltungs-Widget"
+    UNM1: "Sie haben 1 noch nicht moderierten Kommentar"
+    UNMM: "Sie haben %i noch nicht moderierte Kommentare"
+  BlogManagementWidget.ss:
+    LOGOUT: "Logout"
+    POSTNEW: "Neuen Eintrag schreiben"
+  BlogSummary.ss:
+    COMMENTS: "Kommentare"
+    POSTEDBY: "Verfasst von"
+    POSTEDON: "am"
+    VIEWFULL: "Detaillierte Ansicht von dem Titel --"
+  RSSWidget:
+    CT: "Eigener Titel für den feed"
+    NTS: "Anzahl der angezeigten Items"
+    PLURALNAME: "RSS-Widgets"
+    SINGULARNAME: "RSS-Widget"
+    URL: "URL des RSS Feed der anderen Seite. Bitte vergewissern Sie sich, dass diese URL auf einen RSS Feed verweist."
+  SubscribeRSSWidget:
+    PLURALNAME: "RSS-Abonnier-Widgets"
+    SINGULARNAME: "RSS-Abonnier-Widget"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Abonnieren"
+    SUBSCRIBETITLE: "Abonniere diesen Blog per RSS"
+  TagCloudWidget:
+    LIMIT: "Anzahl der erlaubten Tags"
+    PLURALNAME: "Tag-Cloud-Widgets"
+    SBAL: "Alphabet"
+    SBFREQ: "Häufigkeit"
+    SINGULARNAME: "Tag-Cloud-Widget"
+    SORTBY: "Sortiert nach"
+    TILE: "Titel"
+  TrackBackPing:
+    PLURALNAME: "Ping-Verfolgung"
+    SINGULARNAME: "Ping-Verfolgung"
diff --git a/lang/de_DE.php b/lang/de_DE.php
deleted file mode 100644
index 3e4ff0b..0000000
--- a/lang/de_DE.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * German (Germany) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('de_DE', $lang) && is_array($lang['de_DE'])) {
-	$lang['de_DE'] = array_merge($lang['en_US'], $lang['de_DE']);
-} else {
-	$lang['de_DE'] = $lang['en_US'];
-}
-
-$lang['de_DE']['ArchiveWidget']['DispBY'] = 'Anzeige nach';
-$lang['de_DE']['ArchiveWidget']['MONTH'] = 'Monat';
-$lang['de_DE']['ArchiveWidget']['PLURALNAME'] = 'Archiv-Widgets';
-$lang['de_DE']['ArchiveWidget']['SINGULARNAME'] = 'Archiv-Widget';
-$lang['de_DE']['ArchiveWidget']['YEAR'] = 'Jahr';
-$lang['de_DE']['BlogEntry']['AU'] = 'Autor';
-$lang['de_DE']['BlogEntry']['BBH'] = 'BBCode Hilfe';
-$lang['de_DE']['BlogEntry']['CN'] = 'Inhalt';
-$lang['de_DE']['BlogEntry']['DT'] = 'Datum';
-$lang['de_DE']['BlogEntry']['PLURALNAME'] = 'Blog-Einträge';
-$lang['de_DE']['BlogEntry']['SINGULARNAME'] = 'Blog-Eintrag';
-$lang['de_DE']['BlogEntry.ss']['COMMENTS'] = 'Kommentare';
-$lang['de_DE']['BlogEntry.ss']['EDITTHIS'] = 'Eintrag bearbeiten';
-$lang['de_DE']['BlogEntry.ss']['POSTEDBY'] = 'Eintrag von';
-$lang['de_DE']['BlogEntry.ss']['POSTEDON'] = 'am';
-$lang['de_DE']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['de_DE']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Eintrag zurückziehen';
-$lang['de_DE']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Alle Beiträge mit Tag';
-$lang['de_DE']['BlogEntry']['TS'] = 'Tags (Komma getrennt)';
-$lang['de_DE']['BlogHolder']['HAVENTPERM'] = 'Beiträge können nur von Administratoren eingestellt werden. Bitte einloggen.';
-$lang['de_DE']['BlogHolder']['PLURALNAME'] = 'Blog-Besitzer';
-$lang['de_DE']['BlogHolder']['POST'] = 'Eintrag senden';
-$lang['de_DE']['BlogHolder']['RSSFEED'] = 'RSS Feed dieser Blogs';
-$lang['de_DE']['BlogHolder']['SINGULARNAME'] = 'Blog-Besitzer';
-$lang['de_DE']['BlogHolder']['SJ'] = 'Betreff';
-$lang['de_DE']['BlogHolder']['SPUC'] = 'Bitte Tags mit Kommata trennen.';
-$lang['de_DE']['BlogHolder.ss']['NOENTRIES'] = 'Es gibt keine Blog Einträge';
-$lang['de_DE']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Anzeige der Einträge mit Tag';
-$lang['de_DE']['BlogHolder']['SUCCONTENT'] = 'Herzlichen Glückwunsch, das SilverStripe Blog Modul wurde erfolgreich installiert. Dieser Blog-Eintrag kann sicher gelöscht werden. Sie können die Blog-Einstellungen (z.B. die angezeigten Widgets in der Sidebar) im admin-Bereich verändern.';
-$lang['de_DE']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['de_DE']['BlogHolder']['SUCTITLE'] = 'SilverStripe Blog Module erfolgreich installiert';
-$lang['de_DE']['BlogHolder']['TE'] = 'Zum Beispiel: sport, musik, video';
-$lang['de_DE']['BlogManagementWidget']['COMADM'] = 'Kommentare bearbeiten';
-$lang['de_DE']['BlogManagementWidget']['PLURALNAME'] = 'Blog-Verwaltungs-Widgets';
-$lang['de_DE']['BlogManagementWidget']['SINGULARNAME'] = 'Blog-Verwaltungs-Widget';
-$lang['de_DE']['BlogManagementWidget.ss']['LOGOUT'] = 'Logout';
-$lang['de_DE']['BlogManagementWidget.ss']['POSTNEW'] = 'Neuen Eintrag schreiben';
-$lang['de_DE']['BlogManagementWidget']['UNM1'] = 'Sie haben 1 noch nicht moderierten Kommentar';
-$lang['de_DE']['BlogManagementWidget']['UNMM'] = 'Sie haben %i noch nicht moderierte Kommentare';
-$lang['de_DE']['BlogSummary.ss']['COMMENTS'] = 'Kommentare';
-$lang['de_DE']['BlogSummary.ss']['POSTEDBY'] = 'Verfasst von';
-$lang['de_DE']['BlogSummary.ss']['POSTEDON'] = 'am';
-$lang['de_DE']['BlogSummary.ss']['VIEWFULL'] = 'Detaillierte Ansicht von dem Titel --';
-$lang['de_DE']['RSSWidget']['CT'] = 'Eigener Titel für den feed';
-$lang['de_DE']['RSSWidget']['NTS'] = 'Anzahl der angezeigten Items';
-$lang['de_DE']['RSSWidget']['PLURALNAME'] = 'RSS-Widgets';
-$lang['de_DE']['RSSWidget']['SINGULARNAME'] = 'RSS-Widget';
-$lang['de_DE']['RSSWidget']['URL'] = 'URL des RSS Feed der anderen Seite. Bitte vergewissern Sie sich, dass diese URL auf einen RSS Feed verweist.';
-$lang['de_DE']['SubscribeRSSWidget']['PLURALNAME'] = 'RSS-Abonnier-Widgets';
-$lang['de_DE']['SubscribeRSSWidget']['SINGULARNAME'] = 'RSS-Abonnier-Widget';
-$lang['de_DE']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Abonnieren';
-$lang['de_DE']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Abonniere diesen Blog per RSS';
-$lang['de_DE']['TagCloudWidget']['LIMIT'] = 'Anzahl der erlaubten Tags';
-$lang['de_DE']['TagCloudWidget']['PLURALNAME'] = 'Tag-Cloud-Widgets';
-$lang['de_DE']['TagCloudWidget']['SBAL'] = 'Alphabet';
-$lang['de_DE']['TagCloudWidget']['SBFREQ'] = 'Häufigkeit';
-$lang['de_DE']['TagCloudWidget']['SINGULARNAME'] = 'Tag-Cloud-Widget';
-$lang['de_DE']['TagCloudWidget']['SORTBY'] = 'Sortiert nach';
-$lang['de_DE']['TagCloudWidget']['TILE'] = 'Titel';
-$lang['de_DE']['TrackBackPing']['PLURALNAME'] = 'Ping-Verfolgung';
-$lang['de_DE']['TrackBackPing']['SINGULARNAME'] = 'Ping-Verfolgung';
-
-?>
\ No newline at end of file
diff --git a/lang/en.yml b/lang/en.yml
new file mode 100644
index 0000000..312158c
--- /dev/null
+++ b/lang/en.yml
@@ -0,0 +1,95 @@
+en:
+  ArchiveWidget:
+    DispBY: "Display by"
+    MONTH: "month"
+    # 50
+    PLURALNAME: "Archive Widgets"
+    # 50
+    SINGULARNAME: "Archive Widget"
+    YEAR: "year"
+  BlogEntry:
+    AU: "Author"
+    BBH: "BBCode help"
+    CN: "Content"
+    DT: "Date"
+    # 50
+    PLURALNAME: "Blog Entries"
+    # 50
+    SINGULARNAME: "Blog Entry"
+    TS: "Tags (comma sep.)"
+  BlogEntry.ss:
+    COMMENTS: "Comments"
+    EDITTHIS: "Edit this post"
+    POSTEDBY: "Posted by"
+    POSTEDON: "on"
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "Unpublish this post"
+    VIEWALLPOSTTAGGED: "View all posts tagged"
+  BlogHolder:
+    # 50
+    PLURALNAME: "Blog Holders"
+    POST: "Post blog entry"
+    RSSFEED: "RSS feed of these blogs"
+    # 50
+    SINGULARNAME: "Blog Holder"
+    SJ: "Subject"
+    SPUC: "Please separate tags using commas."
+    SUCCONTENT: "Congratulations, the SilverStripe blog module has been successfully installed. This blog entry can be safely deleted. You can configure aspects of your blog (such as the widgets displayed in the sidebar) in [url=admin]the CMS[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blog module successfully installed"
+    TE: "For example: sport, personal, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "There are no blog entries"
+    VIEWINGTAGGED: "Viewing entries tagged with"
+  BlogManagementWidget:
+    COMADM: "Comment administration"
+    # 50
+    PLURALNAME: "Blog Management Widgets"
+    # 50
+    SINGULARNAME: "Blog Management Widget"
+    UNM1: "You have 1 unmoderated comment"
+    UNMM: "You have %i unmoderated comments"
+  BlogManagementWidget.ss:
+    LOGOUT: "Logout"
+    POSTNEW: "Post a new blog entry"
+  BlogSummary.ss:
+    COMMENTS: "Comments"
+    POSTEDBY: "Posted by"
+    POSTEDON: "on"
+    VIEWFULL: "View full post titled -"
+  BlogTree:
+    # 50
+    PLURALNAME: "Blog Tres"
+    # 50
+    SINGULARNAME: "Blog Tree"
+  RSSWidget:
+    CT: "Custom title for the feed"
+    NTS: "Number of Items to show"
+    # 50
+    PLURALNAME: "R S S Widgets"
+    # 50
+    SINGULARNAME: "R S S Widget"
+    URL: "URL of the other page's RSS feed.  Please make sure this URL points to an RSS feed."
+  SubscribeRSSWidget:
+    # 50
+    PLURALNAME: "Subscribe R S S Widgets"
+    # 50
+    SINGULARNAME: "Subscribe R S S Widget"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Subscribe"
+    SUBSCRIBETITLE: "Subscribe to this blog via RSS"
+  TagCloudWidget:
+    LIMIT: "Limit number of tags"
+    # 50
+    PLURALNAME: "Tag Cloud Widgets"
+    SBAL: "alphabet"
+    SBFREQ: "frequency"
+    # 50
+    SINGULARNAME: "Tag Cloud Widget"
+    SORTBY: "Sort by"
+    TILE: "Title"
+  TrackBackPing:
+    # 50
+    PLURALNAME: "Track Back Pings"
+    # 50
+    SINGULARNAME: "Track Back Ping"
diff --git a/lang/en_GB.php b/lang/en_GB.php
deleted file mode 100644
index 486f993..0000000
--- a/lang/en_GB.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * English (United Kingdom) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('en_GB', $lang) && is_array($lang['en_GB'])) {
-	$lang['en_GB'] = array_merge($lang['en_US'], $lang['en_GB']);
-} else {
-	$lang['en_GB'] = $lang['en_US'];
-}
-
-$lang['en_GB']['ArchiveWidget']['DispBY'] = 'Display by';
-$lang['en_GB']['ArchiveWidget']['MONTH'] = 'month';
-$lang['en_GB']['ArchiveWidget']['PLURALNAME'] = 'Archive Widgets';
-$lang['en_GB']['ArchiveWidget']['SINGULARNAME'] = 'Archive Widget';
-$lang['en_GB']['ArchiveWidget']['YEAR'] = 'year';
-$lang['en_GB']['BlogEntry']['AU'] = 'Author';
-$lang['en_GB']['BlogEntry']['BBH'] = 'BBCode help';
-$lang['en_GB']['BlogEntry']['CN'] = 'Content';
-$lang['en_GB']['BlogEntry']['DT'] = 'Date';
-$lang['en_GB']['BlogEntry']['PLURALNAME'] = 'Blog Entries';
-$lang['en_GB']['BlogEntry']['SINGULARNAME'] = 'Blog Entry';
-$lang['en_GB']['BlogEntry.ss']['COMMENTS'] = 'Comments';
-$lang['en_GB']['BlogEntry.ss']['EDITTHIS'] = 'Edit this post';
-$lang['en_GB']['BlogEntry.ss']['POSTEDBY'] = 'Posted by';
-$lang['en_GB']['BlogEntry.ss']['POSTEDON'] = 'on';
-$lang['en_GB']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['en_GB']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Unpublish this post';
-$lang['en_GB']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'View all posts tagged';
-$lang['en_GB']['BlogEntry']['TS'] = 'Tags (comma sep.)';
-$lang['en_GB']['BlogHolder']['HAVENTPERM'] = 'Posting blogs is an administrator task. Please log in.';
-$lang['en_GB']['BlogHolder']['PLURALNAME'] = 'Blog Holders';
-$lang['en_GB']['BlogHolder']['POST'] = 'Post blog entry';
-$lang['en_GB']['BlogHolder']['RSSFEED'] = 'RSS feed of this blog';
-$lang['en_GB']['BlogHolder']['SINGULARNAME'] = 'Blog Holder';
-$lang['en_GB']['BlogHolder']['SJ'] = 'Subject';
-$lang['en_GB']['BlogHolder']['SPUC'] = 'Please separate tags using commas.';
-$lang['en_GB']['BlogHolder.ss']['NOENTRIES'] = 'There are no blog entries';
-$lang['en_GB']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Viewing entries tagged with';
-$lang['en_GB']['BlogHolder']['SUCCONTENT'] = 'Congratulations, the SilverStripe blog module has been successfully installed. This blog entry can be safely deleted. You can configure aspects of your blog (such as the widgets displayed in the sidebar) in [url=admin]the CMS[/url].';
-$lang['en_GB']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['en_GB']['BlogHolder']['SUCTITLE'] = 'SilverStripe blog module successfully installed';
-$lang['en_GB']['BlogHolder']['TE'] = 'For example: sport, personal, science fiction';
-$lang['en_GB']['BlogManagementWidget']['COMADM'] = 'Comment administration';
-$lang['en_GB']['BlogManagementWidget']['PLURALNAME'] = 'Blog Management Widgets';
-$lang['en_GB']['BlogManagementWidget']['SINGULARNAME'] = 'Blog Management Widget';
-$lang['en_GB']['BlogManagementWidget.ss']['LOGOUT'] = 'Logout';
-$lang['en_GB']['BlogManagementWidget.ss']['POSTNEW'] = 'Post a new blog entry';
-$lang['en_GB']['BlogManagementWidget']['UNM1'] = 'You have 1 unmoderated comment';
-$lang['en_GB']['BlogManagementWidget']['UNMM'] = 'You have %i unmoderated comments';
-$lang['en_GB']['BlogSummary.ss']['COMMENTS'] = 'Comments';
-$lang['en_GB']['BlogSummary.ss']['POSTEDBY'] = 'Posted by';
-$lang['en_GB']['BlogSummary.ss']['POSTEDON'] = 'on';
-$lang['en_GB']['BlogSummary.ss']['VIEWFULL'] = 'View full post titled -';
-$lang['en_GB']['RSSWidget']['CT'] = 'Custom title for the feed';
-$lang['en_GB']['RSSWidget']['NTS'] = 'Number of Items to show';
-$lang['en_GB']['RSSWidget']['PLURALNAME'] = 'RSS Widgets';
-$lang['en_GB']['RSSWidget']['SINGULARNAME'] = 'RSS Widget';
-$lang['en_GB']['RSSWidget']['URL'] = 'URL of RSS Feed';
-$lang['en_GB']['SubscribeRSSWidget']['PLURALNAME'] = 'Subscript to RSS Widgets';
-$lang['en_GB']['SubscribeRSSWidget']['SINGULARNAME'] = 'Subscript to an RSS Widget';
-$lang['en_GB']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Subscribe';
-$lang['en_GB']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Subscribe to this blog via RSS';
-$lang['en_GB']['TagCloudWidget']['LIMIT'] = 'Limit number of tags';
-$lang['en_GB']['TagCloudWidget']['PLURALNAME'] = 'Tag Cloud Widgets';
-$lang['en_GB']['TagCloudWidget']['SBAL'] = 'alphabet';
-$lang['en_GB']['TagCloudWidget']['SBFREQ'] = 'frequency';
-$lang['en_GB']['TagCloudWidget']['SINGULARNAME'] = 'Tag Cloud Widget';
-$lang['en_GB']['TagCloudWidget']['SORTBY'] = 'Sort by';
-$lang['en_GB']['TagCloudWidget']['TILE'] = 'Title';
-$lang['en_GB']['TrackBackPing']['PLURALNAME'] = 'Track Back Pings';
-$lang['en_GB']['TrackBackPing']['SINGULARNAME'] = 'Track Back Ping';
-
-?>
\ No newline at end of file
diff --git a/lang/en_GB.yml b/lang/en_GB.yml
new file mode 100644
index 0000000..7bbef8e
--- /dev/null
+++ b/lang/en_GB.yml
@@ -0,0 +1,74 @@
+en_GB:
+  ArchiveWidget:
+    DispBY: "Display by"
+    MONTH: "month"
+    PLURALNAME: "Archive Widgets"
+    SINGULARNAME: "Archive Widget"
+    YEAR: "year"
+  BlogEntry:
+    AU: "Author"
+    BBH: "BBCode help"
+    CN: "Content"
+    DT: "Date"
+    PLURALNAME: "Blog Entries"
+    SINGULARNAME: "Blog Entry"
+    TS: "Tags (comma sep.)"
+  BlogEntry.ss:
+    COMMENTS: "Comments"
+    EDITTHIS: "Edit this post"
+    POSTEDBY: "Posted by"
+    POSTEDON: "on"
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "Unpublish this post"
+    VIEWALLPOSTTAGGED: "View all posts tagged"
+  BlogHolder:
+    PLURALNAME: "Blog Holders"
+    POST: "Post blog entry"
+    RSSFEED: "RSS feed of this blog"
+    SINGULARNAME: "Blog Holder"
+    SJ: "Subject"
+    SPUC: "Please separate tags using commas."
+    SUCCONTENT: "Congratulations, the SilverStripe blog module has been successfully installed. This blog entry can be safely deleted. You can configure aspects of your blog (such as the widgets displayed in the sidebar) in [url=admin]the CMS[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blog module successfully installed"
+    TE: "For example: sport, personal, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "There are no blog entries"
+    VIEWINGTAGGED: "Viewing entries tagged with"
+  BlogManagementWidget:
+    COMADM: "Comment administration"
+    PLURALNAME: "Blog Management Widgets"
+    SINGULARNAME: "Blog Management Widget"
+    UNM1: "You have 1 unmoderated comment"
+    UNMM: "You have %i unmoderated comments"
+  BlogManagementWidget.ss:
+    LOGOUT: "Logout"
+    POSTNEW: "Post a new blog entry"
+  BlogSummary.ss:
+    COMMENTS: "Comments"
+    POSTEDBY: "Posted by"
+    POSTEDON: "on"
+    VIEWFULL: "View full post titled -"
+  RSSWidget:
+    CT: "Custom title for the feed"
+    NTS: "Number of Items to show"
+    PLURALNAME: "RSS Widgets"
+    SINGULARNAME: "RSS Widget"
+    URL: "URL of RSS Feed"
+  SubscribeRSSWidget:
+    PLURALNAME: "Subscript to RSS Widgets"
+    SINGULARNAME: "Subscript to an RSS Widget"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Subscribe"
+    SUBSCRIBETITLE: "Subscribe to this blog via RSS"
+  TagCloudWidget:
+    LIMIT: "Limit number of tags"
+    PLURALNAME: "Tag Cloud Widgets"
+    SBAL: "alphabet"
+    SBFREQ: "frequency"
+    SINGULARNAME: "Tag Cloud Widget"
+    SORTBY: "Sort by"
+    TILE: "Title"
+  TrackBackPing:
+    PLURALNAME: "Track Back Pings"
+    SINGULARNAME: "Track Back Ping"
diff --git a/lang/en_US.php b/lang/en_US.php
deleted file mode 100644
index 1496f5b..0000000
--- a/lang/en_US.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-global $lang;
-
-$lang['en_US']['ArchiveWidget']['DispBY'] = 'Display by';
-$lang['en_US']['ArchiveWidget']['MONTH'] = 'month';
-$lang['en_US']['ArchiveWidget']['PLURALNAME'] = array(
-	'Archive Widgets',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['ArchiveWidget']['SINGULARNAME'] = array(
-	'Archive Widget',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['ArchiveWidget']['YEAR'] = 'year';
-$lang['en_US']['BlogEntry']['AU'] = 'Author';
-$lang['en_US']['BlogEntry']['BBH'] = 'BBCode help';
-$lang['en_US']['BlogEntry']['CN'] = 'Content';
-$lang['en_US']['BlogEntry']['DT'] = 'Date';
-$lang['en_US']['BlogEntry']['PLURALNAME'] = array(
-	'Blog Entries',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['BlogEntry']['SINGULARNAME'] = array(
-	'Blog Entry',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['BlogEntry']['TS'] = 'Tags (comma sep.)';
-$lang['en_US']['BlogEntry.ss']['COMMENTS'] = 'Comments';
-$lang['en_US']['BlogEntry.ss']['EDITTHIS'] = 'Edit this post';
-$lang['en_US']['BlogEntry.ss']['POSTEDBY'] = 'Posted by';
-$lang['en_US']['BlogEntry.ss']['POSTEDON'] = 'on';
-$lang['en_US']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['en_US']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Unpublish this post';
-$lang['en_US']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'View all posts tagged';
-$lang['en_US']['BlogHolder']['PLURALNAME'] = array(
-	'Blog Holders',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['BlogHolder']['POST'] = 'Post blog entry';
-$lang['en_US']['BlogHolder']['RSSFEED'] = 'RSS feed of these blogs';
-$lang['en_US']['BlogHolder']['SINGULARNAME'] = array(
-	'Blog Holder',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['BlogHolder']['SJ'] = 'Subject';
-$lang['en_US']['BlogHolder']['SPUC'] = 'Please separate tags using commas.';
-$lang['en_US']['BlogHolder']['SUCCONTENT'] = 'Congratulations, the SilverStripe blog module has been successfully installed. This blog entry can be safely deleted. You can configure aspects of your blog (such as the widgets displayed in the sidebar) in [url=admin]the CMS[/url].';
-$lang['en_US']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['en_US']['BlogHolder']['SUCTITLE'] = 'SilverStripe blog module successfully installed';
-$lang['en_US']['BlogHolder']['TE'] = 'For example: sport, personal, science fiction';
-$lang['en_US']['BlogHolder.ss']['NOENTRIES'] = 'There are no blog entries';
-$lang['en_US']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Viewing entries tagged with';
-$lang['en_US']['BlogManagementWidget']['COMADM'] = 'Comment administration';
-$lang['en_US']['BlogManagementWidget']['PLURALNAME'] = array(
-	'Blog Management Widgets',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['BlogManagementWidget']['SINGULARNAME'] = array(
-	'Blog Management Widget',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['BlogManagementWidget']['UNM1'] = 'You have 1 unmoderated comment';
-$lang['en_US']['BlogManagementWidget']['UNMM'] = 'You have %i unmoderated comments';
-$lang['en_US']['BlogManagementWidget.ss']['LOGOUT'] = 'Logout';
-$lang['en_US']['BlogManagementWidget.ss']['POSTNEW'] = 'Post a new blog entry';
-$lang['en_US']['BlogSummary.ss']['COMMENTS'] = 'Comments';
-$lang['en_US']['BlogSummary.ss']['POSTEDBY'] = 'Posted by';
-$lang['en_US']['BlogSummary.ss']['POSTEDON'] = 'on';
-$lang['en_US']['BlogSummary.ss']['VIEWFULL'] = 'View full post titled -';
-$lang['en_US']['BlogTree']['PLURALNAME'] = array(
-	'Blog Tres',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['BlogTree']['SINGULARNAME'] = array(
-	'Blog Tree',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['RSSWidget']['CT'] = 'Custom title for the feed';
-$lang['en_US']['RSSWidget']['NTS'] = 'Number of Items to show';
-$lang['en_US']['RSSWidget']['PLURALNAME'] = array(
-	'R S S Widgets',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['RSSWidget']['SINGULARNAME'] = array(
-	'R S S Widget',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['RSSWidget']['URL'] = 'URL of the other page\'s RSS feed.  Please make sure this URL points to an RSS feed.';
-$lang['en_US']['SubscribeRSSWidget']['PLURALNAME'] = array(
-	'Subscribe R S S Widgets',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['SubscribeRSSWidget']['SINGULARNAME'] = array(
-	'Subscribe R S S Widget',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Subscribe';
-$lang['en_US']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Subscribe to this blog via RSS';
-$lang['en_US']['TagCloudWidget']['LIMIT'] = 'Limit number of tags';
-$lang['en_US']['TagCloudWidget']['PLURALNAME'] = array(
-	'Tag Cloud Widgets',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['TagCloudWidget']['SBAL'] = 'alphabet';
-$lang['en_US']['TagCloudWidget']['SBFREQ'] = 'frequency';
-$lang['en_US']['TagCloudWidget']['SINGULARNAME'] = array(
-	'Tag Cloud Widget',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['TagCloudWidget']['SORTBY'] = 'Sort by';
-$lang['en_US']['TagCloudWidget']['TILE'] = 'Title';
-$lang['en_US']['TrackBackPing']['PLURALNAME'] = array(
-	'Track Back Pings',
-	50,
-	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['TrackBackPing']['SINGULARNAME'] = array(
-	'Track Back Ping',
-	50,
-	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-
-?>
\ No newline at end of file
diff --git a/lang/es.yml b/lang/es.yml
new file mode 100644
index 0000000..09218b7
--- /dev/null
+++ b/lang/es.yml
@@ -0,0 +1,74 @@
+es:
+  ArchiveWidget:
+    DispBY: "Mostrar por"
+    MONTH: "mes"
+    PLURALNAME: "Archivar Widgets"
+    SINGULARNAME: "Archivar Widget"
+    YEAR: "año"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "BBCode ayuda"
+    CN: "Contenido"
+    DT: "Fecha"
+    PLURALNAME: "Entradas del Blog"
+    SINGULARNAME: "Entrada del Blog"
+    TS: "Etiquetas (separados por comas)"
+  BlogEntry.ss:
+    COMMENTS: "Comentarios"
+    EDITTHIS: "Editar esta entrada"
+    POSTEDBY: "Publicado por"
+    POSTEDON: "en"
+    TAGS: "Etiquetas:"
+    UNPUBLISHTHIS: "Retirar esta entrada"
+    VIEWALLPOSTTAGGED: "Ver todas las publicaciones etiquetadas"
+  BlogHolder:
+    PLURALNAME: "Contenedores de Blog"
+    POST: "Entrada del blog"
+    RSSFEED: "RSS feed de este blog"
+    SINGULARNAME: "Contenedor de Blog"
+    SJ: "Asunto"
+    SPUC: "Por favor, separa las etiquetas mediante comas."
+    SUCCONTENT: "Felicitaciones, el módulo de blog de SilverStripe ha sido instalado correctamente. Esta entrada puede ser eliminada. Puedes configurar aspectos de tu blog (como los widgets mostrados en la barra lateral) en [url=admin]el CMS[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "El módulo de blog de SilverStripe ha sido instalado correctamente"
+    TE: "Por ejemplo: deporte, cine, tecnología"
+  BlogHolder.ss:
+    NOENTRIES: "No hay entradas"
+    VIEWINGTAGGED: "Ver entrada etiquetadas como"
+  BlogManagementWidget:
+    COMADM: "Administración de comentarios"
+    PLURALNAME: "Widgets de gestión del Blog"
+    SINGULARNAME: "Widget de gestión del Blog"
+    UNM1: "Tienes 1 comentario sin moderar"
+    UNMM: "Tienes %i comentarios sin moderar"
+  BlogManagementWidget.ss:
+    LOGOUT: "Salir"
+    POSTNEW: "Escribir una nueva entrada del blog"
+  BlogSummary.ss:
+    COMMENTS: "Comentarios"
+    POSTEDBY: "Publicado por"
+    POSTEDON: "en"
+    VIEWFULL: "Ver completo el post titulado -"
+  RSSWidget:
+    CT: "Título personalizado  para el feed"
+    NTS: "Número de registros para mostrar"
+    PLURALNAME: "Widgets RSS"
+    SINGULARNAME: "Widget RSS"
+    URL: "URL del RSS Feed"
+  SubscribeRSSWidget:
+    PLURALNAME: "Suscribir a Widgets RSS"
+    SINGULARNAME: "Suscribir a Widget RSS"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Suscribir"
+    SUBSCRIBETITLE: "Suscribirse a este blog vía RSS"
+  TagCloudWidget:
+    LIMIT: "Limitar el número de etiquetas"
+    PLURALNAME: "Nube de Etiquetas de Widgets"
+    SBAL: "alfabeto"
+    SBFREQ: "frecuencia"
+    SINGULARNAME: "Nube de Etiquetas de Widget"
+    SORTBY: "Ordenar por"
+    TILE: "Título"
+  TrackBackPing:
+    PLURALNAME: "Notificaciones de Trackback"
+    SINGULARNAME: "Notificación de Trackback"
diff --git a/lang/es_419.php b/lang/es_419.php
deleted file mode 100644
index 27d8ebb..0000000
--- a/lang/es_419.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- *  language pack
- * @package modules: blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('es_', $lang) && is_array($lang['es_'])) {
-	$lang['es_'] = array_merge($lang['en_US'], $lang['es_']);
-} else {
-	$lang['es_'] = $lang['en_US'];
-}
-
-
-?>
\ No newline at end of file
diff --git a/lang/es_419.yml b/lang/es_419.yml
new file mode 100644
index 0000000..8a28b03
--- /dev/null
+++ b/lang/es_419.yml
@@ -0,0 +1 @@
+es_419:
diff --git a/lang/es_ES.php b/lang/es_ES.php
deleted file mode 100644
index adac8b6..0000000
--- a/lang/es_ES.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Spanish (Spain) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('es_ES', $lang) && is_array($lang['es_ES'])) {
-	$lang['es_ES'] = array_merge($lang['en_US'], $lang['es_ES']);
-} else {
-	$lang['es_ES'] = $lang['en_US'];
-}
-
-$lang['es_ES']['ArchiveWidget']['DispBY'] = 'Mostrar por';
-$lang['es_ES']['ArchiveWidget']['MONTH'] = 'mes';
-$lang['es_ES']['ArchiveWidget']['PLURALNAME'] = 'Archivar Widgets';
-$lang['es_ES']['ArchiveWidget']['SINGULARNAME'] = 'Archivar Widget';
-$lang['es_ES']['ArchiveWidget']['YEAR'] = 'año';
-$lang['es_ES']['BlogEntry']['AU'] = 'Autor';
-$lang['es_ES']['BlogEntry']['BBH'] = 'BBCode ayuda';
-$lang['es_ES']['BlogEntry']['CN'] = 'Contenido';
-$lang['es_ES']['BlogEntry']['DT'] = 'Fecha';
-$lang['es_ES']['BlogEntry']['PLURALNAME'] = 'Entradas del Blog';
-$lang['es_ES']['BlogEntry']['SINGULARNAME'] = 'Entrada del Blog';
-$lang['es_ES']['BlogEntry.ss']['COMMENTS'] = 'Comentarios';
-$lang['es_ES']['BlogEntry.ss']['EDITTHIS'] = 'Editar esta entrada';
-$lang['es_ES']['BlogEntry.ss']['POSTEDBY'] = 'Publicado por';
-$lang['es_ES']['BlogEntry.ss']['POSTEDON'] = 'en';
-$lang['es_ES']['BlogEntry.ss']['TAGS'] = 'Etiquetas:';
-$lang['es_ES']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Retirar esta entrada';
-$lang['es_ES']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Ver todas las publicaciones etiquetadas';
-$lang['es_ES']['BlogEntry']['TS'] = 'Etiquetas (separados por comas)';
-$lang['es_ES']['BlogHolder']['HAVENTPERM'] = 'Escribir en el blog es una tarea del administrador. Por favor, identifícate.';
-$lang['es_ES']['BlogHolder']['PLURALNAME'] = 'Contenedores de Blog';
-$lang['es_ES']['BlogHolder']['POST'] = 'Entrada del blog';
-$lang['es_ES']['BlogHolder']['RSSFEED'] = 'RSS feed de este blog';
-$lang['es_ES']['BlogHolder']['SINGULARNAME'] = 'Contenedor de Blog';
-$lang['es_ES']['BlogHolder']['SJ'] = 'Asunto';
-$lang['es_ES']['BlogHolder']['SPUC'] = 'Por favor, separa las etiquetas mediante comas.';
-$lang['es_ES']['BlogHolder.ss']['NOENTRIES'] = 'No hay entradas';
-$lang['es_ES']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Ver entrada etiquetadas como';
-$lang['es_ES']['BlogHolder']['SUCCONTENT'] = 'Felicitaciones, el módulo de blog de SilverStripe ha sido instalado correctamente. Esta entrada puede ser eliminada. Puedes configurar aspectos de tu blog (como los widgets mostrados en la barra lateral) en [url=admin]el CMS[/url].';
-$lang['es_ES']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['es_ES']['BlogHolder']['SUCTITLE'] = 'El módulo de blog de SilverStripe ha sido instalado correctamente';
-$lang['es_ES']['BlogHolder']['TE'] = 'Por ejemplo: deporte, cine, tecnología';
-$lang['es_ES']['BlogManagementWidget']['COMADM'] = 'Administración de comentarios';
-$lang['es_ES']['BlogManagementWidget']['PLURALNAME'] = 'Widgets de gestión del Blog';
-$lang['es_ES']['BlogManagementWidget']['SINGULARNAME'] = 'Widget de gestión del Blog';
-$lang['es_ES']['BlogManagementWidget.ss']['LOGOUT'] = 'Salir';
-$lang['es_ES']['BlogManagementWidget.ss']['POSTNEW'] = 'Escribir una nueva entrada del blog';
-$lang['es_ES']['BlogManagementWidget']['UNM1'] = 'Tienes 1 comentario sin moderar';
-$lang['es_ES']['BlogManagementWidget']['UNMM'] = 'Tienes %i comentarios sin moderar';
-$lang['es_ES']['BlogSummary.ss']['COMMENTS'] = 'Comentarios';
-$lang['es_ES']['BlogSummary.ss']['POSTEDBY'] = 'Publicado por';
-$lang['es_ES']['BlogSummary.ss']['POSTEDON'] = 'en';
-$lang['es_ES']['BlogSummary.ss']['VIEWFULL'] = 'Ver completo el post titulado -';
-$lang['es_ES']['RSSWidget']['CT'] = 'Título personalizado  para el feed';
-$lang['es_ES']['RSSWidget']['NTS'] = 'Número de registros para mostrar';
-$lang['es_ES']['RSSWidget']['PLURALNAME'] = 'Widgets RSS';
-$lang['es_ES']['RSSWidget']['SINGULARNAME'] = 'Widget RSS';
-$lang['es_ES']['RSSWidget']['URL'] = 'URL del RSS Feed';
-$lang['es_ES']['SubscribeRSSWidget']['PLURALNAME'] = 'Suscribir a Widgets RSS';
-$lang['es_ES']['SubscribeRSSWidget']['SINGULARNAME'] = 'Suscribir a Widget RSS';
-$lang['es_ES']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Suscribir';
-$lang['es_ES']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Suscribirse a este blog vía RSS';
-$lang['es_ES']['TagCloudWidget']['LIMIT'] = 'Limitar el número de etiquetas';
-$lang['es_ES']['TagCloudWidget']['PLURALNAME'] = 'Nube de Etiquetas de Widgets';
-$lang['es_ES']['TagCloudWidget']['SBAL'] = 'alfabeto';
-$lang['es_ES']['TagCloudWidget']['SBFREQ'] = 'frecuencia';
-$lang['es_ES']['TagCloudWidget']['SINGULARNAME'] = 'Nube de Etiquetas de Widget';
-$lang['es_ES']['TagCloudWidget']['SORTBY'] = 'Ordenar por';
-$lang['es_ES']['TagCloudWidget']['TILE'] = 'Título';
-$lang['es_ES']['TrackBackPing']['PLURALNAME'] = 'Notificaciones de Trackback';
-$lang['es_ES']['TrackBackPing']['SINGULARNAME'] = 'Notificación de Trackback';
-
-?>
\ No newline at end of file
diff --git a/lang/es_MX.php b/lang/es_MX.php
deleted file mode 100644
index 2bb2f6a..0000000
--- a/lang/es_MX.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Spanish (Mexico) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('es_MX', $lang) && is_array($lang['es_MX'])) {
-	$lang['es_MX'] = array_merge($lang['en_US'], $lang['es_MX']);
-} else {
-	$lang['es_MX'] = $lang['en_US'];
-}
-
-$lang['es_MX']['ArchiveWidget']['DispBY'] = 'Mostrar por';
-$lang['es_MX']['ArchiveWidget']['MONTH'] = 'mes';
-$lang['es_MX']['ArchiveWidget']['PLURALNAME'] = 'Archivos de Widgets';
-$lang['es_MX']['ArchiveWidget']['SINGULARNAME'] = 'Archivo de Widget';
-$lang['es_MX']['ArchiveWidget']['YEAR'] = 'año';
-$lang['es_MX']['BlogEntry']['AU'] = 'Autor';
-$lang['es_MX']['BlogEntry']['BBH'] = 'Ayuda de BBCode';
-$lang['es_MX']['BlogEntry']['CN'] = 'Contenido';
-$lang['es_MX']['BlogEntry']['DT'] = 'Fecha';
-$lang['es_MX']['BlogEntry']['PLURALNAME'] = 'Entradas del Blog';
-$lang['es_MX']['BlogEntry']['SINGULARNAME'] = 'Entrada del BLog';
-$lang['es_MX']['BlogEntry.ss']['COMMENTS'] = 'Comentarios';
-$lang['es_MX']['BlogEntry.ss']['EDITTHIS'] = 'Editar este mensaje';
-$lang['es_MX']['BlogEntry.ss']['POSTEDBY'] = 'Enviado por';
-$lang['es_MX']['BlogEntry.ss']['POSTEDON'] = 'en';
-$lang['es_MX']['BlogEntry.ss']['TAGS'] = 'Etiquetas:';
-$lang['es_MX']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Ocultar este mensaje';
-$lang['es_MX']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Ver todos los mensajes marcados con la etiqueta';
-$lang['es_MX']['BlogEntry']['TS'] = 'Etiquetas (separadas por coma)';
-$lang['es_MX']['BlogHolder']['HAVENTPERM'] = 'La corrección de la bitácora es tarea del administrador. Por favor ingresa como tal.';
-$lang['es_MX']['BlogHolder']['PLURALNAME'] = 'Titulares del Blog';
-$lang['es_MX']['BlogHolder']['POST'] = 'Enviar entrada a la bitácora';
-$lang['es_MX']['BlogHolder']['RSSFEED'] = 'Alimentar al RSS con esta bitácora';
-$lang['es_MX']['BlogHolder']['SINGULARNAME'] = 'Titular del Blog';
-$lang['es_MX']['BlogHolder']['SJ'] = 'Asunto';
-$lang['es_MX']['BlogHolder']['SPUC'] = 'Por favor separa etiquetas utilizando comas.';
-$lang['es_MX']['BlogHolder.ss']['NOENTRIES'] = 'Bitácora vacía';
-$lang['es_MX']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Ver entradas etiquetadas con';
-$lang['es_MX']['BlogHolder']['SUCCONTENT'] = 'Felicidades, el módulo bitácora de Silverstripe se ha instalado satisfactoriamente. Esta entrada de la bitácora se puede eliminar con seguridad. Puedes configurar aspectos de tu nueva bitácora (tal cómo reproductores mostrados en la barra lateral) en [url=admin] el CMS[/url].';
-$lang['es_MX']['BlogHolder']['SUCTAGS'] = 'bitácora, silverstripe';
-$lang['es_MX']['BlogHolder']['SUCTITLE'] = 'El Módulo bitácora Silverstripe se ha instalado satisfactoriamente.';
-$lang['es_MX']['BlogHolder']['TE'] = 'Por ejemplo: deportes, personal. ciencia ficción';
-$lang['es_MX']['BlogManagementWidget']['COMADM'] = 'Administración de comentarios';
-$lang['es_MX']['BlogManagementWidget']['PLURALNAME'] = 'Widget para la Gestión de Blogs';
-$lang['es_MX']['BlogManagementWidget']['SINGULARNAME'] = 'Wisdget para la Gestion del Blog';
-$lang['es_MX']['BlogManagementWidget.ss']['LOGOUT'] = 'Salir';
-$lang['es_MX']['BlogManagementWidget.ss']['POSTNEW'] = 'Enviar nueva entrada a la bitácora';
-$lang['es_MX']['BlogManagementWidget']['UNM1'] = 'Tienes 1 comentario pendiente de moderación';
-$lang['es_MX']['BlogManagementWidget']['UNMM'] = 'Tienes %i comentarios pendientes de moderación';
-$lang['es_MX']['BlogSummary.ss']['COMMENTS'] = 'Comentarios';
-$lang['es_MX']['BlogSummary.ss']['POSTEDBY'] = 'Enviado por';
-$lang['es_MX']['BlogSummary.ss']['POSTEDON'] = 'en';
-$lang['es_MX']['BlogSummary.ss']['VIEWFULL'] = 'Ver completo el mensaje titulado -';
-$lang['es_MX']['RSSWidget']['CT'] = 'Título personalizado para el alimentador';
-$lang['es_MX']['RSSWidget']['NTS'] = 'Número de elementos a mostrar:';
-$lang['es_MX']['RSSWidget']['PLURALNAME'] = 'Widgets R S S';
-$lang['es_MX']['RSSWidget']['SINGULARNAME'] = 'Widget R S S';
-$lang['es_MX']['RSSWidget']['URL'] = 'URL del RSS alimentado';
-$lang['es_MX']['SubscribeRSSWidget']['PLURALNAME'] = 'Widgets para Suscripción R S S';
-$lang['es_MX']['SubscribeRSSWidget']['SINGULARNAME'] = 'Widget para Suscrición R S S';
-$lang['es_MX']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Suscribe';
-$lang['es_MX']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Suscribirme a este blog vía RSS';
-$lang['es_MX']['TagCloudWidget']['LIMIT'] = 'Limitar el número de etiquetas';
-$lang['es_MX']['TagCloudWidget']['PLURALNAME'] = 'Widgets de Nube de Etiquetas';
-$lang['es_MX']['TagCloudWidget']['SBAL'] = 'alfabeto';
-$lang['es_MX']['TagCloudWidget']['SBFREQ'] = 'frecuencia';
-$lang['es_MX']['TagCloudWidget']['SINGULARNAME'] = 'Widget Nube de Etiquetas';
-$lang['es_MX']['TagCloudWidget']['SORTBY'] = 'Ordenar por';
-$lang['es_MX']['TagCloudWidget']['TILE'] = 'Título';
-$lang['es_MX']['TrackBackPing']['PLURALNAME'] = 'Volver a la Pista de Pings';
-$lang['es_MX']['TrackBackPing']['SINGULARNAME'] = 'Volver a la Pista de Pings';
-
-?>
\ No newline at end of file
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
new file mode 100644
index 0000000..7304922
--- /dev/null
+++ b/lang/es_MX.yml
@@ -0,0 +1,74 @@
+es_MX:
+  ArchiveWidget:
+    DispBY: "Mostrar por"
+    MONTH: "mes"
+    PLURALNAME: "Archivos de Widgets"
+    SINGULARNAME: "Archivo de Widget"
+    YEAR: "año"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "Ayuda de BBCode"
+    CN: "Contenido"
+    DT: "Fecha"
+    PLURALNAME: "Entradas del Blog"
+    SINGULARNAME: "Entrada del BLog"
+    TS: "Etiquetas (separadas por coma)"
+  BlogEntry.ss:
+    COMMENTS: "Comentarios"
+    EDITTHIS: "Editar este mensaje"
+    POSTEDBY: "Enviado por"
+    POSTEDON: "en"
+    TAGS: "Etiquetas:"
+    UNPUBLISHTHIS: "Ocultar este mensaje"
+    VIEWALLPOSTTAGGED: "Ver todos los mensajes marcados con la etiqueta"
+  BlogHolder:
+    PLURALNAME: "Titulares del Blog"
+    POST: "Enviar entrada a la bitácora"
+    RSSFEED: "Alimentar al RSS con esta bitácora"
+    SINGULARNAME: "Titular del Blog"
+    SJ: "Asunto"
+    SPUC: "Por favor separa etiquetas utilizando comas."
+    SUCCONTENT: "Felicidades, el módulo bitácora de Silverstripe se ha instalado satisfactoriamente. Esta entrada de la bitácora se puede eliminar con seguridad. Puedes configurar aspectos de tu nueva bitácora (tal cómo reproductores mostrados en la barra lateral) en [url=admin] el CMS[/url]."
+    SUCTAGS: "bitácora, silverstripe"
+    SUCTITLE: "El Módulo bitácora Silverstripe se ha instalado satisfactoriamente."
+    TE: "Por ejemplo: deportes, personal. ciencia ficción"
+  BlogHolder.ss:
+    NOENTRIES: "Bitácora vacía"
+    VIEWINGTAGGED: "Ver entradas etiquetadas con"
+  BlogManagementWidget:
+    COMADM: "Administración de comentarios"
+    PLURALNAME: "Widget para la Gestión de Blogs"
+    SINGULARNAME: "Wisdget para la Gestion del Blog"
+    UNM1: "Tienes 1 comentario pendiente de moderación"
+    UNMM: "Tienes %i comentarios pendientes de moderación"
+  BlogManagementWidget.ss:
+    LOGOUT: "Salir"
+    POSTNEW: "Enviar nueva entrada a la bitácora"
+  BlogSummary.ss:
+    COMMENTS: "Comentarios"
+    POSTEDBY: "Enviado por"
+    POSTEDON: "en"
+    VIEWFULL: "Ver completo el mensaje titulado -"
+  RSSWidget:
+    CT: "Título personalizado para el alimentador"
+    NTS: "Número de elementos a mostrar:"
+    PLURALNAME: "Widgets R S S"
+    SINGULARNAME: "Widget R S S"
+    URL: "URL del RSS alimentado"
+  SubscribeRSSWidget:
+    PLURALNAME: "Widgets para Suscripción R S S"
+    SINGULARNAME: "Widget para Suscrición R S S"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Suscribe"
+    SUBSCRIBETITLE: "Suscribirme a este blog vía RSS"
+  TagCloudWidget:
+    LIMIT: "Limitar el número de etiquetas"
+    PLURALNAME: "Widgets de Nube de Etiquetas"
+    SBAL: "alfabeto"
+    SBFREQ: "frecuencia"
+    SINGULARNAME: "Widget Nube de Etiquetas"
+    SORTBY: "Ordenar por"
+    TILE: "Título"
+  TrackBackPing:
+    PLURALNAME: "Volver a la Pista de Pings"
+    SINGULARNAME: "Volver a la Pista de Pings"
diff --git a/lang/et_EE.php b/lang/et_EE.php
deleted file mode 100644
index 5870825..0000000
--- a/lang/et_EE.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Estonian (Estonia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('et_EE', $lang) && is_array($lang['et_EE'])) {
-	$lang['et_EE'] = array_merge($lang['en_US'], $lang['et_EE']);
-} else {
-	$lang['et_EE'] = $lang['en_US'];
-}
-
-$lang['et_EE']['ArchiveWidget']['DispBY'] = 'Kuva';
-$lang['et_EE']['ArchiveWidget']['MONTH'] = 'kuu';
-$lang['et_EE']['ArchiveWidget']['PLURALNAME'] = 'Arhiveeri vidinad';
-$lang['et_EE']['ArchiveWidget']['SINGULARNAME'] = 'Arhiveeri vidin';
-$lang['et_EE']['ArchiveWidget']['YEAR'] = 'aasta';
-$lang['et_EE']['BlogEntry']['AU'] = 'Autor';
-$lang['et_EE']['BlogEntry']['BBH'] = 'BBCode spikker';
-$lang['et_EE']['BlogEntry']['CN'] = 'Sisu';
-$lang['et_EE']['BlogEntry']['DT'] = 'Kuupäev';
-$lang['et_EE']['BlogEntry']['PLURALNAME'] = 'Blogi sisu';
-$lang['et_EE']['BlogEntry']['SINGULARNAME'] = 'Blogi sisu';
-$lang['et_EE']['BlogEntry.ss']['COMMENTS'] = 'Kommentaarid';
-$lang['et_EE']['BlogEntry.ss']['EDITTHIS'] = 'Muuda seda postitust';
-$lang['et_EE']['BlogEntry.ss']['POSTEDBY'] = 'Autori';
-$lang['et_EE']['BlogEntry.ss']['POSTEDON'] = 'poolt';
-$lang['et_EE']['BlogEntry.ss']['TAGS'] = 'Sildid:';
-$lang['et_EE']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Muuda see postitus avaldamatuks';
-$lang['et_EE']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Vaata kõiki postitusi siltidega';
-$lang['et_EE']['BlogEntry']['TS'] = 'Sildid (komaga eraldatud)';
-$lang['et_EE']['BlogHolder']['HAVENTPERM'] = 'Blogi postitamine on administraatori ülesanne. Palun logi sisse.';
-$lang['et_EE']['BlogHolder']['PLURALNAME'] = 'Blogi omanikud';
-$lang['et_EE']['BlogHolder']['POST'] = 'Postita blogi sissekanne';
-$lang['et_EE']['BlogHolder']['RSSFEED'] = 'Selle blogi RSS voog';
-$lang['et_EE']['BlogHolder']['SINGULARNAME'] = 'Blogi omanik';
-$lang['et_EE']['BlogHolder']['SJ'] = 'Teema';
-$lang['et_EE']['BlogHolder']['SPUC'] = 'Palun eralda sildid komadega.';
-$lang['et_EE']['BlogHolder.ss']['NOENTRIES'] = 'Blogi sissekanded puuduvad';
-$lang['et_EE']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Kuvatakse sissekandeid siltidega';
-$lang['et_EE']['BlogHolder']['SUCCONTENT'] = 'Õnnitleme, SilverStripe blogimoodul on edukalt installeeritud. Selle blogi sissekande võib ohutult ära kustutada. Oma blogi ilmet (nagu küljeribal kuvatavaid vidinaid) saad seadistada [url=admin]sisuhaldussüsteemi kaudu[/url].';
-$lang['et_EE']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['et_EE']['BlogHolder']['SUCTITLE'] = 'SilverStripe blogimoodul edukalt installeeritud';
-$lang['et_EE']['BlogHolder']['TE'] = 'Näiteks: sport, isiklik, teaduslik fantastika';
-$lang['et_EE']['BlogManagementWidget']['COMADM'] = 'Kommentaaride haldamine';
-$lang['et_EE']['BlogManagementWidget']['PLURALNAME'] = 'Blogi Muudatuse vidinad';
-$lang['et_EE']['BlogManagementWidget']['SINGULARNAME'] = 'Blogi muudatuste vidin';
-$lang['et_EE']['BlogManagementWidget.ss']['LOGOUT'] = 'Logi välja';
-$lang['et_EE']['BlogManagementWidget.ss']['POSTNEW'] = 'Postita uus blogi sissekanne';
-$lang['et_EE']['BlogManagementWidget']['UNM1'] = 'Sul on 1 üle vaatamata kommentaar';
-$lang['et_EE']['BlogManagementWidget']['UNMM'] = 'Sul on %i üle vaatamata kommentaari';
-$lang['et_EE']['BlogSummary.ss']['COMMENTS'] = 'Kommentaarid';
-$lang['et_EE']['BlogSummary.ss']['POSTEDBY'] = 'Postitas';
-$lang['et_EE']['BlogSummary.ss']['POSTEDON'] = '-';
-$lang['et_EE']['BlogSummary.ss']['VIEWFULL'] = 'Vaata tervet postitust pealkirjaga - ';
-$lang['et_EE']['RSSWidget']['CT'] = 'Kohandatud pealkiri voole';
-$lang['et_EE']['RSSWidget']['NTS'] = 'Kuvatavate sissekannete arv';
-$lang['et_EE']['RSSWidget']['PLURALNAME'] = 'RSS vidinad';
-$lang['et_EE']['RSSWidget']['SINGULARNAME'] = 'RSS vidin';
-$lang['et_EE']['RSSWidget']['URL'] = 'URL või RSS voog';
-$lang['et_EE']['SubscribeRSSWidget']['PLURALNAME'] = 'Telli RSS Vidinad';
-$lang['et_EE']['SubscribeRSSWidget']['SINGULARNAME'] = 'Telli RSS Vidin';
-$lang['et_EE']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Telli';
-$lang['et_EE']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Telli blogi RSS kaudu';
-$lang['et_EE']['TagCloudWidget']['LIMIT'] = 'Piira siltide arvu';
-$lang['et_EE']['TagCloudWidget']['PLURALNAME'] = 'Lipikute pilve vidinad';
-$lang['et_EE']['TagCloudWidget']['SBAL'] = 'tähestikuliselt';
-$lang['et_EE']['TagCloudWidget']['SBFREQ'] = 'sageduse järgi';
-$lang['et_EE']['TagCloudWidget']['SINGULARNAME'] = 'Lipikute pilve vidin';
-$lang['et_EE']['TagCloudWidget']['SORTBY'] = 'Sorteeri';
-$lang['et_EE']['TagCloudWidget']['TILE'] = 'Pealkiri';
-$lang['et_EE']['TrackBackPing']['PLURALNAME'] = 'Pingid';
-$lang['et_EE']['TrackBackPing']['SINGULARNAME'] = 'Ping';
-
-?>
\ No newline at end of file
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
new file mode 100644
index 0000000..272ae38
--- /dev/null
+++ b/lang/et_EE.yml
@@ -0,0 +1,74 @@
+et_EE:
+  ArchiveWidget:
+    DispBY: "Kuva"
+    MONTH: "kuu"
+    PLURALNAME: "Arhiveeri vidinad"
+    SINGULARNAME: "Arhiveeri vidin"
+    YEAR: "aasta"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "BBCode spikker"
+    CN: "Sisu"
+    DT: "Kuupäev"
+    PLURALNAME: "Blogi sisu"
+    SINGULARNAME: "Blogi sisu"
+    TS: "Sildid (komaga eraldatud)"
+  BlogEntry.ss:
+    COMMENTS: "Kommentaarid"
+    EDITTHIS: "Muuda seda postitust"
+    POSTEDBY: "Autori"
+    POSTEDON: "poolt"
+    TAGS: "Sildid:"
+    UNPUBLISHTHIS: "Muuda see postitus avaldamatuks"
+    VIEWALLPOSTTAGGED: "Vaata kõiki postitusi siltidega"
+  BlogHolder:
+    PLURALNAME: "Blogi omanikud"
+    POST: "Postita blogi sissekanne"
+    RSSFEED: "Selle blogi RSS voog"
+    SINGULARNAME: "Blogi omanik"
+    SJ: "Teema"
+    SPUC: "Palun eralda sildid komadega."
+    SUCCONTENT: "Õnnitleme, SilverStripe blogimoodul on edukalt installeeritud. Selle blogi sissekande võib ohutult ära kustutada. Oma blogi ilmet (nagu küljeribal kuvatavaid vidinaid) saad seadistada [url=admin]sisuhaldussüsteemi kaudu[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blogimoodul edukalt installeeritud"
+    TE: "Näiteks: sport, isiklik, teaduslik fantastika"
+  BlogHolder.ss:
+    NOENTRIES: "Blogi sissekanded puuduvad"
+    VIEWINGTAGGED: "Kuvatakse sissekandeid siltidega"
+  BlogManagementWidget:
+    COMADM: "Kommentaaride haldamine"
+    PLURALNAME: "Blogi Muudatuse vidinad"
+    SINGULARNAME: "Blogi muudatuste vidin"
+    UNM1: "Sul on 1 üle vaatamata kommentaar"
+    UNMM: "Sul on %i üle vaatamata kommentaari"
+  BlogManagementWidget.ss:
+    LOGOUT: "Logi välja"
+    POSTNEW: "Postita uus blogi sissekanne"
+  BlogSummary.ss:
+    COMMENTS: "Kommentaarid"
+    POSTEDBY: "Postitas"
+    POSTEDON: "-"
+    VIEWFULL: "Vaata tervet postitust pealkirjaga - "
+  RSSWidget:
+    CT: "Kohandatud pealkiri voole"
+    NTS: "Kuvatavate sissekannete arv"
+    PLURALNAME: "RSS vidinad"
+    SINGULARNAME: "RSS vidin"
+    URL: "URL või RSS voog"
+  SubscribeRSSWidget:
+    PLURALNAME: "Telli RSS Vidinad"
+    SINGULARNAME: "Telli RSS Vidin"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Telli"
+    SUBSCRIBETITLE: "Telli blogi RSS kaudu"
+  TagCloudWidget:
+    LIMIT: "Piira siltide arvu"
+    PLURALNAME: "Lipikute pilve vidinad"
+    SBAL: "tähestikuliselt"
+    SBFREQ: "sageduse järgi"
+    SINGULARNAME: "Lipikute pilve vidin"
+    SORTBY: "Sorteeri"
+    TILE: "Pealkiri"
+  TrackBackPing:
+    PLURALNAME: "Pingid"
+    SINGULARNAME: "Ping"
diff --git a/lang/fr.yml b/lang/fr.yml
new file mode 100644
index 0000000..c703637
--- /dev/null
+++ b/lang/fr.yml
@@ -0,0 +1,71 @@
+fr:
+  ArchiveWidget:
+    DispBY: "Afficher par"
+    MONTH: "mois"
+    PLURALNAME: "Widgets Archive"
+    SINGULARNAME: "Widget Archive"
+    YEAR: "années"
+  BlogEntry:
+    AU: "Auteur"
+    BBH: "Aide BBCode"
+    CN: "Contenu"
+    DT: "Date"
+    PLURALNAME: "Billets de blog"
+    SINGULARNAME: "Billet de blog"
+    TS: "Tags (Séparer par une virgule)"
+  BlogEntry.ss:
+    COMMENTS: "Commentaires"
+    EDITTHIS: "Modifier ce message"
+    POSTEDBY: "Posté par"
+    POSTEDON: "sur"
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "Dépublier ce message"
+    VIEWALLPOSTTAGGED: "Voir tous les messages marqués"
+  BlogHolder:
+    PLURALNAME: "Conteneurs Blogs"
+    POST: "Poster une entrée sur le blog"
+    RSSFEED: "Flux RSS de ce blog"
+    SINGULARNAME: "Conteneur Blog"
+    SJ: "Sujet"
+    SPUC: "Veuillez séparer les tags en utilisant une virgule"
+    SUCCONTENT: "Félicitations, le module de blog SilverStripe a été installé avec succès. Cette entrée du blog peut être supprimée sans problème. Vous pouvez configurer les aspects de votre blog (comme les gadgets affichés dans la barre de coté) dans  [url=admin]le CMS[/url]."
+    SUCTAGS: "blog, silverStripe"
+    SUCTITLE: "Le module de blog SilverStripe a été installé avec succès"
+    TE: "Par exemple: sport, personnel, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "Il n'y a aucune entrée dans le blog"
+    VIEWINGTAGGED: "Affichage des entrées marquées avec"
+  BlogManagementWidget:
+    COMADM: "Administration des commentaires"
+    PLURALNAME: "Widgets de Management Blog"
+    SINGULARNAME: "Widget de Management Blog"
+    UNM1: "Vous avez 1 commentaire non modéré"
+    UNMM: "Vous avez %i commentaires non modérés"
+  BlogManagementWidget.ss:
+    LOGOUT: "Déconnexion"
+    POSTNEW: "Publier une nouvelle entrée dans le blog"
+  BlogSummary.ss:
+    COMMENTS: "Commentaires"
+    POSTEDBY: "Posté par"
+    POSTEDON: "sur"
+    VIEWFULL: "Voir le titre du post en entier -"
+  RSSWidget:
+    CT: "Titre personnalisé pour le flux"
+    NTS: "Nombre d'éléments à afficher"
+    PLURALNAME: "Widgets de flux RSS"
+    SINGULARNAME: "Widget de flux RSS"
+    URL: "URL du flux RSS"
+  SubscribeRSSWidget:
+    PLURALNAME: "Widgets d'abonnement RSS"
+    SINGULARNAME: "Widget d'abonnement RSS"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Souscrire"
+    SUBSCRIBETITLE: "Souscrire à ce blog par RSS"
+  TagCloudWidget:
+    LIMIT: "Nombre limite des tags"
+    PLURALNAME: "Widgets Nuage de Tags"
+    SBAL: "alphabet"
+    SBFREQ: "fréquence"
+    SINGULARNAME: "Widget Nuage de Tags"
+    SORTBY: "Trier par"
+    TILE: "Titre"
diff --git a/lang/fr_FR.php b/lang/fr_FR.php
deleted file mode 100644
index 3b94edd..0000000
--- a/lang/fr_FR.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * French (France) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('fr_FR', $lang) && is_array($lang['fr_FR'])) {
-	$lang['fr_FR'] = array_merge($lang['en_US'], $lang['fr_FR']);
-} else {
-	$lang['fr_FR'] = $lang['en_US'];
-}
-
-$lang['fr_FR']['ArchiveWidget']['DispBY'] = 'Afficher par';
-$lang['fr_FR']['ArchiveWidget']['MONTH'] = 'mois';
-$lang['fr_FR']['ArchiveWidget']['PLURALNAME'] = 'Widgets Archive';
-$lang['fr_FR']['ArchiveWidget']['SINGULARNAME'] = 'Widget Archive';
-$lang['fr_FR']['ArchiveWidget']['YEAR'] = 'années';
-$lang['fr_FR']['BlogEntry']['AU'] = 'Auteur';
-$lang['fr_FR']['BlogEntry']['BBH'] = 'Aide BBCode';
-$lang['fr_FR']['BlogEntry']['CN'] = 'Contenu';
-$lang['fr_FR']['BlogEntry']['DT'] = 'Date';
-$lang['fr_FR']['BlogEntry']['PLURALNAME'] = 'Billets de blog';
-$lang['fr_FR']['BlogEntry']['SINGULARNAME'] = 'Billet de blog';
-$lang['fr_FR']['BlogEntry.ss']['COMMENTS'] = 'Commentaires';
-$lang['fr_FR']['BlogEntry.ss']['EDITTHIS'] = 'Modifier ce message';
-$lang['fr_FR']['BlogEntry.ss']['POSTEDBY'] = 'Posté par';
-$lang['fr_FR']['BlogEntry.ss']['POSTEDON'] = 'sur';
-$lang['fr_FR']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['fr_FR']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Dépublier ce message';
-$lang['fr_FR']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Voir tous les messages marqués';
-$lang['fr_FR']['BlogEntry']['TS'] = 'Tags (Séparer par une virgule)';
-$lang['fr_FR']['BlogHolder']['HAVENTPERM'] = 'L\'envoi de blog est réservé aux administrateurs. Loggez vous s\'il vous plaît.';
-$lang['fr_FR']['BlogHolder']['PLURALNAME'] = 'Conteneurs Blogs';
-$lang['fr_FR']['BlogHolder']['POST'] = 'Poster une entrée sur le blog';
-$lang['fr_FR']['BlogHolder']['RSSFEED'] = 'Flux RSS de ce blog';
-$lang['fr_FR']['BlogHolder']['SINGULARNAME'] = 'Conteneur Blog';
-$lang['fr_FR']['BlogHolder']['SJ'] = 'Sujet';
-$lang['fr_FR']['BlogHolder']['SPUC'] = 'Veuillez séparer les tags en utilisant une virgule';
-$lang['fr_FR']['BlogHolder.ss']['NOENTRIES'] = 'Il n\'y a aucune entrée dans le blog';
-$lang['fr_FR']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Affichage des entrées marquées avec';
-$lang['fr_FR']['BlogHolder']['SUCCONTENT'] = 'Félicitations, le module de blog SilverStripe a été installé avec succès. Cette entrée du blog peut être supprimée sans problème. Vous pouvez configurer les aspects de votre blog (comme les gadgets affichés dans la barre de coté) dans  [url=admin]le CMS[/url].';
-$lang['fr_FR']['BlogHolder']['SUCTAGS'] = 'blog, silverStripe';
-$lang['fr_FR']['BlogHolder']['SUCTITLE'] = 'Le module de blog SilverStripe a été installé avec succès';
-$lang['fr_FR']['BlogHolder']['TE'] = 'Par exemple: sport, personnel, science fiction';
-$lang['fr_FR']['BlogManagementWidget']['COMADM'] = 'Administration des commentaires';
-$lang['fr_FR']['BlogManagementWidget']['PLURALNAME'] = 'Widgets de Management Blog';
-$lang['fr_FR']['BlogManagementWidget']['SINGULARNAME'] = 'Widget de Management Blog';
-$lang['fr_FR']['BlogManagementWidget.ss']['LOGOUT'] = 'Déconnexion';
-$lang['fr_FR']['BlogManagementWidget.ss']['POSTNEW'] = 'Publier une nouvelle entrée dans le blog';
-$lang['fr_FR']['BlogManagementWidget']['UNM1'] = 'Vous avez 1 commentaire non modéré';
-$lang['fr_FR']['BlogManagementWidget']['UNMM'] = 'Vous avez %i commentaires non modérés';
-$lang['fr_FR']['BlogSummary.ss']['COMMENTS'] = 'Commentaires';
-$lang['fr_FR']['BlogSummary.ss']['POSTEDBY'] = 'Posté par';
-$lang['fr_FR']['BlogSummary.ss']['POSTEDON'] = 'sur';
-$lang['fr_FR']['BlogSummary.ss']['VIEWFULL'] = 'Voir le titre du post en entier -';
-$lang['fr_FR']['RSSWidget']['CT'] = 'Titre personnalisé pour le flux';
-$lang['fr_FR']['RSSWidget']['NTS'] = 'Nombre d\'éléments à afficher';
-$lang['fr_FR']['RSSWidget']['PLURALNAME'] = 'Widgets de flux RSS';
-$lang['fr_FR']['RSSWidget']['SINGULARNAME'] = 'Widget de flux RSS';
-$lang['fr_FR']['RSSWidget']['URL'] = 'URL du flux RSS';
-$lang['fr_FR']['SubscribeRSSWidget']['PLURALNAME'] = 'Widgets d\'abonnement RSS';
-$lang['fr_FR']['SubscribeRSSWidget']['SINGULARNAME'] = 'Widget d\'abonnement RSS';
-$lang['fr_FR']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Souscrire';
-$lang['fr_FR']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Souscrire à ce blog par RSS';
-$lang['fr_FR']['TagCloudWidget']['LIMIT'] = 'Nombre limite des tags';
-$lang['fr_FR']['TagCloudWidget']['PLURALNAME'] = 'Widgets Nuage de Tags';
-$lang['fr_FR']['TagCloudWidget']['SBAL'] = 'alphabet';
-$lang['fr_FR']['TagCloudWidget']['SBFREQ'] = 'fréquence';
-$lang['fr_FR']['TagCloudWidget']['SINGULARNAME'] = 'Widget Nuage de Tags';
-$lang['fr_FR']['TagCloudWidget']['SORTBY'] = 'Trier par';
-$lang['fr_FR']['TagCloudWidget']['TILE'] = 'Titre';
-
-?>
\ No newline at end of file
diff --git a/lang/hr.yml b/lang/hr.yml
new file mode 100644
index 0000000..ad9d674
--- /dev/null
+++ b/lang/hr.yml
@@ -0,0 +1,46 @@
+hr:
+  ArchiveWidget:
+    MONTH: "mjesec"
+    YEAR: "godina"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "Pomoć za BBCode"
+    CN: "Sadržaj"
+    DT: "Datum"
+    TS: "Tagovi (odvojeni zarezom)"
+  BlogEntry.ss:
+    COMMENTS: "Komentari"
+    POSTEDBY: "Objavio"
+    POSTEDON: "Objavljeno"
+    TAGS: "Tagovi:"
+    VIEWALLPOSTTAGGED: "Pogledaj sve blog zapise tagirane sa"
+  BlogHolder:
+    POST: "Objavi blog zapis"
+    RSSFEED: "RSS feed ovog bloga"
+    SJ: "Tema"
+    SPUC: "Molimo vas razdovojite tagove zarezima."
+    SUCCONTENT: "Čestitamo, SilverStripe blog modul je uspješno instaliran. Ovaj blog zapis se slobodno može obrisati. Postavke bloga je moguće konfigurirati (kao što su widgeti prikazani sa strane) u [url=admin]CMSu[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blog modul uspješno je instaliran"
+    TE: "Na primjer: sport, osobno, znanstvena fantastika"
+  BlogHolder.ss:
+    NOENTRIES: "Nema blog zapisa"
+    VIEWINGTAGGED: "Pogledaj zapise tagirane sa"
+  BlogManagementWidget:
+    COMADM: "Administriranje komentara"
+  BlogManagementWidget.ss:
+    LOGOUT: "Odlogiraj se"
+    POSTNEW: "Objavi novi blog zapis"
+  BlogSummary.ss:
+    COMMENTS: "Komentari"
+    POSTEDON: "Objavljeno"
+    VIEWFULL: "Pogledaj potpuni blog zapis pod nazivom - "
+  RSSWidget:
+    NTS: "Broj orikazanih zapisa"
+    URL: "URL RSS feeda"
+  TagCloudWidget:
+    LIMIT: "Ograniči broj tagova"
+    SBAL: "abecedi"
+    SBFREQ: "učestalosti (frekvenciji)"
+    SORTBY: "Sortiraj prema"
+    TILE: "Naslov"
diff --git a/lang/hr_HR.php b/lang/hr_HR.php
deleted file mode 100644
index b0d42dd..0000000
--- a/lang/hr_HR.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Croatian (Croatia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('hr_HR', $lang) && is_array($lang['hr_HR'])) {
-	$lang['hr_HR'] = array_merge($lang['en_US'], $lang['hr_HR']);
-} else {
-	$lang['hr_HR'] = $lang['en_US'];
-}
-
-$lang['hr_HR']['ArchiveWidget']['MONTH'] = 'mjesec';
-$lang['hr_HR']['ArchiveWidget']['YEAR'] = 'godina';
-$lang['hr_HR']['BlogEntry']['AU'] = 'Autor';
-$lang['hr_HR']['BlogEntry']['BBH'] = 'Pomoć za BBCode';
-$lang['hr_HR']['BlogEntry']['CN'] = 'Sadržaj';
-$lang['hr_HR']['BlogEntry']['DT'] = 'Datum';
-$lang['hr_HR']['BlogEntry.ss']['COMMENTS'] = 'Komentari';
-$lang['hr_HR']['BlogEntry.ss']['POSTEDBY'] = 'Objavio';
-$lang['hr_HR']['BlogEntry.ss']['POSTEDON'] = 'Objavljeno';
-$lang['hr_HR']['BlogEntry.ss']['TAGS'] = 'Tagovi:';
-$lang['hr_HR']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Pogledaj sve blog zapise tagirane sa';
-$lang['hr_HR']['BlogEntry']['TS'] = 'Tagovi (odvojeni zarezom)';
-$lang['hr_HR']['BlogHolder']['HAVENTPERM'] = 'Molimo prijavite se. Objava blog zapisa je administratorova zadaća.';
-$lang['hr_HR']['BlogHolder']['POST'] = 'Objavi blog zapis';
-$lang['hr_HR']['BlogHolder']['RSSFEED'] = 'RSS feed ovog bloga';
-$lang['hr_HR']['BlogHolder']['SJ'] = 'Tema';
-$lang['hr_HR']['BlogHolder']['SPUC'] = 'Molimo vas razdovojite tagove zarezima.';
-$lang['hr_HR']['BlogHolder.ss']['NOENTRIES'] = 'Nema blog zapisa';
-$lang['hr_HR']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Pogledaj zapise tagirane sa';
-$lang['hr_HR']['BlogHolder']['SUCCONTENT'] = 'Čestitamo, SilverStripe blog modul je uspješno instaliran. Ovaj blog zapis se slobodno može obrisati. Postavke bloga je moguće konfigurirati (kao što su widgeti prikazani sa strane) u [url=admin]CMSu[/url].';
-$lang['hr_HR']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['hr_HR']['BlogHolder']['SUCTITLE'] = 'SilverStripe blog modul uspješno je instaliran';
-$lang['hr_HR']['BlogHolder']['TE'] = 'Na primjer: sport, osobno, znanstvena fantastika';
-$lang['hr_HR']['BlogManagementWidget']['COMADM'] = 'Administriranje komentara';
-$lang['hr_HR']['BlogManagementWidget.ss']['LOGOUT'] = 'Odlogiraj se';
-$lang['hr_HR']['BlogManagementWidget.ss']['POSTNEW'] = 'Objavi novi blog zapis';
-$lang['hr_HR']['BlogSummary.ss']['COMMENTS'] = 'Komentari';
-$lang['hr_HR']['BlogSummary.ss']['POSTEDON'] = 'Objavljeno';
-$lang['hr_HR']['BlogSummary.ss']['VIEWFULL'] = 'Pogledaj potpuni blog zapis pod nazivom - ';
-$lang['hr_HR']['RSSWidget']['NTS'] = 'Broj orikazanih zapisa';
-$lang['hr_HR']['RSSWidget']['URL'] = 'URL RSS feeda';
-$lang['hr_HR']['TagCloudWidget']['LIMIT'] = 'Ograniči broj tagova';
-$lang['hr_HR']['TagCloudWidget']['SBAL'] = 'abecedi';
-$lang['hr_HR']['TagCloudWidget']['SBFREQ'] = 'učestalosti (frekvenciji)';
-$lang['hr_HR']['TagCloudWidget']['SORTBY'] = 'Sortiraj prema';
-$lang['hr_HR']['TagCloudWidget']['TILE'] = 'Naslov';
-
-?>
\ No newline at end of file
diff --git a/lang/is.yml b/lang/is.yml
new file mode 100644
index 0000000..0fddb75
--- /dev/null
+++ b/lang/is.yml
@@ -0,0 +1,71 @@
+is:
+  ArchiveWidget:
+    DispBY: "Birta sem"
+    MONTH: "mánuður"
+    YEAR: "ár"
+  BlogEntry:
+    AU: "Höfundur"
+    BBH: "BBCode hjálp"
+    CN: "Efni"
+    DT: "Dags"
+    PLURALNAME: "Blogg færslur"
+    SINGULARNAME: "Blogg færsla"
+    TS: "Tög (komma til aðskilnaðar)"
+  BlogEntry.ss:
+    COMMENTS: "Athugasemdir"
+    EDITTHIS: "Breyta þessari færslu"
+    POSTEDBY: "Skrifað af"
+    POSTEDON: "á"
+    TAGS: "Tög:"
+    UNPUBLISHTHIS: "Hætta birtingu þessarar færslu"
+    VIEWALLPOSTTAGGED: "Birta allar taggaðar færslur"
+  BlogHolder:
+    PLURALNAME: "Blogg umhverfi"
+    POST: "Birta blogg færslu"
+    RSSFEED: "RSS þjónusta fyrir þetta blogg"
+    SINGULARNAME: "Blogg umhverfi"
+    SJ: "Málefni"
+    SPUC: "Vinsamlegast notaðu kommu til að aðskilja tögin"
+    SUCCONTENT: |
+                 Til hamingju, uppsetningin á SilverStripe blogg einingunni tókst. 
+                 Þessari blogg færslu er hægt að eyða á örugganhátt. Þú getur stillt útlit blogsins þíns (svo sem widgets) i  [url=admin] kefinu[/url].
+    SUCTAGS: "silverstripe, blogg"
+    SUCTITLE: "Uppsetning á SilverStripe blogg einingunni tókst"
+    TE: "Til dæmis: íþróttir, persónulegt, vísindasögur"
+  BlogHolder.ss:
+    NOENTRIES: "Það eru engar blogg færslur"
+    VIEWINGTAGGED: "Skoða færslur sem eru taggaðar með"
+  BlogManagementWidget:
+    COMADM: "Athugasemda stjórnun"
+    PLURALNAME: "Blogg stjórnunar aukahlutur"
+    SINGULARNAME: "Blogg stjórnunar aukahlutur"
+    UNM1: "Þú átt 1 óskoðaða athugasemd"
+    UNMM: "Þú átt %i óskoðaða athugasemd"
+  BlogManagementWidget.ss:
+    LOGOUT: "Útskrá"
+    POSTNEW: "Skrifa nýja færslu"
+  BlogSummary.ss:
+    COMMENTS: "Athugasemdir"
+    POSTEDBY: "Skráð af"
+    POSTEDON: "á"
+    VIEWFULL: "Skoða alla færslu -"
+  RSSWidget:
+    CT: "Titill fyrir þjónustuna"
+    NTS: "Fjöldi hluta til að sýna"
+    PLURALNAME: "RSS aukahlutur"
+    SINGULARNAME: "RSS aukahlutur"
+    URL: "Slóð á RSS þjónustuna"
+  SubscribeRSSWidget:
+    PLURALNAME: "Áskriftar RSS aukahlutur"
+    SINGULARNAME: "Áskriftar RSS aukahlutur"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Gerast áskrifandi"
+    SUBSCRIBETITLE: "Gerast áskrifandi að þessu bloggi í gegnum RSS"
+  TagCloudWidget:
+    LIMIT: "Takmarka fjölda tag"
+    PLURALNAME: "Tag ský aukahlutur"
+    SBAL: "stafróf"
+    SBFREQ: "tíðni"
+    SINGULARNAME: "Tag ský aukahlutur"
+    SORTBY: "Raða eftir"
+    TILE: "Titill"
diff --git a/lang/is_IS.php b/lang/is_IS.php
deleted file mode 100644
index 1da4b68..0000000
--- a/lang/is_IS.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Icelandic (Iceland) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('is_IS', $lang) && is_array($lang['is_IS'])) {
-	$lang['is_IS'] = array_merge($lang['en_US'], $lang['is_IS']);
-} else {
-	$lang['is_IS'] = $lang['en_US'];
-}
-
-$lang['is_IS']['ArchiveWidget']['DispBY'] = 'Birta sem';
-$lang['is_IS']['ArchiveWidget']['MONTH'] = 'mánuður';
-$lang['is_IS']['ArchiveWidget']['YEAR'] = 'ár';
-$lang['is_IS']['BlogEntry']['AU'] = 'Höfundur';
-$lang['is_IS']['BlogEntry']['BBH'] = 'BBCode hjálp';
-$lang['is_IS']['BlogEntry']['CN'] = 'Efni';
-$lang['is_IS']['BlogEntry']['DT'] = 'Dags';
-$lang['is_IS']['BlogEntry']['PLURALNAME'] = 'Blogg færslur';
-$lang['is_IS']['BlogEntry']['SINGULARNAME'] = 'Blogg færsla';
-$lang['is_IS']['BlogEntry.ss']['COMMENTS'] = 'Athugasemdir';
-$lang['is_IS']['BlogEntry.ss']['EDITTHIS'] = 'Breyta þessari færslu';
-$lang['is_IS']['BlogEntry.ss']['POSTEDBY'] = 'Skrifað af';
-$lang['is_IS']['BlogEntry.ss']['POSTEDON'] = 'á';
-$lang['is_IS']['BlogEntry.ss']['TAGS'] = 'Tög:';
-$lang['is_IS']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Hætta birtingu þessarar færslu';
-$lang['is_IS']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Birta allar taggaðar færslur';
-$lang['is_IS']['BlogEntry']['TS'] = 'Tög (komma til aðskilnaðar)';
-$lang['is_IS']['BlogHolder']['HAVENTPERM'] = 'Birting bloggs er hlutverk stjórnanda. Vinsamlegast innskráðu þig.';
-$lang['is_IS']['BlogHolder']['PLURALNAME'] = 'Blogg umhverfi';
-$lang['is_IS']['BlogHolder']['POST'] = 'Birta blogg færslu';
-$lang['is_IS']['BlogHolder']['RSSFEED'] = 'RSS þjónusta fyrir þetta blogg';
-$lang['is_IS']['BlogHolder']['SINGULARNAME'] = 'Blogg umhverfi';
-$lang['is_IS']['BlogHolder']['SJ'] = 'Málefni';
-$lang['is_IS']['BlogHolder']['SPUC'] = 'Vinsamlegast notaðu kommu til að aðskilja tögin';
-$lang['is_IS']['BlogHolder.ss']['NOENTRIES'] = 'Það eru engar blogg færslur';
-$lang['is_IS']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Skoða færslur sem eru taggaðar með';
-$lang['is_IS']['BlogHolder']['SUCCONTENT'] = 'Til hamingju, uppsetningin á SilverStripe blogg einingunni tókst. 
-Þessari blogg færslu er hægt að eyða á örugganhátt. Þú getur stillt útlit blogsins þíns (svo sem widgets) i  [url=admin] kefinu[/url].';
-$lang['is_IS']['BlogHolder']['SUCTAGS'] = 'silverstripe, blogg';
-$lang['is_IS']['BlogHolder']['SUCTITLE'] = 'Uppsetning á SilverStripe blogg einingunni tókst';
-$lang['is_IS']['BlogHolder']['TE'] = 'Til dæmis: íþróttir, persónulegt, vísindasögur';
-$lang['is_IS']['BlogManagementWidget']['COMADM'] = 'Athugasemda stjórnun';
-$lang['is_IS']['BlogManagementWidget']['PLURALNAME'] = 'Blogg stjórnunar aukahlutur';
-$lang['is_IS']['BlogManagementWidget']['SINGULARNAME'] = 'Blogg stjórnunar aukahlutur';
-$lang['is_IS']['BlogManagementWidget.ss']['LOGOUT'] = 'Útskrá';
-$lang['is_IS']['BlogManagementWidget.ss']['POSTNEW'] = 'Skrifa nýja færslu';
-$lang['is_IS']['BlogManagementWidget']['UNM1'] = 'Þú átt 1 óskoðaða athugasemd';
-$lang['is_IS']['BlogManagementWidget']['UNMM'] = 'Þú átt %i óskoðaða athugasemd';
-$lang['is_IS']['BlogSummary.ss']['COMMENTS'] = 'Athugasemdir';
-$lang['is_IS']['BlogSummary.ss']['POSTEDBY'] = 'Skráð af';
-$lang['is_IS']['BlogSummary.ss']['POSTEDON'] = 'á';
-$lang['is_IS']['BlogSummary.ss']['VIEWFULL'] = 'Skoða alla færslu -';
-$lang['is_IS']['RSSWidget']['CT'] = 'Titill fyrir þjónustuna';
-$lang['is_IS']['RSSWidget']['NTS'] = 'Fjöldi hluta til að sýna';
-$lang['is_IS']['RSSWidget']['PLURALNAME'] = 'RSS aukahlutur';
-$lang['is_IS']['RSSWidget']['SINGULARNAME'] = 'RSS aukahlutur';
-$lang['is_IS']['RSSWidget']['URL'] = 'Slóð á RSS þjónustuna';
-$lang['is_IS']['SubscribeRSSWidget']['PLURALNAME'] = 'Áskriftar RSS aukahlutur';
-$lang['is_IS']['SubscribeRSSWidget']['SINGULARNAME'] = 'Áskriftar RSS aukahlutur';
-$lang['is_IS']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Gerast áskrifandi';
-$lang['is_IS']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Gerast áskrifandi að þessu bloggi í gegnum RSS';
-$lang['is_IS']['TagCloudWidget']['LIMIT'] = 'Takmarka fjölda tag';
-$lang['is_IS']['TagCloudWidget']['PLURALNAME'] = 'Tag ský aukahlutur';
-$lang['is_IS']['TagCloudWidget']['SBAL'] = 'stafróf';
-$lang['is_IS']['TagCloudWidget']['SBFREQ'] = 'tíðni';
-$lang['is_IS']['TagCloudWidget']['SINGULARNAME'] = 'Tag ský aukahlutur';
-$lang['is_IS']['TagCloudWidget']['SORTBY'] = 'Raða eftir';
-$lang['is_IS']['TagCloudWidget']['TILE'] = 'Titill';
-
-?>
\ No newline at end of file
diff --git a/lang/it.yml b/lang/it.yml
new file mode 100644
index 0000000..4521bce
--- /dev/null
+++ b/lang/it.yml
@@ -0,0 +1,77 @@
+it:
+  ArchiveWidget:
+    DispBY: "Visualizzato da"
+    MONTH: "mese"
+    PLURALNAME: "Widget Archiviazione"
+    SINGULARNAME: "Widget Archiviazione"
+    YEAR: "anno"
+  BlogEntry:
+    AU: "Autore"
+    BBH: "Aiuto BBCode"
+    CN: "Contenuto"
+    DT: "Data"
+    PLURALNAME: "Registrazioni blog"
+    SINGULARNAME: "Registrazione blog"
+    TS: "Etichette (separate da virgola)"
+  BlogEntry.ss:
+    COMMENTS: "Commenti"
+    EDITTHIS: "Modifica questo post"
+    POSTEDBY: "Inserito da"
+    POSTEDON: "su"
+    TAGS: "Etichette:"
+    UNPUBLISHTHIS: "Non pubblicare questo post"
+    VIEWALLPOSTTAGGED: "Visualizza tutti i post con etichetta"
+  BlogHolder:
+    PLURALNAME: "Proprietari blog"
+    POST: "Salva il post nel blog"
+    RSSFEED: "RSS feed di questo blog"
+    SINGULARNAME: "Proprietario blog"
+    SJ: "Soggetto"
+    SPUC: "Per favore separa le etichette usando virgole."
+    SUCCONTENT: "Congratulazioni, il blog SilverStripe è stato installato correttamente. Questo messaggio del blog può essere eliminato. Puoi configurare l'aspetto del tuo blog (come la visualizzazione dei widgets nella sidebar) in [url=admin] del CMS[/url]"
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "Modulo blog SilverStripe installato correttamente"
+    TE: "Ad esempio: sport, personale, fantascienza"
+  BlogHolder.ss:
+    NOENTRIES: "Non ci sono voci nel blog"
+    VIEWINGTAGGED: "Visualizza voci con etichetta"
+  BlogManagementWidget:
+    COMADM: "Amministrazione commenti"
+    PLURALNAME: "Widget di amministrazione blog"
+    SINGULARNAME: "Widget di amministrazione blog"
+    UNM1: "Hai 1 commento da moderare"
+    UNMM: "Hai %i commenti non approvati"
+  BlogManagementWidget.ss:
+    LOGOUT: "Esci"
+    POSTNEW: "Inserisci un nuovo post"
+  BlogSummary.ss:
+    COMMENTS: "Commenti"
+    POSTEDBY: "Inserito da"
+    POSTEDON: "su"
+    VIEWFULL: "Visualizza post intitolato - "
+  BlogTree:
+    PLURALNAME: "Alberi dei blog"
+    SINGULARNAME: "Albero del blog"
+  RSSWidget:
+    CT: "Titolo del feed"
+    NTS: "Numero di argomenti da visualizzare"
+    PLURALNAME: "Widget RSS"
+    SINGULARNAME: "Widget RSS"
+    URL: "URL per il Feed RSS"
+  SubscribeRSSWidget:
+    PLURALNAME: "Sottoscrivi Widget RSS"
+    SINGULARNAME: "Sottoscrivi Widget RSS"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Sottoscrivi"
+    SUBSCRIBETITLE: "Sottoscrivi questo blog via RSS"
+  TagCloudWidget:
+    LIMIT: "Limitare il numero dei tag a"
+    PLURALNAME: "Widget Nuvola di Tag"
+    SBAL: "alfabeto"
+    SBFREQ: "frequenza"
+    SINGULARNAME: "Widget Nuvola di Tag"
+    SORTBY: "Ordina per"
+    TILE: "Titolo"
+  TrackBackPing:
+    PLURALNAME: "Rileva Ping"
+    SINGULARNAME: "Rileva Ping"
diff --git a/lang/it_IT.php b/lang/it_IT.php
deleted file mode 100644
index 3591dd8..0000000
--- a/lang/it_IT.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Italian (Italy) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('it_IT', $lang) && is_array($lang['it_IT'])) {
-	$lang['it_IT'] = array_merge($lang['en_US'], $lang['it_IT']);
-} else {
-	$lang['it_IT'] = $lang['en_US'];
-}
-
-$lang['it_IT']['ArchiveWidget']['DispBY'] = 'Visualizzato da';
-$lang['it_IT']['ArchiveWidget']['MONTH'] = 'mese';
-$lang['it_IT']['ArchiveWidget']['PLURALNAME'] = 'Widget Archiviazione';
-$lang['it_IT']['ArchiveWidget']['SINGULARNAME'] = 'Widget Archiviazione';
-$lang['it_IT']['ArchiveWidget']['YEAR'] = 'anno';
-$lang['it_IT']['BlogEntry']['AU'] = 'Autore';
-$lang['it_IT']['BlogEntry']['BBH'] = 'Aiuto BBCode';
-$lang['it_IT']['BlogEntry']['CN'] = 'Contenuto';
-$lang['it_IT']['BlogEntry']['DT'] = 'Data';
-$lang['it_IT']['BlogEntry']['PLURALNAME'] = 'Registrazioni blog';
-$lang['it_IT']['BlogEntry']['SINGULARNAME'] = 'Registrazione blog';
-$lang['it_IT']['BlogEntry.ss']['COMMENTS'] = 'Commenti';
-$lang['it_IT']['BlogEntry.ss']['EDITTHIS'] = 'Modifica questo post';
-$lang['it_IT']['BlogEntry.ss']['POSTEDBY'] = 'Inserito da';
-$lang['it_IT']['BlogEntry.ss']['POSTEDON'] = 'su';
-$lang['it_IT']['BlogEntry.ss']['TAGS'] = 'Etichette:';
-$lang['it_IT']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Non pubblicare questo post';
-$lang['it_IT']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Visualizza tutti i post con etichetta';
-$lang['it_IT']['BlogEntry']['TS'] = 'Etichette (separate da virgola)';
-$lang['it_IT']['BlogHolder']['HAVENTPERM'] = 'Scrivere nel blog è un\'attività dell\'amministratore. Accedi come amministratore.';
-$lang['it_IT']['BlogHolder']['PLURALNAME'] = 'Proprietari blog';
-$lang['it_IT']['BlogHolder']['POST'] = 'Salva il post nel blog';
-$lang['it_IT']['BlogHolder']['RSSFEED'] = 'RSS feed di questo blog';
-$lang['it_IT']['BlogHolder']['SINGULARNAME'] = 'Proprietario blog';
-$lang['it_IT']['BlogHolder']['SJ'] = 'Soggetto';
-$lang['it_IT']['BlogHolder']['SPUC'] = 'Per favore separa le etichette usando virgole.';
-$lang['it_IT']['BlogHolder.ss']['NOENTRIES'] = 'Non ci sono voci nel blog';
-$lang['it_IT']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Visualizza voci con etichetta';
-$lang['it_IT']['BlogHolder']['SUCCONTENT'] = 'Congratulazioni, il blog SilverStripe è stato installato correttamente. Questo messaggio del blog può essere eliminato. Puoi configurare l\'aspetto del tuo blog (come la visualizzazione dei widgets nella sidebar) in [url=admin] del CMS[/url]';
-$lang['it_IT']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['it_IT']['BlogHolder']['SUCTITLE'] = 'Modulo blog SilverStripe installato correttamente';
-$lang['it_IT']['BlogHolder']['TE'] = 'Ad esempio: sport, personale, fantascienza';
-$lang['it_IT']['BlogManagementWidget']['COMADM'] = 'Amministrazione commenti';
-$lang['it_IT']['BlogManagementWidget']['PLURALNAME'] = 'Widget di amministrazione blog';
-$lang['it_IT']['BlogManagementWidget']['SINGULARNAME'] = 'Widget di amministrazione blog';
-$lang['it_IT']['BlogManagementWidget.ss']['LOGOUT'] = 'Esci';
-$lang['it_IT']['BlogManagementWidget.ss']['POSTNEW'] = 'Inserisci un nuovo post';
-$lang['it_IT']['BlogManagementWidget']['UNM1'] = 'Hai 1 commento da moderare';
-$lang['it_IT']['BlogManagementWidget']['UNMM'] = 'Hai %i commenti non approvati';
-$lang['it_IT']['BlogSummary.ss']['COMMENTS'] = 'Commenti';
-$lang['it_IT']['BlogSummary.ss']['POSTEDBY'] = 'Inserito da';
-$lang['it_IT']['BlogSummary.ss']['POSTEDON'] = 'su';
-$lang['it_IT']['BlogSummary.ss']['VIEWFULL'] = 'Visualizza post intitolato - ';
-$lang['it_IT']['BlogTree']['PLURALNAME'] = 'Alberi dei blog';
-$lang['it_IT']['BlogTree']['SINGULARNAME'] = 'Albero del blog';
-$lang['it_IT']['RSSWidget']['CT'] = 'Titolo del feed';
-$lang['it_IT']['RSSWidget']['NTS'] = 'Numero di argomenti da visualizzare';
-$lang['it_IT']['RSSWidget']['PLURALNAME'] = 'Widget RSS';
-$lang['it_IT']['RSSWidget']['SINGULARNAME'] = 'Widget RSS';
-$lang['it_IT']['RSSWidget']['URL'] = 'URL per il Feed RSS';
-$lang['it_IT']['SubscribeRSSWidget']['PLURALNAME'] = 'Sottoscrivi Widget RSS';
-$lang['it_IT']['SubscribeRSSWidget']['SINGULARNAME'] = 'Sottoscrivi Widget RSS';
-$lang['it_IT']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Sottoscrivi';
-$lang['it_IT']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Sottoscrivi questo blog via RSS';
-$lang['it_IT']['TagCloudWidget']['LIMIT'] = 'Limitare il numero dei tag a';
-$lang['it_IT']['TagCloudWidget']['PLURALNAME'] = 'Widget Nuvola di Tag';
-$lang['it_IT']['TagCloudWidget']['SBAL'] = 'alfabeto';
-$lang['it_IT']['TagCloudWidget']['SBFREQ'] = 'frequenza';
-$lang['it_IT']['TagCloudWidget']['SINGULARNAME'] = 'Widget Nuvola di Tag';
-$lang['it_IT']['TagCloudWidget']['SORTBY'] = 'Ordina per';
-$lang['it_IT']['TagCloudWidget']['TILE'] = 'Titolo';
-$lang['it_IT']['TrackBackPing']['PLURALNAME'] = 'Rileva Ping';
-$lang['it_IT']['TrackBackPing']['SINGULARNAME'] = 'Rileva Ping';
-
-?>
\ No newline at end of file
diff --git a/lang/ms.yml b/lang/ms.yml
new file mode 100644
index 0000000..0696061
--- /dev/null
+++ b/lang/ms.yml
@@ -0,0 +1,22 @@
+ms:
+  ArchiveWidget:
+    PLURALNAME: "Arkiv Widgets"
+    SINGULARNAME: "Arkiv Widget"
+  BlogEntry:
+    PLURALNAME: "Blog Poster"
+    SINGULARNAME: "Blog Post"
+  BlogHolder:
+    PLURALNAME: "Blog holdere"
+    SINGULARNAME: "Blog holder"
+  BlogManagementWidget:
+    PLURALNAME: "Blog Admin Widgets"
+    SINGULARNAME: "Blog Admin Widgets"
+  RSSWidget:
+    PLURALNAME: "R S S Widgets"
+    SINGULARNAME: "R S S Widget"
+  SubscribeRSSWidget:
+    PLURALNAME: "Abonner på R S S Widgets"
+    SINGULARNAME: "Abonner på R S S Widgets"
+  TagCloudWidget:
+    PLURALNAME: "Tag Cloud Widgets"
+    SINGULARNAME: "Tag Cloud Widget"
diff --git a/lang/ms_MY.php b/lang/ms_MY.php
deleted file mode 100644
index b24eb12..0000000
--- a/lang/ms_MY.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Malay (Malaysia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('ms_MY', $lang) && is_array($lang['ms_MY'])) {
-	$lang['ms_MY'] = array_merge($lang['en_US'], $lang['ms_MY']);
-} else {
-	$lang['ms_MY'] = $lang['en_US'];
-}
-
-$lang['ms_MY']['ArchiveWidget']['PLURALNAME'] = 'Arkiv Widgets';
-$lang['ms_MY']['ArchiveWidget']['SINGULARNAME'] = 'Arkiv Widget';
-$lang['ms_MY']['BlogEntry']['PLURALNAME'] = 'Blog Poster';
-$lang['ms_MY']['BlogEntry']['SINGULARNAME'] = 'Blog Post';
-$lang['ms_MY']['BlogHolder']['PLURALNAME'] = 'Blog holdere';
-$lang['ms_MY']['BlogHolder']['SINGULARNAME'] = 'Blog holder';
-$lang['ms_MY']['BlogManagementWidget']['PLURALNAME'] = 'Blog Admin Widgets';
-$lang['ms_MY']['BlogManagementWidget']['SINGULARNAME'] = 'Blog Admin Widgets';
-$lang['ms_MY']['RSSWidget']['PLURALNAME'] = 'R S S Widgets';
-$lang['ms_MY']['RSSWidget']['SINGULARNAME'] = 'R S S Widget';
-$lang['ms_MY']['SubscribeRSSWidget']['PLURALNAME'] = 'Abonner på R S S Widgets';
-$lang['ms_MY']['SubscribeRSSWidget']['SINGULARNAME'] = 'Abonner på R S S Widgets';
-$lang['ms_MY']['TagCloudWidget']['PLURALNAME'] = 'Tag Cloud Widgets';
-$lang['ms_MY']['TagCloudWidget']['SINGULARNAME'] = 'Tag Cloud Widget';
-
-?>
\ No newline at end of file
diff --git a/lang/nl.yml b/lang/nl.yml
new file mode 100644
index 0000000..ff968b3
--- /dev/null
+++ b/lang/nl.yml
@@ -0,0 +1,74 @@
+nl:
+  ArchiveWidget:
+    DispBY: "Tonen door"
+    MONTH: "maand"
+    PLURALNAME: "Archief-widgets"
+    SINGULARNAME: "Archief-widget"
+    YEAR: "jaar"
+  BlogEntry:
+    AU: "Auteur"
+    BBH: "BBCode hulp"
+    CN: "Inhoud"
+    DT: "Datum"
+    PLURALNAME: "Blog Artikelen"
+    SINGULARNAME: "Blog Artikel"
+    TS: "Tags (Komma gescheiden)"
+  BlogEntry.ss:
+    COMMENTS: "Reacties"
+    EDITTHIS: "Bewerk deze post"
+    POSTEDBY: "Auteur"
+    POSTEDON: "Aan"
+    TAGS: "Tags:"
+    UNPUBLISHTHIS: "onpubliceer deze post"
+    VIEWALLPOSTTAGGED: "Bekijk alle posten getiteld"
+  BlogHolder:
+    PLURALNAME: "Blog Houders"
+    POST: "Blogartikel plaatsen"
+    RSSFEED: "RSS-feed van deze blog"
+    SINGULARNAME: "Blog Houder"
+    SJ: "Onderwerp"
+    SPUC: "Scheid de tags met behulp van komma's."
+    SUCCONTENT: "Gefeliciteerd, de SilverStripe blog module is met succes geïnstalleerd. Dit blogartikel kan veilig worden verwijderd. U kunt aspecten van uw blog (zoals de widgets weergegeven in de zijbalk) in [url=admin]het CMS[/url] veranderen."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blog module met succes geïnstalleerd"
+    TE: "Bijvoorbeeld: sport, persoonlijke, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "Er zijn geen blog artikelen"
+    VIEWINGTAGGED: "U bekijkt artikelen getagged met"
+  BlogManagementWidget:
+    COMADM: "Opmerking administratie"
+    PLURALNAME: "Blog Management Widgets"
+    SINGULARNAME: "Blog Management Widgets"
+    UNM1: "U heeft 1 niet gecontroleerde opmerking"
+    UNMM: "U heeft %i niet gecontroleerde opmerkingen"
+  BlogManagementWidget.ss:
+    LOGOUT: "Afmelden"
+    POSTNEW: "Publiceer een nieuw blog entree"
+  BlogSummary.ss:
+    COMMENTS: "Reacties"
+    POSTEDBY: "Geplaatst door"
+    POSTEDON: "Aan"
+    VIEWFULL: "Bekijk het gehele post getitled"
+  RSSWidget:
+    CT: "Aangepaste titel voor de RSS-feed"
+    NTS: "Aantal objecten tonen"
+    PLURALNAME: "RSS-widget"
+    SINGULARNAME: "R S S Widget"
+    URL: "URL van de RSS-feed"
+  SubscribeRSSWidget:
+    PLURALNAME: "Abonneer R S S Widgets"
+    SINGULARNAME: "Abonneer R S S Widget"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Inschrijven"
+    SUBSCRIBETITLE: "Inschrijven om dit weblog via RSS te volgen"
+  TagCloudWidget:
+    LIMIT: "Beperk aantal tags"
+    PLURALNAME: "Tag Cloud Widgets"
+    SBAL: "alfabet"
+    SBFREQ: "frequentie"
+    SINGULARNAME: "Tag Cloud Widget"
+    SORTBY: "Sorteer bij"
+    TILE: "Titel"
+  TrackBackPing:
+    PLURALNAME: "Track Back Pings"
+    SINGULARNAME: "Track Back Ping"
diff --git a/lang/nl_NL.php b/lang/nl_NL.php
deleted file mode 100644
index 294fe4a..0000000
--- a/lang/nl_NL.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Dutch (Netherlands) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('nl_NL', $lang) && is_array($lang['nl_NL'])) {
-	$lang['nl_NL'] = array_merge($lang['en_US'], $lang['nl_NL']);
-} else {
-	$lang['nl_NL'] = $lang['en_US'];
-}
-
-$lang['nl_NL']['ArchiveWidget']['DispBY'] = 'Tonen door';
-$lang['nl_NL']['ArchiveWidget']['MONTH'] = 'maand';
-$lang['nl_NL']['ArchiveWidget']['PLURALNAME'] = 'Archief-widgets';
-$lang['nl_NL']['ArchiveWidget']['SINGULARNAME'] = 'Archief-widget';
-$lang['nl_NL']['ArchiveWidget']['YEAR'] = 'jaar';
-$lang['nl_NL']['BlogEntry']['AU'] = 'Auteur';
-$lang['nl_NL']['BlogEntry']['BBH'] = 'BBCode hulp';
-$lang['nl_NL']['BlogEntry']['CN'] = 'Inhoud';
-$lang['nl_NL']['BlogEntry']['DT'] = 'Datum';
-$lang['nl_NL']['BlogEntry']['PLURALNAME'] = 'Blog Artikelen';
-$lang['nl_NL']['BlogEntry']['SINGULARNAME'] = 'Blog Artikel';
-$lang['nl_NL']['BlogEntry.ss']['COMMENTS'] = 'Reacties';
-$lang['nl_NL']['BlogEntry.ss']['EDITTHIS'] = 'Bewerk deze post';
-$lang['nl_NL']['BlogEntry.ss']['POSTEDBY'] = 'Auteur';
-$lang['nl_NL']['BlogEntry.ss']['POSTEDON'] = 'Aan';
-$lang['nl_NL']['BlogEntry.ss']['TAGS'] = 'Tags:';
-$lang['nl_NL']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'onpubliceer deze post';
-$lang['nl_NL']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Bekijk alle posten getiteld';
-$lang['nl_NL']['BlogEntry']['TS'] = 'Tags (Komma gescheiden)';
-$lang['nl_NL']['BlogHolder']['HAVENTPERM'] = 'Het plaatsen van blogartikelen is een beheerder taak. Log aub in.';
-$lang['nl_NL']['BlogHolder']['PLURALNAME'] = 'Blog Houders';
-$lang['nl_NL']['BlogHolder']['POST'] = 'Blogartikel plaatsen';
-$lang['nl_NL']['BlogHolder']['RSSFEED'] = 'RSS-feed van deze blog';
-$lang['nl_NL']['BlogHolder']['SINGULARNAME'] = 'Blog Houder';
-$lang['nl_NL']['BlogHolder']['SJ'] = 'Onderwerp';
-$lang['nl_NL']['BlogHolder']['SPUC'] = 'Scheid de tags met behulp van komma\'s.';
-$lang['nl_NL']['BlogHolder.ss']['NOENTRIES'] = 'Er zijn geen blog artikelen';
-$lang['nl_NL']['BlogHolder.ss']['VIEWINGTAGGED'] = 'U bekijkt artikelen getagged met';
-$lang['nl_NL']['BlogHolder']['SUCCONTENT'] = 'Gefeliciteerd, de SilverStripe blog module is met succes geïnstalleerd. Dit blogartikel kan veilig worden verwijderd. U kunt aspecten van uw blog (zoals de widgets weergegeven in de zijbalk) in [url=admin]het CMS[/url] veranderen.';
-$lang['nl_NL']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['nl_NL']['BlogHolder']['SUCTITLE'] = 'SilverStripe blog module met succes geïnstalleerd';
-$lang['nl_NL']['BlogHolder']['TE'] = 'Bijvoorbeeld: sport, persoonlijke, science fiction';
-$lang['nl_NL']['BlogManagementWidget']['COMADM'] = 'Opmerking administratie';
-$lang['nl_NL']['BlogManagementWidget']['PLURALNAME'] = 'Blog Management Widgets';
-$lang['nl_NL']['BlogManagementWidget']['SINGULARNAME'] = 'Blog Management Widgets';
-$lang['nl_NL']['BlogManagementWidget.ss']['LOGOUT'] = 'Afmelden';
-$lang['nl_NL']['BlogManagementWidget.ss']['POSTNEW'] = 'Publiceer een nieuw blog entree';
-$lang['nl_NL']['BlogManagementWidget']['UNM1'] = 'U heeft 1 niet gecontroleerde opmerking';
-$lang['nl_NL']['BlogManagementWidget']['UNMM'] = 'U heeft %i niet gecontroleerde opmerkingen';
-$lang['nl_NL']['BlogSummary.ss']['COMMENTS'] = 'Reacties';
-$lang['nl_NL']['BlogSummary.ss']['POSTEDBY'] = 'Geplaatst door';
-$lang['nl_NL']['BlogSummary.ss']['POSTEDON'] = 'Aan';
-$lang['nl_NL']['BlogSummary.ss']['VIEWFULL'] = 'Bekijk het gehele post getitled';
-$lang['nl_NL']['RSSWidget']['CT'] = 'Aangepaste titel voor de RSS-feed';
-$lang['nl_NL']['RSSWidget']['NTS'] = 'Aantal objecten tonen';
-$lang['nl_NL']['RSSWidget']['PLURALNAME'] = 'RSS-widget';
-$lang['nl_NL']['RSSWidget']['SINGULARNAME'] = 'R S S Widget';
-$lang['nl_NL']['RSSWidget']['URL'] = 'URL van de RSS-feed';
-$lang['nl_NL']['SubscribeRSSWidget']['PLURALNAME'] = 'Abonneer R S S Widgets';
-$lang['nl_NL']['SubscribeRSSWidget']['SINGULARNAME'] = 'Abonneer R S S Widget';
-$lang['nl_NL']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Inschrijven';
-$lang['nl_NL']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Inschrijven om dit weblog via RSS te volgen';
-$lang['nl_NL']['TagCloudWidget']['LIMIT'] = 'Beperk aantal tags';
-$lang['nl_NL']['TagCloudWidget']['PLURALNAME'] = 'Tag Cloud Widgets';
-$lang['nl_NL']['TagCloudWidget']['SBAL'] = 'alfabet';
-$lang['nl_NL']['TagCloudWidget']['SBFREQ'] = 'frequentie';
-$lang['nl_NL']['TagCloudWidget']['SINGULARNAME'] = 'Tag Cloud Widget';
-$lang['nl_NL']['TagCloudWidget']['SORTBY'] = 'Sorteer bij';
-$lang['nl_NL']['TagCloudWidget']['TILE'] = 'Titel';
-$lang['nl_NL']['TrackBackPing']['PLURALNAME'] = 'Track Back Pings';
-$lang['nl_NL']['TrackBackPing']['SINGULARNAME'] = 'Track Back Ping';
-
-?>
\ No newline at end of file
diff --git a/lang/pl.yml b/lang/pl.yml
new file mode 100644
index 0000000..5dd7fff
--- /dev/null
+++ b/lang/pl.yml
@@ -0,0 +1,62 @@
+pl:
+  ArchiveWidget:
+    DispBY: "Wyświetlaj według"
+    MONTH: "miesiąc"
+    YEAR: "rok"
+  BlogEntry:
+    AU: "Autor"
+    BBH: "Pomoc BBCode"
+    CN: "Zawartość"
+    DT: "Data"
+    PLURALNAME: "Wpisy bloga"
+    SINGULARNAME: "Wpis bloga"
+    TS: "Tagi (oddziel przecinkami)"
+  BlogEntry.ss:
+    COMMENTS: "Komentarze"
+    EDITTHIS: "Edytuj ten post"
+    POSTEDBY: "Dodane przez"
+    POSTEDON: "Opublikowano"
+    TAGS: "Tagi:"
+    UNPUBLISHTHIS: "Cofnij publikację tego postu"
+    VIEWALLPOSTTAGGED: "Zobacz wszystkie posty otagowane jako"
+  BlogHolder:
+    PLURALNAME: "Blog Listy"
+    POST: "Publikuj wpis"
+    RSSFEED: "Subskrybuj wpisy na tym blogu przez RSS"
+    SINGULARNAME: "Blog Lista"
+    SJ: "Temat"
+    SPUC: "Oddziel tagi używając przecinków."
+    SUCCONTENT: "Gratulacje, moduł bloga SilverStripe został poprawnie zainstalowany. Możesz spokojnie usunąć ten wpis. Możesz skonfigurować różne części swojego bloga (takie jak widgety, wyświetlane z boku) w [url=admin]CMSie[/url]."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "Blog SilverStripe został poprawnie zainstalowany."
+    TE: "Na przykład: sport, osobiste, science fiction"
+  BlogHolder.ss:
+    NOENTRIES: "Nie ma żadnych wpisów na blogu"
+    VIEWINGTAGGED: "Zobacz wpisy otagowane jako"
+  BlogManagementWidget:
+    COMADM: "Administracja komentarzami"
+    UNM1: "Masz 1 niesprawdzony komentarz"
+    UNMM: "Masz %i niesprawdzonych komentarzy"
+  BlogManagementWidget.ss:
+    LOGOUT: "Wyloguj"
+    POSTNEW: "Dodaj nowy wpis"
+  BlogSummary.ss:
+    COMMENTS: "Komentarze"
+    POSTEDBY: "Napisane przez"
+    POSTEDON: "Opublikowano"
+    VIEWFULL: "Zobacz pełny post zatytułowany - "
+  RSSWidget:
+    CT: "Tytuł dla kanału"
+    NTS: "Ilość pokazywanych wpisów"
+    PLURALNAME: "Widżety RSS"
+    SINGULARNAME: "Widżet RSS"
+    URL: "URL RSS"
+  SubscribeRSSWidget:
+    PLURALNAME: "Subksrybuj widżety RSS"
+    SINGULARNAME: "Subksrybuj widżet RSS"
+  TagCloudWidget:
+    LIMIT: "Limit tagów"
+    SBAL: "alfabetu"
+    SBFREQ: "częstości występowania"
+    SORTBY: "Sortuj według"
+    TILE: "Tytuł"
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
deleted file mode 100644
index b1c9e2e..0000000
--- a/lang/pl_PL.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Polish (Poland) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('pl_PL', $lang) && is_array($lang['pl_PL'])) {
-	$lang['pl_PL'] = array_merge($lang['en_US'], $lang['pl_PL']);
-} else {
-	$lang['pl_PL'] = $lang['en_US'];
-}
-
-$lang['pl_PL']['ArchiveWidget']['DispBY'] = 'Wyświetlaj według';
-$lang['pl_PL']['ArchiveWidget']['MONTH'] = 'miesiąc';
-$lang['pl_PL']['ArchiveWidget']['YEAR'] = 'rok';
-$lang['pl_PL']['BlogEntry']['AU'] = 'Autor';
-$lang['pl_PL']['BlogEntry']['BBH'] = 'Pomoc BBCode';
-$lang['pl_PL']['BlogEntry']['CN'] = 'Zawartość';
-$lang['pl_PL']['BlogEntry']['DT'] = 'Data';
-$lang['pl_PL']['BlogEntry']['PLURALNAME'] = 'Wpisy bloga';
-$lang['pl_PL']['BlogEntry']['SINGULARNAME'] = 'Wpis bloga';
-$lang['pl_PL']['BlogEntry.ss']['COMMENTS'] = 'Komentarze';
-$lang['pl_PL']['BlogEntry.ss']['EDITTHIS'] = 'Edytuj ten post';
-$lang['pl_PL']['BlogEntry.ss']['POSTEDBY'] = 'Dodane przez';
-$lang['pl_PL']['BlogEntry.ss']['POSTEDON'] = 'Opublikowano';
-$lang['pl_PL']['BlogEntry.ss']['TAGS'] = 'Tagi:';
-$lang['pl_PL']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Cofnij publikację tego postu';
-$lang['pl_PL']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Zobacz wszystkie posty otagowane jako';
-$lang['pl_PL']['BlogEntry']['TS'] = 'Tagi (oddziel przecinkami)';
-$lang['pl_PL']['BlogHolder']['HAVENTPERM'] = 'Tylko administrator może publikować wpisy na blogu. Zaloguj się.';
-$lang['pl_PL']['BlogHolder']['PLURALNAME'] = 'Blog Listy';
-$lang['pl_PL']['BlogHolder']['POST'] = 'Publikuj wpis';
-$lang['pl_PL']['BlogHolder']['RSSFEED'] = 'Subskrybuj wpisy na tym blogu przez RSS';
-$lang['pl_PL']['BlogHolder']['SINGULARNAME'] = 'Blog Lista';
-$lang['pl_PL']['BlogHolder']['SJ'] = 'Temat';
-$lang['pl_PL']['BlogHolder']['SPUC'] = 'Oddziel tagi używając przecinków.';
-$lang['pl_PL']['BlogHolder.ss']['NOENTRIES'] = 'Nie ma żadnych wpisów na blogu';
-$lang['pl_PL']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Zobacz wpisy otagowane jako';
-$lang['pl_PL']['BlogHolder']['SUCCONTENT'] = 'Gratulacje, moduł bloga SilverStripe został poprawnie zainstalowany. Możesz spokojnie usunąć ten wpis. Możesz skonfigurować różne części swojego bloga (takie jak widgety, wyświetlane z boku) w [url=admin]CMSie[/url].';
-$lang['pl_PL']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['pl_PL']['BlogHolder']['SUCTITLE'] = 'Blog SilverStripe został poprawnie zainstalowany.';
-$lang['pl_PL']['BlogHolder']['TE'] = 'Na przykład: sport, osobiste, science fiction';
-$lang['pl_PL']['BlogManagementWidget']['COMADM'] = 'Administracja komentarzami';
-$lang['pl_PL']['BlogManagementWidget.ss']['LOGOUT'] = 'Wyloguj';
-$lang['pl_PL']['BlogManagementWidget.ss']['POSTNEW'] = 'Dodaj nowy wpis';
-$lang['pl_PL']['BlogManagementWidget']['UNM1'] = 'Masz 1 niesprawdzony komentarz';
-$lang['pl_PL']['BlogManagementWidget']['UNMM'] = 'Masz %i niesprawdzonych komentarzy';
-$lang['pl_PL']['BlogSummary.ss']['COMMENTS'] = 'Komentarze';
-$lang['pl_PL']['BlogSummary.ss']['POSTEDBY'] = 'Napisane przez';
-$lang['pl_PL']['BlogSummary.ss']['POSTEDON'] = 'Opublikowano';
-$lang['pl_PL']['BlogSummary.ss']['VIEWFULL'] = 'Zobacz pełny post zatytułowany - ';
-$lang['pl_PL']['RSSWidget']['CT'] = 'Tytuł dla kanału';
-$lang['pl_PL']['RSSWidget']['NTS'] = 'Ilość pokazywanych wpisów';
-$lang['pl_PL']['RSSWidget']['PLURALNAME'] = 'Widżety RSS';
-$lang['pl_PL']['RSSWidget']['SINGULARNAME'] = 'Widżet RSS';
-$lang['pl_PL']['RSSWidget']['URL'] = 'URL RSS';
-$lang['pl_PL']['SubscribeRSSWidget']['PLURALNAME'] = 'Subksrybuj widżety RSS';
-$lang['pl_PL']['SubscribeRSSWidget']['SINGULARNAME'] = 'Subksrybuj widżet RSS';
-$lang['pl_PL']['TagCloudWidget']['LIMIT'] = 'Limit tagów';
-$lang['pl_PL']['TagCloudWidget']['SBAL'] = 'alfabetu';
-$lang['pl_PL']['TagCloudWidget']['SBFREQ'] = 'częstości występowania';
-$lang['pl_PL']['TagCloudWidget']['SORTBY'] = 'Sortuj według';
-$lang['pl_PL']['TagCloudWidget']['TILE'] = 'Tytuł';
-
-?>
\ No newline at end of file
diff --git a/lang/pt.yml b/lang/pt.yml
new file mode 100644
index 0000000..5cad61f
--- /dev/null
+++ b/lang/pt.yml
@@ -0,0 +1,29 @@
+pt:
+  BlogEntry:
+    PLURALNAME: "Posts no Blog"
+  BlogEntry.ss:
+    COMMENTS: "Comentários"
+    EDITTHIS: "Editar este post"
+    POSTEDBY: "Inserido por"
+    POSTEDON: "em"
+    UNPUBLISHTHIS: "Não publicar este post"
+  BlogHolder:
+    RSSFEED: "Feed RSS para este blog"
+    SUCCONTENT: "Parabéns, o módulo do blog do SilverStripe foi instalado com sucesso. Este post pode ser apagado. Poderá configurar as preferências do blog (assim como os widgets presentes no menu) através [url=admin]do CMS[/url]."
+    SUCTITLE: "O módulo do blog do SilverStripe foi instalado com sucesso."
+  BlogManagementWidget:
+    COMADM: "Administração de comentários"
+    UNM1: "Existe 1 comentário por moderar"
+    UNMM: "Existem %i comentários por moderar"
+  BlogManagementWidget.ss:
+    LOGOUT: "Sair"
+  BlogSummary.ss:
+    COMMENTS: "Comentários"
+    POSTEDON: "em"
+  RSSWidget:
+    NTS: "Número de items para mostrar"
+    URL: "Endereço (URL) do RSS Feed"
+  TagCloudWidget:
+    SBAL: "alfabeto"
+    SORTBY: "Ordenar por"
+    TILE: "Título"
diff --git a/lang/pt_PT.php b/lang/pt_PT.php
deleted file mode 100644
index 2cd2943..0000000
--- a/lang/pt_PT.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Portuguese (Portugal) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('pt_PT', $lang) && is_array($lang['pt_PT'])) {
-	$lang['pt_PT'] = array_merge($lang['en_US'], $lang['pt_PT']);
-} else {
-	$lang['pt_PT'] = $lang['en_US'];
-}
-
-$lang['pt_PT']['BlogEntry']['PLURALNAME'] = 'Posts no Blog';
-$lang['pt_PT']['BlogEntry.ss']['COMMENTS'] = 'Comentários';
-$lang['pt_PT']['BlogEntry.ss']['EDITTHIS'] = 'Editar este post';
-$lang['pt_PT']['BlogEntry.ss']['POSTEDBY'] = 'Inserido por';
-$lang['pt_PT']['BlogEntry.ss']['POSTEDON'] = 'em';
-$lang['pt_PT']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Não publicar este post';
-$lang['pt_PT']['BlogHolder']['HAVENTPERM'] = 'A inserção de post é uma tarefa do administrador. Por favor faça o login.';
-$lang['pt_PT']['BlogHolder']['RSSFEED'] = 'Feed RSS para este blog';
-$lang['pt_PT']['BlogHolder']['SUCCONTENT'] = 'Parabéns, o módulo do blog do SilverStripe foi instalado com sucesso. Este post pode ser apagado. Poderá configurar as preferências do blog (assim como os widgets presentes no menu) através [url=admin]do CMS[/url].';
-$lang['pt_PT']['BlogHolder']['SUCTITLE'] = 'O módulo do blog do SilverStripe foi instalado com sucesso.';
-$lang['pt_PT']['BlogManagementWidget']['COMADM'] = 'Administração de comentários';
-$lang['pt_PT']['BlogManagementWidget.ss']['LOGOUT'] = 'Sair';
-$lang['pt_PT']['BlogManagementWidget']['UNM1'] = 'Existe 1 comentário por moderar';
-$lang['pt_PT']['BlogManagementWidget']['UNMM'] = 'Existem %i comentários por moderar';
-$lang['pt_PT']['BlogSummary.ss']['COMMENTS'] = 'Comentários';
-$lang['pt_PT']['BlogSummary.ss']['POSTEDON'] = 'em';
-$lang['pt_PT']['RSSWidget']['NTS'] = 'Número de items para mostrar';
-$lang['pt_PT']['RSSWidget']['URL'] = 'Endereço (URL) do RSS Feed';
-$lang['pt_PT']['TagCloudWidget']['SBAL'] = 'alfabeto';
-$lang['pt_PT']['TagCloudWidget']['SORTBY'] = 'Ordenar por';
-$lang['pt_PT']['TagCloudWidget']['TILE'] = 'Título';
-
-?>
\ No newline at end of file
diff --git a/lang/ru.yml b/lang/ru.yml
new file mode 100644
index 0000000..f1275c8
--- /dev/null
+++ b/lang/ru.yml
@@ -0,0 +1,53 @@
+ru:
+  ArchiveWidget:
+    DispBY: "Группировать по"
+    MONTH: "месяцу"
+    YEAR: "году"
+  BlogEntry:
+    AU: "Автор"
+    BBH: "Подсказка по BBCode"
+    CN: "Содержимое"
+    DT: "Дата"
+    TS: "Метки (раздел. запят.)"
+  BlogEntry.ss:
+    COMMENTS: "Комментарии"
+    EDITTHIS: "Редакт. эту запись"
+    POSTEDBY: "Автор: "
+    POSTEDON: ":"
+    TAGS: "Метки:"
+    UNPUBLISHTHIS: "Убрать запись с опубликов. сайта"
+    VIEWALLPOSTTAGGED: "Смотреть все записи с метками"
+  BlogHolder:
+    POST: "Опубликовать запись в блоге"
+    RSSFEED: "RSS подписка на этот блог"
+    SJ: "Тема"
+    SPUC: "Разделяйте метки запятыми."
+    SUCCONTENT: "Поздравляем, модуль блога SilverStripe был успешно установлен. Эта запись в блоге может быть удалена. Вы можете настроить вид блога (например, отображение виджетов в боковой панели) в [url=admin]Системе Управления Содержимым[/url]."
+    SUCTAGS: "silverstripe, блог"
+    SUCTITLE: "Модуль блога SilverStripe успешно установлен"
+    TE: "Например - спорт, личное, фантастика"
+  BlogHolder.ss:
+    NOENTRIES: "В блоге нет записей"
+    VIEWINGTAGGED: "Просмотр записей с метками "
+  BlogManagementWidget:
+    COMADM: "Управление комментариями"
+    UNM1: "У вас 1 непроверенный комментарий"
+    UNMM: "У вас %i непроверенных комментариев"
+  BlogManagementWidget.ss:
+    LOGOUT: "Выход"
+    POSTNEW: "Опубликовать новую запись"
+  BlogSummary.ss:
+    COMMENTS: "Комментарии"
+    POSTEDBY: "Автор:"
+    POSTEDON: ":"
+    VIEWFULL: "См. полностью запись под названием: "
+  RSSWidget:
+    CT: "Собственное название ленты новостей"
+    NTS: "Показывать кол-во записей"
+    URL: "URL ленты RSS"
+  TagCloudWidget:
+    LIMIT: "Ограничить кол-во меток"
+    SBAL: "алфавиту"
+    SBFREQ: "частоте"
+    SORTBY: "Сортировать по"
+    TILE: "Название"
diff --git a/lang/ru_RU.php b/lang/ru_RU.php
deleted file mode 100644
index e6215c5..0000000
--- a/lang/ru_RU.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Russian (Russia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('ru_RU', $lang) && is_array($lang['ru_RU'])) {
-	$lang['ru_RU'] = array_merge($lang['en_US'], $lang['ru_RU']);
-} else {
-	$lang['ru_RU'] = $lang['en_US'];
-}
-
-$lang['ru_RU']['ArchiveWidget']['DispBY'] = 'Группировать по';
-$lang['ru_RU']['ArchiveWidget']['MONTH'] = 'месяцу';
-$lang['ru_RU']['ArchiveWidget']['YEAR'] = 'году';
-$lang['ru_RU']['BlogEntry']['AU'] = 'Автор';
-$lang['ru_RU']['BlogEntry']['BBH'] = 'Подсказка по BBCode';
-$lang['ru_RU']['BlogEntry']['CN'] = 'Содержимое';
-$lang['ru_RU']['BlogEntry']['DT'] = 'Дата';
-$lang['ru_RU']['BlogEntry.ss']['COMMENTS'] = 'Комментарии';
-$lang['ru_RU']['BlogEntry.ss']['EDITTHIS'] = 'Редакт. эту запись';
-$lang['ru_RU']['BlogEntry.ss']['POSTEDBY'] = 'Автор: ';
-$lang['ru_RU']['BlogEntry.ss']['POSTEDON'] = ':';
-$lang['ru_RU']['BlogEntry.ss']['TAGS'] = 'Метки:';
-$lang['ru_RU']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Убрать запись с опубликов. сайта';
-$lang['ru_RU']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Смотреть все записи с метками';
-$lang['ru_RU']['BlogEntry']['TS'] = 'Метки (раздел. запят.)';
-$lang['ru_RU']['BlogHolder']['HAVENTPERM'] = 'Публикация записей в блоге доступна только администратору. Пожалуйста, войдите.';
-$lang['ru_RU']['BlogHolder']['POST'] = 'Опубликовать запись в блоге';
-$lang['ru_RU']['BlogHolder']['RSSFEED'] = 'RSS подписка на этот блог';
-$lang['ru_RU']['BlogHolder']['SJ'] = 'Тема';
-$lang['ru_RU']['BlogHolder']['SPUC'] = 'Разделяйте метки запятыми.';
-$lang['ru_RU']['BlogHolder.ss']['NOENTRIES'] = 'В блоге нет записей';
-$lang['ru_RU']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Просмотр записей с метками ';
-$lang['ru_RU']['BlogHolder']['SUCCONTENT'] = 'Поздравляем, модуль блога SilverStripe был успешно установлен. Эта запись в блоге может быть удалена. Вы можете настроить вид блога (например, отображение виджетов в боковой панели) в [url=admin]Системе Управления Содержимым[/url].';
-$lang['ru_RU']['BlogHolder']['SUCTAGS'] = 'silverstripe, блог';
-$lang['ru_RU']['BlogHolder']['SUCTITLE'] = 'Модуль блога SilverStripe успешно установлен';
-$lang['ru_RU']['BlogHolder']['TE'] = 'Например - спорт, личное, фантастика';
-$lang['ru_RU']['BlogManagementWidget']['COMADM'] = 'Управление комментариями';
-$lang['ru_RU']['BlogManagementWidget.ss']['LOGOUT'] = 'Выход';
-$lang['ru_RU']['BlogManagementWidget.ss']['POSTNEW'] = 'Опубликовать новую запись';
-$lang['ru_RU']['BlogManagementWidget']['UNM1'] = 'У вас 1 непроверенный комментарий';
-$lang['ru_RU']['BlogManagementWidget']['UNMM'] = 'У вас %i непроверенных комментариев';
-$lang['ru_RU']['BlogSummary.ss']['COMMENTS'] = 'Комментарии';
-$lang['ru_RU']['BlogSummary.ss']['POSTEDBY'] = 'Автор:';
-$lang['ru_RU']['BlogSummary.ss']['POSTEDON'] = ':';
-$lang['ru_RU']['BlogSummary.ss']['VIEWFULL'] = 'См. полностью запись под названием: ';
-$lang['ru_RU']['RSSWidget']['CT'] = 'Собственное название ленты новостей';
-$lang['ru_RU']['RSSWidget']['NTS'] = 'Показывать кол-во записей';
-$lang['ru_RU']['RSSWidget']['URL'] = 'URL ленты RSS';
-$lang['ru_RU']['TagCloudWidget']['LIMIT'] = 'Ограничить кол-во меток';
-$lang['ru_RU']['TagCloudWidget']['SBAL'] = 'алфавиту';
-$lang['ru_RU']['TagCloudWidget']['SBFREQ'] = 'частоте';
-$lang['ru_RU']['TagCloudWidget']['SORTBY'] = 'Сортировать по';
-$lang['ru_RU']['TagCloudWidget']['TILE'] = 'Название';
-
-?>
\ No newline at end of file
diff --git a/lang/sr.yml b/lang/sr.yml
new file mode 100644
index 0000000..73ae778
--- /dev/null
+++ b/lang/sr.yml
@@ -0,0 +1,48 @@
+sr:
+  ArchiveWidget:
+    DispBY: "Прикажи по"
+    MONTH: "месецу"
+    YEAR: "години"
+  BlogEntry:
+    AU: "Аутор"
+    BBH: "Помоћ око ББкода"
+    CN: "Садржај"
+    DT: "Датум"
+    TS: "Ознаке (одвојене зарезом)"
+  BlogEntry.ss:
+    COMMENTS: "Коментари"
+    EDITTHIS: "Измени овај унос"
+    POSTEDBY: "Послао"
+    POSTEDON: " "
+    TAGS: "Тагови:"
+    VIEWALLPOSTTAGGED: "Погледајте све уносе означене са"
+  BlogHolder:
+    POST: "Пошаљи унос у блог"
+    RSSFEED: "RSS довод овог блога"
+    SJ: "Наслов"
+    SPUC: "Одвојите ознаке зарезима."
+    SUCTAGS: "silverstripe, блог"
+    SUCTITLE: "SilverStripe модул за блог је успешно инсталиран"
+    TE: "На пример: спорт, лично, научна фантастика"
+  BlogHolder.ss:
+    NOENTRIES: "Нема уноса у блог"
+    VIEWINGTAGGED: "Приказујем уносе означене са"
+  BlogManagementWidget:
+    COMADM: "Администрација коментара"
+  BlogManagementWidget.ss:
+    LOGOUT: "Одјави се"
+    POSTNEW: "Пошаљи нов унос у блог"
+  BlogSummary.ss:
+    COMMENTS: "Коментари"
+    POSTEDON: "у"
+    VIEWFULL: "Погледајте цео унос насловљен - "
+  RSSWidget:
+    CT: "Прилагођени наслов за овај довод"
+    NTS: "Број ставки за приказивање"
+    URL: "URL RSS довода"
+  TagCloudWidget:
+    LIMIT: "Ограничи број тагова"
+    SBAL: "азбучном реду"
+    SBFREQ: "фреквенцији"
+    SORTBY: "Сортирај по"
+    TILE: "Наслов"
diff --git a/lang/sr_RS.php b/lang/sr_RS.php
deleted file mode 100644
index 758d1e3..0000000
--- a/lang/sr_RS.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Serbian (Serbia) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('sr_RS', $lang) && is_array($lang['sr_RS'])) {
-	$lang['sr_RS'] = array_merge($lang['en_US'], $lang['sr_RS']);
-} else {
-	$lang['sr_RS'] = $lang['en_US'];
-}
-
-$lang['sr_RS']['ArchiveWidget']['DispBY'] = 'Прикажи по';
-$lang['sr_RS']['ArchiveWidget']['MONTH'] = 'месецу';
-$lang['sr_RS']['ArchiveWidget']['YEAR'] = 'години';
-$lang['sr_RS']['BlogEntry']['AU'] = 'Аутор';
-$lang['sr_RS']['BlogEntry']['BBH'] = 'Помоћ око ББкода';
-$lang['sr_RS']['BlogEntry']['CN'] = 'Садржај';
-$lang['sr_RS']['BlogEntry']['DT'] = 'Датум';
-$lang['sr_RS']['BlogEntry.ss']['COMMENTS'] = 'Коментари';
-$lang['sr_RS']['BlogEntry.ss']['EDITTHIS'] = 'Измени овај унос';
-$lang['sr_RS']['BlogEntry.ss']['POSTEDBY'] = 'Послао';
-$lang['sr_RS']['BlogEntry.ss']['POSTEDON'] = ' ';
-$lang['sr_RS']['BlogEntry.ss']['TAGS'] = 'Тагови:';
-$lang['sr_RS']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Погледајте све уносе означене са';
-$lang['sr_RS']['BlogEntry']['TS'] = 'Ознаке (одвојене зарезом)';
-$lang['sr_RS']['BlogHolder']['HAVENTPERM'] = 'Слање нових уноса у блог је администраторски задатак. Пријавите се.';
-$lang['sr_RS']['BlogHolder']['POST'] = 'Пошаљи унос у блог';
-$lang['sr_RS']['BlogHolder']['RSSFEED'] = 'RSS довод овог блога';
-$lang['sr_RS']['BlogHolder']['SJ'] = 'Наслов';
-$lang['sr_RS']['BlogHolder']['SPUC'] = 'Одвојите ознаке зарезима.';
-$lang['sr_RS']['BlogHolder.ss']['NOENTRIES'] = 'Нема уноса у блог';
-$lang['sr_RS']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Приказујем уносе означене са';
-$lang['sr_RS']['BlogHolder']['SUCTAGS'] = 'silverstripe, блог';
-$lang['sr_RS']['BlogHolder']['SUCTITLE'] = 'SilverStripe модул за блог је успешно инсталиран';
-$lang['sr_RS']['BlogHolder']['TE'] = 'На пример: спорт, лично, научна фантастика';
-$lang['sr_RS']['BlogManagementWidget']['COMADM'] = 'Администрација коментара';
-$lang['sr_RS']['BlogManagementWidget.ss']['LOGOUT'] = 'Одјави се';
-$lang['sr_RS']['BlogManagementWidget.ss']['POSTNEW'] = 'Пошаљи нов унос у блог';
-$lang['sr_RS']['BlogSummary.ss']['COMMENTS'] = 'Коментари';
-$lang['sr_RS']['BlogSummary.ss']['POSTEDON'] = 'у';
-$lang['sr_RS']['BlogSummary.ss']['VIEWFULL'] = 'Погледајте цео унос насловљен - ';
-$lang['sr_RS']['RSSWidget']['CT'] = 'Прилагођени наслов за овај довод';
-$lang['sr_RS']['RSSWidget']['NTS'] = 'Број ставки за приказивање';
-$lang['sr_RS']['RSSWidget']['URL'] = 'URL RSS довода';
-$lang['sr_RS']['TagCloudWidget']['LIMIT'] = 'Ограничи број тагова';
-$lang['sr_RS']['TagCloudWidget']['SBAL'] = 'азбучном реду';
-$lang['sr_RS']['TagCloudWidget']['SBFREQ'] = 'фреквенцији';
-$lang['sr_RS']['TagCloudWidget']['SORTBY'] = 'Сортирај по';
-$lang['sr_RS']['TagCloudWidget']['TILE'] = 'Наслов';
-
-?>
\ No newline at end of file
diff --git a/lang/tr.yml b/lang/tr.yml
new file mode 100644
index 0000000..1a2c75e
--- /dev/null
+++ b/lang/tr.yml
@@ -0,0 +1,74 @@
+tr:
+  ArchiveWidget:
+    DispBY: "Görüntüle"
+    MONTH: "ay"
+    PLURALNAME: "Arşiv Zımbırtıları"
+    SINGULARNAME: "Arşiv Zımbırtısı"
+    YEAR: "yıl"
+  BlogEntry:
+    AU: "Yazar"
+    BBH: "BBCode yardımı"
+    CN: "İçerik"
+    DT: "Tarih"
+    PLURALNAME: "Blog Girdileri"
+    SINGULARNAME: "Blog Girdisi"
+    TS: "Etiketler (virgülle ayrılmış)"
+  BlogEntry.ss:
+    COMMENTS: "Yorumlar"
+    EDITTHIS: "Bu girdiyi yeniden düzenle"
+    POSTEDBY: "Gönderen "
+    POSTEDON: "üzerinde"
+    TAGS: "Etiketler:"
+    UNPUBLISHTHIS: "Bu girdiyi yayından kaldır"
+    VIEWALLPOSTTAGGED: "Etiketlenen tüm girdileri görüntüle"
+  BlogHolder:
+    PLURALNAME: "Blog Sahipleri"
+    POST: "Blog girdisi gönderin"
+    RSSFEED: "Bu blog'un RSS beslemesi"
+    SINGULARNAME: "Blog Sahibi"
+    SJ: "Konu"
+    SPUC: "Lüfen etiketleri virgülle ayırın."
+    SUCCONTENT: "Tebrikler, SilverStripe blog modülü başarıyla kuruldu. Bu blog girdisini silebilirsiniz. Ayrıca, isterseniz [url=admin]CMS[/url] içerisinde blog'unuzun görünümünde degişiklikler yapabilirsiniz."
+    SUCTAGS: "silverstripe, blog"
+    SUCTITLE: "SilverStripe blog modülü başarıyla kuruldu"
+    TE: "Örneğin: spor, kişisel, bilim kurgu"
+  BlogHolder.ss:
+    NOENTRIES: "Blog girdileri mevcut değil"
+    VIEWINGTAGGED: "Girdiler görüntüleniyor, etiket:"
+  BlogManagementWidget:
+    COMADM: "Yorum yönetimi"
+    PLURALNAME: "Blog Yönetim Zımbırtıları"
+    SINGULARNAME: "Blog Yönetim Zımbırtısı"
+    UNM1: "1 adet onay bekleyen yorumunuz var"
+    UNMM: "%i adet onay bekleyen yorumunuz var"
+  BlogManagementWidget.ss:
+    LOGOUT: "Oturumu kapat"
+    POSTNEW: "Yeni bir blog girdisi oluştur"
+  BlogSummary.ss:
+    COMMENTS: "Yorumlar"
+    POSTEDBY: "Gönderen: "
+    POSTEDON: "üzerinde"
+    VIEWFULL: "Postun tamamını görüntüle -"
+  RSSWidget:
+    CT: "Besleme için özel başlık"
+    NTS: "Görüntülenecek öğe adedi"
+    PLURALNAME: "R S S Zımbırtıları"
+    SINGULARNAME: "R S S Zımbırtısı"
+    URL: "RSS beslemesi'nin URL'i"
+  SubscribeRSSWidget:
+    PLURALNAME: "R S S Zımbırtılarına abone ol"
+    SINGULARNAME: "R S S Zımbırtısına abone ol"
+  SubscribeRSSWidget.ss:
+    SUBSCRIBETEXT: "Abone Ol"
+    SUBSCRIBETITLE: "Bu bloğa RSS ile abone ol"
+  TagCloudWidget:
+    LIMIT: "Etiket sayısini sınırla"
+    PLURALNAME: "Etiket Bulutu Zımbırtıları"
+    SBAL: "alfabe"
+    SBFREQ: "frekans"
+    SINGULARNAME: "Etiket Bulutu Zımbırtısı"
+    SORTBY: "Sıralama"
+    TILE: "Başlık"
+  TrackBackPing:
+    PLURALNAME: "Geri İz Yoklamaları"
+    SINGULARNAME: "Geri İz Yoklaması"
diff --git a/lang/tr_TR.php b/lang/tr_TR.php
deleted file mode 100644
index 23d9564..0000000
--- a/lang/tr_TR.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Turkish (Turkey) language pack
- * @package blog
- * @subpackage i18n
- */
-
-i18n::include_locale_file('blog', 'en_US');
-
-global $lang;
-
-if(array_key_exists('tr_TR', $lang) && is_array($lang['tr_TR'])) {
-	$lang['tr_TR'] = array_merge($lang['en_US'], $lang['tr_TR']);
-} else {
-	$lang['tr_TR'] = $lang['en_US'];
-}
-
-$lang['tr_TR']['ArchiveWidget']['DispBY'] = 'Görüntüle';
-$lang['tr_TR']['ArchiveWidget']['MONTH'] = 'ay';
-$lang['tr_TR']['ArchiveWidget']['PLURALNAME'] = 'Arşiv Zımbırtıları';
-$lang['tr_TR']['ArchiveWidget']['SINGULARNAME'] = 'Arşiv Zımbırtısı';
-$lang['tr_TR']['ArchiveWidget']['YEAR'] = 'yıl';
-$lang['tr_TR']['BlogEntry']['AU'] = 'Yazar';
-$lang['tr_TR']['BlogEntry']['BBH'] = 'BBCode yardımı';
-$lang['tr_TR']['BlogEntry']['CN'] = 'İçerik';
-$lang['tr_TR']['BlogEntry']['DT'] = 'Tarih';
-$lang['tr_TR']['BlogEntry']['PLURALNAME'] = 'Blog Girdileri';
-$lang['tr_TR']['BlogEntry']['SINGULARNAME'] = 'Blog Girdisi';
-$lang['tr_TR']['BlogEntry.ss']['COMMENTS'] = 'Yorumlar';
-$lang['tr_TR']['BlogEntry.ss']['EDITTHIS'] = 'Bu girdiyi yeniden düzenle';
-$lang['tr_TR']['BlogEntry.ss']['POSTEDBY'] = 'Gönderen ';
-$lang['tr_TR']['BlogEntry.ss']['POSTEDON'] = 'üzerinde';
-$lang['tr_TR']['BlogEntry.ss']['TAGS'] = 'Etiketler:';
-$lang['tr_TR']['BlogEntry.ss']['UNPUBLISHTHIS'] = 'Bu girdiyi yayından kaldır';
-$lang['tr_TR']['BlogEntry.ss']['VIEWALLPOSTTAGGED'] = 'Etiketlenen tüm girdileri görüntüle';
-$lang['tr_TR']['BlogEntry']['TS'] = 'Etiketler (virgülle ayrılmış)';
-$lang['tr_TR']['BlogHolder']['HAVENTPERM'] = 'Sadece yöneticiler blog girebilirler. Lütfen oturum açın.';
-$lang['tr_TR']['BlogHolder']['PLURALNAME'] = 'Blog Sahipleri';
-$lang['tr_TR']['BlogHolder']['POST'] = 'Blog girdisi gönderin';
-$lang['tr_TR']['BlogHolder']['RSSFEED'] = 'Bu blog\'un RSS beslemesi';
-$lang['tr_TR']['BlogHolder']['SINGULARNAME'] = 'Blog Sahibi';
-$lang['tr_TR']['BlogHolder']['SJ'] = 'Konu';
-$lang['tr_TR']['BlogHolder']['SPUC'] = 'Lüfen etiketleri virgülle ayırın.';
-$lang['tr_TR']['BlogHolder.ss']['NOENTRIES'] = 'Blog girdileri mevcut değil';
-$lang['tr_TR']['BlogHolder.ss']['VIEWINGTAGGED'] = 'Girdiler görüntüleniyor, etiket:';
-$lang['tr_TR']['BlogHolder']['SUCCONTENT'] = 'Tebrikler, SilverStripe blog modülü başarıyla kuruldu. Bu blog girdisini silebilirsiniz. Ayrıca, isterseniz [url=admin]CMS[/url] içerisinde blog\'unuzun görünümünde degişiklikler yapabilirsiniz.';
-$lang['tr_TR']['BlogHolder']['SUCTAGS'] = 'silverstripe, blog';
-$lang['tr_TR']['BlogHolder']['SUCTITLE'] = 'SilverStripe blog modülü başarıyla kuruldu';
-$lang['tr_TR']['BlogHolder']['TE'] = 'Örneğin: spor, kişisel, bilim kurgu';
-$lang['tr_TR']['BlogManagementWidget']['COMADM'] = 'Yorum yönetimi';
-$lang['tr_TR']['BlogManagementWidget']['PLURALNAME'] = 'Blog Yönetim Zımbırtıları';
-$lang['tr_TR']['BlogManagementWidget']['SINGULARNAME'] = 'Blog Yönetim Zımbırtısı';
-$lang['tr_TR']['BlogManagementWidget.ss']['LOGOUT'] = 'Oturumu kapat';
-$lang['tr_TR']['BlogManagementWidget.ss']['POSTNEW'] = 'Yeni bir blog girdisi oluştur';
-$lang['tr_TR']['BlogManagementWidget']['UNM1'] = '1 adet onay bekleyen yorumunuz var';
-$lang['tr_TR']['BlogManagementWidget']['UNMM'] = '%i adet onay bekleyen yorumunuz var';
-$lang['tr_TR']['BlogSummary.ss']['COMMENTS'] = 'Yorumlar';
-$lang['tr_TR']['BlogSummary.ss']['POSTEDBY'] = 'Gönderen: ';
-$lang['tr_TR']['BlogSummary.ss']['POSTEDON'] = 'üzerinde';
-$lang['tr_TR']['BlogSummary.ss']['VIEWFULL'] = 'Postun tamamını görüntüle -';
-$lang['tr_TR']['RSSWidget']['CT'] = 'Besleme için özel başlık';
-$lang['tr_TR']['RSSWidget']['NTS'] = 'Görüntülenecek öğe adedi';
-$lang['tr_TR']['RSSWidget']['PLURALNAME'] = 'R S S Zımbırtıları';
-$lang['tr_TR']['RSSWidget']['SINGULARNAME'] = 'R S S Zımbırtısı';
-$lang['tr_TR']['RSSWidget']['URL'] = 'RSS beslemesi\'nin URL\'i';
-$lang['tr_TR']['SubscribeRSSWidget']['PLURALNAME'] = 'R S S Zımbırtılarına abone ol';
-$lang['tr_TR']['SubscribeRSSWidget']['SINGULARNAME'] = 'R S S Zımbırtısına abone ol';
-$lang['tr_TR']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Abone Ol';
-$lang['tr_TR']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Bu bloğa RSS ile abone ol';
-$lang['tr_TR']['TagCloudWidget']['LIMIT'] = 'Etiket sayısini sınırla';
-$lang['tr_TR']['TagCloudWidget']['PLURALNAME'] = 'Etiket Bulutu Zımbırtıları';
-$lang['tr_TR']['TagCloudWidget']['SBAL'] = 'alfabe';
-$lang['tr_TR']['TagCloudWidget']['SBFREQ'] = 'frekans';
-$lang['tr_TR']['TagCloudWidget']['SINGULARNAME'] = 'Etiket Bulutu Zımbırtısı';
-$lang['tr_TR']['TagCloudWidget']['SORTBY'] = 'Sıralama';
-$lang['tr_TR']['TagCloudWidget']['TILE'] = 'Başlık';
-$lang['tr_TR']['TrackBackPing']['PLURALNAME'] = 'Geri İz Yoklamaları';
-$lang['tr_TR']['TrackBackPing']['SINGULARNAME'] = 'Geri İz Yoklaması';
-
-?>
\ No newline at end of file