From: Siebrand Mazeland Date: Tue, 10 Nov 2009 21:05:16 +0000 (+0100) Subject: Localisation updates from translatewiki.net (2009-11-10) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d9b9784b210c5d23084503d3e1761b1336b30ffa;p=quix0rs-gnu-social.git Localisation updates from translatewiki.net (2009-11-10) --- diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index 2821c4d839..a05e3245ca 100644 Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index f6b0cb3f2d..33844a4c76 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:47+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:41+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Неправилен размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -534,7 +534,7 @@ msgstr "Изрязване" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -634,7 +634,7 @@ msgstr "Не е указан профил." msgid "No profile with that ID." msgstr "Не е открит профил с такъв идентификатор." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Блокиране на потребителя" @@ -646,24 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Не" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Списък с потребителите в тази група." +msgid "Do not block this user" +msgstr "Разблокиране на този потребител" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Да" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Списък с потребителите в тази група." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Блокиране на потребителя" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1159,7 +1159,7 @@ msgstr "Не членувате в тази група." msgid "Block user from group" msgstr "Блокиране на потребителя" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1167,7 +1167,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Списък с потребителите в тази група." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Списък с потребителите в тази група." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1232,7 +1242,7 @@ msgstr "Лотого е обновено." msgid "Failed updating logo." msgstr "Неуспешно обновяване на логото." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1246,7 +1256,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "Списък с потребителите в тази група." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1254,10 +1264,6 @@ msgstr "" msgid "Block" msgstr "Блокиране" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Блокиране на потребителя" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1666,7 +1672,7 @@ msgid "Nickname" msgstr "Псевдоним" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Парола" @@ -1910,61 +1916,66 @@ msgstr "Това е изходящата ви кутия с лични съоб msgid "Change password" msgstr "Смяна на паролата" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Смяна на паролата" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Смяна на паролата." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Паролата е записана." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Стара парола" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Нова парола" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или повече знака" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потвърждаване" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "също като паролата по-горе" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Промяна" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Паролата трябва да е 6 или повече знака." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролите не съвпадат." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Грешна стара парола" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидност." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Паролата е записана." @@ -2403,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Е-поща" @@ -2633,7 +2644,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2686,7 +2697,7 @@ msgstr "Емисия с бележки на %s" msgid "FOAF for %s group" msgstr "Изходяща кутия за %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Членове" @@ -3335,40 +3346,40 @@ msgstr "Грешка в базата от данни — отговор при msgid "Welcome to %1$s, @%2$s!" msgstr "Съобщение до %1$s в %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Промяна настройките на профила" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Качване на аватар" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Смяна на паролата" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Промяна обработката на писмата" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Потребителски профил" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Друго" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Други настройки" @@ -3967,35 +3978,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Група" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блокиране" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Блокиране на потребителя" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редактиране настройките на групата %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Лого" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Добавяне или редактиране логото на %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Добавяне или редактиране логото на %s" @@ -4191,7 +4202,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4215,7 +4226,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4613,47 +4624,47 @@ msgstr "Изпращате на пряко съобщение до този по msgid "Message" msgstr "Съобщение" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index 49b67a1983..ac01d8ed92 100644 Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 25a572c8ca..11d83cad82 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:50+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:44+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -484,7 +484,7 @@ msgid "Invalid size." msgstr "Mida invàlida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -532,7 +532,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -636,7 +636,7 @@ msgstr "No s'ha especificat perfil." msgid "No profile with that ID." msgstr "No hi ha cap perfil amb aquesta ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Usuari bloquejat." @@ -648,24 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "La llista dels usuaris d'aquest grup." +msgid "Do not block this user" +msgstr "Desbloquejar aquest usuari" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sí" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "La llista dels usuaris d'aquest grup." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquejar aquest usuari" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1168,7 +1168,7 @@ msgstr "No ets membre d'aquest grup." msgid "Block user from group" msgstr "Usuari bloquejat." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1176,7 +1176,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "La llista dels usuaris d'aquest grup." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "La llista dels usuaris d'aquest grup." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1253,7 @@ msgstr "Logo actualitzat." msgid "Failed updating logo." msgstr "Error en actualitzar logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s membre/s en el grup" @@ -1257,7 +1267,7 @@ msgstr "%s membre/s en el grup, pàgina %d" msgid "A list of the users in this group." msgstr "La llista dels usuaris d'aquest grup." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1265,10 +1275,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquejar" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquejar aquest usuari" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1685,7 +1691,7 @@ msgid "Nickname" msgstr "Sobrenom" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contrasenya" @@ -1934,60 +1940,65 @@ msgstr "" msgid "Change password" msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Canviar la teva contrasenya" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Contrasenya canviada." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Antiga contrasenya" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasenya" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o més caràcters" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "repeteix la contrasenya anterior" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Canviar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Les contrasenyes no coincideixen." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contrasenya antiga incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invàlid." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasenya guardada." @@ -2433,7 +2444,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correu electrònic" @@ -2665,7 +2676,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s grup" @@ -2717,7 +2728,7 @@ msgstr "Feed d'avisos del grup %s" msgid "FOAF for %s group" msgstr "Safata de sortida per %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membres" @@ -3373,40 +3384,40 @@ msgstr "Error de BD en inserir resposta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Missatge per a %1$s a %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Canviar les preferències del teu perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Pujar un avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Canviar la teva contrasenya" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Canviar correu electrònic" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Perfil de l'usuari" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Altres" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Altres opcions" @@ -3998,35 +4009,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grup" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquejar" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Usuari bloquejat." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propietats del grup %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Afegir o editar logo %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Afegir o editar logo %s" @@ -4229,7 +4240,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4253,7 +4264,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4651,47 +4662,47 @@ msgstr "Enviar un missatge directe a aquest usuari" msgid "Message" msgstr "Missatge" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index f9cf40b2eb..275a5e3a30 100644 Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 096e495479..17a12027f6 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:53+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:47+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "Neplatná velikost" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Obrázek" @@ -531,7 +531,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -633,7 +633,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Žádný takový uživatel." @@ -646,23 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Nelze přesměrovat na server: %s" +msgid "Do not block this user" +msgstr "Žádný takový uživatel." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Žádný takový uživatel." #: actions/block.php:165 @@ -1153,7 +1154,7 @@ msgstr "Neodeslal jste nám profil" msgid "Block user from group" msgstr "Žádný takový uživatel." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1161,7 +1162,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Nelze přesměrovat na server: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Žádný takový uživatel." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1224,7 +1235,7 @@ msgstr "Obrázek nahrán" msgid "Failed updating logo." msgstr "Nahrávání obrázku selhalo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1238,7 +1249,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1246,11 +1257,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Žádný takový uživatel." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1631,7 +1637,7 @@ msgid "Nickname" msgstr "Přezdívka" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Heslo" @@ -1873,62 +1879,66 @@ msgstr "" msgid "Change password" msgstr "Změnit heslo" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Změnit heslo" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Heslo uloženo" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Staré heslo" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nové heslo" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 a více znaků" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Heslo znovu" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "stejné jako heslo výše" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Změnit" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Hesla nesouhlasí" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Neplatné heslo" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Chyba při ukládaní uživatele; neplatný" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Heslo uloženo" @@ -2367,7 +2377,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2582,7 +2592,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2636,7 +2646,7 @@ msgstr "Feed sdělení pro %s" msgid "FOAF for %s group" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Členem od" @@ -3280,41 +3290,41 @@ msgstr "Chyba v DB při vkládání odpovědi: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Nahrávání obrázku selhalo." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Uživatel nemá profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3914,36 +3924,36 @@ msgstr "Místo. Město, stát." msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Žádný takový uživatel." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Žádný takový uživatel." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Odhlásit" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4141,7 +4151,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4165,7 +4175,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4570,47 +4580,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index fa4ddeb8c6..9591afa0ba 100644 Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index d6c1f3fdb2..0cca46cb48 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:55+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:49+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -489,7 +489,7 @@ msgid "Invalid size." msgstr "Ungültige Größe." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -538,7 +538,7 @@ msgstr "Zuschneiden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -640,7 +640,7 @@ msgstr "Kein Profil angegeben." msgid "No profile with that ID." msgstr "Kein Benutzer-Profil mit dieser ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Benutzer blockieren" @@ -652,24 +652,25 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nein" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Liste der Benutzer in dieser Gruppe." +msgid "Do not block this user" +msgstr "Benutzer freigeben" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" -msgstr "Liste der Benutzer in dieser Gruppe." +msgid "Block this user" +msgstr "Benutzer blockieren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1172,7 +1173,7 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "Block user from group" msgstr "Benutzer blockieren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1180,7 +1181,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Liste der Benutzer in dieser Gruppe." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Liste der Benutzer in dieser Gruppe." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1246,7 +1257,7 @@ msgstr "Logo aktualisiert." msgid "Failed updating logo." msgstr "Aktualisierung des Logos fehlgeschlagen." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s Gruppen-Mitglieder" @@ -1260,7 +1271,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d" msgid "A list of the users in this group." msgstr "Liste der Benutzer in dieser Gruppe." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 #, fuzzy msgid "Admin" msgstr "Admin" @@ -1269,11 +1280,6 @@ msgstr "Admin" msgid "Block" msgstr "Blockieren" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Benutzer blockieren" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Nutzername" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passwort" @@ -1939,60 +1945,65 @@ msgstr "" msgid "Change password" msgstr "Passwort ändern" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Ändere dein Passwort" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Ändere dein Passwort." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Passwort geändert" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Altes Passwort" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Neues Passwort" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 oder mehr Zeichen" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bestätigen" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "Gleiches Passwort wie oben" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Ändern" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwörter stimmen nicht überein." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Altes Passwort falsch" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passwort gespeichert." @@ -2439,7 +2450,7 @@ msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-Mail" @@ -2675,7 +2686,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s Gruppe" @@ -2727,7 +2738,7 @@ msgstr "Nachrichtenfeed der Gruppe %s" msgid "FOAF for %s group" msgstr "Postausgang von %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Mitglieder" @@ -3384,40 +3395,40 @@ msgstr "Datenbankfehler beim Einfügen der Antwort: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Nachricht an %1$s auf %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Avatar hochladen" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Ändere dein Passwort" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Ändere die E-Mail Verarbeitung" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Benutzerprofil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Sonstige" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Sonstige Optionen" @@ -4016,36 +4027,36 @@ msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blockieren" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Benutzer blockieren" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, fuzzy, php-format msgid "Edit %s group properties" msgstr "%s Gruppeneinstellungen bearbeiten" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, fuzzy, php-format msgid "Add or edit %s logo" msgstr "%s Logo hinzufügen oder bearbeiten" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s Logo hinzufügen oder bearbeiten" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4684,47 +4695,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt" msgid "Message" msgstr "Nachricht" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index b7bd294470..72dc2ce585 100644 Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 5abc36274a..a7163a7620 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:58+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:52+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -478,7 +478,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "" @@ -527,7 +527,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -627,7 +627,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -639,21 +639,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1142,7 +1144,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1150,7 +1152,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1212,7 +1222,7 @@ msgstr "Αποσύνδεση" msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1226,7 +1236,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Διαχειριστής" @@ -1234,10 +1244,6 @@ msgstr "Διαχειριστής" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1607,7 +1613,7 @@ msgid "Nickname" msgstr "Ψευδώνυμο" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Κωδικός" @@ -1847,62 +1853,67 @@ msgstr "" msgid "Change password" msgstr "Αλλαγή κωδικού" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Αλλάξτε τον κωδικό σας" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Αλλαγή κωδικού" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Ο κωδικός αποθηκεύτηκε." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Νέος κωδικός" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ή περισσότεροι χαρακτήρες" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Επιβεβαίωση" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Αλλαγή" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Οι κωδικοί δεν ταυτίζονται." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Λάθος παλιός κωδικός" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Αδύνατη η αποθήκευση του νέου κωδικού" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Ο κωδικός αποθηκεύτηκε." @@ -2335,7 +2346,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2563,7 +2574,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2616,7 +2627,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Μέλος από" @@ -3239,40 +3250,40 @@ msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγω msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Αλλάξτε τον κωδικό σας" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3857,34 +3868,34 @@ msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Ομάδα" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Επεξεργασία ιδιοτήτων της ομάδας %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Λογότυπο" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s" @@ -4076,7 +4087,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4100,7 +4111,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4496,47 +4507,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index dfe476cb9a..b6dc8fa58d 100644 Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 71bcfd906b..384e60927c 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:02+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:54+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Invalid size." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -635,7 +635,7 @@ msgstr "No profile specified." msgid "No profile with that ID." msgstr "No profile with that ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Block user" @@ -647,24 +647,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "A list of the users in this group." +msgid "Do not block this user" +msgstr "Unblock this user" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Yes" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "A list of the users in this group." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Block this user" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1160,7 +1160,7 @@ msgstr "You are not a member of that group." msgid "Block user from group" msgstr "Block user" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1168,7 +1168,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "A list of the users in this group." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "A list of the users in this group." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1233,7 +1243,7 @@ msgstr "Logo updated." msgid "Failed updating logo." msgstr "Failed updating logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s group members" @@ -1247,7 +1257,7 @@ msgstr "%s group members, page %d" msgid "A list of the users in this group." msgstr "A list of the users in this group." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1255,10 +1265,6 @@ msgstr "Admin" msgid "Block" msgstr "Block" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Block this user" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1667,7 +1673,7 @@ msgid "Nickname" msgstr "Nickname" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Password" @@ -1911,60 +1917,65 @@ msgstr "This is your outbox, which lists private messages you have sent." msgid "Change password" msgstr "Change password" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Change your password" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Change your password." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Password change" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Old password" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "New password" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 or more characters" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirm" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "same as password above" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Change" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Password must be 6 or more characters." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwords don't match." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Incorrect old password" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Can't save new password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password saved." @@ -2403,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "Same as password above. Required." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2635,7 +2646,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s group" @@ -2687,7 +2698,7 @@ msgstr "Notice feed for %s group" msgid "FOAF for %s group" msgstr "Outbox for %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Members" @@ -3339,40 +3350,40 @@ msgstr "DB error inserting reply: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Message to %1$s on %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Change your profile settings" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Upload an avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Change your password" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Change e-mail handling" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "User profile" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Other" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Other options" @@ -3964,35 +3975,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Group" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Block" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Block user" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Edit %s group properties" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Add or edit %s logo" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Add or edit %s logo" @@ -4195,7 +4206,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4219,7 +4230,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4617,47 +4628,47 @@ msgstr "Send a direct message to this user" msgid "Message" msgstr "Message" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index a200a581ff..eda9105486 100644 Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index cd3cf31f49..d04d4f826f 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:05+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:57+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -637,7 +637,7 @@ msgstr "No se especificó perfil." msgid "No profile with that ID." msgstr "No existe perfil con ese ID" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuario." @@ -649,24 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Lista de los usuarios en este grupo." +msgid "Do not block this user" +msgstr "Desbloquear este usuario" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sí" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Lista de los usuarios en este grupo." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquear este usuario." #: actions/block.php:165 msgid "You have already blocked this user." @@ -1169,7 +1169,7 @@ msgstr "No eres miembro de ese grupo" msgid "Block user from group" msgstr "Bloquear usuario." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1177,7 +1177,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Lista de los usuarios en este grupo." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Lista de los usuarios en este grupo." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1244,7 +1254,7 @@ msgstr "SE actualizó logo." msgid "Failed updating logo." msgstr "Error al actualizar logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Miembros del grupo %s" @@ -1258,7 +1268,7 @@ msgstr "Miembros del grupo %s, página %d" msgid "A list of the users in this group." msgstr "Lista de los usuarios en este grupo." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1266,10 +1276,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquear este usuario." - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1687,7 +1693,7 @@ msgid "Nickname" msgstr "Apodo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contraseña" @@ -1938,62 +1944,67 @@ msgstr "" msgid "Change password" msgstr "Cambiar contraseña" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Cambia tu contraseña" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Cambia tu contraseña." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Cambio de contraseña " -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Antigua contraseña" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nueva contraseña" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o más caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "repita la contraseña anterior" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Cotrnaseña debe tener 6 o más caracteres." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Las contraseñas no coinciden" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contraseña antigua incorrecta." -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Se guardó Contraseña." @@ -2443,7 +2454,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correo electrónico" @@ -2677,7 +2688,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Grupo %s" @@ -2731,7 +2742,7 @@ msgstr "Feed de avisos de grupo %s" msgid "FOAF for %s group" msgstr "Bandeja de salida para %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Miembros" @@ -3396,39 +3407,39 @@ msgstr "Error de BD al insertar respuesta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaje a %1$s en %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Cargar un avatar." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Cambia tu contraseña" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Cambiar el manejo del correo." -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Diseñar tu perfil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Otro" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Otras opciones" @@ -4019,34 +4030,34 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Bloqueado" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "usuarios bloqueados" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propiedades del grupo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Agregar o editar el logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Agregar o editar el diseño de %s" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4675,47 +4686,47 @@ msgstr "Enviar un mensaje directo a este usuario" msgid "Message" msgstr "Mensaje" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index f8bf4c211a..61946bd6a9 100644 Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 021c423d95..8202cd4f41 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -12,21 +12,20 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:08+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:00+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Tuota tagia ei ole." +msgstr "Sivua ei ole." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -167,9 +166,9 @@ msgid "No message text!" msgstr "Viestissä ei ole tekstiä!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on 140 merkkiä." +msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -181,7 +180,7 @@ msgstr "" "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" msgstr "Suorat viestit käyttäjälle %s" @@ -206,7 +205,6 @@ msgid "No status found with that ID." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" msgstr "Tämä päivitys on jo suosikki!" @@ -215,7 +213,6 @@ msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" msgstr "Tämä päivitys ei ole suosikki!" @@ -233,13 +230,12 @@ msgid "Could not follow user: %s is already on your list." msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi" #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt." +msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Et voi lopettaa itsesi tilausta!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -315,7 +311,7 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Liikaa aliaksia. Maksimimäärä on %d." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 @@ -332,16 +328,15 @@ msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "Alias ei voi olla sama kuin ryhmätunnus." #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Sinä kuulut jo tähän ryhmään " +msgstr "Sinä kuulut jo tähän ryhmään." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." #: actions/apigroupjoin.php:138 #, fuzzy, php-format @@ -349,12 +344,11 @@ msgid "Could not join user %s to group %s." msgstr "Käyttäjää %s ei voinut liittää ryhmään %s" #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" @@ -369,7 +363,7 @@ msgid "groups on %s" msgstr "Ryhmän toiminnot" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" msgstr "Käyttäjän %s ryhmät" @@ -387,9 +381,8 @@ msgid "You may not delete another user's status." msgstr "Et voi poistaa toisen käyttäjän päivitystä." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Kuva poistettu." +msgstr "Päivitys poistettu." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -397,9 +390,9 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apistatusesupdate.php:152 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "Päivitys on liian pitkä. Maksimipituus on 140 merkkiä." +msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." #: actions/apistatusesupdate.php:193 msgid "Not found" @@ -408,12 +401,11 @@ msgstr "Ei löytynyt" #: actions/apistatusesupdate.php:216 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Kuvatiedoston formaattia ei ole tuettu." +msgstr "Formaattia ei ole tuettu." #: actions/apitimelinefavorites.php:107 #, php-format @@ -489,7 +481,7 @@ msgid "Invalid size." msgstr "Koko ei kelpaa." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Kuva" @@ -537,7 +529,7 @@ msgstr "Rajaa" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -605,9 +597,8 @@ msgid "A list of the users blocked from joining this group." msgstr "Lista ryhmän käyttäjistä." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Käyttäjän eston poisto epäonnistui." +msgstr "Poista käyttäjän esto ryhmästä" #: actions/blockedfromgroup.php:313 lib/unblockform.php:150 msgid "Unblock" @@ -638,7 +629,7 @@ msgstr "Profiilia ei ole määritelty." msgid "No profile with that ID." msgstr "Ei profiilia tuolle ID:lle." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Estä käyttäjä" @@ -650,23 +641,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Ei" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Älä estä tätä käyttäjää tästä ryhmästä" +#, fuzzy +msgid "Do not block this user" +msgstr "Poista esto tältä käyttäjältä" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Kyllä" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Lista ryhmän käyttäjistä." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Estä tämä käyttäjä" #: actions/block.php:165 msgid "You have already blocked this user." @@ -802,9 +794,9 @@ msgid "Use this form to edit the group." msgstr "Käytä tätä lomaketta muokataksesi ryhmää." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "kuvaus on liian pitkä (max 140 merkkiä)." +msgstr "kuvaus on liian pitkä (max %d merkkiä)." #: actions/editgroup.php:253 msgid "Could not update group." @@ -1069,22 +1061,20 @@ msgid "A selection of some of the great users on %s" msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "Uusi päivitys" +msgstr "Ei päivitystä id-tunnusta" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "Uusi päivitys" +msgstr "Ei päivitystä" #: actions/file.php:42 msgid "No attachments" -msgstr "" +msgstr "Ei liitteitä" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "Ei ladattuja liitteitä" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1104,9 +1094,8 @@ msgid "That user has blocked you from subscribing." msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Ei valtuutusta." +msgstr "Sinulla ei ole valtuutusta tähän." #: actions/finishremotesubscribe.php:109 #, fuzzy @@ -1129,20 +1118,17 @@ msgid "No such group." msgstr "Tuota ryhmää ei ole." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Päivitystä ei ole." +msgstr "Tiedostoa ei ole." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "Tiedosto hävisi." +msgstr "Tiedostoa ei voi lukea." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 -#, fuzzy msgid "No group specified." -msgstr "Profiilia ei ole määritelty." +msgstr "Ryhmää ei ole määritelty." #: actions/groupblock.php:91 msgid "Only an admin can block group members." @@ -1163,7 +1149,7 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Block user from group" msgstr "Estä käyttäjä" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1171,7 +1157,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Älä estä tätä käyttäjää tästä ryhmästä" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1180,9 +1174,9 @@ msgid "No ID" msgstr "ID-tunnusta ei ole" #: actions/groupdesignsettings.php:68 -#, fuzzy msgid "You must be logged in to edit a group." -msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän." +msgstr "" +"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." #: actions/groupdesignsettings.php:141 #, fuzzy @@ -1235,7 +1229,7 @@ msgstr "Logo päivitetty." msgid "Failed updating logo." msgstr "Logon päivittäminen epäonnistui." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Ryhmän %s jäsenet" @@ -1249,7 +1243,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d" msgid "A list of the users in this group." msgstr "Lista ryhmän käyttäjistä." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Ylläpito" @@ -1257,14 +1251,9 @@ msgstr "Ylläpito" msgid "Block" msgstr "Estä" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Estä tämä käyttäjä" - #: actions/groupmembers.php:441 -#, fuzzy msgid "Make user an admin of the group" -msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää" +msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/groupmembers.php:473 #, fuzzy @@ -1273,7 +1262,7 @@ msgstr "Ylläpito" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1296,9 +1285,8 @@ msgstr "Ryhmähaku" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "Ei hakutuloksia" +msgstr "Ei tuloksia" #: actions/groupsearch.php:82 #, php-format @@ -1340,7 +1328,7 @@ msgstr "Luo uusi ryhmä" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä." #: actions/groupunblock.php:95 #, fuzzy @@ -1676,7 +1664,7 @@ msgid "Nickname" msgstr "Tunnus" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Salasana" @@ -1766,9 +1754,8 @@ msgid "" msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi." #: actions/newmessage.php:181 -#, fuzzy msgid "Message sent" -msgstr "Viesti" +msgstr "Viesti lähetetty" #: actions/newmessage.php:185 lib/command.php:375 #, php-format @@ -1860,7 +1847,7 @@ msgstr "Yhdistä" #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Vain " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 #: lib/api.php:991 lib/api.php:1101 @@ -1885,7 +1872,7 @@ msgstr "Hallinnoi muita asetuksia." #: actions/othersettings.php:117 msgid "Shorten URLs with" -msgstr "" +msgstr "Lyhennä URL-osoitteita" #: actions/othersettings.php:118 msgid "Automatic shortening service to use." @@ -1922,60 +1909,65 @@ msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit." msgid "Change password" msgstr "Vaihda salasana" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Vaihda salasanasi" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Vaihda salasanasi." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Salasanan vaihto" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Vanha salasana" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Uusi salasana" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 tai useampia merkkejä" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Vahvista" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "sama salasana kuin yllä" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Vaihda" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Salasanat eivät täsmää." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Väärä vanha salasana" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Salasana tallennettu." @@ -2049,14 +2041,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite." #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä" +msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Kuvaile itseäsi ja" +msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2282,7 +2273,7 @@ msgstr "" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Käyttäjätunnus tai sähköpostiosoite" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2421,7 +2412,7 @@ msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Sähköposti" @@ -2661,7 +2652,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Ryhmä %s" @@ -2713,7 +2704,7 @@ msgstr "Päivityssyöte ryhmälle %s" msgid "FOAF for %s group" msgstr "Käyttäjän %s lähetetyt viestit" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Jäsenet" @@ -3364,40 +3355,40 @@ msgstr "Tietokantavirhe tallennettaessa vastausta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Lataa kuva" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Vaihda salasanasi" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Muuta sähköpostin käsittelyasetuksia." -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Käyttäjän profiili" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Muut" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Muita asetuksia" @@ -3990,35 +3981,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Ryhmä" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Estä" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Estä käyttäjä" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Muokkaa %s ryhmän ominaisuuksia" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Lisää ryhmälle %s logo tai muokkaa sitä " -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Lisää ryhmälle %s logo tai muokkaa sitä " @@ -4225,7 +4216,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4249,7 +4240,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4647,47 +4638,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle" msgid "Message" msgstr "Viesti" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index ca1b457b1e..59b7812fc4 100644 Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index a31cc3e037..7507e44dbe 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:10+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:03+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "Taille incorrecte." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -530,7 +530,7 @@ msgstr "Recadrer" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "Aucun profil n'a été spécifié." msgid "No profile with that ID." msgstr "Aucun profil ne correspond à cet identifiant." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquer cet utilisateur" @@ -646,24 +646,24 @@ msgstr "" "vous ne serez pas informé des @-réponses de sa part." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Non" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgid "Do not block this user" +msgstr "Débloquer cet utilisateur" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Oui" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquer cet utilisateur " #: actions/block.php:165 msgid "You have already blocked this user." @@ -1157,7 +1157,7 @@ msgstr "L'utilisateur n'est pas membre du groupe." msgid "Block user from group" msgstr "Bloquer cet utilisateur du groupe" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1165,7 +1165,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Liste des utilisateurs inscrits à ce groupe." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Liste des utilisateurs inscrits à ce groupe." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1229,7 +1239,7 @@ msgstr "Logo mis à jour." msgid "Failed updating logo." msgstr "La mise à jour du logo a échoué." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Membres du groupe %s" @@ -1243,7 +1253,7 @@ msgstr "Membres du groupe %s - page %d" msgid "A list of the users in this group." msgstr "Liste des utilisateurs inscrits à ce groupe." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrer" @@ -1251,10 +1261,6 @@ msgstr "Administrer" msgid "Block" msgstr "Bloquer" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquer cet utilisateur " - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" @@ -1673,7 +1679,7 @@ msgid "Nickname" msgstr "Pseudo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Mot de passe" @@ -1920,60 +1926,65 @@ msgstr "" msgid "Change password" msgstr "Modifier le mot de passe" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modifier votre mot de passe" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Modifier votre mot de passe." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Modification du mot de passe" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Ancien mot de passe" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nouveau mot de passe" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 caractères ou plus" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmer" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "identique au mot de passe ci-dessus" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modifier" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Votre mot de passe doit contenir au moins 6 caractères." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Ancien mot de passe incorrect" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Mot de passe enregistré." @@ -2426,7 +2437,7 @@ msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Courriel" @@ -2662,7 +2673,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Groupe %s" @@ -2714,7 +2725,7 @@ msgstr "Fil des statuts du groupe %s" msgid "FOAF for %s group" msgstr "Boîte d'envoi de %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membres" @@ -3365,39 +3376,39 @@ msgstr "Erreur de base de donnée en insérant la réponse :%s" msgid "Welcome to %1$s, @%2$s!" msgstr "Message adressé à %1$s le %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Ajouter un avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modifier votre mot de passe" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Modifier le traitement des courriels" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Conception" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Concevez votre profile" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Autres " -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Autres options " @@ -3993,34 +4004,34 @@ msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Groupe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Bloqué" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s utilisateurs bloqués" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Modifier les propriétés du groupe %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Ajouter ou modifier le logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Ajouter ou modifier la conception de %s" @@ -4237,7 +4248,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4261,7 +4272,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4666,47 +4677,47 @@ msgstr "Envoyer un message à cet utilisateur" msgid "Message" msgstr "Message " -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "il y a quelques secondes " -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index e419f3b44f..bf827fd681 100644 Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 0433383fe1..294ef6f949 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:13+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:05+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -536,7 +536,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -638,7 +638,7 @@ msgstr "Non se especificou ningún perfil." msgid "No profile with that ID." msgstr "Non se atopou un perfil con ese ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuario" @@ -653,22 +653,25 @@ msgstr "" "ser notificado de ningunha resposta-@ del." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Bloquear usuario" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Si" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +#, fuzzy +msgid "Block this user" +msgstr "Bloquear usuario" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1171,7 +1174,7 @@ msgstr "%1s non é unha orixe fiable." msgid "Block user from group" msgstr "Bloquear usuario" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, fuzzy, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1182,7 +1185,15 @@ msgstr "" "do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " "ser notificado de ningunha resposta-@ del." -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1247,7 +1258,7 @@ msgstr "Avatar actualizado." msgid "Failed updating logo." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1261,7 +1272,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1269,11 +1280,6 @@ msgstr "" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Bloquear usuario" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1686,7 +1692,7 @@ msgid "Nickname" msgstr "Alcume" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contrasinal" @@ -1933,62 +1939,67 @@ msgstr "" msgid "Change password" msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Cambiar contrasinal" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Contrasinal gardada." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Contrasinal antiga" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasinal" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ou máis caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "igual á contrasinal de enriba" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modificado" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "As contrasinais non coinciden" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contrasinal actual incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasinal gardada." @@ -2445,7 +2456,7 @@ msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correo Electrónico" @@ -2678,7 +2689,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2733,7 +2744,7 @@ msgstr "Fonte de chíos para %s" msgid "FOAF for %s group" msgstr "Band. Saída para %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro dende" @@ -3401,41 +3412,41 @@ msgstr "Erro ó inserir a contestación na BD: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Configuración de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Acounteceu un fallo ó actualizar o avatar." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Cambiar contrasinal" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Cambiar a xestión de email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "O usuario non ten perfil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Outros" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Outras opcions" @@ -4072,36 +4083,36 @@ msgstr "¿Onde estas, coma \"Cidade, Provincia, País\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Bloquear usuario" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Sair" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4320,7 +4331,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4344,7 +4355,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4772,47 +4783,47 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "Message" msgstr "Nova mensaxe" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index 700f4c5ce9..faaf5f29bf 100644 Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 7c043a5b3f..902e4a5c08 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:16+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:08+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "גודל לא חוקי." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "תמונה" @@ -532,7 +532,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -634,7 +634,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "אין משתמש כזה." @@ -647,23 +647,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "לא" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "נכשלה ההפניה לשרת: %s" +msgid "Do not block this user" +msgstr "אין משתמש כזה." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "כן" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "אין משתמש כזה." #: actions/block.php:165 @@ -1155,7 +1156,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Block user from group" msgstr "אין משתמש כזה." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1164,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "נכשלה ההפניה לשרת: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "אין משתמש כזה." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1227,7 +1238,7 @@ msgstr "התמונה עודכנה." msgid "Failed updating logo." msgstr "עדכון התמונה נכשל." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1241,7 +1252,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1249,11 +1260,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "אין משתמש כזה." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1634,7 +1640,7 @@ msgid "Nickname" msgstr "כינוי" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "סיסמה" @@ -1876,62 +1882,66 @@ msgstr "" msgid "Change password" msgstr "שנה סיסמה" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "שנה סיסמה" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "הסיסמה נשמרה." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "סיסמה ישנה" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "סיסמה חדשה" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "לפחות 6 אותיות" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "אשר" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "זהה לסיסמה למעלה" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "שנה" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "הסיסמאות לא תואמות." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "הסיסמה הישנה לא נכונה" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "לא ניתן לשמור את הסיסמה" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "הסיסמה נשמרה." @@ -2366,7 +2376,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "" @@ -2578,7 +2588,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2632,7 +2642,7 @@ msgstr "הזנת הודעות של %s" msgid "FOAF for %s group" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "חבר מאז" @@ -3274,41 +3284,41 @@ msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "עדכון התמונה נכשל." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "למשתמש אין פרופיל." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3908,36 +3918,36 @@ msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "אין משתמש כזה." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "אין משתמש כזה." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "צא" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4133,7 +4143,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4157,7 +4167,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4565,47 +4575,47 @@ msgstr "" msgid "Message" msgstr "הודעה חדשה" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index f1850515b6..eaf63735e3 100644 Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c4fad2f35a..c0bef7ddf2 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:18+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:10+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -474,7 +474,7 @@ msgid "Invalid size." msgstr "Ótæk stærð." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Mynd" @@ -522,7 +522,7 @@ msgstr "Skera af" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -620,7 +620,7 @@ msgstr "Engin persónuleg síða tilgreind" msgid "No profile with that ID." msgstr "Engin persónulega síða með þessu einkenni" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Loka á notanda" @@ -632,22 +632,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nei" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Opna á þennan notanda" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Já" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Loka á þennan notanda" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1132,7 +1134,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1140,7 +1142,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1199,7 +1209,7 @@ msgstr "Einkennismynd uppfærð." msgid "Failed updating logo." msgstr "Tókst ekki að uppfæra einkennismynd" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Hópmeðlimir %s" @@ -1213,7 +1223,7 @@ msgstr "Hópmeðlimir %s, síða %d" msgid "A list of the users in this group." msgstr "Listi yfir notendur í þessum hóp." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Stjórnandi" @@ -1221,10 +1231,6 @@ msgstr "Stjórnandi" msgid "Block" msgstr "Loka" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Loka á þennan notanda" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1632,7 +1638,7 @@ msgid "Nickname" msgstr "Stuttnefni" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Lykilorð" @@ -1879,60 +1885,65 @@ msgstr "" msgid "Change password" msgstr "Breyta lykilorði" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Breyta lykilorðinu þínu" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Breyta lykilorðinu þínu." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Lykilorðabreyting" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Eldra lykilorð" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nýtt lykilorð" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eða fleiri tákn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Staðfesta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "sama og lykilorðið hér fyrir ofan" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Breyta" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Lykilorðin passa ekki saman." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Rangt eldra lykilorð" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Villa kom upp í vistun notanda: ótækt." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lykilorð vistað." @@ -2373,7 +2384,7 @@ msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Tölvupóstur" @@ -2605,7 +2616,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s hópurinn" @@ -2657,7 +2668,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "%s hópurinn" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Meðlimir" @@ -3293,39 +3304,39 @@ msgstr "Gagnagrunnsvilla við innsetningu svars: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg síða" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þínum" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Hlaða upp einkennismynd" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Breyta lykilorðinu þínu" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Breyta tölvupóstumsjón" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Annað" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Aðrir valkostir" @@ -3911,34 +3922,34 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Hópur" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Breyta hópstillingum %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Einkennismerki" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Bæta við eða breyta einkennismerki %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4136,7 +4147,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4160,7 +4171,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4553,47 +4564,47 @@ msgstr "Senda bein skilaboð til þessa notanda" msgid "Message" msgstr "Skilaboð" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index 29a83753a1..1e33d6b95d 100644 Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index e1ce3066de..06a8a0a125 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:21+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:13+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "Dimensione non valida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Immagine" @@ -531,7 +531,7 @@ msgstr "Ritaglia" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "Nessun profilo specificato." msgid "No profile with that ID." msgstr "Nessun profilo con quel ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Blocca utente" @@ -643,24 +643,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +msgid "Do not block this user" +msgstr "Sblocca questo utente" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sì" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Blocca questo utente" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1161,7 +1161,7 @@ msgstr "Non sei un membro di quel gruppo." msgid "Block user from group" msgstr "Blocca utente" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1169,7 +1169,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Un elenco degli utenti in questo gruppo." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Un elenco degli utenti in questo gruppo." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1234,7 +1244,7 @@ msgstr "Logo aggiornato." msgid "Failed updating logo." msgstr "Errore nell'aggiornare il logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Membri del gruppo %s" @@ -1248,7 +1258,7 @@ msgstr "Membri del gruppo %s, pagina %d" msgid "A list of the users in this group." msgstr "Un elenco degli utenti in questo gruppo." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Amministra" @@ -1256,10 +1266,6 @@ msgstr "Amministra" msgid "Block" msgstr "Blocca" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Blocca questo utente" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1673,7 +1679,7 @@ msgid "Nickname" msgstr "Soprannome" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Password" @@ -1919,60 +1925,65 @@ msgstr "" msgid "Change password" msgstr "Modifica password" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modifica la tua password" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Modifica la tua password." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Cambio password" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Vecchia password" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nuova password" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o più caratteri" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Conferma" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "stessa password di sopra" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modifica" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La password deve essere di 6 o più caratteri." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Le password non corrispondono." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Vecchia password non corretta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password salvata." @@ -2416,7 +2427,7 @@ msgid "Same as password above. Required." msgstr "Stessa password di sopra. Richiesta." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2649,7 +2660,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Gruppi di %s" @@ -2701,7 +2712,7 @@ msgstr "Feed dei messaggi per il gruppo %s" msgid "FOAF for %s group" msgstr "Casella posta inviata di %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membri" @@ -3353,40 +3364,40 @@ msgstr "Errore del DB nell'inserire la risposta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Messaggio a %1$s su %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Carica un'immagine" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modifica la tua password" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Modifica la gestione dell'email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Profilo utente" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Altro" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Altre opzioni" @@ -3977,35 +3988,35 @@ msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blocca" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Blocca utente" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Modifica le proprietà del gruppo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Aggiungi o modifica il logo di %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Aggiungi o modifica il logo di %s" @@ -4208,7 +4219,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4232,7 +4243,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4630,47 +4641,47 @@ msgstr "Invia un messaggio diretto a questo utente" msgid "Message" msgstr "Messaggio" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index c0931726bb..9bbc582ac1 100644 Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 409d64b0ac..fd22e5177c 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:23+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:16+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -485,7 +485,7 @@ msgid "Invalid size." msgstr "不正なサイズ。" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "アバター" @@ -534,7 +534,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -635,7 +635,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "そのようなユーザはいません。" @@ -648,23 +648,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "サーバへリダイレクトできません : %s" +msgid "Do not block this user" +msgstr "このユーザをアンブロックする" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "このユーザをブロックする" #: actions/block.php:165 @@ -1160,7 +1160,7 @@ msgstr "そのプロファイルは送信されていません。" msgid "Block user from group" msgstr "そのようなユーザはいません。" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1168,7 +1168,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "サーバへリダイレクトできません : %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "このユーザをブロックする" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1231,7 +1241,7 @@ msgstr "アバターが更新されました。" msgid "Failed updating logo." msgstr "アバターの更新に失敗しました。" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1245,7 +1255,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "管理者" @@ -1253,10 +1263,6 @@ msgstr "管理者" msgid "Block" msgstr "ブロック" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "このユーザをブロックする" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1662,7 +1668,7 @@ msgid "Nickname" msgstr "ニックネーム" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "パスワード" @@ -1900,62 +1906,67 @@ msgstr "" msgid "Change password" msgstr "パスワードの変更" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "パスワードの変更" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "パスワードの変更" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "パスワードが保存されました。" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "古いパスワード" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新しいパスワード" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6文字以上" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確認" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "上のパスワードと同じ" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "変更" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "パスワードが一致しません。" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "古いパスワードが間違っています。" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "ユーザ保存エラー; 不正なユーザ" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "新しいパスワードを保存できません。" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "パスワードが保存されました。" @@ -2392,7 +2403,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "メール" @@ -2622,7 +2633,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2676,7 +2687,7 @@ msgstr "%sの通知フィード" msgid "FOAF for %s group" msgstr "%sの通知フィード" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "からのメンバー" @@ -3312,40 +3323,40 @@ msgstr "返信を追加する際にデータベースエラー : %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "プロファイル" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "プロファイル設定の変更" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "アバターのアップロード" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "パスワードの変更" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "メールの扱いを変更" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "プロファイルがありません。" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "その他" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "その他のオプション" @@ -3940,35 +3951,35 @@ msgstr "いる場所, 例えば \"City, State (or Region), Country\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "グループ" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "ブロック" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "そのようなユーザはいません。" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "%s グループプロパティを編集" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "ロゴ" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "%s ロゴの追加や編集" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s ロゴの追加や編集" @@ -4161,7 +4172,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4185,7 +4196,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4585,47 +4596,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index bb916d3562..b2e5f3d923 100644 Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 1c8b2350bb..f521a9f095 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:26+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:19+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "옳지 않은 크기" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "아바타" @@ -531,7 +531,7 @@ msgstr "자르기" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "프로필을 지정하지 않았습니다." msgid "No profile with that ID." msgstr "해당 ID의 프로필이 없습니다." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "사용자를 차단합니다." @@ -643,24 +643,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "아니오" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "이 그룹의 회원리스트" +msgid "Do not block this user" +msgstr "이 사용자를 차단해제합니다." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "네, 맞습니다." -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "이 그룹의 회원리스트" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "이 사용자 차단하기" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1155,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Block user from group" msgstr "사용자를 차단합니다." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1163,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "이 그룹의 회원리스트" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "이 그룹의 회원리스트" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1228,7 +1238,7 @@ msgstr "로고를 업데이트했습니다." msgid "Failed updating logo." msgstr "로고 업데이트에 실패했습니다." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s 그룹 회원" @@ -1242,7 +1252,7 @@ msgstr "%s 그룹 회원, %d페이지" msgid "A list of the users in this group." msgstr "이 그룹의 회원리스트" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "관리자" @@ -1250,10 +1260,6 @@ msgstr "관리자" msgid "Block" msgstr "차단하기" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "이 사용자 차단하기" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1655,7 +1661,7 @@ msgid "Nickname" msgstr "별명" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "비밀 번호" @@ -1898,60 +1904,65 @@ msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비 msgid "Change password" msgstr "비밀번호 바꾸기" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "비밀번호 바꾸기" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "비밀번호를 변경하세요." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "비밀번호 변경" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "기존 비밀 번호" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "새로운 비밀 번호" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6글자 이상" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "인증" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "위 비밀번호와 동일하게" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "변환" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "비밀번호는 6자리 이상이어야 합니다." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "비밀 번호가 일치하지 않습니다." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "기존 비밀 번호가 틀렸습니다" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "사용자 저장 오류; 무효한 사용자" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "새 비밀번호를 저장 할 수 없습니다." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "비밀 번호 저장" @@ -2390,7 +2401,7 @@ msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "이메일" @@ -2620,7 +2631,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s 그룹" @@ -2672,7 +2683,7 @@ msgstr "%s 그룹을 위한 공지피드" msgid "FOAF for %s group" msgstr "%s의 보낸쪽지함" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "회원" @@ -3318,40 +3329,40 @@ msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "아바타를 업로드하세요." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "비밀번호 바꾸기" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "이메일 처리 변경" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "이용자 프로필" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "기타" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "다른 옵션들" @@ -3942,35 +3953,35 @@ msgstr "그룹의 위치, \"시/군/구, 도, 나라\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "그룹" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "차단하기" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "사용자를 차단합니다." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "%s 그룹 속성 편집" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "로고" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "%s logo 추가 혹은 수정" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s logo 추가 혹은 수정" @@ -4165,7 +4176,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4189,7 +4200,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4587,47 +4598,47 @@ msgstr "이 회원에게 직접 메시지를 보냅니다." msgid "Message" msgstr "메시지" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index 37f92cabd6..3914f339c9 100644 Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 558b936d84..91f7eaebef 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:29+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:21+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "Погрешна големина." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -532,7 +532,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -633,7 +633,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Нема таков корисник." @@ -646,23 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Не може да се пренасочи кон серверот: %s" +msgid "Do not block this user" +msgstr "Нема таков корисник." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Нема таков корисник." #: actions/block.php:165 @@ -1153,7 +1154,7 @@ msgstr "Не ни го испративте тој профил." msgid "Block user from group" msgstr "Нема таков корисник." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1161,7 +1162,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Не може да се пренасочи кон серверот: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Нема таков корисник." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1224,7 +1235,7 @@ msgstr "Аватарот е ажуриран." msgid "Failed updating logo." msgstr "Товарањето на аватарот не успеа." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1238,7 +1249,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1246,11 +1257,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Нема таков корисник." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1632,7 +1638,7 @@ msgid "Nickname" msgstr "Прекар" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Лозинка" @@ -1876,62 +1882,66 @@ msgstr "" msgid "Change password" msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Лозинката е снимена." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Стара лозинка" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Нова лозинка" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или повеќе знаци" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потврди" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "исто како лозинката погоре" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Промени" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Лозинките не се совпаѓаат." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Неточна стара лозинка" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Грешка во снимањето на корисникот; неправилен." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Новата лозинка не може да се сними" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Лозинката е снимена." @@ -2372,7 +2382,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Е-пошта" @@ -2588,7 +2598,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2642,7 +2652,7 @@ msgstr "Канал со известувања на %s" msgid "FOAF for %s group" msgstr "Канал со известувања на %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Член од" @@ -3285,41 +3295,41 @@ msgstr "Одговор од внесот во базата: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Товарањето на аватарот не успеа." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Корисникот нема профил." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3919,36 +3929,36 @@ msgstr "Каде се наоѓате, на пр. „Град, Држава“." msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Нема таков корисник." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Нема таков корисник." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Одјави се" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4145,7 +4155,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4169,7 +4179,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4573,47 +4583,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "пред %d месеци" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index 48b0d829e7..80e30b11f4 100644 Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index f744e82733..fa895ce1c0 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:31+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:24+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Ugyldig størrelse" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Brukerbilde" @@ -536,7 +536,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -636,7 +636,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -648,21 +648,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Kan ikke slette notisen." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1150,7 +1152,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1158,7 +1160,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1229,7 @@ msgstr "Avataren har blitt oppdatert." msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1233,7 +1243,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1241,10 +1251,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1634,7 +1640,7 @@ msgid "Nickname" msgstr "Nick" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passord" @@ -1869,62 +1875,67 @@ msgstr "" msgid "Change password" msgstr "Endre passord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Endre passordet ditt" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Endre passord" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Passordet ble lagret" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gammelt passord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eller flere tegn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekreft" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Endre" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Feil gammelt passord" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarer ikke å lagre nytt passord." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passordet ble lagret" @@ -2356,7 +2367,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-post" @@ -2581,7 +2592,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2634,7 +2645,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Klarte ikke å lagre profil." -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Medlem siden" @@ -3258,40 +3269,40 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Endre passordet ditt" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Endre eposthåndtering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Klarte ikke å lagre profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3881,35 +3892,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logg ut" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4107,7 +4118,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4131,7 +4142,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4531,47 +4542,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index ef46506ae1..74e52e10d1 100644 Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index e979675fbc..42b7768097 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -1,17 +1,18 @@ # Translation of StatusNet to Dutch # +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Siebrand # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:37+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:29+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -83,7 +84,7 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" -"Probeer te abonneren op meer gebruikers, [wordt lid van een groep](%%action." +"Probeer te abonneren op meer gebruikers, [word lid van een groep](%%action." "groups%%) of plaats zelf berichten." #: actions/all.php:134 @@ -92,6 +93,9 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een " +"bericht aan die gebruiker richten](%%%%action.newnotice%%%%?status_textarea=%" +"s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -485,7 +489,7 @@ msgid "Invalid size." msgstr "Ongeldige afmetingen." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -534,7 +538,7 @@ msgstr "Uitsnijden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -633,7 +637,7 @@ msgstr "Er is geen profiel opgegeven." msgid "No profile with that ID." msgstr "Er is geen profiel met dat ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Gebruiker blokkeren" @@ -645,22 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nee" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen" +#, fuzzy +msgid "Do not block this user" +msgstr "Deblokkeer deze gebruiker." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "Deze gebruiker de toegang tot deze groep ontzeggen" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Deze gebruiker blokkeren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1012,6 +1018,8 @@ msgstr "De meest populaire mededelingen op de site op dit moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favoriete mededelingen zijn te zien op deze pagina, maar er zijn nog geen " +"favoriete mededelingen." #: actions/favorited.php:153 msgid "" @@ -1150,7 +1158,7 @@ msgstr "De gebruiker is geen lid van de groep." msgid "Block user from group" msgstr "Gebruiker toegang tot de groep blokkeren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1158,7 +1166,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Deze gebruiker de toegang tot deze groep ontzeggen" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de " @@ -1221,7 +1237,7 @@ msgstr "Logo geactualiseerd." msgid "Failed updating logo." msgstr "Het bijwerken van het logo is mislukt." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "leden van de groep %s" @@ -1235,7 +1251,7 @@ msgstr "% groeps leden, pagina %d" msgid "A list of the users in this group." msgstr "Ledenlijst van deze groep" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Beheerder" @@ -1243,10 +1259,6 @@ msgstr "Beheerder" msgid "Block" msgstr "Blokkeren" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Deze gebruiker blokkeren" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Deze gebruiker groepsbeheerder maken" @@ -1656,7 +1668,7 @@ msgid "Nickname" msgstr "Gebruikersnaam" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Wachtwoord" @@ -1896,60 +1908,65 @@ msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan." msgid "Change password" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Uw wachtwoord wijzigen" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Oud wachtwoord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nieuw wachtwoord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Zes of meer tekens" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bevestigen" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "gelijk aan wachtwoord hierboven" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Wijzigen" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Het wachtwoord moet zes of meer tekens bevatten." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "De wachtwoorden komen niet overeen." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Het oude wachtwoord is onjuist" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." @@ -2258,11 +2275,11 @@ msgstr "" #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Wachtwoordherstel" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Gebruikersnaam of e-mailadres" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2400,7 +2417,7 @@ msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2631,7 +2648,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "Dit is de manier om dat te delen wat u wilt." -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s groep" @@ -2683,7 +2700,7 @@ msgstr "Mededelingenfeed voor groep %s (Atom)" msgid "FOAF for %s group" msgstr "Vriend van een vriend voor de groep %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Leden" @@ -3342,39 +3359,39 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Avatar uploaden" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Uw wachtwoord wijzigen" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "E-mailafhandeling wijzigen" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Ontwerp" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Uw profiel ontwerpen" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Overige" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Overige instellingen" @@ -3966,34 +3983,34 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d." -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Groep" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Geblokkeerd" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s geblokkeerde gebruikers" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Eigenschappen van de groep %s bewerken" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Logo voor %s toevoegen of verwijderen" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "%s-ontwerp toevoegen of bewerken" @@ -4214,7 +4231,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4238,7 +4255,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4646,47 +4663,47 @@ msgstr "Deze gebruiker een direct bericht zenden" msgid "Message" msgstr "Bericht" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index fe675d2f6b..bf03dffcc6 100644 Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index e9aac3e380..6de37a959b 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:34+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:26+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -481,7 +481,7 @@ msgid "Invalid size." msgstr "Ugyldig storleik." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Brukarbilete" @@ -529,7 +529,7 @@ msgstr "Skaler" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -629,7 +629,7 @@ msgstr "Ingen vald profil." msgid "No profile with that ID." msgstr "Fann ingen profil med den IDen." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Blokker brukaren" @@ -641,24 +641,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nei" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Ei liste over brukarane i denne gruppa." +msgid "Do not block this user" +msgstr "Lås opp brukaren" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Jau" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Ei liste over brukarane i denne gruppa." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Blokkér denne brukaren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1155,7 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Block user from group" msgstr "Blokker brukaren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1163,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Ei liste over brukarane i denne gruppa." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ei liste over brukarane i denne gruppa." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1228,7 +1238,7 @@ msgstr "Logo oppdatert." msgid "Failed updating logo." msgstr "Feil ved oppdatering av logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s medlemmar i gruppa" @@ -1242,7 +1252,7 @@ msgstr "%s medlemmar i gruppa, side %d" msgid "A list of the users in this group." msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1250,10 +1260,6 @@ msgstr "Administrator" msgid "Block" msgstr "Blokkér" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Blokkér denne brukaren" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1657,7 +1663,7 @@ msgid "Nickname" msgstr "Kallenamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passord" @@ -1903,60 +1909,65 @@ msgstr "Dette er din utboks som syner alle private meldingar du har sendt." msgid "Change password" msgstr "Endra passord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Endra passordet ditt" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Endra passordet ditt" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Endra passord" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gamalt passord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eller fleire teikn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Godta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "same passord som ovanfor" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Endra" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Passord må være minst 6 teikn." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passorda var ikkje like." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Det gamle passordet stemmer ikkje" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lagra passord." @@ -2400,7 +2411,7 @@ msgid "Same as password above. Required." msgstr "Samme som passord over. Påkrevd." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Epost" @@ -2633,7 +2644,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s gruppe" @@ -2685,7 +2696,7 @@ msgstr "Notisstraum for %s gruppa" msgid "FOAF for %s group" msgstr "Utboks for %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" @@ -3334,40 +3345,40 @@ msgstr "Databasefeil, kan ikkje lagra svar: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Last opp ein avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Endra passordet ditt" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Endra eposthandtering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Brukarprofil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Anna" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Andre val" @@ -3958,35 +3969,35 @@ msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blokkér" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Blokker brukaren" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Rediger %s gruppa sine eigenskapar" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Legg til eller rediger logoen til %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Legg til eller rediger logoen til %s" @@ -4188,7 +4199,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4212,7 +4223,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4610,47 +4621,47 @@ msgstr "Send ei direktemelding til denne brukaren" msgid "Message" msgstr "Melding" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index 41e944d17a..861243ce26 100644 Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index e77b821b10..6f5c7433c0 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:39+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:32+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Nieprawidłowy rozmiar." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Awatar" @@ -535,7 +535,7 @@ msgstr "Przytnij" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -632,7 +632,7 @@ msgstr "Nie podano profilu." msgid "No profile with that ID." msgstr "Brak profilu o tym identyfikatorze." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Zablokuj użytkownika" @@ -647,22 +647,24 @@ msgstr "" "przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nie" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Nie blokuj tego użytkownika w tej grupie" +#, fuzzy +msgid "Do not block this user" +msgstr "Odblokuj tego użytkownika" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Tak" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "Zablokuj tego użytkownika w tej grupie" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Zablokuj tego użytkownika" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1157,7 @@ msgstr "Użytkownik nie jest członkiem grupy." msgid "Block user from group" msgstr "Zablokuj użytkownika w grupie" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1166,7 +1168,15 @@ msgstr "" "Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować " "grupy w przyszłości." -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Nie blokuj tego użytkownika w tej grupie" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Zablokuj tego użytkownika w tej grupie" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie." @@ -1225,7 +1235,7 @@ msgstr "Zaktualizowano logo." msgid "Failed updating logo." msgstr "Zaktualizowanie logo nie powiodło się." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Członkowie grupy %s" @@ -1239,7 +1249,7 @@ msgstr "Członkowie grupy %s, strona %d" msgid "A list of the users in this group." msgstr "Lista użytkowników znajdujących się w tej grupie." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1247,10 +1257,6 @@ msgstr "Administrator" msgid "Block" msgstr "Zablokuj" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Zablokuj tego użytkownika" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Uczyń użytkownika administratorem grupy" @@ -1670,7 +1676,7 @@ msgid "Nickname" msgstr "Pseudonim" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Hasło" @@ -1918,60 +1924,65 @@ msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłał msgid "Change password" msgstr "Zmień hasło" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Zmień hasło" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Zmień hasło." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Zmiana hasła" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Stare hasło" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nowe hasło" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 lub więcej znaków" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Potwierdź" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "takie samo jak hasło powyżej" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Zmień" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Hasło musi mieć sześć lub więcej znaków." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Hasła nie pasują do siebie." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Niepoprawne stare hasło" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasła." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Zapisano hasło." @@ -2428,7 +2439,7 @@ msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasło. Wymagane." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2673,7 +2684,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "To jest sposób na współdzielenie tego, co chcesz." -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Grupa %s" @@ -2725,7 +2736,7 @@ msgstr "Kanał wpisów dla grupy %s (Atom)" msgid "FOAF for %s group" msgstr "FOAF dla %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Członkowie" @@ -3402,39 +3413,39 @@ msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s!" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Zmień ustawienia profilu" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Wyślij awatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Zmień hasło" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Zmień obsługę adresu e-mail" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Wygląd" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Wygląd profilu" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Inne" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Inne opcje" @@ -4052,34 +4063,34 @@ msgstr "" "Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie " "%d" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupa" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Zablokowano" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s zablokowani użytkownicy" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Edytuj właściwości grupy %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Dodaj lub edytuj logo grupy %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Dodaj lub edytuj wygląd %s" @@ -4302,7 +4313,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4326,7 +4337,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4736,47 +4747,47 @@ msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika" msgid "Message" msgstr "Wiadomość" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index a6a7896325..116a7bacd1 100644 Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index f7c53b7190..cd7997a50c 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:42+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:35+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -479,7 +479,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -527,7 +527,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -626,7 +626,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -638,21 +638,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Não" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Desbloquear este utilizador" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1140,7 +1142,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1148,7 +1150,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1209,7 +1219,7 @@ msgstr "Avatar actualizado." msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1223,7 +1233,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1231,10 +1241,6 @@ msgstr "" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1628,7 +1634,7 @@ msgid "Nickname" msgstr "Alcunha" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "" @@ -1867,61 +1873,66 @@ msgstr "" msgid "Change password" msgstr "Modificar palavra-passe" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modificar a sua palavra-passe" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Modificar a sua palavra-passe" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova palavra-passe" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ou mais caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modificar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Palavra-passe antiga incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possível guardar a nova password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2354,7 +2365,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2580,7 +2591,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2632,7 +2643,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Feed para a tag %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "" @@ -3248,39 +3259,39 @@ msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modificar a sua palavra-passe" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Alterar email handling" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3868,35 +3879,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Desbloquear este utilizador" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4089,7 +4100,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4113,7 +4124,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4511,47 +4522,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index f6e2b38f00..478729896c 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index c584ad8695..aa7f47ccab 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:45+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:40+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -536,7 +536,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -636,7 +636,7 @@ msgstr "Não foi especificado nenhum perfil." msgid "No profile with that ID." msgstr "Não foi encontrado nenhum perfil com esse ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuário" @@ -648,23 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Não" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." +msgid "Do not block this user" +msgstr "Desbloquear este usuário" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sim" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Bloquear usuário" #: actions/block.php:165 @@ -1167,7 +1168,7 @@ msgstr "Você não está assinando esse perfil." msgid "Block user from group" msgstr "Bloquear usuário" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1175,7 +1176,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Bloquear usuário" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1242,7 +1253,7 @@ msgstr "O avatar foi atualizado." msgid "Failed updating logo." msgstr "Não foi possível atualizar o avatar." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1256,7 +1267,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1264,11 +1275,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Bloquear usuário" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Apelido" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Senha" @@ -1942,62 +1948,67 @@ msgstr "" msgid "Change password" msgstr "Alterar a senha" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Altere a sua senha" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Altera a sua senha" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "A senha foi salva." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Senha antiga" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova senha" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "No mínimo 6 caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "igual à senha acima" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Alterar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "As senhas não coincidem." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "A senha antiga está incorreta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possível salvar a nova senha." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "A senha foi salva." @@ -2445,7 +2456,7 @@ msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2678,7 +2689,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2733,7 +2744,7 @@ msgstr "Mensagens de %s" msgid "FOAF for %s group" msgstr "Mensagens de %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro desde" @@ -3390,40 +3401,40 @@ msgstr "Erro no banco de dados na inserção da reposta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Mensagem para %1$s no %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Enviar um avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Altere a sua senha" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Configurações de uso do e-mail" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "O usuário não tem perfil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Outras" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Outras opções" @@ -4022,35 +4033,35 @@ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Bloquear usuário" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propriedades do grupo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Adicionar ou editar logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Adicionar ou editar logo de %s" @@ -4253,7 +4264,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4277,7 +4288,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4680,47 +4691,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário." msgid "Message" msgstr "Nova mensagem" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "segundos atrás" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1 min atrás" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d mins atrás" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1 hora atrás" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d horas atrás" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "1 dia atrás" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d dias atrás" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1 mês atrás" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d meses atrás" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 932761df1b..7a8ba6e3df 100644 Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 9f9bfc4a7f..80bfd1d725 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:48+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:42+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Неверный размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -536,7 +536,7 @@ msgstr "Обрезать" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -636,7 +636,7 @@ msgstr "Профиль не определен." msgid "No profile with that ID." msgstr "Нет профиля с таким ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Заблокировать пользователя." @@ -648,24 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Нет" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Список пользователей, являющихся членами этой группы." +msgid "Do not block this user" +msgstr "Разблокировать пользователя." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Да" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Список пользователей, являющихся членами этой группы." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Заблокировать пользователя." #: actions/block.php:165 msgid "You have already blocked this user." @@ -1170,7 +1170,7 @@ msgstr "Вы не являетесь членом этой группы." msgid "Block user from group" msgstr "Заблокировать пользователя." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1178,7 +1178,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Список пользователей, являющихся членами этой группы." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Список пользователей, являющихся членами этой группы." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1253,7 @@ msgstr "Логотип обновлён." msgid "Failed updating logo." msgstr "Неудача при обновлении логотипа." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Участники группы %s" @@ -1257,7 +1267,7 @@ msgstr "Участники группы %s, страница %d" msgid "A list of the users in this group." msgstr "Список пользователей, являющихся членами этой группы." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Настройки" @@ -1265,10 +1275,6 @@ msgstr "Настройки" msgid "Block" msgstr "Блокировать" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Заблокировать пользователя." - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1682,7 +1688,7 @@ msgid "Nickname" msgstr "Имя" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Пароль" @@ -1928,60 +1934,65 @@ msgstr "" msgid "Change password" msgstr "Изменить пароль" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Изменить ваш пароль" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Изменить ваш пароль" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль сохранён." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Старый пароль" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Новый пароль" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или больше знаков" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Подтвердить" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "повторить пароль сверху" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Изменить" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль должен быть длиной не менее 6 символов." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Пароли не совпадают." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Некорректный старый пароль" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Ошибка сохранения пользователя; неверное имя." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Не удаётся сохранить новый пароль." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль сохранён." @@ -2434,7 +2445,7 @@ msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2666,7 +2677,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Группа %s" @@ -2718,7 +2729,7 @@ msgstr "Лента записей от группы %s" msgid "FOAF for %s group" msgstr "Исходящие для %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Участники" @@ -3388,40 +3399,40 @@ msgstr "Ошибка баз данных при вставке ответа дл msgid "Welcome to %1$s, @%2$s!" msgstr "Сообщение для %1$s на %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Изменить ваши настройки профиля" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Загрузить аватар" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Изменить ваш пароль" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Изменить электронный адрес" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Профиль пользователя" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Другое" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Другие опции" @@ -4013,35 +4024,35 @@ msgstr "Где находится группа, например «Город, msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Группа" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блокировать" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Заблокировать пользователя." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редактировать информацию о группе %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Логотип" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Добавить или изменить логотип группы %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Добавить или изменить логотип группы %s" @@ -4237,7 +4248,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4261,7 +4272,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4660,47 +4671,47 @@ msgstr "Послать приватное сообщение этому поль msgid "Message" msgstr "Сообщение" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo index d9bcf82c8a..8c1d54b027 100644 Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 9a9f25c701..f43a686b7e 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:50+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:45+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Felaktig storlek" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Användarbild" @@ -536,7 +536,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -640,7 +640,7 @@ msgstr "Ingen mottagare tillagd." msgid "No profile with that ID." msgstr "Ingen status hittad med det ID" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Ingen sådan användare" @@ -653,23 +653,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nej" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgid "Do not block this user" +msgstr "Ingen sådan användare" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Ingen sådan användare" #: actions/block.php:165 @@ -1177,7 +1178,7 @@ msgstr "Du skickade inte oss den profilen" msgid "Block user from group" msgstr "Ingen sådan användare" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1185,7 +1186,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ingen sådan användare" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1250,7 +1261,7 @@ msgstr "Användarbilden uppdaterad." msgid "Failed updating logo." msgstr "Uppdatering av profilbild misslyckades." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1264,7 +1275,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1272,11 +1283,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Ingen sådan användare" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Smeknamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Lösenord" @@ -1937,62 +1943,67 @@ msgstr "Detta är din outbox som innehåller meddelanden som du skickat." msgid "Change password" msgstr "Byt lösenord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Ändra ditt lösenord" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Ändra ditt lösenord" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Lösenord är sparat." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gammalt lösenord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt lösenord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Minst 6 tecken" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekräfta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "samma som lösenordet ovan" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Ändra" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lösenordet måste vara minst 6 tecken." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Lösenorden matchar inte." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Felaktigt, gammalt lösenord" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fel uppstog när användare skulle sparas." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Kan inte spara det nya lösenordet." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lösenord är sparat." @@ -2435,7 +2446,7 @@ msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. Måste fyllas i." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Epost" @@ -2668,7 +2679,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2722,7 +2733,7 @@ msgstr "Inlägg flöde för %s" msgid "FOAF for %s group" msgstr "Outbox för %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Medlem sedan" @@ -3376,41 +3387,41 @@ msgstr "Databasfel för svar: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Meddelande till %1$s på %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Uppdatering av profilbild misslyckades." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Ändra ditt lösenord" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Ändra email hantering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Användaren har ingen profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -4018,36 +4029,36 @@ msgstr "Var du håller till, såsom \"Stad, Län, Land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Ingen sådan användare" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Ingen sådan användare" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logga ut" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4689,47 +4700,47 @@ msgstr "Du kan inte skicka meddelande till den användaren." msgid "Message" msgstr "Nytt meddelande" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index ca72f004c7..d1784c5d83 100644 Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 00d73df85a..b044aef997 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -6,21 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:53+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:48+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి పేజీ లేదు" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -45,9 +44,9 @@ msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%s and friends, page %d" -msgstr "%s మరియు మిత్రులు" +msgstr "%s మరియు మిత్రులు, పేజీ %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 @@ -56,19 +55,19 @@ msgid "%s and friends" msgstr "%s మరియు మిత్రులు" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)" #: actions/all.php:127 #, php-format @@ -98,9 +97,8 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s మరియు మిత్రులు" +msgstr "మీరు మరియు మీ స్నేహితులు" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format @@ -151,7 +149,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "" +msgstr "వాడుకరి నిరోధం విఫలమైంది." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." @@ -159,12 +157,12 @@ msgstr "" #: actions/apidirectmessagenew.php:126 msgid "No message text!" -msgstr "" +msgstr "సందేశపు పాఠ్యం లేదు!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." +msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -255,9 +253,8 @@ msgstr "అవతారపు సమాచారాన్ని భద్రప #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం" +msgstr "మారుపేర్లని సృష్టించలేకపోయాం." #: actions/apigroupcreate.php:166 actions/newgroup.php:224 #, fuzzy @@ -295,9 +292,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." #: actions/apigroupcreate.php:261 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)." +msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." #: actions/apigroupcreate.php:272 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -309,29 +306,28 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు" +msgstr "తప్పుడు మారుపేరు: \"%s\"" #: actions/apigroupcreate.php:321 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." +msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు." #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." @@ -360,12 +356,12 @@ msgstr "%s గుంపులు" #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" -msgstr "" +msgstr "%s పై గుంపులు" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" -msgstr "%s గుంపులు" +msgstr "%s యొక్క గుంపులు" #: actions/apigrouplist.php:103 #, fuzzy, php-format @@ -378,12 +374,11 @@ msgstr "" #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "" +msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "అవతారాన్ని తాజాకరించాం." +msgstr "స్థితిని తొలగించాం." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -484,7 +479,7 @@ msgid "Invalid size." msgstr "తప్పుడు పరిమాణం." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "అవతారం" @@ -524,7 +519,7 @@ msgstr "ఎగుమతించు" #: actions/avatarsettings.php:228 actions/grouplogo.php:286 msgid "Crop" -msgstr "" +msgstr "కత్తిరించు" #: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74 #: actions/emailsettings.php:237 actions/favor.php:75 @@ -532,7 +527,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -565,9 +560,8 @@ msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." #: actions/avatarsettings.php:387 -#, fuzzy msgid "Avatar deleted." -msgstr "అవతారాన్ని తాజాకరించాం." +msgstr "అవతారాన్ని తొలగించాం." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 @@ -581,9 +575,8 @@ msgstr "పేరు లేదు." #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -#, fuzzy msgid "No such group" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి గుంపు లేదు" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -634,10 +627,9 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 -#, fuzzy +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "వాడుకరిని నిరోధించు" #: actions/block.php:136 msgid "" @@ -647,23 +639,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "కాదు" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "అటువంటి వాడుకరి లేరు." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "అవును" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "అటువంటి వాడుకరి లేరు." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "ఈ వాడుకరిని నిరోధించు" #: actions/block.php:165 #, fuzzy @@ -722,9 +715,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "ప్రాంతం" +msgstr "సంభాషణ" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -760,7 +752,7 @@ msgstr "ఈ నోటీసుని తొలగించలేము." #: actions/deletenotice.php:146 lib/noticelist.php:522 msgid "Delete this notice" -msgstr "" +msgstr "ఈ నోటీసుని తొలగించు" #: actions/deletenotice.php:157 msgid "There was a problem with your session token. Try again, please." @@ -807,9 +799,8 @@ msgid "Could not update group." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." #: actions/editgroup.php:269 -#, fuzzy msgid "Options saved." -msgstr "అమరికలు భద్రమయ్యాయి." +msgstr "ఎంపికలు భద్రమయ్యాయి." #: actions/emailsettings.php:60 msgid "Email Settings" @@ -1046,12 +1037,12 @@ msgstr "" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "విశేష వాడుకరులు" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "విశేష వాడుకరులు, పేజీ %d" #: actions/featured.php:99 #, php-format @@ -1070,7 +1061,7 @@ msgstr "కొత్త సందేశం" #: actions/file.php:42 msgid "No attachments" -msgstr "" +msgstr "జోడింపులు లేవు" #: actions/file.php:51 msgid "No uploaded attachments" @@ -1111,9 +1102,8 @@ msgstr "దూరపు ప్రొపైలుని తాజాకరిం #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupunblock.php:86 actions/leavegroup.php:83 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 -#, fuzzy msgid "No such group." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి గుంపు లేదు." #: actions/getfile.php:75 #, fuzzy @@ -1135,9 +1125,8 @@ msgid "Only an admin can block group members." msgstr "" #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." #: actions/groupblock.php:100 msgid "User is not a member of group." @@ -1148,7 +1137,7 @@ msgstr "" msgid "Block user from group" msgstr "అటువంటి వాడుకరి లేరు." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1156,7 +1145,16 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "అటువంటి వాడుకరి లేరు." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1217,7 @@ msgstr "అవతారాన్ని తాజాకరించాం." msgid "Failed updating logo." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s గుంపు సభ్యులు" @@ -1227,24 +1225,19 @@ msgstr "%s గుంపు సభ్యులు" #: actions/groupmembers.php:96 #, php-format msgid "%s group members, page %d" -msgstr "" +msgstr "%s గుంపు సభ్యులు, పేజీ %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "ఈ గుంపులో వాడుకరులు జాబితా." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" #: actions/groupmembers.php:346 lib/blockform.php:153 msgid "Block" -msgstr "" - -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "నిరోధించు" #: actions/groupmembers.php:441 msgid "Make user an admin of the group" @@ -1305,7 +1298,7 @@ msgstr "గుంపులు" #: actions/groups.php:64 #, php-format msgid "Groups, page %d" -msgstr "" +msgstr "గుంపులు, పేజీ %d" #: actions/groups.php:90 #, php-format @@ -1318,9 +1311,8 @@ msgid "" msgstr "" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy msgid "Create a new group" -msgstr "కొత్త ఖాతా సృష్టించుకోండి" +msgstr "కొత్త గుంపుని సృష్టించు" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." @@ -1451,11 +1443,11 @@ msgstr "" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "" +msgstr "ఆహ్వానము(ల)ని పంపించాం" #: actions/invite.php:112 msgid "Invite new users" -msgstr "" +msgstr "కొత్త వాడుకరులని ఆహ్వానించండి" #: actions/invite.php:128 msgid "You are already subscribed to these users:" @@ -1488,7 +1480,7 @@ msgstr "" #: actions/invite.php:187 msgid "Email addresses" -msgstr "" +msgstr "ఈమెయిలు చిరునామాలు" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" @@ -1544,12 +1536,11 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "" +msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు" #: actions/joingroup.php:128 lib/command.php:234 #, php-format @@ -1617,7 +1608,7 @@ msgid "Nickname" msgstr "పేరు" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "సంకేతపదం" @@ -1702,7 +1693,7 @@ msgstr "" #: actions/newmessage.php:181 msgid "Message sent" -msgstr "" +msgstr "సందేశాన్ని పంపించాం" #: actions/newmessage.php:185 lib/command.php:375 #, php-format @@ -1793,7 +1784,7 @@ msgstr "అనుసంధానించు" #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "మాత్రమే " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 #: lib/api.php:991 lib/api.php:1101 @@ -1856,62 +1847,66 @@ msgstr "" msgid "Change password" msgstr "సంకేతపదం మార్చుకోండి" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "సంకేతపదం మార్చుకోండి" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "సంకేతపదం భద్రమయ్యింది." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "పాత సంకేతపదం" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "నిర్థారించు" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "పై సంకేతపదం వలెనే" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "మార్చు" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "సంకేతపదాలు సరిపోలలేదు." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "పాత సంకేతపదం తప్పు" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "సంకేతపదం భద్రమయ్యింది." @@ -1973,7 +1968,6 @@ msgstr "పూర్తి పేరు" #: actions/profilesettings.php:115 actions/register.php:452 #: lib/groupeditform.php:161 -#, fuzzy msgid "Homepage" msgstr "హోమ్ పేజీ" @@ -2347,7 +2341,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "ఈమెయిల్" @@ -2555,7 +2549,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s గుంపు" @@ -2566,9 +2560,8 @@ msgid "%s group, page %d" msgstr "" #: actions/showgroup.php:218 -#, fuzzy msgid "Group profile" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "గుంపు ప్రొఫైలు" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 @@ -2583,7 +2576,7 @@ msgstr "సందేశాలు" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "మారుపేర్లు" #: actions/showgroup.php:293 msgid "Group actions" @@ -2609,7 +2602,7 @@ msgstr "%s యొక్క సందేశముల ఫీడు" msgid "FOAF for %s group" msgstr "%s గుంపు" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "సభ్యులు" @@ -2963,7 +2956,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" -msgstr "" +msgstr "ఫొటో" #: actions/tagother.php:141 msgid "Tag user" @@ -3049,7 +3042,7 @@ msgstr "" #: actions/userauthorization.php:188 msgid "License" -msgstr "" +msgstr "లైసెన్సు" #: actions/userauthorization.php:209 msgid "Accept" @@ -3238,41 +3231,41 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "ప్రొఫైలు" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "వాడుకరికి ప్రొఫైలు లేదు." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "ఇతర" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "ఇతర ఎంపికలు" @@ -3437,7 +3430,7 @@ msgstr "కొత్త సందేశం" #: lib/action.php:794 msgid "All " -msgstr "" +msgstr "అన్నీ " #: lib/action.php:799 msgid "license." @@ -3465,7 +3458,7 @@ msgstr "జోడింపులు" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "రచయిత" #: lib/attachmentlist.php:278 #, fuzzy @@ -3727,13 +3720,12 @@ msgid "Tile background image" msgstr "" #: lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "సంకేతపదం మార్చుకోండి" +msgstr "రంగులను మార్చు" #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "నేపథ్యం" #: lib/designsettings.php:191 #, fuzzy @@ -3865,35 +3857,35 @@ msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "గుంపు" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "అటువంటి వాడుకరి లేరు." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "అటువంటి వాడుకరి లేరు." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "చిహ్నం" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4027,7 +4019,7 @@ msgid "" msgstr "" #: lib/mail.php:253 -#, fuzzy, php-format +#, php-format msgid "Location: %s\n" msgstr "ప్రాంతం: %s\n" @@ -4085,7 +4077,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4109,7 +4101,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4239,7 +4231,7 @@ msgstr "%s, సంగతులేమిటి?" #: lib/noticeform.php:180 msgid "Attach" -msgstr "" +msgstr "జోడించు" #: lib/noticeform.php:184 msgid "Attach a file" @@ -4303,7 +4295,7 @@ msgstr "స్పందనలు" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "ఇష్టాంశాలు" #: lib/personalgroupnav.php:115 msgid "User" @@ -4366,7 +4358,7 @@ msgstr "ప్రజా" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "వాడుకరి గుంపులు" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" @@ -4447,7 +4439,7 @@ msgstr "" #: lib/subscriptionlist.php:126 msgid "(none)" -msgstr "" +msgstr "(ఏమీలేవు)" #: lib/subs.php:48 msgid "Already subscribed!" @@ -4514,49 +4506,49 @@ msgstr "" #: lib/userprofile.php:273 msgid "Message" -msgstr "" +msgstr "సందేశం" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index 166d3bad65..49093b4dc3 100644 Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index c27caff298..c25d1a8a6c 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:56+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:50+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Geçersiz büyüklük." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -637,7 +637,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Böyle bir kullanıcı yok." @@ -650,23 +650,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Sunucuya yönlendirme yapılamadı: %s" +msgid "Do not block this user" +msgstr "Böyle bir kullanıcı yok." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Böyle bir kullanıcı yok." #: actions/block.php:165 @@ -1155,7 +1156,7 @@ msgstr "Bize o profili yollamadınız" msgid "Block user from group" msgstr "Böyle bir kullanıcı yok." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1164,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Sunucuya yönlendirme yapılamadı: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Böyle bir kullanıcı yok." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1226,7 +1237,7 @@ msgstr "Avatar güncellendi." msgid "Failed updating logo." msgstr "Avatar güncellemede hata." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1240,7 +1251,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1248,11 +1259,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Böyle bir kullanıcı yok." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1635,7 +1641,7 @@ msgid "Nickname" msgstr "Takma ad" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Parola" @@ -1880,62 +1886,66 @@ msgstr "" msgid "Change password" msgstr "Parolayı değiştir" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Parolayı değiştir" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Parola kaydedildi." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Eski parola" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Yeni parola" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 veya daha fazla karakter" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Onayla" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "yukaridaki parola ile aynı" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Değiştir" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Parolalar birbirini tutmuyor." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Eski parola yanlış" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Parola kaydedildi." @@ -2378,7 +2388,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Eposta" @@ -2590,7 +2600,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2644,7 +2654,7 @@ msgstr "%s için durum RSS beslemesi" msgid "FOAF for %s group" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Üyelik başlangıcı" @@ -3280,41 +3290,41 @@ msgstr "Cevap eklenirken veritabanı hatası: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Avatar güncellemede hata." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Kullanıcının profili yok." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3915,36 +3925,36 @@ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Böyle bir kullanıcı yok." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Böyle bir kullanıcı yok." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Çıkış" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4142,7 +4152,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4166,7 +4176,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4571,47 +4581,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index 9e23cdc7f0..e7e6fe0eab 100644 Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 7890af28f8..a1a002b85a 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:58+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:53+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -484,7 +484,7 @@ msgid "Invalid size." msgstr "Недійсний розмір." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватара" @@ -532,7 +532,7 @@ msgstr "Втяти" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -633,7 +633,7 @@ msgstr "Не визначено жодного профілю." msgid "No profile with that ID." msgstr "Не визначено профілю з таким ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Блокувати користувача." @@ -645,24 +645,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Ні" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Список учасників цієї групи." +msgid "Do not block this user" +msgstr "Розблокувати цього користувача" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Так" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Список учасників цієї групи." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Блокувати користувача" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1161,7 +1161,7 @@ msgstr "Ви не є учасником цієї групи." msgid "Block user from group" msgstr "Блокувати користувача." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1169,7 +1169,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Список учасників цієї групи." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Список учасників цієї групи." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1234,7 +1244,7 @@ msgstr "Логотип оновлено." msgid "Failed updating logo." msgstr "Оновлення логотипу завершилось невдачею." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Учасники групи %s" @@ -1248,7 +1258,7 @@ msgstr "Учасники групи %s, сторінка %d" msgid "A list of the users in this group." msgstr "Список учасників цієї групи." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Адмін" @@ -1256,10 +1266,6 @@ msgstr "Адмін" msgid "Block" msgstr "Блок" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Блокувати користувача" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1677,7 +1683,7 @@ msgid "Nickname" msgstr "Ім'я користувача" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Пароль" @@ -1927,60 +1933,65 @@ msgstr "" msgid "Change password" msgstr "Змінити пароль" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Змінити ваш пароль" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Змінити пароль." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль замінено" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Старий пароль" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Новий пароль" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 або більше знаків" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Підтвердити" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "такий само, як і пароль вище" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Змінити" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль має складатись з 6-ти або більше знаків." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролі не співпадають." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Старий пароль неточний" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Помилка при збереженні користувача; недійсний." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Не можна зберегти новий пароль." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль збережено." @@ -2428,7 +2439,7 @@ msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Пошта" @@ -2661,7 +2672,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Група %s" @@ -2713,7 +2724,7 @@ msgstr "Живлення повідомлень для групи %s" msgid "FOAF for %s group" msgstr "Вихідні для %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Учасники" @@ -3365,40 +3376,40 @@ msgstr "Помилка бази даних при додаванні відпо msgid "Welcome to %1$s, @%2$s!" msgstr "Повідомлення до %1$s на %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Змінити налаштування профілю" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Завантаження аватари" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Змінити ваш пароль" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Змінити електронну адресу вручну" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Профіль користувача." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Інше" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Інші опції" @@ -3989,35 +4000,35 @@ msgstr "Локація групи, на зразок \"Місто, област msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Група" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блок" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Блокувати користувача." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редагувати властивості групи %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Лого" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Додати або редагувати логотип %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Додати або редагувати логотип %s" @@ -4221,7 +4232,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4245,7 +4256,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4643,47 +4654,47 @@ msgstr "Надіслати пряме повідомлення цьому кор msgid "Message" msgstr "Повідомлення" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index df6915cec4..bb42fbee77 100644 Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index b7bc3231af..f1b61c263e 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:01+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:55+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Kích thước không hợp lệ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Hình đại diện" @@ -541,7 +541,7 @@ msgstr "Nhóm" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -643,7 +643,7 @@ msgstr "" msgid "No profile with that ID." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Ban user" @@ -656,23 +656,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Không" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." +msgid "Do not block this user" +msgstr "Bỏ chặn người dùng này" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Có" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Ban user" #: actions/block.php:165 @@ -1190,7 +1191,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Block user from group" msgstr "Ban user" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1198,7 +1199,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ban user" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1265,7 +1276,7 @@ msgstr "Hình đại diện đã được cập nhật." msgid "Failed updating logo." msgstr "Cập nhật hình đại diện không thành công." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, fuzzy, php-format msgid "%s group members" msgstr "Thành viên" @@ -1279,7 +1290,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1287,11 +1298,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Ban user" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1713,7 +1719,7 @@ msgid "Nickname" msgstr "Biệt danh" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Mật khẩu" @@ -1967,63 +1973,68 @@ msgstr "" msgid "Change password" msgstr "Đổi mật khẩu" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Thay đổi mật khẩu của bạn" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Thay đổi mật khẩu của bạn" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Đã lưu mật khẩu." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Mật khẩu cũ" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Mật khẩu mới" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nhận" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "cùng mật khẩu ở trên" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 #, fuzzy msgid "Password must be 6 or more characters." msgstr "Mật khẩu phải nhiều hơn 6 ký tự." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Mật khẩu không khớp." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Mật khẩu cũ sai" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Không thể lưu mật khẩu mới" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Đã lưu mật khẩu." @@ -2469,7 +2480,7 @@ msgid "Same as password above. Required." msgstr "Cùng mật khẩu ở trên. Bắt buộc." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2697,7 +2708,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, fuzzy, php-format msgid "%s group" msgstr "%s và nhóm" @@ -2752,7 +2763,7 @@ msgstr "Dòng tin nhắn cho %s" msgid "FOAF for %s group" msgstr "Hộp thư đi của %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Thành viên" @@ -3414,42 +3425,42 @@ msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sơ " -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Cập nhật hình đại diện không thành công." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Thay đổi mật khẩu của bạn" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Đang thực hiện việc thay đổi email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Hồ sơ" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 #, fuzzy msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -4068,36 +4079,36 @@ msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Nhóm" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Ban user" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Ban user" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Thoát" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4322,7 +4333,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4346,7 +4357,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4778,47 +4789,47 @@ msgstr "Bạn đã theo những người này:" msgid "Message" msgstr "Tin mới nhất" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index 94772c6ca3..f3b08115df 100644 Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 06465826f2..1a5c6d5ba2 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:05+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:58+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "大小不正确。" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "头像" @@ -537,7 +537,7 @@ msgstr "剪裁" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -641,7 +641,7 @@ msgstr "没有收件人。" msgid "No profile with that ID." msgstr "没有找到此ID的信息。" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "阻止用户" @@ -654,24 +654,25 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "否" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "该组成员列表。" +msgid "Do not block this user" +msgstr "取消阻止次用户" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "是" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" -msgstr "该组成员列表。" +msgid "Block this user" +msgstr "阻止该用户" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1169,7 +1170,7 @@ msgstr "您未告知此个人信息" msgid "Block user from group" msgstr "阻止用户" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1177,7 +1178,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1254,7 @@ msgstr "logo已更新。" msgid "Failed updating logo." msgstr "更新logo失败。" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s 组成员" @@ -1257,7 +1268,7 @@ msgstr "%s 组成员, 第 %d 页" msgid "A list of the users in this group." msgstr "该组成员列表。" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "admin管理员" @@ -1265,11 +1276,6 @@ msgstr "admin管理员" msgid "Block" msgstr "阻止" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "阻止该用户" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1671,7 +1677,7 @@ msgid "Nickname" msgstr "昵称" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "密码" @@ -1912,62 +1918,67 @@ msgstr "这是您的发件箱，包含您发送的私人消息。" msgid "Change password" msgstr "修改密码" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "修改密码" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "修改密码" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "密码已保存。" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "旧密码" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新密码" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 个或更多字符" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "相同的密码" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "密码必须包含 6 个或更多字符。" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "密码不匹配。" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "旧密码不正确" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "保存用户时出错；不正确。" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "无法保存新密码。" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "密码已保存。" @@ -2405,7 +2416,7 @@ msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "电子邮件" @@ -2631,7 +2642,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s 组" @@ -2685,7 +2696,7 @@ msgstr "%s 的通告聚合" msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" @@ -3339,40 +3350,40 @@ msgstr "添加回复时数据库出错：%s" msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "修改您的个人信息" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "上载一个头像。" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "修改密码" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "修改电子邮件" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信息。" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "其他" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "其他选项" @@ -3979,36 +3990,36 @@ msgstr "你的位置，格式类似\"城市，省份，国家\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "组" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "阻止" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "阻止用户" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "编辑 %s群选项" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logo图标" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "添加或编辑 %s 图标" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "添加或编辑 %s 图标" @@ -4214,7 +4225,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4238,7 +4249,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4654,47 +4665,47 @@ msgstr "无法向此用户发送消息。" msgid "Message" msgstr "新消息" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index 2d9e59f007..36cdef3ba1 100644 Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index e408035157..0843684be3 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:08+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 21:00:00+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -485,7 +485,7 @@ msgid "Invalid size." msgstr "尺寸錯誤" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "個人圖像" @@ -534,7 +534,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -636,7 +636,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "無此使用者" @@ -649,23 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "無法連結到伺服器:%s" +msgid "Do not block this user" +msgstr "無此使用者" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "無此使用者" #: actions/block.php:165 @@ -1149,7 +1150,7 @@ msgstr "" msgid "Block user from group" msgstr "無此使用者" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1157,7 +1158,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "無法連結到伺服器:%s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "無此使用者" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1230,7 @@ msgstr "更新個人圖像" msgid "Failed updating logo." msgstr "無法上傳個人圖像" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1233,7 +1244,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1241,11 +1252,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "無此使用者" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1613,7 +1619,7 @@ msgid "Nickname" msgstr "暱稱" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "" @@ -1848,61 +1854,65 @@ msgstr "" msgid "Change password" msgstr "更改密碼" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "更改密碼" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新密碼" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6個以上字元" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確認" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "更改" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "舊密碼錯誤" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "儲存使用者發生錯誤;使用者名稱無效" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "無法存取新密碼" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2331,7 +2341,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "電子信箱" @@ -2539,7 +2549,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2592,7 +2602,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "無此通知" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "何時加入會員的呢？" @@ -3221,41 +3231,41 @@ msgstr "增加回覆時,資料庫發生錯誤: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "無法上傳個人圖像" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "無此通知" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3845,36 +3855,36 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "無此使用者" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "無此使用者" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "登出" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4071,7 +4081,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4095,7 +4105,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4495,47 +4505,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr ""