We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit eb711321 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into testing

parents a844c423 76821df9

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -831,7 +831,7 @@ function mail_notify_group_join($group, $joiner)
// TRANS: Subject of group join notification e-mail.
// TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
$headers['Subject'] = sprintf(_('%1$s has joined '.
'your group %2$s on %3$s.'),
'your group %2$s on %3$s'),
$joiner->getBestName(),
$group->getBestName(),
common_config('site', 'name'));
......
This diff is collapsed.
This diff is collapsed.
......@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-11 13:47+0000\n"
"PO-Revision-Date: 2011-09-11 13:50:17+0000\n"
"POT-Creation-Date: 2011-09-25 21:42+0000\n"
"PO-Revision-Date: 2011-09-25 21:44:49+0000\n"
"Language-Team: Bulgarian <https://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r96777); Translate extension (2011-08-30)\n"
"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-POT-Import-Date: 2011-08-30 09:58:26+0000\n"
"X-POT-Import-Date: 2011-09-11 15:11:17+0000\n"
#. TRANS: Database error message.
#, php-format
......@@ -3064,12 +3064,6 @@ msgstr ""
msgid "Save license settings."
msgstr "Запазване настройките на сайта"
#. TRANS: Client error displayed when trying to log in while already logged in.
#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
#. TRANS: Client error displayed when trying to register while already logged in.
msgid "Already logged in."
msgstr "Вече сте влезли."
#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
......@@ -3425,6 +3419,33 @@ msgstr ""
msgid "Not a supported data format."
msgstr "Неподдържан формат на данните"
#. TRANS: Page title for profile settings.
#, fuzzy
msgid "Old school UI settings"
msgstr "Настройки за SMS"
#. TRANS: Usage instructions for profile settings.
msgid "If you like it \"the old way\", you can set that here."
msgstr ""
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
msgid "Settings saved."
msgstr "Настройките са запазени."
msgid "Only stream mode (no conversations) in timelines"
msgstr ""
msgid "Show conversation page as hierarchical trees"
msgstr ""
msgid "Show nicknames (not full names) in timelines"
msgstr ""
#. TRANS: Button text to save a list.
msgid "Save"
msgstr "Запазване"
#. TRANS: ShortName in the OpenSearch interface when trying to find users.
msgid "People Search"
msgstr "Търсене на хора"
......@@ -3433,6 +3454,11 @@ msgstr "Търсене на хора"
msgid "Notice Search"
msgstr "Търсене на бележки"
#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
#. TRANS: Client error displayed when trying to register while already logged in.
msgid "Already logged in."
msgstr "Вече сте влезли."
#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
#, fuzzy
msgid "No user ID specified."
......@@ -4216,11 +4242,6 @@ msgstr "Грешка при запазване етикетите."
msgid "Could not save tags."
msgstr "Грешка при запазване на етикетите."
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
msgid "Settings saved."
msgstr "Настройките са запазени."
#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
#. TRANS: Page title for page where a user account can be restored from backup.
#, fuzzy
......@@ -6692,14 +6713,6 @@ msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
#. TRANS: Link text for link that will subscribe to a remote profile.
#. TRANS: Button text to subscribe to a user.
#. TRANS: Button text for subscribing to a list.
#, fuzzy
msgctxt "BUTTON"
msgid "Subscribe"
msgstr "Абониране"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#, php-format
msgid "%1$s - %2$s"
......@@ -7753,6 +7766,11 @@ msgstr ""
msgid "Go to the installer."
msgstr "Влизане в сайта"
#. TRANS: Header on conversation page. Hidden by default (h2).
#. TRANS: Label for user statistics.
msgid "Notices"
msgstr "Бележки"
#. TRANS: Page title for when a database error occurs.
msgid "Database error"
msgstr "Грешка в базата от данни"
......@@ -8697,6 +8715,9 @@ msgstr "в контекст"
msgid "Repeated by"
msgstr "Повторено от"
msgid " "
msgstr ""
#. TRANS: Link title in notice list item to reply to a notice.
#, fuzzy
msgid "Reply to this notice."
......@@ -8763,10 +8784,6 @@ msgid_plural "Describe the list or topic in %d characters."
msgstr[0] "Опишете групата или темата в до %d букви"
msgstr[1] "Опишете групата или темата в до %d букви"
#. TRANS: Button text to save a list.
msgid "Save"
msgstr "Запазване"
#. TRANS: Button title to delete a list.
#, fuzzy
msgid "Delete this list."
......@@ -9047,10 +9064,6 @@ msgstr "Потребител"
msgid "Member since"
msgstr "Участник от"
#. TRANS: Label for user statistics.
msgid "Notices"
msgstr "Бележки"
#. TRANS: Label for user statistics.
#. TRANS: Average count of posts made per day since account registration.
msgid "Daily average"
......@@ -9338,6 +9351,15 @@ msgstr "Свързване"
msgid "Authorized connected applications"
msgstr "Изтриване на приложението"
#. TRANS: Menu item in settings navigation panel.
msgctxt "MENU"
msgid "Old school"
msgstr ""
#. TRANS: Menu item title in settings navigation panel.
msgid "UI tweaks for old-school users"
msgstr ""
#. TRANS: Title of form to silence a user.
#, fuzzy
msgctxt "TITLE"
......@@ -9444,6 +9466,13 @@ msgstr "Поканете приятели и колеги да се присъе
msgid "Subscribe to this user"
msgstr "Абониране за този потребител"
#. TRANS: Button text to subscribe to a user.
#. TRANS: Button text for subscribing to a list.
#, fuzzy
msgctxt "BUTTON"
msgid "Subscribe"
msgstr "Абониране"
#. TRANS: Button title to subscribe to a user.
#, fuzzy
msgid "Subscribe to this user."
......@@ -9779,31 +9808,3 @@ msgstr ""