Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica
This commit is contained in:
commit
f761031d0a
@ -46,7 +46,7 @@ function subs_subscribe_to($user, $other)
|
|||||||
{
|
{
|
||||||
|
|
||||||
if ($user->isSubscribed($other)) {
|
if ($user->isSubscribed($other)) {
|
||||||
return _('Already subscribed!');
|
return _('Already subscribed!.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($other->hasBlocked($user)) {
|
if ($other->hasBlocked($user)) {
|
||||||
|
Binary file not shown.
@ -144,7 +144,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Вече сте влезли."
|
msgstr "Вече сте влезли."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Вече сте абонирани!"
|
msgstr "Вече сте абонирани!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -160,7 +160,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Ja estàs connectat."
|
msgstr "Ja estàs connectat."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Ja estàs subscrit!"
|
msgstr "Ja estàs subscrit!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -160,7 +160,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Již přihlášen"
|
msgstr "Již přihlášen"
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Již přihlášeno"
|
msgstr "Již přihlášeno"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -159,7 +159,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Bereits eingeloggt."
|
msgstr "Bereits eingeloggt."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Bereits abonniert!"
|
msgstr "Bereits abonniert!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -288,7 +288,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
||||||
|
Binary file not shown.
@ -152,7 +152,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Already logged in."
|
msgstr "Already logged in."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Already subscribed!"
|
msgstr "Already subscribed!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -160,7 +160,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Ya estás conectado."
|
msgstr "Ya estás conectado."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "¡Ya está suscrito!"
|
msgstr "¡Ya está suscrito!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -1644,7 +1644,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
|
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
|
||||||
|
@ -164,7 +164,7 @@ msgid "Already logged in."
|
|||||||
msgstr "כבר מחובר."
|
msgstr "כבר מחובר."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "כבר מנוי!"
|
msgstr "כבר מנוי!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -154,7 +154,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Accesso già effettuato."
|
msgstr "Accesso già effettuato."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Già abbonato!"
|
msgstr "Già abbonato!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -154,7 +154,7 @@ msgid "Already logged in."
|
|||||||
msgstr "既にログインしています。"
|
msgstr "既にログインしています。"
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "既に購読しています。"
|
msgstr "既に購読しています。"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -165,7 +165,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48 ../lib/subs.php:42 lib/subs.php:42
|
#: ../actions/subscribe.php:48 ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
|
#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
|
||||||
|
@ -287,7 +287,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!"
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
||||||
|
Binary file not shown.
@ -162,7 +162,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Веќе сте најавени."
|
msgstr "Веќе сте најавени."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Веќе сте претплатени!"
|
msgstr "Веќе сте претплатени!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -165,7 +165,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Al ingelogd."
|
msgstr "Al ingelogd."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Al geabonneerd!"
|
msgstr "Al geabonneerd!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -225,7 +225,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Allerede logget inn."
|
msgstr "Allerede logget inn."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:49 ../lib/subs.php:42 lib/subs.php:42
|
#: ../actions/subscribe.php:49 ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
||||||
|
Binary file not shown.
@ -172,7 +172,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Jesteś już zalogowany."
|
msgstr "Jesteś już zalogowany."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Już obserwujesz!"
|
msgstr "Już obserwujesz!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -288,7 +288,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
||||||
|
Binary file not shown.
@ -328,7 +328,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Já está autenticado."
|
msgstr "Já está autenticado."
|
||||||
|
|
||||||
#: ../lib/subs.php:42
|
#: ../lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Já foi assinado!"
|
msgstr "Já foi assinado!"
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54
|
#: ../actions/deletenotice.php:54
|
||||||
|
@ -318,7 +318,7 @@ msgid "Already logged in."
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54
|
#: ../actions/deletenotice.php:54
|
||||||
|
Binary file not shown.
@ -155,7 +155,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Redan inloggad."
|
msgstr "Redan inloggad."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Det finns redan en prenumeration!"
|
msgstr "Det finns redan en prenumeration!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -159,7 +159,7 @@ msgid "Already logged in."
|
|||||||
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
|
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "ఇప్పటికే చేరారు!"
|
msgstr "ఇప్పటికే చేరారు!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
|
#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
|
||||||
|
Binary file not shown.
@ -161,7 +161,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Zaten giriş yapılmış."
|
msgstr "Zaten giriş yapılmış."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Zaten abone olunmuş!."
|
msgstr "Zaten abone olunmuş!."
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Binary file not shown.
@ -235,7 +235,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Тепер ви увійшли."
|
msgstr "Тепер ви увійшли."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:49
|
#: ../actions/subscribe.php:49
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Тепер ви підписані!"
|
msgstr "Тепер ви підписані!"
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54
|
#: ../actions/deletenotice.php:54
|
||||||
|
Binary file not shown.
@ -157,7 +157,7 @@ msgid "Already logged in."
|
|||||||
msgstr "Đã đăng nhập."
|
msgstr "Đã đăng nhập."
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "Đã đăng nhận rồi!"
|
msgstr "Đã đăng nhận rồi!"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
@ -343,7 +343,7 @@ msgid "Already logged in."
|
|||||||
msgstr "已登录。"
|
msgstr "已登录。"
|
||||||
|
|
||||||
#: ../lib/subs.php:42 lib/subs.php:42
|
#: ../lib/subs.php:42 lib/subs.php:42
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "已订阅!"
|
msgstr "已订阅!"
|
||||||
|
|
||||||
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
|
||||||
|
@ -140,7 +140,7 @@ msgid "Already logged in."
|
|||||||
msgstr "已登入"
|
msgstr "已登入"
|
||||||
|
|
||||||
#: ../actions/subscribe.php:48
|
#: ../actions/subscribe.php:48
|
||||||
msgid "Already subscribed!
|
msgid "Already subscribed!."
|
||||||
msgstr "此帳號已註冊"
|
msgstr "此帳號已註冊"
|
||||||
|
|
||||||
#: ../actions/userauthorization.php:76
|
#: ../actions/userauthorization.php:76
|
||||||
|
Loading…
Reference in New Issue
Block a user