diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-01-12 21:03:00 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-01-12 21:03:00 +0000 |
| commit | 387354816b46f0ee429c530de940583edb24bd93 (patch) | |
| tree | cf6ebcfd58980db56a4909776118b09dc8e81597 | |
| parent | 05ab300c39f10271bc94b9fece8f275e3ac75174 (diff) | |
lang remove 'Mail address' - use existing 'Email address'
lang remove unused 'return to homepage'
lang change key 'a user use already this mail address' to 'this email address is already in use'
git-svn-id: http://piwigo.org/svn/trunk@8635 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
36 files changed, 35 insertions, 103 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 1bd3fe03a..1085cc431 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -61,7 +61,7 @@ where upper('.$conf['user_fields']['email'].') = upper(\''.$mail_address.'\') list($count) = pwg_db_fetch_row(pwg_query($query)); if ($count != 0) { - return l10n('a user use already this mail address'); + return l10n('this email address is already in use'); } } } diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php index c2b73f508..95a629538 100644 --- a/language/ar_SA/common.lang.php +++ b/language/ar_SA/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'الخصوصية'; $lang['Image only RSS feed'] = 'التغذية الراجعه للصورةRSS'; $lang['Keyword'] = 'كلمة مفتاحية'; $lang['Links'] = 'روابط'; -$lang['Mail address'] = 'بريدك الالكتروني'; $lang['N/A'] = 'غير معروف'; $lang['New on %s'] = 'جديد لـ %s'; $lang['New password confirmation does not correspond'] = 'كلمة المرور ليست متطابقة'; @@ -268,7 +267,6 @@ $lang['please enter your password again'] = 'من فضلك أعد كتابة ك $lang['Auto login'] = 'دخول آلي'; $lang['remove this tag from the list'] = 'احذف هذه الكلمات من القائمة'; $lang['representative'] = 'صفه /نموذجي'; -$lang['return to homepage'] = 'عودة للصفحه الرئيسية'; $lang['Search for Author'] = 'ابحث عن الكاتب'; $lang['Search in albums'] = 'ابحث في الألبومات'; $lang['Search by Date'] = 'بحث حسب التاريخ'; @@ -333,7 +331,7 @@ $lang['Waiting page: %s'] = 'صفحة تنتظر: %s'; $lang['Picture uploaded by %s'] = 'حملت الصورة بواسطة %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'وضغ سيئ للضيف "ضيف", استخدم الحالة الافرتاضية. يرجى ابلاغ المسؤول عن الموقع.'; $lang['Administrator, webmaster and special user cannot use this method'] = 'خاصية للادارة فقط لايمكنك استخدامها'; -$lang['a user use already this mail address'] = 'هذا البريد مسجل لدينامن قبل'; +$lang['this email address is already in use'] = 'هذا البريد مسجل لدينامن قبل'; $lang['Album results for'] = 'نتيجة البحث في الالبومات عن:'; $lang['Tag results for'] = 'نتائج الكلمات الدلائلية'; $lang['from %s to %s'] = 'من%s الي %s'; diff --git a/language/ca_ES/common.lang.php b/language/ca_ES/common.lang.php index 4d2afd427..6dcae3552 100644 --- a/language/ca_ES/common.lang.php +++ b/language/ca_ES/common.lang.php @@ -82,7 +82,6 @@ $lang['Identification'] = 'Identificació'; $lang['Image only RSS feed'] = 'Canal RSS només d\imatges'; $lang['Keyword'] = 'Paraula clau'; $lang['Links'] = 'Enllaços'; -$lang['Mail address'] = 'Adreça de correu'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Nou a %s'; $lang['New password confirmation does not correspond'] = 'La confirmació de la nova contrasenya no correspon'; @@ -260,7 +259,6 @@ $lang['please enter your password again'] = 'si us plau introduïu la vostra con $lang['Auto login'] = 'Inici de sessió automàtic'; $lang['remove this tag from the list'] = 'elimina aquesta etiqueta de la llista'; $lang['representative'] = 'representatiu'; -$lang['return to homepage'] = 'torna a la pàgina inicial'; $lang['Search for Author'] = 'Cerca per autor'; $lang['Search in albums'] = 'Cerca en les categories'; $lang['Search by Date'] = 'Cerca per data'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = 'Imatge carregada per %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Estat erroni de l\'usuari "invitat", s\'està utilitzant l\'estat predeterminat. Si us plau informeu-ho a l\'administrador de la web.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'L\'administrador, l\'administrador de la web i els usuaris especials no poden utilitzar aquest mètode'; -$lang['a user use already this mail address'] = 'un usuari ja utilitza aquesta adreça de correu'; +$lang['this email address is already in use'] = 'un usuari ja utilitza aquesta adreça de correu'; $lang['Album results for'] = 'Resultats de la categoria per'; $lang['Tag results for'] = 'Resultats de l\'etiqueta per'; $lang['from %s to %s'] = 'de %s a %s'; diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php index 035e44c10..2331e85aa 100644 --- a/language/cs_CZ/common.lang.php +++ b/language/cs_CZ/common.lang.php @@ -88,7 +88,6 @@ $lang['Identification'] = 'Identifikace'; $lang['Image only RSS feed'] = 'RSS vlákno jen s fotografiemi'; $lang['Keyword'] = 'Klíčové slovo'; $lang['Links'] = 'Odkazy'; -$lang['Mail address'] = 'E-mailová adresa'; $lang['N/A'] = 'nezadáno'; $lang['New on %s'] = 'Nový na %s'; $lang['New password confirmation does not correspond'] = 'Zadaná hesla se neshodují.'; @@ -267,7 +266,6 @@ $lang['please enter your password again'] = 'prosím zadejte znovu heslo '; $lang['Auto login'] = 'Automatické přihlášení'; $lang['remove this tag from the list'] = 'odstranit toto klíčové slovo ze seznamu'; $lang['representative'] = 'Reprezentant'; -$lang['return to homepage'] = 'Zpět na úvodní stranu'; $lang['Search for Author'] = 'Hledat autora'; $lang['Search in albums'] = 'Hledat v albech'; $lang['Search by Date'] = 'Hledat podle data přidání'; @@ -333,7 +331,7 @@ $lang['Picture uploaded by %s'] = 'Fotografie nahrána %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Špatný stav pro uživatele "host", bude použit výchozí stav. Prosím informujte administrátora.'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrátor nemůže použít tuto metodu.'; -$lang['a user use already this mail address'] = 'Tato e-mailová adresa je již používána'; +$lang['this email address is already in use'] = 'Tato e-mailová adresa je již používána'; $lang['Album results for'] = 'Alba výsledky pro'; $lang['Tag results for'] = 'Výsledky pro klíčová slova'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php index 58286ca50..896b1c103 100644 --- a/language/da_DK/common.lang.php +++ b/language/da_DK/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Identifikation'; $lang['Image only RSS feed'] = 'Kun foto RSS feed'; $lang['Keyword'] = 'Nøgleord'; $lang['Links'] = 'Links'; -$lang['Mail address'] = 'Mail addresse'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Ny på %s'; $lang['New password confirmation does not correspond'] = 'Nyt password stemmer ikke'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'Indtast dit password igen'; $lang['Auto login'] = 'Auto login'; $lang['remove this tag from the list'] = 'fjern dette tag fra denne liste'; $lang['representative'] = 'repræsentativ'; -$lang['return to homepage'] = 'tilbage til startsiden'; $lang['Search for Author'] = 'søg for Author'; $lang['Search in albums'] = 'søg in kategorier'; $lang['Search by Date'] = 'søg efter dato'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Foto uploaded af %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Forket status for gæste bruger. Kontakt webmaster.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and specielle brugere akn ikke bruge denne metode'; -$lang['a user use already this mail address'] = 'en bruger bruger allerede denne mail addresse'; +$lang['this email address is already in use'] = 'en bruger bruger allerede denne mail addresse'; $lang['Album results for'] = 'kategori resulter for'; $lang['Tag results for'] = 'Tag resulter for'; $lang['from %s to %s'] = 'fra %s til %s'; diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php index c8c1889ea..0b2086fed 100644 --- a/language/de_DE/common.lang.php +++ b/language/de_DE/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Anmeldung'; $lang['Image only RSS feed'] = 'Bilder RSS-Feed'; $lang['Keyword'] = 'Stichwort'; $lang['Links'] = 'Links'; -$lang['Mail address'] = $lang['Email addresse']; $lang['N/A'] = 'nicht vorhanden'; $lang['New on %s'] = 'Neu am %s'; $lang['New password confirmation does not correspond'] = 'Fehler bei der Bestätigung des Passwortes'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'Bitte geben Sie erneut Ihr Passwort $lang['Auto login'] = 'Auto-Login'; $lang['remove this tag from the list'] = 'entfernen diesem Tag in der Liste'; $lang['representative'] = 'representativ'; -$lang['return to homepage'] = 'Zurück zur Homepage'; $lang['Search for Author'] = 'Suche nach Autor'; $lang['Search in albums'] = 'Suche in den Alben'; $lang['Search by Date'] = 'Suche nach Datum'; @@ -330,7 +328,7 @@ $lang['Picture uploaded by %s'] = 'Bild hochgeladen von %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status der Benutzer "guest" nicht entspricht, Verwendung des Standard. Bitte kontaktieren Sie den Webmaster.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, Webmaster und spezieller Benutzer können nicht diese Methode verwenden'; -$lang['a user use already this mail address'] = 'Diese E-Mail-Adresse wird bereits verwendet'; +$lang['this email address is already in use'] = 'Diese E-Mail-Adresse wird bereits verwendet'; $lang['Album results for'] = 'Albumresultate für'; $lang['Tag results for'] = 'Ergebnisse der Tag für'; $lang['from %s to %s'] = 'von %s bis %s'; diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index e17640c83..3457ffa72 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = "Identification"; $lang['Image only RSS feed'] = "Images only RSS feed"; $lang['Keyword'] = "Keyword"; $lang['Links'] = "Links"; -$lang['Mail address'] = "Mail address"; $lang['N/A'] = "N/A"; $lang['New on %s'] = "New on %s"; $lang['New password confirmation does not correspond'] = "New password confirmation does not match"; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = "please enter your password again"; $lang['Auto login'] = "Auto login"; $lang['remove this tag from the list'] = "remove this tag from the list"; $lang['representative'] = "representative"; -$lang['return to homepage'] = "return to home page"; $lang['Search for Author'] = "Search for an author"; $lang['Search in albums'] = "Search in albums"; $lang['Search by Date'] = "Search by date"; @@ -325,7 +323,7 @@ $lang['Waiting page: %s'] = "Awaiting page: %s"; $lang['Picture uploaded by %s'] = "Picture uploaded by %s"; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster."; $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method"; -$lang['a user use already this mail address'] = "another user already use this mail address"; +$lang['this email address is already in use'] = "this email address is already in use"; $lang['Album results for'] = "Album results for"; $lang['Tag results for'] = "Tag results for"; $lang['from %s to %s'] = "from %s to %s"; diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php index 69fd0c592..17242bebc 100644 --- a/language/es_AR/common.lang.php +++ b/language/es_AR/common.lang.php @@ -83,7 +83,6 @@ $lang['Help'] = 'Ayuda'; $lang['Image only RSS feed'] = 'Flujo RSS de las imágenes'; $lang['Keyword'] = 'Palabra clave'; $lang['Links'] = 'Enlaces'; -$lang['Mail address'] = 'Dirección de correo electrónico'; $lang['N/A'] = 'no disponible'; $lang['New on %s'] = 'Nuevo el %s'; $lang['New password confirmation does not correspond'] = 'La confirmacion de su contraseña no corresponde'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'Por favor vuelva a ingresar su cont $lang['Auto login'] = 'Connexión automática'; $lang['remove this tag from the list'] = 'borrar este tag de la lista'; $lang['representative'] = 'Representante'; -$lang['return to homepage'] = 'volver a la página de inicio'; $lang['Search for Author'] = 'Buscar un autor'; $lang['Search in albums'] = 'Buscar en las categorías'; $lang['Search by Date'] = 'Buscar por fecha'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = 'Imagen subida por %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'El estatuto de usuario "huésped" no corresponde, se utilizará el estatuto por defecto. Por favor avísele al webmaster.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administradores, webmasters y usuarios especiales no pueden usar ese método'; -$lang['a user use already this mail address'] = 'ya existe un usuario con esa misma dirección de correo electrónico'; +$lang['this email address is already in use'] = 'ya existe un usuario con esa misma dirección de correo electrónico'; $lang['Album results for'] = 'Resultados de categorías para'; $lang['Tag results for'] = 'Resultados de tags para'; $lang['from %s to %s'] = 'del %s al %s'; diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php index ae6756f09..90efb9a0a 100644 --- a/language/es_ES/common.lang.php +++ b/language/es_ES/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Identificación'; $lang['Image only RSS feed'] = 'Contenido RSS: sólo imagen'; $lang['Keyword'] = 'Palabra clave'; $lang['Links'] = 'Enlaces'; -$lang['Mail address'] = $lang['Email address']; $lang['N/A'] = 'no disponible'; $lang['New on %s'] = 'Nuevo el %s'; $lang['New password confirmation does not correspond'] = 'Los valores de la contraseña no coinciden'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'Por favor, escriba de nuevo su cont $lang['Auto login'] = 'Conexión automática'; $lang['remove this tag from the list'] = 'quitar este tag de la lista'; $lang['representative'] = 'representante'; -$lang['return to homepage'] = 'Volver a la página de inicio'; $lang['Search for Author'] = 'Buscar por autor'; $lang['Search in albums'] = 'Buscar en los àlbumes'; $lang['Search by Date'] = 'Buscar por fecha'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = 'Imagen cargada por %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'El estatus del usuario "guest" no es conforme, se utilizará el estatus por defecto. Por favor, informe al administrador del sitio.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'El Administrador, el administrador del sitio y el usuario especial no pueden utilizar este método'; -$lang['a user use already this mail address'] = 'Otro usuario ya utiliza esta dirección e-mail'; +$lang['this email address is already in use'] = 'Otro usuario ya utiliza esta dirección e-mail'; $lang['Album results for'] = 'Résultados de los àlbumes por'; $lang['Tag results for'] = 'Resultados de las etiquetas para'; $lang['from %s to %s'] = 'de %s a %s'; diff --git a/language/fa_IR/common.lang.php b/language/fa_IR/common.lang.php index 7f11ffb13..52c7cf034 100644 --- a/language/fa_IR/common.lang.php +++ b/language/fa_IR/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = "شناسایی"; $lang['Image only RSS feed'] = "Images only RSS feed"; $lang['Keyword'] = "کلید واژهها"; $lang['Links'] = "لینکها"; -$lang['Mail address'] = "آدرسهای ایمیل"; $lang['N/A'] = "N/A"; $lang['New on %s'] = "جدید در %s"; $lang['New password confirmation does not correspond'] = "تایید گذرواژه با گذرواژه مطابقت ندارند!"; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = "لطفا گذرواژه خود را $lang['Auto login'] = "ورود اتوماتیک"; $lang['remove this tag from the list'] = "حذف این برچسب از لیست"; $lang['representative'] = "نماینده"; -$lang['return to homepage'] = "بازگشت به صفحه اصلی"; $lang['Search for Author'] = "جستجو برای نویسنده"; $lang['Search in albums'] = "جستجو در دسته"; $lang['Search by Date'] = "چستچو با تاریخ"; @@ -325,7 +323,7 @@ $lang['Waiting page: %s'] = "صفحات در حال انتظار: %s"; $lang['Picture uploaded by %s'] = "تصویر توسط %s آپلود شده"; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "وضعیت بد برای کاربر \"میهمان\" ، وضعیت پیشفرض . لطفا این موضوع را با وبمستر(مدیرسایت) در میان بگذارید."; $lang['Administrator, webmaster and special user cannot use this method'] = "مدیر ، وبمستر و کاربر ویژه نمیتوانند از این متد استفاده نمایند."; -$lang['a user use already this mail address'] = "یک کاربر دیگر این آدرس ایمیل را در سیستم ثبت کرده است."; +$lang['this email address is already in use'] = "یک کاربر دیگر این آدرس ایمیل را در سیستم ثبت کرده است."; $lang['Album results for'] = "نتایج دسته برای"; $lang['Tag results for'] = "نتایج برچسب برای"; $lang['from %s to %s'] = "از %s تا %s"; diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php index d8887da69..281f2d1d9 100644 --- a/language/fr_CA/common.lang.php +++ b/language/fr_CA/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = 'Identification'; $lang['Image only RSS feed'] = 'Flux RSS des images uniquement'; $lang['Keyword'] = 'Mot-clef'; $lang['Links'] = 'Liens'; -$lang['Mail address'] = $lang['Email address']; $lang['N/A'] = 'non disponible'; $lang['New on %s'] = 'Nouveau le %s'; $lang['New password confirmation does not correspond'] = 'Erreur de confirmation de mot de passe'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'Merci d\'entrer à nouveau votre mo $lang['Auto login'] = 'Connexion auto'; $lang['remove this tag from the list'] = 'retirer ce mot clé de la liste'; $lang['representative'] = 'représentante'; -$lang['return to homepage'] = 'retour à la page d\'accueil'; $lang['Search for Author'] = 'Rechercher un auteur'; $lang['Search in albums'] = 'Rechercher dans les catégories'; $lang['Search by Date'] = 'Recherche par date'; @@ -330,7 +328,7 @@ $lang['Picture uploaded by %s'] = 'Image téléchargée par %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statut de l\'utilisateur "guest" non conforme, utilisation du statut par défaut. Veuillez prévenir le webmestre.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode'; -$lang['a user use already this mail address'] = 'un autre utilisateur utilise déjà cette adresse de courriel'; +$lang['this email address is already in use'] = 'un autre utilisateur utilise déjà cette adresse de courriel'; $lang['Album results for'] = 'Résultats des catégories pour'; $lang['Tag results for'] = 'Résultats des mots clés pour'; $lang['from %s to %s'] = 'du %s au %s'; diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index c0ef4df0b..fbdf2b348 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = 'Identification'; $lang['Image only RSS feed'] = 'Flux RSS des images uniquement'; $lang['Keyword'] = 'Mot-clef'; $lang['Links'] = 'Liens'; -$lang['Mail address'] = $lang['Email address']; $lang['N/A'] = 'non disponible'; $lang['New on %s'] = 'Nouveau le %s'; $lang['New password confirmation does not correspond'] = 'Erreur de confirmation de mot de passe'; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = 'Merci d\'entrer à nouveau votre mo $lang['Auto login'] = 'Connexion auto'; $lang['remove this tag from the list'] = 'retirer ce tag de la liste'; $lang['representative'] = 'représentante'; -$lang['return to homepage'] = 'retour à la page d\'accueil'; $lang['Search for Author'] = 'Rechercher un auteur'; $lang['Search in albums'] = 'Rechercher dans les albums'; $lang['Search by Date'] = 'Recherche par date'; @@ -327,7 +325,7 @@ $lang['Picture uploaded by %s'] = 'Image téléchargée par %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statut de l\'utilisateur "guest" non conforme, utilisation du statut par défaut. Veuillez prévenir le webmestre.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode'; -$lang['a user use already this mail address'] = 'un autre utilisateur utilise déjà cette adresse e-mail'; +$lang['this email address is already in use'] = 'un autre utilisateur utilise déjà cette adresse e-mail'; $lang['Album results for'] = 'Résultats des albums pour'; $lang['Tag results for'] = 'Résultats des tags pour'; $lang['from %s to %s'] = 'du %s au %s'; diff --git a/language/he_IL/common.lang.php b/language/he_IL/common.lang.php index e9f86656b..35cea58b3 100644 --- a/language/he_IL/common.lang.php +++ b/language/he_IL/common.lang.php @@ -82,7 +82,6 @@ $lang['Identification'] = "הזדהות"; $lang['Image only RSS feed'] = "תמונות בלבד RSS "; $lang['Keyword'] = "מילות מפתח"; $lang['Links'] = "קישורים"; -$lang['Mail address'] = "כתובת הדואר"; $lang['N/A'] = "N/A לא ידוע"; $lang['New on %s'] = "חדש ב %s"; $lang['New password confirmation does not correspond'] = "אישור סיסמה חדשה אינו תואם"; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = "הכנס בבקשה את הסיסמ $lang['Auto login'] = "התחברות אוטומטית"; $lang['remove this tag from the list'] = "מחק את התווית הזאת מהרשימה"; $lang['representative'] = "נבחר"; -$lang['return to homepage'] = "חזור לדף הבית"; $lang['Search for Author'] = "חפש את המחבר"; $lang['Search in albums'] = "חפש בקטגוריה"; $lang['Search by Date'] = "חפש לפי תאריך"; @@ -325,7 +323,7 @@ $lang['Waiting page: %s'] = "דף ממתין: %s"; $lang['Picture uploaded by %s'] = "התמונה הועלתה על ידי %s"; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב לא טוב עבור המשתמש "האורח", השתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.'; $lang['Administrator, webmaster and special user cannot use this method'] = "מנהל ראשי, מנהל האתר ו ומשתמשים מסויימים לא יכולים להשתמש בmethod הזה"; -$lang['a user use already this mail address'] = "משתמש אחר כבר משתמש בדואר האלקטרוני הזה"; +$lang['this email address is already in use'] = "משתמש אחר כבר משתמש בדואר האלקטרוני הזה"; $lang['Album results for'] = "תוצאות עבור הקטגוריה"; $lang['Tag results for'] = "תוצאות עבור התוויות"; $lang['from %s to %s'] = "מ %s עד %s"; diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php index 3ec329651..af6c941ba 100644 --- a/language/hr_HR/common.lang.php +++ b/language/hr_HR/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Prijavnica'; $lang['Image only RSS feed'] = 'RSS izvor samo za slike'; $lang['Keyword'] = 'Ključna riječ'; $lang['Links'] = 'Poveznice'; -$lang['Mail address'] = 'E-Mail adresa'; $lang['N/A'] = 'N/D'; $lang['New on %s'] = 'Novi na on %s'; $lang['New password confirmation does not correspond'] = 'Potvrda nove zaporke ne odgovara'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'molimo unesite zaporku ponovo'; $lang['Auto login'] = 'Samoprijava'; $lang['remove this tag from the list'] = 'ukloni ovaj tag iz popisa'; $lang['representative'] = 'predstavnik'; -$lang['return to homepage'] = 'povratak na naslovnicu'; $lang['Search for Author'] = 'Pretraživanje po Autoru'; $lang['Search in albums'] = 'Pretraživanje u Skupinama'; $lang['Search by Date'] = 'Pretraživanje po Nadnevku'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Sliku prebacio %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Loš status za korisnika "guest", koristi se pretpostavljeni status. Molimo obavjestite webmaster-a.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Upravitelj, webmaster i posebni korisnik ne mogu koristiti ovu metodu'; -$lang['a user use already this mail address'] = 'korisnik već koristi ovu e-mail adresu'; +$lang['this email address is already in use'] = 'korisnik već koristi ovu e-mail adresu'; $lang['Album results for'] = 'Ishodi skupine za '; $lang['Tag results for'] = 'Ishodi tagova za'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php index b6d414560..342b0b6e0 100644 --- a/language/hu_HU/common.lang.php +++ b/language/hu_HU/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Belépés'; $lang['Image only RSS feed'] = 'Képek RSS'; $lang['Keyword'] = 'Kulcsszó'; $lang['Links'] = 'Kapcsolódó linkek'; -$lang['Mail address'] = 'E-mail cím'; $lang['N/A'] = 'Nincs adat'; $lang['New on %s'] = 'Új %s'; $lang['New password confirmation does not correspond'] = 'Az új jelszó megerősítése nem sikerült'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'Kérem, adja meg újra jelszavát'; $lang['Auto login'] = 'Jegyezd meg'; $lang['remove this tag from the list'] = 'Ezt a címkét távolítsa el a listáról'; $lang['representative'] = 'képviselő'; -$lang['return to homepage'] = 'Kezdőlap'; $lang['Search for Author'] = 'Szerző keresése'; $lang['Search in albums'] = 'Album keresése'; $lang['Search by Date'] = 'Keresés dátum alapján'; @@ -330,7 +328,7 @@ $lang['Picture uploaded by %s'] = 'A képet feltöltötte: %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Rossz felhasználói állapot "vendég", az alapértelmezett állapot. Kérjük, küldjön értesítést a webmesternek.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Adminisztrátor, webmester és különleges felhasználó nem használja ezt a módszert'; -$lang['a user use already this mail address'] = 'Ezt az e-mail címet már egy másik felhasználó használja.'; +$lang['this email address is already in use'] = 'Ezt az e-mail címet már egy másik felhasználó használja.'; $lang['Album results for'] = 'Album eredményei'; $lang['Tag results for'] = 'Címke eredményei'; $lang['from %s to %s'] = '%s-tól %s-ig'; diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php index bcaf6603f..3ab6ef7f3 100644 --- a/language/it_IT/common.lang.php +++ b/language/it_IT/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = 'Identificazione'; $lang['Image only RSS feed'] = 'Feed RSS solo per le immagini'; $lang['Keyword'] = 'Parola chiave'; $lang['Links'] = 'Links'; -$lang['Mail address'] = $lang['Email address']; $lang['N/A'] = 'Non disponibile'; $lang['New on %s'] = 'Nuovo il %s'; $lang['New password confirmation does not correspond'] = 'La conferma della nuova password non corrisponde'; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = 'Reinserire la password, grazie.'; $lang['Auto login'] = 'Conessione automatica'; $lang['remove this tag from the list'] = 'Eliminare questo tag dall\'elenco'; $lang['representative'] = 'rappresentative'; -$lang['return to homepage'] = 'Torna alla homepage'; $lang['Search for Author'] = 'Cercare un Autore'; $lang['Search in albums'] = 'Cercare negli album'; $lang['Search by Date'] = 'Cercare per data'; @@ -327,7 +325,7 @@ $lang['Picture uploaded by %s'] = 'Immagine caricata da %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Lo status dell\'utente "guest" non è conforme, viene usato lo status di default. Per favore avvisa il webmaster.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Amministratore, webmaster e utente speciale non possono utilizzare questo metodo'; -$lang['a user use already this mail address'] = 'un utente usa già questo indirizzo mail'; +$lang['this email address is already in use'] = 'un utente usa già questo indirizzo mail'; $lang['Album results for'] = 'Risultati degli album per'; $lang['Tag results for'] = 'Risultato dei tag per'; $lang['from %s to %s'] = 'da %s a %s'; diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php index 3b8a5b75a..8591744b2 100644 --- a/language/ja_JP/common.lang.php +++ b/language/ja_JP/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'アイデンティフィケーション'; $lang['Image only RSS feed'] = 'イメージ限定RSSフィード'; $lang['Keyword'] = 'キーワード'; $lang['Links'] = 'リンク'; -$lang['Mail address'] = 'メールアドレス'; $lang['N/A'] = 'なし'; $lang['New on %s'] = '最新投稿 - %s'; $lang['New password confirmation does not correspond'] = '新しいパスワードの承認が合致しません。'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'あなたのパスワードを再 $lang['Auto login'] = '自動ログイン'; $lang['remove this tag from the list'] = 'このタグをリストから削除する'; $lang['representative'] = '見本'; -$lang['return to homepage'] = 'ホームページに戻る'; $lang['Search for Author'] = '作者で探す'; $lang['Search in albums'] = 'カテゴリを探す'; $lang['Search by Date'] = '日付で探す'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = '%s によりアップロードされた写真 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'デフォルトステータスの使用に関して、ユーザ「ゲスト」は正しくないステータスです。ウェブマスタにご連絡ください。'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = '管理者、ウェブマスタおよび特別ユーザは、この方法を使用できません。'; -$lang['a user use already this mail address'] = 'このメールアドレスは、すでに他のユーザに使用されています。'; +$lang['this email address is already in use'] = 'このメールアドレスは、すでに他のユーザに使用されています。'; $lang['Album results for'] = 'カテゴリ検索結果:'; $lang['Tag results for'] = 'タグ検索結果:'; $lang['from %s to %s'] = '%s - %s'; diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php index 166309870..9f305d0e7 100644 --- a/language/ka_GE/common.lang.php +++ b/language/ka_GE/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'იდენტიფიკაცია'; $lang['Image only RSS feed'] = 'RSS ლენტი ფოტოებით'; $lang['Keyword'] = 'ძირითადი სიტყვები'; $lang['Links'] = 'ბმულები'; -$lang['Mail address'] = 'საფოსტო მისამართი'; $lang['N/A'] = 'გაურკვეველია'; $lang['New on %s'] = 'ახალი %s'; $lang['New password confirmation does not correspond'] = 'New password confirmation does not correspond'; @@ -264,7 +263,6 @@ $lang['please enter your password again'] = 'პაროლი კიდევ $lang['Auto login'] = 'დამიმახსოვრე'; $lang['remove this tag from the list'] = 'გადავაგდოთ ეს ტეგი სიიდან'; $lang['representative'] = 'წარმომადგენელი'; -$lang['return to homepage'] = 'დავბრუნდეთ მთავარ გვერდზე'; $lang['Search for Author'] = 'ძიება ავტორის მიხედვით'; $lang['Search in albums'] = 'ძიება კატეგორიებში'; $lang['Search by Date'] = 'ძიება თარიღით'; @@ -332,7 +330,7 @@ $lang['Picture uploaded by %s'] = 'ფოტო ატვირთულია % $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'მომხმარებლის არასწორი სტატუსი "სტუმარი", გამოიყენეთ ძირითადი სტატუსი. გთხოვთ შეატყობინოთ ადმინისტრატორს.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method'; -$lang['a user use already this mail address'] = 'მომხმარებელი ასეთი მისამართით უკვე არსებობს'; +$lang['this email address is already in use'] = 'მომხმარებელი ასეთი მისამართით უკვე არსებობს'; $lang['Album results for'] = 'დღის კატეგორიების რეზულტატი'; $lang['Tag results for'] = 'დღის სიტყვა–რეზულტატი'; $lang['from %s to %s'] = ' %s დან %s მდე'; diff --git a/language/lv_LV/common.lang.php b/language/lv_LV/common.lang.php index 57a4b1c2d..d7eb0b6db 100644 --- a/language/lv_LV/common.lang.php +++ b/language/lv_LV/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = "Identifikācija"; $lang['Image only RSS feed'] = "Tkai RSS piegādes attēli"; $lang['Keyword'] = "Atslēgvārds"; $lang['Links'] = "Saites"; -$lang['Mail address'] = "Pasta adrese"; $lang['N/A'] = "N/A"; $lang['New on %s'] = "Jauns %s"; $lang['New password confirmation does not correspond'] = "Jaunas paroles apstiprinājums nesakrīt"; @@ -261,7 +260,6 @@ $lang['please enter your password again'] = "lūdzu ievadiet savu paroli vēlrei $lang['Auto login'] = "Auto logins"; $lang['remove this tag from the list'] = "izņemt šo tagu no saraksta"; $lang['representative'] = "pārstāvis"; -$lang['return to homepage'] = "atgriezties mājas lapā"; $lang['Search for Author'] = "Meklēšana pēc autora"; $lang['Search in albums'] = 'Meklēt albūmos'; $lang['Search by Date'] = "Meklēšana pēc datuma"; @@ -325,7 +323,7 @@ $lang['Waiting page: %s'] = "Gaida lapu: %s"; $lang['Picture uploaded by %s'] = "Attēlu augšupielādējis %s"; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Lietotāja \"viesis\" nepareizs satuss, lietojiet statusu pēc noklusējuma. Lūdzu informējiet webmasteru."; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrātors, webmāsters un īpašais lietotājs var izmantot šo metodi'; -$lang['a user use already this mail address'] = "cits lietotājs jau lieto šo pasta adresi"; +$lang['this email address is already in use'] = "cits lietotājs jau lieto šo pasta adresi"; $lang['Album results for'] = 'Albūma rezultāti priekš'; $lang['Tag results for'] = "Tagu rezultāti priekš"; $lang['from %s to %s'] = "no %s līdz %s"; diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php index abc6227f4..c990345f0 100644 --- a/language/mk_MK/common.lang.php +++ b/language/mk_MK/common.lang.php @@ -92,7 +92,6 @@ $lang['Identification'] = 'Корисник'; $lang['Image only RSS feed'] = 'Парцијален RSS feed (фотографии)'; $lang['Keyword'] = 'Клучен збор'; $lang['Links'] = 'Линкови'; -$lang['Mail address'] = 'E-mail адреса'; $lang['N/A'] = 'Не е познат'; $lang['New on %s'] = 'Нова на %s'; $lang['New password confirmation does not correspond'] = 'Повторената нова лозинка не е точна. Пробајте повторно.'; @@ -272,7 +271,6 @@ $lang['please enter your password again'] = 'Ве молиме повторно $lang['Auto login'] = 'Логирај ме автоматски на секоја моја посета'; $lang['remove this tag from the list'] = 'избриши ја оваа етикета од листата'; $lang['representative'] = 'главна икона'; -$lang['return to homepage'] = 'Врати се на почетната страница'; $lang['search'] = 'Пребарување'; $lang['Search for Author'] = 'Барај по автор'; $lang['Search in albums'] = 'Барај по категории'; diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php index 243282c1b..89398349f 100644 --- a/language/nl_NL/common.lang.php +++ b/language/nl_NL/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Administratie'; $lang['Image only RSS feed'] = 'Alleen RSS feed mbt afbeeldingen'; $lang['Keyword'] = 'Sleutelwoord'; $lang['Links'] = 'Links'; -$lang['Mail address'] = 'Email-adres'; $lang['N/A'] = 'Niet bekend'; $lang['New on %s'] = 'Nieuw op %s'; $lang['New password confirmation does not correspond'] = 'Nieuw wachtwoord bevestiging komt niet overeen'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'vul uw wachtwoord nogmaals in'; $lang['Auto login'] = 'Auto login'; $lang['remove this tag from the list'] = 'Verwijder deze tag van de lijst'; $lang['representative'] = 'representatief'; -$lang['return to homepage'] = 'Terug naar de startpagina'; $lang['Search for Author'] = 'Zoek naar maker'; $lang['Search in albums'] = 'Zoeken in categorieën'; $lang['Search by Date'] = 'Zoeken op datum'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = 'Afbeelding ge-uploaded door %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Foutieve status voor gebruiker "guest", gebruik standaard status. Waarschuw de webbeheerder.'; // --------- Starting below: New or revised $lang ---- from Butterfly (1.8) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webbeheerder en speciale gebruiker kunnen deze methode niet gebruiken'; -$lang['a user use already this mail address'] = 'Een andere gebruiker maakt al gebruik van dit email-adres'; +$lang['this email address is already in use'] = 'Een andere gebruiker maakt al gebruik van dit email-adres'; $lang['Album results for'] = 'Categorie resultaten voor'; $lang['Tag results for'] = 'Tag resultaten voor'; $lang['from %s to %s'] = 'van %s tot %s'; diff --git a/language/no_NO/common.lang.php b/language/no_NO/common.lang.php index 8dde0256a..2fb35d0d2 100644 --- a/language/no_NO/common.lang.php +++ b/language/no_NO/common.lang.php @@ -46,7 +46,7 @@ $lang['Waiting page: %s'] = "Avventer side: %s"; $lang['Picture uploaded by %s'] = "Bilde opplastet av %s"; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Feil status for bruker \"gjest\", default status vil bli brukt. Vennligst kontakt webmaster."; $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster og spesial bruker kan ikke bruke denne metoden"; -$lang['a user use already this mail address'] = "En annen bruker har allerede denne mail addressen"; +$lang['this email address is already in use'] = "En annen bruker har allerede denne mail addressen"; $lang['Tag results for'] = "Tag resultat for"; $lang['from %s to %s'] = "fra %s til %s"; $lang['Play of slideshow'] = 'Avspill slideshow'; @@ -124,7 +124,6 @@ $lang['Identification'] = 'Identifikasjon'; $lang['Image only RSS feed'] = 'Bare bilder RSS feed'; $lang['Keyword'] = 'Nøkkelord'; $lang['Links'] = 'Linker'; -$lang['Mail address'] = 'Mail addresse'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Ny den %s'; $lang['%d album updated'] = '%d album oppdatert'; @@ -308,7 +307,6 @@ $lang['%d Kb'] = '%d Kb'; $lang['Week %d'] = 'Uke %d'; $lang['remove this tag from the list'] = 'fjern tag fra denne listen'; $lang['representative'] = 'representative'; -$lang['return to homepage'] = 'returner til hjemmeside'; $lang['Search for Author'] = 'Søk etter forfatter'; $lang['Search in albums'] = 'Søk i album'; $lang['Search by Date'] = 'Søk etter dato'; diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php index cc00d9fbd..8ec65e90c 100644 --- a/language/pl_PL/common.lang.php +++ b/language/pl_PL/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Logowanie'; $lang['Image only RSS feed'] = 'RSS feed tylko dla zdjęć'; $lang['Keyword'] = 'Słowo kluczowe'; $lang['Links'] = 'Linki'; -$lang['Mail address'] = 'Adres email'; $lang['N/A'] = 'N/D'; $lang['New on %s'] = 'Nowe %s'; $lang['New password confirmation does not correspond'] = 'Potwierdzenie podczas potwierdzania nowego hasła'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'wprowadź hasło jeszcze raz'; $lang['Auto login'] = 'Pamiętaj mnie'; $lang['remove this tag from the list'] = 'usuń ten tag z listy'; $lang['representative'] = 'reprezentant'; -$lang['return to homepage'] = 'powrót do strony głównej'; $lang['Search for Author'] = 'Szukaj Autora'; $lang['Search in albums'] = 'Szukaj w albumach'; $lang['Search by Date'] = 'Szukaj po Dacie'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Zdjęcie wgrane przez %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zły status dla użytkownika "gość", używam domyślnego'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i special user nie mogą używać tej metody'; -$lang['a user use already this mail address'] = 'użytkownik już używa tego adresu email'; +$lang['this email address is already in use'] = 'użytkownik już używa tego adresu email'; $lang['Album results for'] = 'Wyniki albumu dla'; $lang['Tag results for'] = 'Wyniki tagów dla'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php index fda03322a..e7ae7f162 100644 --- a/language/pt_BR/common.lang.php +++ b/language/pt_BR/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Identificação'; $lang['Image only RSS feed'] = 'RSS das imagens'; $lang['Keyword'] = 'Palavra chave'; $lang['Links'] = 'Links'; -$lang['Mail address'] = 'Endereço'; $lang['N/A'] = 'Não disponível'; $lang['New on %s'] = 'Novo em %s'; $lang['New password confirmation does not correspond'] = 'Erro na confirmação da senha'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'Por favor, digite sua senha novamen $lang['Auto login'] = 'Auto login (conexão automática)'; $lang['remove this tag from the list'] = 'remover esta tag da lista'; $lang['representative'] = 'representante'; -$lang['return to homepage'] = 'voltar à página de início'; $lang['Search for Author'] = 'Pesquisar por autor'; $lang['Search in albums'] = 'Pesquisar nas categorias'; $lang['Search by Date'] = 'Pesquisar por data'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Imagem enviada por %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método'; -$lang['a user use already this mail address'] = 'um outro usuário já utiliza este email'; +$lang['this email address is already in use'] = 'um outro usuário já utiliza este email'; $lang['Album results for'] = 'Resultados da categoria para'; $lang['Tag results for'] = 'Resultados da tag para'; $lang['from %s to %s'] = 'de %s ao %s'; diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php index 7b56ba261..09cf88573 100644 --- a/language/pt_PT/common.lang.php +++ b/language/pt_PT/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Identificação'; $lang['Image only RSS feed'] = 'RSS das imagens'; $lang['Keyword'] = 'Palavra chave'; $lang['Links'] = 'Links'; -$lang['Mail address'] = 'Endereço de email'; $lang['N/A'] = 'Não disponível'; $lang['New on %s'] = 'Novo em %s'; $lang['New password confirmation does not correspond'] = 'Erro na confirmação da palavra-passe'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'Por favor, digite sua palavra-passe $lang['Auto login'] = 'Auto login (conexão automática)'; $lang['remove this tag from the list'] = 'remover esta tag da lista'; $lang['representative'] = 'representante'; -$lang['return to homepage'] = 'voltar à página de início'; $lang['Search for Author'] = 'Pesquisar por autor'; $lang['Search in albums'] = 'Pesquisar nas categorias'; $lang['Search by Date'] = 'Pesquisar por data'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Imagem enviada por %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrador, webmaster e utilizador especial não podem utilizar este método'; -$lang['a user use already this mail address'] = 'um outro usuário já utiliza este email'; +$lang['this email address is already in use'] = 'um outro usuário já utiliza este email'; $lang['Album results for'] = 'Resultados da categoria para'; $lang['Tag results for'] = 'Resultados da tag para'; $lang['from %s to %s'] = 'de %s ao %s'; diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php index 92dcf9a2d..7be3335aa 100644 --- a/language/ro_RO/common.lang.php +++ b/language/ro_RO/common.lang.php @@ -86,7 +86,6 @@ $lang['Identification'] = 'Identificare'; $lang['Image only RSS feed'] = 'RSS feed numai cu imagini'; $lang['Keyword'] = 'Cuvînt cheie'; $lang['Links'] = 'Link-uri'; -$lang['Mail address'] = 'Adresa de mail'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Nou pe %s'; $lang['New password confirmation does not correspond'] = 'Noua confirmare a parolei nu se potriveşte'; @@ -253,7 +252,6 @@ $lang['please enter your password again'] = 'vă rugăm să introduceţi parola $lang['Auto login'] = 'Conectare automatică'; $lang['remove this tag from the list'] = 'eliminaţi acesta etichetă de pe lista'; $lang['representative'] = 'reprezentant'; -$lang['return to homepage'] = 'reveniţi la prima pagină'; $lang['Search for Author'] = 'Caută autor'; $lang['Search in albums'] = 'Caută în categorii'; $lang['Previous'] = 'Precedent(e)'; @@ -318,7 +316,7 @@ $lang['Waiting page: %s'] = 'Pagina de aşteptare : %s'; $lang['Picture uploaded by %s'] = 'Imagine adăugată de %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statutul utilizatorului "invitat" este eronat, se vor folosi parametrii impliciţi. Va rugăm sa informaţi webmasterul.'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administratorul, webmasterul şi utilizatorul special nu pot folosi aceasta metodă'; -$lang['a user use already this mail address'] = 'un alt utilizator foloseşte deja acest e-mail'; +$lang['this email address is already in use'] = 'un alt utilizator foloseşte deja acest e-mail'; $lang['Album results for'] = 'Rezultatele categoriilor pentru'; $lang['Tag results for'] = 'Rezultatele etichetelor pentru'; $lang['from %s to %s'] = 'de la %s până la %s'; diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php index fc772b1aa..551ac4fc5 100644 --- a/language/ru_RU/common.lang.php +++ b/language/ru_RU/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Идентификация'; $lang['Image only RSS feed'] = 'RSS лента только с фотографиями'; $lang['Keyword'] = 'Ключевые слова'; $lang['Links'] = 'Ссылки'; -$lang['Mail address'] = 'Почтовый адрес'; $lang['N/A'] = 'не определен'; $lang['New on %s'] = 'Новое в %s'; $lang['New password confirmation does not correspond'] = 'New password confirmation does not correspond'; @@ -263,7 +262,6 @@ $lang['please enter your password again'] = 'введите пароль еще $lang['Auto login'] = 'Запомнить меня'; $lang['remove this tag from the list'] = 'удалить этот тэг из списка'; $lang['representative'] = 'представитель'; -$lang['return to homepage'] = 'вернуться на главную'; $lang['Search for Author'] = 'Поиск по автору'; $lang['Search in albums'] = 'Поиск в альбомах'; $lang['Search by Date'] = 'Поиск по дате'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Фотография загружена %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Неверный статус пользователя "гость", используйте статус по умолчанию. Пожалуйста сообщите вебмастеру.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method'; -$lang['a user use already this mail address'] = 'пользователь с таким адресом уже есть'; +$lang['this email address is already in use'] = 'пользователь с таким адресом уже есть'; $lang['Album results for'] = 'Альбом определен для'; $lang['Tag results for'] = 'Слова-результаты для'; $lang['from %s to %s'] = 'от %s до %s'; diff --git a/language/sh_RS/common.lang.php b/language/sh_RS/common.lang.php index 13e551d41..cfcbdb843 100644 --- a/language/sh_RS/common.lang.php +++ b/language/sh_RS/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Prijava'; $lang['Image only RSS feed'] = 'RSS izvor samo za slike'; $lang['Keyword'] = 'Ključna riječ'; $lang['Links'] = 'Linkovi'; -$lang['Mail address'] = 'E-Mail adresa'; $lang['N/A'] = 'N/D'; $lang['New on %s'] = 'Novi na on %s'; $lang['New password confirmation does not correspond'] = 'Potvrda nove lozinke ne odgovara'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'molimo unesite lozinku ponovo'; $lang['Auto login'] = 'Upamti me'; $lang['remove this tag from the list'] = 'ukloni ovaj tag iz popisa'; $lang['representative'] = 'predstavnik'; -$lang['return to homepage'] = 'povratak na početnu'; $lang['Search for Author'] = 'Pretraživanje po Autoru'; $lang['Search in albums'] = 'Pretraživanje u Kategorijama'; $lang['Search by Date'] = 'Pretraživanje po Datumu'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Sliku prebacio %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Loš status za korisnika "guest", koristi se podrazumevani status. Molimo obavestite webmaster-a.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster i posebni korisnik ne mogu koristiti ovu metodu'; -$lang['a user use already this mail address'] = 'korisnik već koristi ovu e-mail adresu'; +$lang['this email address is already in use'] = 'korisnik već koristi ovu e-mail adresu'; $lang['Album results for'] = 'Rezultati kategorije za '; $lang['Tag results for'] = 'Rezultati tagova za'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/sk_SK/common.lang.php b/language/sk_SK/common.lang.php index dab481f42..57641d6db 100644 --- a/language/sk_SK/common.lang.php +++ b/language/sk_SK/common.lang.php @@ -88,7 +88,6 @@ $lang['Identification'] = 'Identifikácia'; $lang['Image only RSS feed'] = 'RSS vlákno len s fotografiami'; $lang['Keyword'] = 'Kľúčové slovo'; $lang['Links'] = 'Odkazy'; -$lang['Mail address'] = 'E-mailová adresa'; $lang['N/A'] = 'nezadané'; $lang['New on %s'] = 'Nový na %s'; $lang['New password confirmation does not correspond'] = 'Zadané heslá sa nezhodujú.'; @@ -267,7 +266,6 @@ $lang['please enter your password again'] = 'prosím zadajte znovu heslo'; $lang['Auto login'] = 'Automatické prihlásenie'; $lang['remove this tag from the list'] = 'odstrániť toto kľúčové slovo zo zoznamu'; $lang['representative'] = 'vzorový'; -$lang['return to homepage'] = 'späť na úvodnú stránku'; $lang['Search for Author'] = 'Hľadať autora'; $lang['Search in albums'] = 'Hľadanie v albumoch'; $lang['Search by Date'] = 'Hľadať podľa dátumu pridania'; @@ -331,7 +329,7 @@ $lang['Waiting page: %s'] = 'Čakanie na stránku: %s'; $lang['Picture uploaded by %s'] = 'Fotografia nahraná %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zlý stav pre používateľa "hosť", bude použitý východzí stav. Prosím informujte webmastra.'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrátor, webmaster a špeciálny používateľ nemôžu použiť túto metódu.'; -$lang['a user use already this mail address'] = 'táto e-mailová adresa je už používaná'; +$lang['this email address is already in use'] = 'táto e-mailová adresa je už používaná'; $lang['Album results for'] = 'Výsledky pre album'; $lang['Tag results for'] = 'Výsledky pre kľúčové slová'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/sl_SL/common.lang.php b/language/sl_SL/common.lang.php index d39ad230a..e94f94b15 100644 --- a/language/sl_SL/common.lang.php +++ b/language/sl_SL/common.lang.php @@ -82,7 +82,6 @@ $lang['Identification'] = 'Identifikacija'; $lang['Image only RSS feed'] = 'RSS vir (samo slike)'; $lang['Keyword'] = 'Ključna beseda'; $lang['Links'] = 'Povezave'; -$lang['Mail address'] = 'Naslov pošte'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Nov na %s'; $lang['New password confirmation does not correspond'] = 'Potrditveno geslo se ne ujema'; @@ -236,7 +235,6 @@ $lang['please enter your password again'] = 'prosim vnesite svoje geslo še enkr $lang['Auto login'] = 'Avtomatska prijava'; $lang['remove this tag from the list'] = 'odstrani značko iz seznama'; $lang['representative'] = 'reprezentativen'; -$lang['return to homepage'] = 'vrni se na domačo stran'; $lang['Search for Author'] = 'Iskanje po avtorju'; $lang['Search in albums'] = 'Iskanje po kategorijah'; $lang['Search by Date'] = 'Iskanje po datumo'; @@ -305,7 +303,7 @@ $lang['Waiting page: %s'] = 'Čakajoče strani: %s'; $lang['Picture uploaded by %s'] = 'Sliko naložil %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Nepravilen status uporabnika "guest", uporabljen bo privzeti status. Prosim obvestite skrbnika.'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, skrbnik in posebni uporabnik ne morejo uporabljati te metode'; -$lang['a user use already this mail address'] = 'email uporablja že drug uporabnik'; +$lang['this email address is already in use'] = 'email uporablja že drug uporabnik'; $lang['Album results for'] = 'Category results for'; $lang['Tag results for'] = 'Tag results for'; $lang['from %s to %s'] = 'od %s do %s'; diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php index 44ae37bcd..615ca6425 100644 --- a/language/sr_RS/common.lang.php +++ b/language/sr_RS/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = 'Пријава'; $lang['Image only RSS feed'] = 'RSS извор само за слике'; $lang['Keyword'] = 'Кључна реч'; $lang['Links'] = 'Интернет везе'; -$lang['Mail address'] = 'Адреса електронске поште'; $lang['N/A'] = 'Н/Д'; $lang['New on %s'] = 'Нови на %s'; $lang['New password confirmation does not correspond'] = 'Потврда нове лозинке не одговара'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = 'молимо унесите лоз $lang['Auto login'] = 'Упамти ме'; $lang['remove this tag from the list'] = 'уклони ову ознаку из пописа'; $lang['representative'] = 'представник'; -$lang['return to homepage'] = 'повратак на почетну'; $lang['Search for Author'] = 'Претраживање по аутору'; $lang['Search in albums'] = 'Претраживање у категоријама'; $lang['Search by Date'] = 'Претраживање по датуму'; @@ -329,7 +327,7 @@ $lang['Picture uploaded by %s'] = 'Слику пребацио %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Лош статус за корисника "гост", користи се подразумевани статус. Молимо обавестите мајстора интернет страница.'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster и посебни корисник не могу користити ову методу'; -$lang['a user use already this mail address'] = 'корисник већ користи ову адресу електронске поште'; +$lang['this email address is already in use'] = 'корисник већ користи ову адресу електронске поште'; $lang['Album results for'] = 'Резултати категорије за '; $lang['Tag results for'] = 'Резултати ознака за'; $lang['from %s to %s'] = 'од %s до %s'; diff --git a/language/sv_SE/common.lang.php b/language/sv_SE/common.lang.php index 4737187a8..1ac310870 100644 --- a/language/sv_SE/common.lang.php +++ b/language/sv_SE/common.lang.php @@ -48,7 +48,7 @@ $lang['Waiting page: %s'] = 'Väntar på sidan: %s'; $lang['Picture uploaded by %s'] = 'Bild upp laddad av %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'dålig status för användare \"gäst\", default status kommer används Vanligen meddela webmastern..'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Administratör, webmaster och speciell användare kan inte använda denna metod'; -$lang['a user use already this mail address'] = 'annan användare använder redan denna e-post'; +$lang['this email address is already in use'] = 'annan användare använder redan denna e-post'; $lang['Album results for'] = 'Kategori resultat för'; $lang['Tag results for'] = 'Tag Resultat för'; $lang['from %s to %s'] = 'från %s till %s'; @@ -125,7 +125,6 @@ $lang['Identification'] = 'Identifiering'; $lang['Image only RSS feed'] = 'Endast bilder RSS-flöde'; $lang['Keyword'] = 'sökord'; $lang['Links'] = 'sökord'; -$lang['Mail address'] = 'E-postadress'; $lang['%d waiting element'] = '%d avvaktar process'; $lang['%d waiting elements'] = '%d avvaktar processer'; $lang['New password confirmation does not correspond'] = 'Nytt lösenord matchar inte'; @@ -303,7 +302,6 @@ $lang['please enter your password again'] = 'Vanligen ange ditt lösenord igen'; $lang['Auto login'] = 'Automatisk inloggning'; $lang['remove this tag from the list'] = 'ta bort taggen från listan'; $lang['representative'] = 'representant'; -$lang['return to homepage'] = 'tillbaka till start sidan'; $lang['Search for Author'] = 'Sök efter en fotograf'; $lang['Search in albums'] = 'Sök i kategori'; $lang['Search by Date'] = 'Sök efter datum'; diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php index a45e99ed3..d6e212321 100644 --- a/language/tr_TR/common.lang.php +++ b/language/tr_TR/common.lang.php @@ -82,7 +82,6 @@ $lang['Identification'] = 'Kimlik'; $lang['Image only RSS feed'] = 'Yanlizca Resim - RSS'; $lang['Keyword'] = 'Anahtar Kelime'; $lang['Links'] = 'Bağlantılar'; -$lang['Mail address'] = 'Posta Adresi'; $lang['N/A'] = 'N/A'; $lang['New on %s'] = 'Yeni %s'; $lang['New password confirmation does not correspond'] = 'Parola dogrulama hatası'; @@ -281,7 +280,7 @@ $lang['Waiting page: %s'] = 'Beklenen Sayfa: %s'; $lang['Picture uploaded by %s'] = 'resimi Gönderen %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Kullanıcı için kötü statü "ziyaretçi", varsayılan statü kullanılıyor. Lütfen webmaster\'a bildirin'; $lang['Administrator, webmaster and special user cannot use this method'] = 'Yönetici, webmaster ve özel kullanıcı bu metodu kullanamaz'; -$lang['a user use already this mail address'] = 'bu e-posta adresi başka bir kullanıcı tarafından kullanılmaktadır.'; +$lang['this email address is already in use'] = 'bu e-posta adresi başka bir kullanıcı tarafından kullanılmaktadır.'; $lang['Album results for'] = 'Albüm sonuçları'; $lang['Tag results for'] = 'işaretleme sonuçları'; $lang['from %s to %s'] = 'şundan %s buna %s'; @@ -328,7 +327,6 @@ $lang['This author modified following comment:'] = 'bu yayımcı gönderdiği yo $lang['This author removed the comment with id %d'] = 'bu yayımcı id numarası %d olan yorumu silmiştir'; $lang['delete this comment'] = 'yorumu sil'; $lang['validate this comment'] = 'yorumu onayla'; -$lang['return to homepage'] = 'ana sayfaya dönüş'; $lang['Search for Author'] = 'yayımcı kullanıcı adıyla ara'; $lang['Search in albums'] = 'Albümlerde ara'; $lang['Search by Date'] = 'tarihe göre ara'; diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php index efb65a616..06e6e183e 100644 --- a/language/vi_VN/common.lang.php +++ b/language/vi_VN/common.lang.php @@ -83,7 +83,6 @@ $lang['Identification'] = 'Định danh'; $lang['Image only RSS feed'] = 'Chỉ hiện hình ảnh trên RSS feed';
$lang['Keyword'] = 'Từ khoá';
$lang['Links'] = 'Liên kết';
-$lang['Mail address'] = 'Địa chỉ mail';
$lang['N/A'] = 'Không có';
$lang['New on %s'] = 'hình mới ở %s';
$lang['New password confirmation does not correspond'] = 'Xác nhận mật khẩu mới không được phản hồi';
@@ -261,7 +260,6 @@ $lang['please enter your password again'] = 'vui lòng nhập lại mật khẩu $lang['Auto login'] = 'Tự động đăng nhập';
$lang['remove this tag from the list'] = 'bỏ tag này khỏi danh sách';
$lang['representative'] = 'đại diện';
-$lang['return to homepage'] = 'trở lại trang chủ';
$lang['Search for Author'] = 'Tìm kiếm theo tác giả';
$lang['Search in albums'] = 'Tìm kiếm trong các đề mục';
$lang['Search by Date'] = 'Tìm kiếm theo ngày tháng';
@@ -327,7 +325,7 @@ $lang['Picture uploaded by %s'] = 'Hình được gởi bởi %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status xấu đối với thành viên đăng thuộc nhóm "khách", sử dụng status mặc định. Thông báo ngay cho Quản trị';
// --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
$lang['Administrator, webmaster and special user cannot use this method'] = 'Quản trị viên và thành viên đặc biệt không thể sử dụng cách này';
-$lang['a user use already this mail address'] = 'đã có thành viên sử dụng địa chỉ email này';
+$lang['this email address is already in use'] = 'đã có thành viên sử dụng địa chỉ email này';
$lang['Album results for'] = 'Kết quả đề mục cho';
$lang['Tag results for'] = 'Kết quả tag cho';
$lang['from %s to %s'] = 'từ %s đến %s';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php index 779c608d1..06acc719d 100644 --- a/language/zh_CN/common.lang.php +++ b/language/zh_CN/common.lang.php @@ -84,7 +84,6 @@ $lang['Identification'] = '身份鉴别'; $lang['Image only RSS feed'] = '图片RSS'; $lang['Keyword'] = '关键字'; $lang['Links'] = '链接'; -$lang['Mail address'] = $lang['Email address']; $lang['N/A'] = '不存在'; $lang['New on %s'] = '新创于 %s'; $lang['New password confirmation does not correspond'] = '前后密码不一致'; @@ -262,7 +261,6 @@ $lang['please enter your password again'] = '请输入新密码'; $lang['Auto login'] = '自动连接'; $lang['remove this tag from the list'] = '删除此标签'; $lang['representative'] = '代理人'; -$lang['return to homepage'] = '返回首页'; $lang['Search for Author'] = '搜索上传者'; $lang['Search in albums'] = '在相册里搜索'; $lang['Search by Date'] = '通过日期查询'; @@ -328,7 +326,7 @@ $lang['Picture uploaded by %s'] = '图片上载者 %s'; $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = '如果游客反常拥有普通用户才拥有状态，请向网络管理员报告。'; // --------- Starting below: New or revised $lang ---- from Butterfly (2.0) $lang['Administrator, webmaster and special user cannot use this method'] = '管理员, 网管和特定用户不能使用此方法功能'; -$lang['a user use already this mail address'] = '邮箱地址已存在'; +$lang['this email address is already in use'] = '邮箱地址已存在'; $lang['Album results for'] = '相册的结果'; $lang['Tag results for'] = '符合查询标签结果'; $lang['from %s to %s'] = '从 %s 到 %s'; diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl index c7f6d446f..b827c3aa0 100644 --- a/themes/default/template/register.tpl +++ b/themes/default/template/register.tpl @@ -46,7 +46,7 @@ </li> <li> <span class="property"> - <label for="mail_address">{'Mail address'|@translate}</label> + <label for="mail_address">{'Email address'|@translate}</label> </span> <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" > ({'useful when password forgotten'|@translate}) |