Index: admin/blog.php =================================================================== --- admin/blog.php (revision 1482) +++ admin/blog.php (revision 1615) @@ -82,7 +82,12 @@ '
'. form::field('blog_id',30,32,html::escapeHTML($blog_id)).'
'. - ''.__('At least 2 characters using letters, numbers or symbols.').'
'. - ''.__('Please note that changing your blog ID may require changes in your public index.php file.').'
'. + ''.__('At least 2 characters using letters, numbers or symbols.').'
'; + + if ($blog_id) { + echo + ''.__('Please note that changing your blog ID may require changes in your public index.php file.').'
'; + } + echo ''. form::field('blog_name',30,255,html::escapeHTML($blog_name)).'
'. Index: admin/blog_pref.php =================================================================== --- admin/blog_pref.php (revision 1553) +++ admin/blog_pref.php (revision 1615) @@ -170,5 +170,5 @@ if ($rs) { - throw new Exception(__('That blog Id is already in use.')); + throw new Exception(__('This blog ID is already used.')); } } Index: admin/js/prelude.js =================================================================== --- admin/js/prelude.js (revision 1600) +++ admin/js/prelude.js (revision 1615) @@ -8,4 +8,5 @@ $('#prelude a').removeClass('hidden'); $('#wrapper').css('padding-top', '1em'); + $('#help-button').css('top', '4em'); } } Index: locales/bn/main.po =================================================================== --- locales/bn/main.po (revision 1556) +++ locales/bn/main.po (revision 1615) @@ -215,5 +215,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear ইতিমধ্যেই ইন্সটল করা আছে।" Index: locales/ca/main.po =================================================================== --- locales/ca/main.po (revision 1556) +++ locales/ca/main.po (revision 1615) @@ -219,5 +219,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "DotClear esta instal·lat." Index: locales/cs/main.po =================================================================== --- locales/cs/main.po (revision 1556) +++ locales/cs/main.po (revision 1615) @@ -214,5 +214,5 @@ msgstr "Zakázat vyhledavacím enginům indexovat nebo archivovat obsah blogu." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Blog ID je už použito." Index: locales/da/main.po =================================================================== --- locales/da/main.po (revision 1556) +++ locales/da/main.po (revision 1615) @@ -215,5 +215,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear er allerede installeret." Index: locales/de/main.po =================================================================== --- locales/de/main.po (revision 1556) +++ locales/de/main.po (revision 1615) @@ -212,5 +212,5 @@ msgstr "Erlaube Suchmaschinen weder das Durchsuchen und Archivieren des Inhaltes noch des Archivs dieses Blogs." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Diese Blog-ID wird schon verwendet." Index: locales/en/main.po =================================================================== --- locales/en/main.po (revision 1557) +++ locales/en/main.po (revision 1615) @@ -211,5 +211,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/eo/main.po =================================================================== --- locales/eo/main.po (revision 1556) +++ locales/eo/main.po (revision 1615) @@ -211,5 +211,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/es-ar/main.po =================================================================== --- locales/es-ar/main.po (revision 1556) +++ locales/es-ar/main.po (revision 1615) @@ -217,5 +217,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear ya está instalado." Index: locales/es/main.po =================================================================== --- locales/es/main.po (revision 1556) +++ locales/es/main.po (revision 1615) @@ -218,5 +218,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear ya está instalado." Index: locales/eu/main.po =================================================================== --- locales/eu/main.po (revision 1556) +++ locales/eu/main.po (revision 1615) @@ -211,5 +211,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/fr/main.po =================================================================== --- locales/fr/main.po (revision 1609) +++ locales/fr/main.po (revision 1615) @@ -230,5 +230,5 @@ msgstr "Je souhaite que mon blog ne soit ni indexé ni archivé par les moteurs de recherche et archiveurs." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Cet identifiant est déjà utilisé." @@ -1678,5 +1678,5 @@ msgid "Ping blogs" -msgstr "Faire des rétroliens" +msgstr "Envoyer des rétroliens" msgid "Trackbacks" Index: locales/hu/main.po =================================================================== --- locales/hu/main.po (revision 1556) +++ locales/hu/main.po (revision 1615) @@ -219,5 +219,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "A DotClear már telepítve van." Index: locales/it/main.po =================================================================== --- locales/it/main.po (revision 1556) +++ locales/it/main.po (revision 1615) @@ -212,5 +212,5 @@ msgstr "Impedisci ai motori di ricerca e ai sistemi di archiviazione di indicizzare o salvare il contenuto del blog." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "L'ID del blog è già in uso." Index: locales/ja/main.po =================================================================== --- locales/ja/main.po (revision 1556) +++ locales/ja/main.po (revision 1615) @@ -222,5 +222,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear はすでにインストールされています。" Index: locales/ko/main.po =================================================================== --- locales/ko/main.po (revision 1556) +++ locales/ko/main.po (revision 1615) @@ -220,5 +220,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear가 이미 설치되어 있습니다." Index: locales/lt/main.po =================================================================== --- locales/lt/main.po (revision 1556) +++ locales/lt/main.po (revision 1615) @@ -193,5 +193,5 @@ msgstr "Nenoriu, kad paieškos sistemos ir archyvatoriai indeksuotų ir archyvuotų mano blogo turinio." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Šito blogo ID jau yra naudojamas." Index: locales/nl/main.po =================================================================== --- locales/nl/main.po (revision 1614) +++ locales/nl/main.po (revision 1615) @@ -211,5 +211,5 @@ msgstr "Zoekmachines mogen mijn blog niet indexeren en archiveren." -msgid "This blog ID is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/oc/main.po =================================================================== --- locales/oc/main.po (revision 1556) +++ locales/oc/main.po (revision 1615) @@ -212,5 +212,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/pl/main.po =================================================================== --- locales/pl/main.po (revision 1556) +++ locales/pl/main.po (revision 1615) @@ -212,5 +212,5 @@ msgstr "Chcę, aby wyszukiwarki i archiwizery nie indeksowały i nie archiwizowały zawartości mojego bloga." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Ten identyfikator bloga jest już używany." Index: locales/pt-br/main.po =================================================================== --- locales/pt-br/main.po (revision 1556) +++ locales/pt-br/main.po (revision 1615) @@ -219,5 +219,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "DotClear já está instalado." Index: locales/pt/main.po =================================================================== --- locales/pt/main.po (revision 1556) +++ locales/pt/main.po (revision 1615) @@ -218,5 +218,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear já está instalado." Index: locales/ro/main.po =================================================================== --- locales/ro/main.po (revision 1556) +++ locales/ro/main.po (revision 1615) @@ -213,5 +213,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/ru/main.po =================================================================== --- locales/ru/main.po (revision 1556) +++ locales/ru/main.po (revision 1615) @@ -216,5 +216,5 @@ msgstr "Я не хочу, чтобы мой блог индексировался и архивировался поисковыми машинами." -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear уже установлен." Index: locales/sr/main.po =================================================================== --- locales/sr/main.po (revision 1579) +++ locales/sr/main.po (revision 1615) @@ -217,5 +217,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear est déjà installé." @@ -1654,5 +1654,5 @@ msgid "Ping blogs" -msgstr "Faire des rétroliens" +msgstr "Envoyer des rétroliens" msgid "Trackbacks" Index: locales/sv/main.po =================================================================== --- locales/sv/main.po (revision 1556) +++ locales/sv/main.po (revision 1615) @@ -211,5 +211,5 @@ msgstr "" -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "" Index: locales/te/main.po =================================================================== --- locales/te/main.po (revision 1556) +++ locales/te/main.po (revision 1615) @@ -215,5 +215,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "డాట్క్లియర్ ఇప్పటికే స్థాపితమైవుంది." Index: locales/tr/main.po =================================================================== --- locales/tr/main.po (revision 1556) +++ locales/tr/main.po (revision 1615) @@ -217,5 +217,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear evvelce kurulmuş." Index: locales/zh-cn/main.po =================================================================== --- locales/zh-cn/main.po (revision 1556) +++ locales/zh-cn/main.po (revision 1615) @@ -215,5 +215,5 @@ #, fuzzy -msgid "That blog Id is already in use." +msgid "This blog ID is already used." msgstr "Dotclear 已被安装。"