summaryrefslogtreecommitdiff
path: root/locale/mk
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-10 15:25:43 -0800
committerZach Copley <zach@status.net>2009-11-10 15:25:43 -0800
commitdb64b612961c37477d0729e9ff4f882fb5df7b8d (patch)
tree9ae5a31b58a289fc838c29c34230edd3962c231f /locale/mk
parentee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff)
parent91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff)
Merge branch '0.9.x' into finish-account-api
* 0.9.x: Added a events for the settings menu items Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server. Changed to Evan's event style and added an AuthPlugin superclass add geo output to statuses in json, xml, atom, rss in API Localisation updates from translatewiki.net (2009-11-10) Localisation updates from translatewiki.net Update pot add lat and long parameters to api/statuses/update change credential check to work more like other events fixup output of object attributes in db error code Performance fix for subscription/subscriber lists based on feedback from ops. Adjusting indexes to make favorites query more efficient, based on feedback from ops. Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php" Added hook for the Group navigation items Updated block @title text (shouldn't say from group) Updated group block markup Revert "Remove more contractions"
Diffstat (limited to 'locale/mk')
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin44819 -> 44896 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po144
2 files changed, 77 insertions, 67 deletions
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 37f92cabd..3914f339c 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 558b936d8..91f7eaebe 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 "пред една година"