Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2013-01-02 11:43:14 -05:00
commit 3cad875d0c
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

2
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
View file

@ -56,7 +56,7 @@ msgstr "Streams"
#: airtime_mvc/application/configs/navigation.php:70
#: airtime_mvc/application/controllers/PreferenceController.php:134
msgid "Support Feedback"
msgstr "Retroalimentación sobre el soporte técnico"
msgstr "Tu estación en nuestro catálogo"
#: airtime_mvc/application/configs/navigation.php:76
#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:5

BIN
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

16
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
View file

@ -599,7 +599,7 @@ msgstr "Телефон:"
#: airtime_mvc/application/forms/AddUser.php:54
#: airtime_mvc/application/forms/SupportSettings.php:46
msgid "Email:"
msgstr "Электронный адрес:"
msgstr "Email:"
#: airtime_mvc/application/forms/RegisterAirtime.php:62
#: airtime_mvc/application/forms/SupportSettings.php:57
@ -826,7 +826,7 @@ msgstr "Не является допустимой папкой"
#: airtime_mvc/application/forms/AddUser.php:23
#: airtime_mvc/application/forms/Login.php:19
msgid "Username:"
msgstr "Имя пользователя:"
msgstr "Логин:"
#: airtime_mvc/application/forms/AddUser.php:32
#: airtime_mvc/application/forms/Login.php:34
@ -843,7 +843,7 @@ msgstr "Фамилия"
#: airtime_mvc/application/forms/AddUser.php:63
msgid "Mobile Phone:"
msgstr "Мобильный телефон:"
msgstr "Тел:"
#: airtime_mvc/application/forms/AddUser.php:69
msgid "Skype:"
@ -1934,7 +1934,7 @@ msgstr "Проиграно"
#: airtime_mvc/application/controllers/LocaleController.php:158
msgid "Choose Storage Folder"
msgstr "Выберите папку для хранения"
msgstr "выберите папку для хранения"
#: airtime_mvc/application/controllers/LocaleController.php:159
msgid "Choose Folder to Watch"
@ -2600,7 +2600,7 @@ msgstr "Источник Show "
#: airtime_mvc/application/views/scripts/partialviews/header.phtml:45
msgid "Scheduled Play"
msgstr "Запланированное проигрывание"
msgstr "Из календаря"
#: airtime_mvc/application/views/scripts/partialviews/header.phtml:54
msgid "ON AIR"
@ -2994,7 +2994,7 @@ msgstr "URL потока: "
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:9
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:27
msgid "Choose folder"
msgstr "Выберите папку"
msgstr "Выбрать"
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:10
msgid "Set"
@ -3080,7 +3080,7 @@ msgstr "Настройки входного потока"
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:109
msgid "Master Source Connection URL:"
msgstr "URL подключения к источнику Master:"
msgstr "URL подключения к Master:"
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:115
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:159
@ -3099,7 +3099,7 @@ msgstr "ВОССТАНОВИТЬ"
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:153
msgid "Show Source Connection URL:"
msgstr "URL подключения к источнику Show:"
msgstr "URL подключения к Show:"
#: airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml:4
msgid "Repeat Days:"